X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fbackends%2Fjvm%2Fgenerator-jvm.c;h=bf3b07b52aee0c728cf194e2fbb521b635500557;hb=6a3dfd4bef9a28863a7645070f0067f4a09d143a;hp=c389ebce731e08fd36d13c36fceff9083f2308b9;hpb=833752b95ce17f151a60ba00a75e25b4afc67f4d;p=dsw-obn.git

diff --git a/src/backends/jvm/generator-jvm.c b/src/backends/jvm/generator-jvm.c
index c389ebc..bf3b07b 100644
--- a/src/backends/jvm/generator-jvm.c
+++ b/src/backends/jvm/generator-jvm.c
@@ -9,6 +9,7 @@
 #include <gc.h>
 
 #include "../../oberon-internals.h"
+#include "../../generator.h"
 #include "generator-jvm.h"
 #include "generator-jvm-abi.h"
 #include "generator-jvm-asm.h"
@@ -731,6 +732,18 @@ oberon_generator_fini_module(oberon_module_t * mod)
 static void
 push_expr(gen_proc_t * p, oberon_expr_t * expr);
 
+static void
+oberon_generate_static_initialization(gen_proc_t * p, oberon_object_t * x)
+{
+	if(x -> type -> class == OBERON_TYPE_ARRAY
+		|| x -> type -> class == OBERON_TYPE_RECORD)
+	{
+		jvm_generate_ldst_prepare(p, x -> gen_var);
+		jvm_generate_new(p, x -> type, 0);
+		jvm_generate_store(p, x -> gen_var);
+	}
+}
+
 void
 oberon_generate_begin_module(oberon_context_t * ctx)
 {
@@ -766,13 +779,7 @@ oberon_generate_begin_module(oberon_context_t * ctx)
 		else if(x -> class == OBERON_CLASS_VAR)
 		{
 			jvm_generate_var_initialization(p, x -> gen_var);
-			if(x -> type -> class == OBERON_TYPE_ARRAY
-				|| x -> type -> class == OBERON_TYPE_RECORD)
-			{
-				jvm_generate_ldst_prepare(p, x -> gen_var);
-				jvm_generate_new(p, x -> type, 0);
-				jvm_generate_store(p, x -> gen_var);
-			}
+			oberon_generate_static_initialization(p, x);
 		}
 
 		x = x -> next;
@@ -897,9 +904,22 @@ jvm_generate_local_initialization(gen_proc_t * p, oberon_object_t * x)
 	switch(x -> class)
 	{
 		case OBERON_CLASS_VAR_PARAM:
+			jvm_generate_var_initialization(p, v);
+			break;
 		case OBERON_CLASS_PARAM:
+			jvm_generate_var_initialization(p, v);
+			if(x -> type -> class == OBERON_TYPE_ARRAY)
+			{
+				jvm_generate_array_duplicate_and_replace(p, v, x -> type);
+			}
+			else if(x -> type -> class == OBERON_TYPE_RECORD)
+			{				
+				jvm_generate_record_duplicate_and_replace(p, v, x -> type);
+			}
+			break;
 		case OBERON_CLASS_VAR:
 			jvm_generate_var_initialization(p, v);
+			oberon_generate_static_initialization(p, x);
 			break;
 		case OBERON_CLASS_CONST:
 		case OBERON_CLASS_TYPE:
@@ -909,18 +929,6 @@ jvm_generate_local_initialization(gen_proc_t * p, oberon_object_t * x)
 			gen_error("jvm_generate_local_initialization: wat class %i", x -> class);
 			break;
 	}
-
-	if(x -> class == OBERON_CLASS_PARAM)
-	{
-		if(x -> type -> class == OBERON_TYPE_ARRAY)
-		{
-			jvm_generate_array_duplicate_and_replace(p, v, x -> type);
-		}
-		else if(x -> type -> class == OBERON_TYPE_RECORD)
-		{				
-			jvm_generate_record_duplicate_and_replace(p, v, x -> type);
-		}
-	}
 }
 
 void
@@ -981,6 +989,7 @@ oberon_generate_end_proc(oberon_context_t * ctx)
 	m = ctx -> mod -> gen_mod;
 	p = m -> class -> p;
 
+	oberon_generate_trap(ctx, -4);
 	jvm_generate_function_end(p);
 }