X-Git-Url: http://deadsoftware.ru/gitweb?p=dsw-obn.git;a=blobdiff_plain;f=src%2Fbackends%2Fjvm%2Fgenerator-jvm.c;h=5b45cc166bca184d32d0640a24f9f90a016617ef;hp=065d9634c48a73b4b3900e63a17fd3e6f5a7ff6e;hb=b09b4829b70cf34a470003286ea100663d7fe442;hpb=844ae6c007ac4606ad4ac3938876b67c014bb5eb

diff --git a/src/backends/jvm/generator-jvm.c b/src/backends/jvm/generator-jvm.c
index 065d963..5b45cc1 100644
--- a/src/backends/jvm/generator-jvm.c
+++ b/src/backends/jvm/generator-jvm.c
@@ -424,7 +424,7 @@ oberon_generate_procedure_pointer_class(oberon_object_t * proc)
 	int cell_size = jvm_cell_size_for_type(proc -> type -> base);
 	jvm_generate(p, use_size, cell_size, "invokestatic %s%s", full_name, signature);
 
-	if(proc -> type -> base -> class == OBERON_TYPE_VOID)
+	if(proc -> type -> base -> class == OBERON_TYPE_NOTYPE)
 	{
 		jvm_generate(p, 0, 0, "return");
 	}
@@ -475,18 +475,10 @@ oberon_generator_init_type(oberon_context_t * ctx, oberon_type_t * type)
 	memset(t, 0, sizeof *t);
 	type -> gen_type = t;
 
-	if(type -> class != OBERON_TYPE_VOID)
-	{
-		t -> wide = jvm_is_wide_type(type);
-		t -> prefix = jvm_get_prefix(type);
-		t -> postfix = jvm_get_postfix(type);
-	}
-	t -> cell_size = jvm_cell_size_for_type(type);
-	t -> desc = jvm_get_descriptor(type);
-
+	gen_module_t * m;
 	switch(type -> class)
 	{
-		case OBERON_TYPE_VOID:
+		case OBERON_TYPE_NOTYPE:
 		case OBERON_TYPE_INTEGER:
 		case OBERON_TYPE_BOOLEAN:
 		case OBERON_TYPE_ARRAY:
@@ -495,10 +487,9 @@ oberon_generator_init_type(oberon_context_t * ctx, oberon_type_t * type)
 		case OBERON_TYPE_CHAR:
 		case OBERON_TYPE_STRING:
 		case OBERON_TYPE_SET:
+		case OBERON_TYPE_NIL:
 			break;
 		case OBERON_TYPE_RECORD:
-			;
-			gen_module_t * m;
 			m = type -> module -> gen_mod;
 			oberon_generate_record_class(m, type);
 			break;
@@ -509,6 +500,20 @@ oberon_generator_init_type(oberon_context_t * ctx, oberon_type_t * type)
 			gen_error("oberon_generator_init_type: unk calss %i", type -> class);
 			break;
 	}
+
+	if(type -> class != OBERON_TYPE_NOTYPE)
+	{
+		t -> wide = jvm_is_wide_type(type);
+		t -> prefix = jvm_get_prefix(type);
+		t -> postfix = jvm_get_postfix(type);
+	}
+
+	t -> cell_size = jvm_cell_size_for_type(type);
+
+	if(type -> class != OBERON_TYPE_NIL)
+	{
+		t -> desc = jvm_get_descriptor(type);
+	}
 }
 
 void
@@ -1036,8 +1041,6 @@ jvm_generate_call_proc(gen_proc_t * p, oberon_item_t * desig)
 		}
 	}
 
-	printf("direct_call == %i\n", direct_call);
-
 	oberon_type_t * procsig;
 	procsig = desig -> parent -> result;
 
@@ -1133,29 +1136,35 @@ jvm_generate_expr_new_pointer(gen_proc_t * p, oberon_type_t * type, int num, obe
 	jvm_generate_new(p, type -> base, num);
 }
 
+static void
+jvm_generate_cast_prefix(gen_proc_t * p, char prefix, char postfix)
+{
+	if(prefix == postfix)
+	{
+		return;
+	}
+
+	int from_cell_size = jvm_cell_size_for_postfix(prefix);
+	int to_cell_size = jvm_cell_size_for_postfix(postfix);
+	jvm_generate(p, from_cell_size, to_cell_size, "%c2%c", prefix, postfix);
+}
+
 static void
 jvm_generate_cast_type(gen_proc_t * p, oberon_type_t * from, oberon_type_t * to)
 {
 	if(to -> class == OBERON_TYPE_RECORD || to -> class == OBERON_TYPE_POINTER)
 	{
-		char * full_name = jvm_get_class_full_name(to);
-		jvm_generate(p, 1, 1, "checkcast %s", full_name);
+		if(to -> class == OBERON_TYPE_POINTER && to -> base -> class == OBERON_TYPE_RECORD)
+		{
+			char * full_name = jvm_get_class_full_name(to);
+			jvm_generate(p, 1, 1, "checkcast %s", full_name);
+		}
 	}
 	else
 	{
 		char prefix = jvm_get_prefix(from);
 		char postfix = jvm_get_postfix(to);
-		int from_cell_size = jvm_cell_size_for_type(from);
-		int to_cell_size = jvm_cell_size_for_type(to);
-
-		jvm_generate_comment(p, "cast type class from %i(%i) to %i(%i)", from -> class, from -> size, to -> class, to -> size);
-
-		if(prefix == postfix)
-		{
-			return;
-		}
-
-		jvm_generate(p, from_cell_size, to_cell_size, "%c2%c", prefix, postfix);
+		jvm_generate_cast_prefix(p, prefix, postfix);
 	}
 }
 
@@ -1187,20 +1196,17 @@ push_item(gen_proc_t * p, oberon_item_t * item)
 			;
 			char postfix = jvm_get_postfix(item -> result);
 			int cell_size = jvm_cell_size_for_postfix(postfix);
-			assert(item -> parent -> is_item);
-			push_item(p, (oberon_item_t *) item -> parent);
+			push_item(p, item -> parent);
 			push_expr(p, item -> args);
 			jvm_generate(p, 1 + 1, cell_size, "%caload", postfix);
 			break;
 		case MODE_FIELD:
-			assert(item -> parent -> is_item);
-			push_item(p, (oberon_item_t *) item -> parent);
+			push_item(p, item -> parent);
 			jvm_generate_load(p, item -> var -> gen_var);
 			break;
 		case MODE_DEREF:
 			/* Все объекты в jvm представляются как указатели */
-			assert(item -> parent -> is_item);
-			push_item(p, (oberon_item_t *) item -> parent);
+			push_item(p, item -> parent);
 			break;
 		case MODE_NIL:
 			jvm_generate(p, 0, 1, "aconst_null");
@@ -1214,6 +1220,11 @@ push_item(gen_proc_t * p, oberon_item_t * item)
 		case MODE_STRING:
 			jvm_generate_push_string(p, item -> string, item -> result -> size);
 			break;
+		case MODE_LEN:
+			push_item(p, item -> parent);
+			jvm_generate_array_len(p, item -> integer);
+			jvm_generate_cast_prefix(p, 'i', jvm_get_postfix(item -> result));
+			break;
 		default:
 			gen_error("push_item: unk mode %i", item -> mode);
 			break;
@@ -1301,6 +1312,19 @@ jvm_generate_compare_op(gen_proc_t * p, oberon_type_t * t, int op)
 		jvm_generate(p, 2 * cell_size, 1, "%ccmp%c", prefix, fop);
 		jvm_generate(p, 1, 1, "if%s L%i", cmpop, label_true);
 	}
+	else if(prefix == 'a')
+	{
+		if(t -> class == OBERON_TYPE_STRING
+			|| (t -> class == OBERON_TYPE_POINTER && t -> base -> class == OBERON_TYPE_CHAR))
+		{
+			jvm_generate(p, 2, 1, "invokestatic SYSTEM/STRCMP([B[B)I");
+			jvm_generate(p, 1, 0, "if%s L%i", cmpop, label_true);
+		}
+		else
+		{
+			jvm_generate(p, 1, 0, "if_acmp%s L%i", cmpop, label_true);
+		}
+	}
 	else
 	{
 		jvm_generate(p, 2 * cell_size, 0, "if_%ccmp%s L%i", prefix, cmpop, label_true);
@@ -1333,6 +1357,9 @@ jvm_generate_operator(gen_proc_t * p, oberon_type_t * t, int op)
 		case OP_ABS:
 			jvm_generate_abs(p, prefix);
 			break;
+		case OP_CAP:
+			jvm_generate(p, cell_size, cell_size, "invokestatic java/lang/Character/toUpperCase(I)I");
+			break;
 
 		case OP_ADD:
 			jvm_generate(p, 2 * cell_size, cell_size, "%cadd", prefix);
@@ -1356,6 +1383,7 @@ jvm_generate_operator(gen_proc_t * p, oberon_type_t * t, int op)
 			jvm_generate(p, 2 * cell_size, cell_size, "%cand", prefix);
 			break;
 		case OP_DIFFERENCE:
+			/* (a - b) == a & ~b */
 			jvm_generate_push_int_size(p, -1, t -> size);
 			jvm_generate(p, 2 * cell_size, cell_size, "%cxor", prefix);
 			jvm_generate(p, 2 * cell_size, cell_size, "%cand", prefix);
@@ -1482,6 +1510,7 @@ jvm_generate_in(gen_proc_t * p, oberon_expr_t * a, oberon_expr_t * b)
 	int label_else = jvm_new_label_id(p);
 	int label_end = jvm_new_label_id(p);
 
+	/* (a IN b) == (1 << a) & b */
 	jvm_generate_push_int_size(p, 1, t -> size);
 	push_expr(p, a);
 	jvm_generate(p, 2 * cell_size, cell_size, "%cshl", prefix);
@@ -1501,6 +1530,51 @@ jvm_generate_in(gen_proc_t * p, oberon_expr_t * a, oberon_expr_t * b)
 	jvm_generate_label(p, label_end);
 }
 
+static void
+jvm_generate_ash(gen_proc_t * p, oberon_expr_t * a, oberon_expr_t * b)
+{
+	oberon_type_t * t = a -> result;
+	int cell_size = jvm_cell_size_for_type(t);
+	char prefix = jvm_get_prefix(t);
+	int label_else = jvm_new_label_id(p);
+	int label_end = jvm_new_label_id(p);
+
+	/* if b < 0 then a << b else a >> b end */
+
+	push_expr(p, a);
+	push_expr(p, b);
+	if(cell_size == 1)
+	{
+		jvm_generate(p, cell_size, 2 * cell_size, "dup");
+	}
+	else
+	{
+		jvm_generate(p, cell_size, 2 * cell_size, "dup2");
+	}
+	jvm_generate_push_int_size(p, 0, t -> size);
+	jvm_generate_compare_op(p, t, OP_LSS);
+
+	jvm_generate(p, cell_size, 0, "ifne L%i", label_else);
+	jvm_generate(p, 2 * cell_size, cell_size, "%cshl", prefix);
+	jvm_generate(p, 0, 0, "goto L%i", label_end);
+	jvm_generate_label(p, label_else);
+	jvm_generate_abs(p, prefix);	
+	jvm_generate(p, 2 * cell_size, cell_size, "%cshr", prefix);
+	jvm_generate_label(p, label_end);
+}
+
+static void
+jvm_generate_entier(gen_proc_t * p, oberon_expr_t * x, oberon_type_t * res)
+{
+	char prefix = jvm_get_prefix(x -> result);
+	char postfix = jvm_get_postfix(res);
+
+	push_expr(p, x);
+	jvm_generate_cast_prefix(p, prefix, 'd');
+	jvm_generate(p, 2, 2, "invokestatic java/lang/Math/floor(D)D");
+	jvm_generate_cast_prefix(p, 'd', postfix);
+}
+
 static void
 push_operator(gen_proc_t * p, oberon_oper_t * oper)
 {
@@ -1516,9 +1590,13 @@ push_operator(gen_proc_t * p, oberon_oper_t * oper)
 		case OP_UNARY_MINUS:
 		case OP_LOGIC_NOT:
 		case OP_ABS:
+		case OP_CAP:
 			push_expr(p, oper -> left);
 			jvm_generate_operator(p, preq, op);
 			break;
+		case OP_ENTIER:
+			jvm_generate_entier(p, oper -> left, oper -> result);
+			break;
 
 		case OP_ADD:
 		case OP_SUB:
@@ -1561,6 +1639,10 @@ push_operator(gen_proc_t * p, oberon_oper_t * oper)
 		case OP_IN:
 			jvm_generate_in(p, oper -> left, oper -> right);
 			break;
+
+		case OP_ASH:
+			jvm_generate_ash(p, oper -> left, oper -> right);
+			break;
 		default:
 			gen_error("push_oper: unk op %i", op);
 			break;
@@ -1643,27 +1725,73 @@ oberon_generate_assign(oberon_context_t * ctx, oberon_expr_t * src, oberon_expr_
 }
 
 void
-oberon_generate_code(oberon_context_t * ctx)
+oberon_generate_copy(oberon_context_t * ctx, oberon_expr_t * src, oberon_expr_t * dst)
+{
+	gen_module_t * m;
+	gen_proc_t * p;
+	char * desc;
+
+	m = ctx -> mod -> gen_mod;
+	p = m -> class -> p;
+
+	push_expr(p, src);
+	push_expr(p, dst);
+
+	desc = jvm_get_descriptor(dst -> result);
+
+	jvm_generate(p, 2, 0, "invokestatic SYSTEM/COPY(%s%s)V", desc, desc);
+}
+
+void
+oberon_generate_assert(oberon_context_t * ctx, oberon_expr_t * cond)
 {
-	printf("generate code\n");
+	gen_module_t * m;
+	gen_proc_t * p;
+
+	m = ctx -> mod -> gen_mod;
+	p = m -> class -> p;
+
+	push_expr(p, cond);
+	jvm_generate(p, 1, 0, "invokestatic SYSTEM/ASSERT(Z)V");
 }
 
 void
-oberon_generator_dump(oberon_context_t * ctx, char * path)
+oberon_generate_assert_n(oberon_context_t * ctx, oberon_expr_t * cond, int64_t n)
 {
-	printf("jit: dump code\n");
+	gen_module_t * m;
+	gen_proc_t * p;
+
+	m = ctx -> mod -> gen_mod;
+	p = m -> class -> p;
+
+	push_expr(p, cond);
+	jvm_generate_push_int_size(p, n, 8);
+	jvm_generate(p, 1 + 2, 0, "invokestatic SYSTEM/ASSERT(ZJ)V");
 }
 
-void *
-oberon_generator_get_procedure(oberon_context_t * ctx, const char * name)
+void
+oberon_generate_trap(oberon_context_t * ctx, int64_t n)
 {
-	printf("jit: get pointer to procedure %s\n", name);
-	return NULL;
+	gen_module_t * m;
+	gen_proc_t * p;
+
+	m = ctx -> mod -> gen_mod;
+	p = m -> class -> p;
+
+	jvm_generate_push_int_size(p, n, 8);
+	jvm_generate(p, 2, 0, "invokestatic SYSTEM/TRAP(J)V");
 }
 
-void *
-oberon_generator_get_var(oberon_context_t * ctx, const char * name)
+void
+oberon_generate_halt(oberon_context_t * ctx, int64_t n)
 {
-	printf("jit: get pointer to var %s\n", name);
-	return NULL;
+	gen_module_t * m;
+	gen_proc_t * p;
+
+	m = ctx -> mod -> gen_mod;
+	p = m -> class -> p;
+
+	jvm_generate_push_int_size(p, n, 8);
+	jvm_generate(p, 2, 0, "invokestatic SYSTEM/HALT(J)V");
 }
+