Исправлена инициализация локальных статических структур

[dsw-obn.git] / src / backends / jvm / generator-jvm.c

diff --git a/src/backends/jvm/generator-jvm.c b/src/backends/jvm/generator-jvm.c
index e4ea3833027a6d27cd502cf3be21e98191cfc4b7..bf3b07b52aee0c728cf194e2fbb521b635500557 100644 (file)
--- 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"
@@ -631,6 +632,13 @@ oberon_generator_init_var(oberon_context_t * ctx, oberon_object_t * var)
        struct gen_class * c;
        char * name = var -> name;
        gen_type_t * t = var -> type -> gen_type;
+
+       assert(name);
+       if(t == NULL)
+       {
+               gen_error("uninitialized type class %i", var -> type -> class);
+       }
+
        switch(var -> class)
        {
                case OBERON_CLASS_VAR_PARAM:
@@ -724,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)
 {
@@ -759,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;
@@ -864,10 +878,12 @@ jvm_generate_local_object(gen_proc_t * p, oberon_object_t * x)
                case OBERON_CLASS_VAR:
                        jvm_generate_var(v);
                        break;
+               case OBERON_CLASS_CONST:
+               case OBERON_CLASS_TYPE:
                case OBERON_CLASS_PROC:
                        break;
                default:
-                       gen_error("jvm_generate_local_initialization: wat");
+                       gen_error("jvm_generate_local_initialization: wat class %i", x -> class);
                        break;
        }
 }
@@ -888,28 +904,31 @@ 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:
                case OBERON_CLASS_PROC:
                        break;
                default:
-                       gen_error("jvm_generate_local_initialization: wat");
+                       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
@@ -970,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);
 }