X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fbackends%2Fjvm%2Fgenerator-jvm.c;h=c063e2fc7fcc03ddd8c2150e03cca24c2220a96a;hb=789adb9354da345b13aa284f3f4f8f1046cadbc4;hp=1ba25c9afe28ee69e957cb10b6c9572814f06176;hpb=1233fb1d5d8f67a8f5e970386c1c4cbb6691ec04;p=dsw-obn.git

diff --git a/src/backends/jvm/generator-jvm.c b/src/backends/jvm/generator-jvm.c
index 1ba25c9..c063e2f 100644
--- a/src/backends/jvm/generator-jvm.c
+++ b/src/backends/jvm/generator-jvm.c
@@ -493,6 +493,7 @@ oberon_generator_init_type(oberon_context_t * ctx, oberon_type_t * type)
 		case OBERON_TYPE_SET:
 		case OBERON_TYPE_NIL:
 		case OBERON_TYPE_SYSTEM_BYTE:
+		case OBERON_TYPE_SYSTEM_PTR:
 			break;
 		case OBERON_TYPE_RECORD:
 			m = type -> module -> gen_mod;
@@ -1569,36 +1570,35 @@ jvm_generate_in(gen_proc_t * p, oberon_expr_t * a, oberon_expr_t * b)
 }
 
 static void
-jvm_generate_ash(gen_proc_t * p, oberon_expr_t * a, oberon_expr_t * b)
+jvm_generate_shift(gen_proc_t * p, int op, 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 */
+	char dt = jvm_get_type_of_prefix(prefix);
 
 	push_expr(p, a);
+	jvm_generate_cast_type(p, a -> result, t);
 	push_expr(p, b);
-	if(cell_size == 1)
-	{
-		jvm_generate(p, cell_size, 2 * cell_size, "dup");
-	}
-	else
+	jvm_generate_cast_type(p, b -> result, t);
+
+	char * opname;
+	switch(op)
 	{
-		jvm_generate(p, cell_size, 2 * cell_size, "dup2");
+		case OP_ASH:
+			opname = "ASH";
+			break;
+		case OP_LSH:
+			opname = "LSH";
+			break;
+		case OP_ROT:
+			opname = "ROT";
+			break;
+		default:
+			gen_error("jvm_generate_shift: invalid op %i", op);
 	}
-	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);
+	jvm_generate(p, 2 * cell_size, cell_size, "invokestatic SYSTEM/%s(%c%c)%c", opname, dt, dt, dt);
 }
 
 static void
@@ -1679,7 +1679,9 @@ push_operator(gen_proc_t * p, oberon_oper_t * oper)
 			break;
 
 		case OP_ASH:
-			jvm_generate_ash(p, oper -> left, oper -> right);
+		case OP_LSH:
+		case OP_ROT:
+			jvm_generate_shift(p, op, oper -> left, oper -> right);
 			break;
 		default:
 			gen_error("push_oper: unk op %i", op);