X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fbackends%2Fjvm%2Fgenerator-jvm.c;h=ee4bc67c17d31f33f25ba5047600658776953755;hb=3d4021b9a2dd52aaf4b97859a8a58b74903ebac9;hp=401196595b08b739401d9e39e82ec6d80c9d2ace;hpb=9f8036eb00032fa7f756113365cb42e05ab262df;p=dsw-obn.git

diff --git a/src/backends/jvm/generator-jvm.c b/src/backends/jvm/generator-jvm.c
index 4011965..ee4bc67 100644
--- a/src/backends/jvm/generator-jvm.c
+++ b/src/backends/jvm/generator-jvm.c
@@ -1141,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
 	{
@@ -1301,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);
@@ -1356,6 +1372,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 +1499,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);
@@ -1687,6 +1705,19 @@ oberon_generate_assert_n(oberon_context_t * ctx, oberon_expr_t * cond, int64_t n
 	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)
 {