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

diff --git a/src/backends/jvm/generator-jvm.c b/src/backends/jvm/generator-jvm.c
index bb11231..189d8d2 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);