X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fbackends%2Fjvm%2Fgenerator-jvm.c;h=c131f7f750080b2ce9f3ace65639063f0617d548;hb=2e868cbd80ac5144b08154aaf2cf7bf7be455b61;hp=2456aa79cd9bafd5a6b4e71f26c5715ea250e9e8;hpb=8c59e1e41700802575cefb289600028909c5ffc2;p=dsw-obn.git

diff --git a/src/backends/jvm/generator-jvm.c b/src/backends/jvm/generator-jvm.c
index 2456aa7..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;
@@ -707,6 +709,8 @@ oberon_generator_init_module(oberon_context_t * ctx, oberon_module_t * mod)
 	fprintf(class -> fp, ".class %s\n", mod -> name);
 	fprintf(class -> fp, ".super java/lang/Object\n\n");
 
+	fprintf(class -> fp, ".field private static $INITIALIZED$ Z\n\n");
+
 	m -> class = class;
 
 	c -> current_m = m;
@@ -724,19 +728,36 @@ push_expr(gen_proc_t * p, oberon_expr_t * expr);
 void
 oberon_generate_begin_module(oberon_context_t * ctx)
 {
-	struct gen_class * class = ctx -> mod -> gen_mod -> class;
-	gen_proc_t * p = jvm_create_proc(class);
+	gen_proc_t * p;
+	int label_cont;
+	struct gen_class * class;
 
-	jvm_generate_function_header(p, "public", "<init>", "()V");
-	jvm_alloc_register_untyped(p -> rf, false);
-	jvm_generate(p, 0, 1, "aload_0");
-	jvm_generate(p, 1, 0, "invokespecial java/lang/Object/<init>()V");
+	class = ctx -> mod -> gen_mod -> class;
+
+	p = jvm_create_proc(class);
+	jvm_generate_function_header(p, "public static", "BEGIN", "()V");
+
+	label_cont = jvm_new_label_id(p);
+	jvm_generate(p, 0, 1, "getstatic %s/$INITIALIZED$ Z", class -> full_name);
+	jvm_generate(p, 1, 0, "ifeq L%i", label_cont);
+	jvm_generate(p, 0, 0, "return");
+	jvm_generate_label(p, label_cont);
+
+	jvm_generate(p, 0, 1, "iconst_1");
+	jvm_generate(p, 1, 0, "putstatic %s/$INITIALIZED$ Z", class -> full_name);
 
 	/* Инициализация переменных объявленных в модуле */
 	oberon_object_t * x = ctx -> mod -> decl -> list -> next;
 	while(x != NULL)
 	{
-		if(x -> class == OBERON_CLASS_VAR)
+		if(x -> class == OBERON_CLASS_MODULE)
+		{
+			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)
 		{
 			jvm_generate_var_initialization(p, x -> gen_var);
 			if(x -> type -> class == OBERON_TYPE_ARRAY
@@ -760,6 +781,14 @@ oberon_generate_end_module(oberon_context_t * ctx)
 
 	jvm_generate(p, 0, 0, "return");
 	jvm_generate_function_end(class -> p);
+
+	p = jvm_create_proc(class);
+	jvm_generate_function_header(p, "private", "<init>", "()V");
+	jvm_alloc_register_untyped(p -> rf, false);
+	jvm_generate(p, 0, 1, "aload_0");
+	jvm_generate(p, 1, 0, "invokespecial java/lang/Object/<init>()V");
+	jvm_generate(p, 0, 0, "return");
+	jvm_generate_function_end(class -> p);
 }
 
 /*
@@ -914,7 +943,7 @@ oberon_generate_begin_proc(oberon_context_t * ctx, oberon_object_t * proc)
 
 	jvm_generate_procedure_frame(proc);
 
-	/* Создание парамеров и переменных */
+	/* Создание параметров и переменных */
 	var = proc -> scope -> list -> next;
 	while(var)
 	{
@@ -1020,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;
@@ -1538,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);
@@ -1565,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);
 }
 
@@ -1648,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);