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

diff --git a/src/backends/jvm/generator-jvm.c b/src/backends/jvm/generator-jvm.c
index 4501055..4011965 100644
--- a/src/backends/jvm/generator-jvm.c
+++ b/src/backends/jvm/generator-jvm.c
@@ -424,7 +424,7 @@ oberon_generate_procedure_pointer_class(oberon_object_t * proc)
 	int cell_size = jvm_cell_size_for_type(proc -> type -> base);
 	jvm_generate(p, use_size, cell_size, "invokestatic %s%s", full_name, signature);
 
-	if(proc -> type -> base -> class == OBERON_TYPE_VOID)
+	if(proc -> type -> base -> class == OBERON_TYPE_NOTYPE)
 	{
 		jvm_generate(p, 0, 0, "return");
 	}
@@ -475,18 +475,10 @@ oberon_generator_init_type(oberon_context_t * ctx, oberon_type_t * type)
 	memset(t, 0, sizeof *t);
 	type -> gen_type = t;
 
-	if(type -> class != OBERON_TYPE_VOID)
-	{
-		t -> wide = jvm_is_wide_type(type);
-		t -> prefix = jvm_get_prefix(type);
-		t -> postfix = jvm_get_postfix(type);
-	}
-	t -> cell_size = jvm_cell_size_for_type(type);
-	t -> desc = jvm_get_descriptor(type);
-
+	gen_module_t * m;
 	switch(type -> class)
 	{
-		case OBERON_TYPE_VOID:
+		case OBERON_TYPE_NOTYPE:
 		case OBERON_TYPE_INTEGER:
 		case OBERON_TYPE_BOOLEAN:
 		case OBERON_TYPE_ARRAY:
@@ -495,10 +487,9 @@ oberon_generator_init_type(oberon_context_t * ctx, oberon_type_t * type)
 		case OBERON_TYPE_CHAR:
 		case OBERON_TYPE_STRING:
 		case OBERON_TYPE_SET:
+		case OBERON_TYPE_NIL:
 			break;
 		case OBERON_TYPE_RECORD:
-			;
-			gen_module_t * m;
 			m = type -> module -> gen_mod;
 			oberon_generate_record_class(m, type);
 			break;
@@ -509,6 +500,20 @@ oberon_generator_init_type(oberon_context_t * ctx, oberon_type_t * type)
 			gen_error("oberon_generator_init_type: unk calss %i", type -> class);
 			break;
 	}
+
+	if(type -> class != OBERON_TYPE_NOTYPE)
+	{
+		t -> wide = jvm_is_wide_type(type);
+		t -> prefix = jvm_get_prefix(type);
+		t -> postfix = jvm_get_postfix(type);
+	}
+
+	t -> cell_size = jvm_cell_size_for_type(type);
+
+	if(type -> class != OBERON_TYPE_NIL)
+	{
+		t -> desc = jvm_get_descriptor(type);
+	}
 }
 
 void
@@ -678,6 +683,7 @@ oberon_generator_init_proc(oberon_context_t * ctx, oberon_object_t * proc)
 	struct gen_class * class = proc -> module -> gen_mod -> class;
 	proc -> gen_proc = jvm_create_proc(class);
 	proc -> gen_proc -> full_name = jvm_get_field_full_name_safe(proc);
+	jvm_create_static_links(proc);
 }
 
 void
@@ -881,15 +887,26 @@ oberon_generate_begin_proc(oberon_context_t * ctx, oberon_object_t * proc)
 
 	p = proc -> gen_proc;
 
-	if(proc -> local == false)
+	if(proc -> local)
+	{
+		signature = jvm_get_local_procedure_signature(proc);
+	}
+	else
 	{
 		oberon_generate_procedure_pointer_class(proc);
+		signature = jvm_get_procedure_signature(proc -> type);
 	}
 
-	signature = jvm_get_procedure_signature(proc -> type);
 	name = jvm_get_name(proc);
 	jvm_generate_function_header(p, "public static", name, signature);
 
+	if(proc -> local)
+	{
+		jvm_generate_staticlinks(proc);
+	}
+
+	jvm_generate_procedure_frame(proc);
+
 	/* Создание парамеров и переменных */
 	var = proc -> scope -> list -> next;
 	while(var)
@@ -898,7 +915,6 @@ oberon_generate_begin_proc(oberon_context_t * ctx, oberon_object_t * proc)
 		var = var -> next;
 	}
 
-	jvm_generate_procedure_frame(proc);
 	jvm_generate_frame_initialization(p);
 
 	/* Инициализация парамеров и переменных */
@@ -1016,8 +1032,6 @@ jvm_generate_call_proc(gen_proc_t * p, oberon_item_t * desig)
 	assert(desig -> var == NULL);
 	assert(desig -> mode == MODE_CALL);
 
-	char * signature = NULL;
-
 	bool direct_call = false;
 	if(desig -> parent -> mode == MODE_VAR)
 	{
@@ -1027,11 +1041,8 @@ jvm_generate_call_proc(gen_proc_t * p, oberon_item_t * desig)
 		}
 	}
 
-	printf("direct_call == %i\n", direct_call);
-
 	oberon_type_t * procsig;
 	procsig = desig -> parent -> result;
-	signature = jvm_get_procedure_signature(procsig);
 
 	if(direct_call == false)
 	{
@@ -1039,6 +1050,11 @@ jvm_generate_call_proc(gen_proc_t * p, oberon_item_t * desig)
 		push_item(p, desig -> parent);
 	}
 
+	if(direct_call)
+	{
+		jvm_generate_push_static_links(p, desig -> parent -> var);
+	}
+
 	int args_cells = 0;
 	int result_cells = jvm_cell_size_for_type(procsig -> base);
 
@@ -1064,11 +1080,13 @@ jvm_generate_call_proc(gen_proc_t * p, oberon_item_t * desig)
 	if(direct_call)
 	{
 		char * full_name = jvm_get_field_full_name(desig -> parent -> var);
+		char * signature = jvm_get_local_procedure_signature(desig -> parent -> var);
 		jvm_generate(p, args_cells, result_cells, "invokestatic %s%s", full_name, signature);
 	}
 	else
 	{
 		char * cname = jvm_get_class_full_name(procsig);
+		char * signature = jvm_get_procedure_signature(procsig);
 		jvm_generate(p, 1 + args_cells, result_cells, "invokevirtual %s/invoke%s", cname, signature);
 	}
 }
@@ -1160,13 +1178,11 @@ push_item(gen_proc_t * p, oberon_item_t * item)
 			}
 			break;
 		case MODE_INTEGER:
+		case MODE_BOOLEAN:
 		case MODE_CHAR:
 		case MODE_SET:
 			jvm_generate_push_int_size(p, item -> integer, item -> result -> size);
 			break;
-		case MODE_BOOLEAN:
-			jvm_generate_push_int_size(p, item -> boolean, item -> result -> size);
-			break;
 		case MODE_CALL:
 			jvm_generate_call_proc(p, item);
 			break;
@@ -1174,20 +1190,17 @@ push_item(gen_proc_t * p, oberon_item_t * item)
 			;
 			char postfix = jvm_get_postfix(item -> result);
 			int cell_size = jvm_cell_size_for_postfix(postfix);
-			assert(item -> parent -> is_item);
-			push_item(p, (oberon_item_t *) item -> parent);
+			push_item(p, item -> parent);
 			push_expr(p, item -> args);
 			jvm_generate(p, 1 + 1, cell_size, "%caload", postfix);
 			break;
 		case MODE_FIELD:
-			assert(item -> parent -> is_item);
-			push_item(p, (oberon_item_t *) item -> parent);
+			push_item(p, item -> parent);
 			jvm_generate_load(p, item -> var -> gen_var);
 			break;
 		case MODE_DEREF:
 			/* Все объекты в jvm представляются как указатели */
-			assert(item -> parent -> is_item);
-			push_item(p, (oberon_item_t *) item -> parent);
+			push_item(p, item -> parent);
 			break;
 		case MODE_NIL:
 			jvm_generate(p, 0, 1, "aconst_null");
@@ -1630,27 +1643,60 @@ oberon_generate_assign(oberon_context_t * ctx, oberon_expr_t * src, oberon_expr_
 }
 
 void
-oberon_generate_code(oberon_context_t * ctx)
+oberon_generate_copy(oberon_context_t * ctx, oberon_expr_t * src, oberon_expr_t * dst)
 {
-	printf("generate code\n");
+	gen_module_t * m;
+	gen_proc_t * p;
+	char * desc;
+
+	m = ctx -> mod -> gen_mod;
+	p = m -> class -> p;
+
+	push_expr(p, src);
+	push_expr(p, dst);
+
+	desc = jvm_get_descriptor(dst -> result);
+
+	jvm_generate(p, 2, 0, "invokestatic SYSTEM/COPY(%s%s)V", desc, desc);
 }
 
 void
-oberon_generator_dump(oberon_context_t * ctx, char * path)
+oberon_generate_assert(oberon_context_t * ctx, oberon_expr_t * cond)
 {
-	printf("jit: dump code\n");
+	gen_module_t * m;
+	gen_proc_t * p;
+
+	m = ctx -> mod -> gen_mod;
+	p = m -> class -> p;
+
+	push_expr(p, cond);
+	jvm_generate(p, 1, 0, "invokestatic SYSTEM/ASSERT(Z)V");
 }
 
-void *
-oberon_generator_get_procedure(oberon_context_t * ctx, const char * name)
+void
+oberon_generate_assert_n(oberon_context_t * ctx, oberon_expr_t * cond, int64_t n)
 {
-	printf("jit: get pointer to procedure %s\n", name);
-	return NULL;
+	gen_module_t * m;
+	gen_proc_t * p;
+
+	m = ctx -> mod -> gen_mod;
+	p = m -> class -> p;
+
+	push_expr(p, cond);
+	jvm_generate_push_int_size(p, n, 8);
+	jvm_generate(p, 1 + 2, 0, "invokestatic SYSTEM/ASSERT(ZJ)V");
 }
 
-void *
-oberon_generator_get_var(oberon_context_t * ctx, const char * name)
+void
+oberon_generate_halt(oberon_context_t * ctx, int64_t n)
 {
-	printf("jit: get pointer to var %s\n", name);
-	return NULL;
+	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/HALT(J)V");
 }
+