X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fbackends%2Fjvm%2Fgenerator-jvm.c;h=5e74d18a0acfdf31d609959415e0d7a92ecdfc5a;hb=9e17ac5ff506785891f06e3beeba66185fc7f867;hp=1ec731f8eb37d275a3114ed050bbd262fd2a9615;hpb=8b545fd0349be12160b9f50c1f4b6f072eac436f;p=dsw-obn.git

diff --git a/src/backends/jvm/generator-jvm.c b/src/backends/jvm/generator-jvm.c
index 1ec731f..5e74d18 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;
 
@@ -1175,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;
@@ -1189,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,29 +1641,3 @@ oberon_generate_assign(oberon_context_t * ctx, oberon_expr_t * src, oberon_expr_
 
 	store_expr(p, dst, src);
 }
-
-void
-oberon_generate_code(oberon_context_t * ctx)
-{
-	printf("generate code\n");
-}
-
-void
-oberon_generator_dump(oberon_context_t * ctx, char * path)
-{
-	printf("jit: dump code\n");
-}
-
-void *
-oberon_generator_get_procedure(oberon_context_t * ctx, const char * name)
-{
-	printf("jit: get pointer to procedure %s\n", name);
-	return NULL;
-}
-
-void *
-oberon_generator_get_var(oberon_context_t * ctx, const char * name)
-{
-	printf("jit: get pointer to var %s\n", name);
-	return NULL;
-}