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

diff --git a/src/backends/jvm/generator-jvm.c b/src/backends/jvm/generator-jvm.c
index 065d963..bb11231 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
@@ -1036,8 +1041,6 @@ 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;
 
@@ -1187,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");
@@ -1643,27 +1643,73 @@ 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_generate_assert_n(oberon_context_t * ctx, oberon_expr_t * cond, int64_t n)
+{
+	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_procedure(oberon_context_t * ctx, const char * name)
+void
+oberon_generate_trap(oberon_context_t * ctx, 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;
+
+	jvm_generate_push_int_size(p, n, 8);
+	jvm_generate(p, 2, 0, "invokestatic SYSTEM/TRAP(J)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");
 }
+