X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fbackends%2Fjvm%2Fgenerator-jvm.c;h=c131f7f750080b2ce9f3ace65639063f0617d548;hb=2e868cbd80ac5144b08154aaf2cf7bf7be455b61;hp=e897f6e98cb64913f5e58b9612ad8be3e7ef1c9c;hpb=9531d399c60190a8daf625dd99f9c141753bba5e;p=dsw-obn.git

diff --git a/src/backends/jvm/generator-jvm.c b/src/backends/jvm/generator-jvm.c
index e897f6e..c131f7f 100644
--- a/src/backends/jvm/generator-jvm.c
+++ b/src/backends/jvm/generator-jvm.c
@@ -492,6 +492,8 @@ oberon_generator_init_type(oberon_context_t * ctx, oberon_type_t * type)
 		case OBERON_TYPE_STRING:
 		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;
@@ -750,7 +752,10 @@ oberon_generate_begin_module(oberon_context_t * ctx)
 	{
 		if(x -> class == OBERON_CLASS_MODULE)
 		{
-			jvm_generate(p, 0, 0, "invokestatic %s/BEGIN()V", x -> module -> gen_mod -> class -> full_name);
+			if(!x -> module -> intrinsic)
+			{
+				jvm_generate(p, 0, 0, "invokestatic %s/BEGIN()V", x -> module -> gen_mod -> class -> full_name);
+			}
 		}
 		else if(x -> class == OBERON_CLASS_VAR)
 		{
@@ -886,7 +891,6 @@ jvm_generate_local_initialization(gen_proc_t * p, oberon_object_t * x)
 		case OBERON_CLASS_VAR_PARAM:
 		case OBERON_CLASS_PARAM:
 		case OBERON_CLASS_VAR:
-			jvm_generate_var(v);
 			jvm_generate_var_initialization(p, v);
 			break;
 		case OBERON_CLASS_PROC:
@@ -1045,13 +1049,16 @@ push_varptr(gen_proc_t * p, oberon_expr_t * expr)
 			jvm_generate_ldst_prepare(p, expr -> item.var -> gen_var);
 			break;
 		case MODE_INDEX:
-			push_item(p, (oberon_item_t *) expr -> item.parent);
+			push_item(p, expr -> item.parent);
 			push_expr(p, expr -> item.args);
 			break;
 		case MODE_FIELD:
-			push_item(p, (oberon_item_t *) expr -> item.parent);
+			push_item(p, expr -> item.parent);
 			jvm_generate_ldst_prepare(p, expr -> item.var -> gen_var);
 			break;
+		case MODE_DEREF:
+			push_varptr(p, (oberon_expr_t *) expr -> item.parent);
+			break;
 		default:
 			gen_error("push_varptr: wat %i", expr -> item.mode);
 			break;
@@ -1563,7 +1570,7 @@ 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_ash(gen_proc_t * p, oberon_expr_t * a, oberon_expr_t * b, bool logical)
 {
 	oberon_type_t * t = a -> result;
 	int cell_size = jvm_cell_size_for_type(t);
@@ -1590,8 +1597,15 @@ jvm_generate_ash(gen_proc_t * p, oberon_expr_t * a, oberon_expr_t * b)
 	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_abs(p, prefix);
+	if(logical)
+	{
+		jvm_generate(p, 2 * cell_size, cell_size, "%cushr", prefix);
+	}
+	else
+	{
+		jvm_generate(p, 2 * cell_size, cell_size, "%cshr", prefix);
+	}
 	jvm_generate_label(p, label_end);
 }
 
@@ -1673,7 +1687,10 @@ push_operator(gen_proc_t * p, oberon_oper_t * oper)
 			break;
 
 		case OP_ASH:
-			jvm_generate_ash(p, oper -> left, oper -> right);
+			jvm_generate_ash(p, oper -> left, oper -> right, false);
+			break;
+		case OP_LSH:
+			jvm_generate_ash(p, oper -> left, oper -> right, true);
 			break;
 		default:
 			gen_error("push_oper: unk op %i", op);