X-Git-Url: http://deadsoftware.ru/gitweb?p=dsw-obn.git;a=blobdiff_plain;f=src%2Fbackends%2Fjvm%2Fgenerator-jvm.c;h=450105525a0aa9b290fd7e0c3f7c91e5904dfdd9;hp=559325964d72498d3bfd7cfee1f1faf9e7e02012;hb=1ef429eea9ba6825395446aac0b5980454ac0383;hpb=6e0d9d632fdf070f9777fe90b9add849562acaf2

diff --git a/src/backends/jvm/generator-jvm.c b/src/backends/jvm/generator-jvm.c
index 5593259..4501055 100644
--- a/src/backends/jvm/generator-jvm.c
+++ b/src/backends/jvm/generator-jvm.c
@@ -378,7 +378,7 @@ oberon_generate_procedure_pointer_class(oberon_object_t * proc)
 
 	fprintf(fp, ".field public static pointer %s\n\n", absdesc);
 
-	fprintf(fp, ".method <init>()V\n");
+	fprintf(fp, ".method private <init>()V\n");
 	fprintf(fp, "  aload_0\n");
 	fprintf(fp, "  invokespecial %s/<init>()V\n", abscname);
 	fprintf(fp, "  return\n");
@@ -419,7 +419,6 @@ oberon_generate_procedure_pointer_class(oberon_object_t * proc)
 		use_size += t -> cell_size;
 		param = param -> next;
 	}
-
 	
 	char * full_name = jvm_get_field_full_name(proc);
 	int cell_size = jvm_cell_size_for_type(proc -> type -> base);
@@ -522,10 +521,7 @@ oberon_generator_init_record(oberon_context_t * ctx, oberon_type_t * rec)
 	oberon_object_t * field = rec -> decl;
 	for(int i = 0; i < num; i++)
 	{
-		char * name = field -> name;
-		gen_var_t * v = field -> gen_var;
-		gen_type_t * t = field -> type -> gen_type;
-		jvm_generate_and_init_field(class, v, name, t);
+		jvm_generate_var(field -> gen_var);
 		field = field -> next;
 	}
 
@@ -548,7 +544,7 @@ oberon_generator_init_record(oberon_context_t * ctx, oberon_type_t * rec)
 	for(int i = 0; i < num; i++)
 	{
 		jvm_generate(p, 0, 1, "aload_0");
-		jvm_generate_variable_initialization(p, field -> gen_var);
+		jvm_generate_var_initialization(p, field -> gen_var);
 
 		if(field -> type -> class == OBERON_TYPE_RECORD
 			|| field -> type -> class == OBERON_TYPE_ARRAY)
@@ -566,14 +562,16 @@ oberon_generator_init_record(oberon_context_t * ctx, oberon_type_t * rec)
 	/* Метод для копирования полей класса */
 	/* reg0 == src -> reg1 == dst */
 	p = jvm_create_proc(class);
-	gen_var_t * copy_dst = oberon_generator_new_var();
-	gen_var_t * copy_src = oberon_generator_new_var();
 	char * signature = new_string("(%s%s)V", rec -> gen_type -> desc, rec -> gen_type -> desc);
 	jvm_generate_function_header(p, "public static", "$COPY$", signature);
-	jvm_init_param(p, copy_dst, rec -> gen_type);
-	jvm_init_param(p, copy_src, rec -> gen_type);
-	jvm_generate_param_initialization(p, copy_dst, "dst");
-	jvm_generate_param_initialization(p, copy_src, "src");
+
+	gen_var_t * copy_dst = jvm_create_function_var(p, JVM_STORAGE_REGISTER, "dst", rec -> gen_type);
+	gen_var_t * copy_src = jvm_create_function_var(p, JVM_STORAGE_REGISTER, "src", rec -> gen_type);
+	jvm_generate_var(copy_dst);
+	jvm_generate_var(copy_src);
+	jvm_generate_var_initialization(p, copy_dst);
+	jvm_generate_var_initialization(p, copy_src);
+
 	num = rec -> num_decl;
 	field = rec -> decl;
 	for(int i = 0; i < num; i++)
@@ -613,9 +611,6 @@ oberon_generator_init_record(oberon_context_t * ctx, oberon_type_t * rec)
 void
 oberon_generator_init_var(oberon_context_t * ctx, oberon_object_t * var)
 {
-	gen_var_t * v = oberon_generator_new_var();
-	var -> gen_var = v;
-
 	gen_module_t * m;
 	m = ctx -> mod -> gen_mod;
 
@@ -623,29 +618,33 @@ oberon_generator_init_var(oberon_context_t * ctx, oberon_object_t * var)
 	class = m -> class;
 
 	gen_proc_t * p;
+	struct gen_class * c;
+	char * name = var -> name;
+	gen_type_t * t = var -> type -> gen_type;
 	switch(var -> class)
 	{
 		case OBERON_CLASS_VAR_PARAM:
 			p = var -> parent -> gen_proc;
-			jvm_init_var_param(p, v, var -> type -> gen_type);
+			var -> gen_var = jvm_create_function_var(p, JVM_STORAGE_FRAME_PARAM_VARPTR, name, t);
 			break;
 		case OBERON_CLASS_PARAM:
 			p = var -> parent -> gen_proc;
-			jvm_init_param(p, v, var -> type -> gen_type);
+			var -> gen_var = jvm_create_function_var(p, JVM_STORAGE_FRAME_PARAM_VAR, name, t);
 			break;
 		case OBERON_CLASS_FIELD:
-			/* Заполняются при инициализации структуры */
-			/* смотри oberon_generator_init_record() */
+			c = var -> parent_type -> gen_type -> class;
+			var -> gen_var = jvm_create_class_var(c, JVM_STORAGE_FIELD_VAR, name, t);
 			break;
 		case OBERON_CLASS_VAR:
 			if(var -> local)
 			{
 				p = var -> parent -> gen_proc;
-				jvm_init_named_local_var(p, v, var -> type -> gen_type);
+				var -> gen_var = jvm_create_function_var(p, JVM_STORAGE_FRAME_VAR, name, t);
 			}
 			else
 			{
-				jvm_generate_and_init_global_var(class, v, var -> name, var -> type -> gen_type);
+				var -> gen_var = jvm_create_class_var(class, JVM_STORAGE_STATIC_VAR, name, t);
+				jvm_generate_var(var -> gen_var);
 			}
 			break;
 		default:
@@ -659,16 +658,18 @@ oberon_generator_init_temp_var(oberon_context_t * ctx, oberon_object_t * var)
 {
 	assert(var -> class == OBERON_CLASS_VAR);
 
-	gen_var_t * v = oberon_generator_new_var();
-	var -> gen_var = v;
-
 	gen_module_t * m;
 	m = ctx -> mod -> gen_mod;
 
 	gen_proc_t * p;
 	p = m -> class -> p;
 
-	jvm_generate_and_init_local_var(p, v, var -> type -> gen_type);
+	gen_type_t * t;
+	t = var -> type -> gen_type;
+
+	var -> gen_var = jvm_create_function_temp_var(p, t);
+	jvm_generate_var(var -> gen_var);
+	jvm_generate_var_initialization(p, var -> gen_var);
 }
 
 void
@@ -676,6 +677,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);
 }
 
 void
@@ -723,7 +725,7 @@ oberon_generate_begin_module(oberon_context_t * ctx)
 	{
 		if(x -> class == OBERON_CLASS_VAR)
 		{
-			jvm_generate_variable_initialization(p, x -> gen_var);
+			jvm_generate_var_initialization(p, x -> gen_var);
 			if(x -> type -> class == OBERON_TYPE_ARRAY
 				|| x -> type -> class == OBERON_TYPE_RECORD)
 			{
@@ -802,11 +804,10 @@ jvm_generate_record_duplicate_and_replace(gen_proc_t * p, gen_var_t * v, oberon_
 }
 
 static void
-jvm_generate_local_initialization(gen_proc_t * p, oberon_object_t * x)
+jvm_generate_local_object(gen_proc_t * p, oberon_object_t * x)
 {
 	gen_var_t * v;
 	struct gen_class * class;
-	char * name;
 
 	v = x -> gen_var;
 	class = p -> class;
@@ -815,17 +816,40 @@ jvm_generate_local_initialization(gen_proc_t * p, oberon_object_t * x)
 	assert(class -> p);
 	assert(x -> local);
 
-	name = jvm_get_name(x);
 	switch(x -> class)
 	{
 		case OBERON_CLASS_VAR_PARAM:
-			jvm_generate_var_param_initialization(p, v, name);
-			break;
 		case OBERON_CLASS_PARAM:
-			jvm_generate_param_initialization(p, v, name);
+		case OBERON_CLASS_VAR:
+			jvm_generate_var(v);
 			break;
+		case OBERON_CLASS_PROC:
+			break;
+		default:
+			gen_error("jvm_generate_local_initialization: wat");
+			break;
+	}
+}
+
+static void
+jvm_generate_local_initialization(gen_proc_t * p, oberon_object_t * x)
+{
+	gen_var_t * v;
+	struct gen_class * class;
+
+	v = x -> gen_var;
+	class = p -> class;
+
+	// Убеждаемся что сейчас находимся в функции
+	assert(class -> p);
+	assert(x -> local);
+
+	switch(x -> class)
+	{
+		case OBERON_CLASS_VAR_PARAM:
+		case OBERON_CLASS_PARAM:
 		case OBERON_CLASS_VAR:
-			jvm_generate_named_local_var_initialization(p, v, name);
+			jvm_generate_var_initialization(p, v);
 			break;
 		case OBERON_CLASS_PROC:
 			break;
@@ -834,7 +858,7 @@ jvm_generate_local_initialization(gen_proc_t * p, oberon_object_t * x)
 			break;
 	}
 
-	if(x -> class == OBERON_CLASS_PARAM || x -> class == OBERON_CLASS_VAR_PARAM)
+	if(x -> class == OBERON_CLASS_PARAM)
 	{
 		if(x -> type -> class == OBERON_TYPE_ARRAY)
 		{
@@ -853,6 +877,7 @@ oberon_generate_begin_proc(oberon_context_t * ctx, oberon_object_t * proc)
 	gen_proc_t * p;
 	char * name;
 	char * signature;
+	oberon_object_t * var;
 
 	p = proc -> gen_proc;
 
@@ -865,8 +890,19 @@ oberon_generate_begin_proc(oberon_context_t * ctx, oberon_object_t * proc)
 	name = jvm_get_name(proc);
 	jvm_generate_function_header(p, "public static", name, signature);
 
-	/* Инициализация */
-	oberon_object_t * var = proc -> scope -> list -> next;
+	/* Создание парамеров и переменных */
+	var = proc -> scope -> list -> next;
+	while(var)
+	{
+		jvm_generate_local_object(p, var);
+		var = var -> next;
+	}
+
+	jvm_generate_procedure_frame(proc);
+	jvm_generate_frame_initialization(p);
+
+	/* Инициализация парамеров и переменных */
+	var = proc -> scope -> list -> next;
 	while(var)
 	{
 		jvm_generate_local_initialization(p, var);
@@ -1389,10 +1425,12 @@ jvm_generate_range(gen_proc_t * p, oberon_expr_t * a, oberon_expr_t * b)
 	}
 	else
 	{
-		ra = oberon_generator_new_var();
-		rb = oberon_generator_new_var();
-		jvm_generate_and_init_local_var(p, ra, type -> gen_type);
-		jvm_generate_and_init_local_var(p, rb, type -> gen_type);
+		ra = jvm_create_function_temp_var(p, type -> gen_type);
+		rb = jvm_create_function_temp_var(p, type -> gen_type);
+		jvm_generate_var(ra);
+		jvm_generate_var(rb);
+		jvm_generate_var_initialization(p, ra);
+		jvm_generate_var_initialization(p, rb);
 		label_else = jvm_new_label_id(p);
 		label_end = jvm_new_label_id(p);