X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fbackends%2Fjvm%2Fgenerator-jvm.c;h=189d8d275421b67a4fc2081d664c37ccf4149fc7;hb=75d0fd92a5342358f37ed9369ccce9355273e51a;hp=90b0e88f777caa2c3731b55241603b971d126af6;hpb=a0ff807fe0e69c50469e506836467da32f23f754;p=dsw-obn.git

diff --git a/src/backends/jvm/generator-jvm.c b/src/backends/jvm/generator-jvm.c
index 90b0e88..189d8d2 100644
--- a/src/backends/jvm/generator-jvm.c
+++ b/src/backends/jvm/generator-jvm.c
@@ -475,20 +475,7 @@ 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_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);
-	}
-
+	gen_module_t * m;
 	switch(type -> class)
 	{
 		case OBERON_TYPE_NOTYPE:
@@ -503,8 +490,6 @@ oberon_generator_init_type(oberon_context_t * ctx, oberon_type_t * type)
 		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;
@@ -515,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
@@ -1142,8 +1141,11 @@ 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
 	{
@@ -1302,6 +1304,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);
@@ -1642,3 +1657,75 @@ oberon_generate_assign(oberon_context_t * ctx, oberon_expr_t * src, oberon_expr_
 
 	store_expr(p, dst, src);
 }
+
+void
+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)
+{
+	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_generate_assert_n(oberon_context_t * ctx, oberon_expr_t * cond, int64_t 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_generate_trap(oberon_context_t * ctx, int64_t n)
+{
+	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_generate_halt(oberon_context_t * ctx, int64_t n)
+{
+	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");
+}
+