Добавлен ручной каст типов-записей

[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 1225a86a23b4a0f1479b6a8fc0a0265b574a654b..8c9d69f61258fb91af3a443771b682692fb7d1ee 100644 (file)
--- a/src/backends/jvm/generator-jvm.c
+++ b/src/backends/jvm/generator-jvm.c
@@ -827,7 +827,16 @@ oberon_generate_record_class(gen_module_t * m, oberon_type_t * rec)
 
        fprintf(class -> fp, ".source %s\n", rec -> module -> name);
        fprintf(class -> fp, ".class  public %s\n", cname);
-       fprintf(class -> fp, ".super  java/lang/Object\n\n");
+
+       if(rec -> base == NULL)
+       {
+               fprintf(class -> fp, ".super  java/lang/Object\n\n");
+       }
+       else
+       {
+               class -> base = rec -> base -> gen_type -> class;
+               fprintf(class -> fp, ".super  %s\n\n", class -> base -> full_name);
+       }
 
        rec -> gen_type -> class = class;
 }
@@ -887,7 +896,14 @@ oberon_generator_init_record(oberon_context_t * ctx, oberon_type_t * rec)
        jvm_generate_function_header(p, "public", "<init>", "()V");
        jvm_alloc_register_untyped(p -> rf, false);
        jvm_generate(p, 0, 1, "aload_0");
-       jvm_generate(p, 1, 0, "invokespecial java/lang/Object/<init>()V");
+       if(class -> base)
+       {
+               jvm_generate(p, 1, 0, "invokespecial %s/<init>()V", class -> base -> full_name);
+       }
+       else
+       {
+               jvm_generate(p, 1, 0, "invokespecial java/lang/Object/<init>()V");
+       }
        num = rec -> num_decl;
        field = rec -> decl;
        for(int i = 0; i < num; i++)
@@ -1299,19 +1315,27 @@ jvm_generate_expr_new_pointer(gen_proc_t * p, oberon_type_t * type, int num, obe
 static void
 jvm_generate_cast_type(gen_proc_t * p, oberon_type_t * from, oberon_type_t * to)
 {
-       char prefix = jvm_get_prefix(from);
-       char postfix = jvm_get_postfix(to);
-       int from_cell_size = jvm_cell_size_for_type(from);
-       int to_cell_size = jvm_cell_size_for_type(to);
-
-       jvm_generate_comment(p, "cast type class from %i(%i) to %i(%i)", from -> class, from -> size, to -> class, to -> size);
-
-       if(prefix == postfix)
+       if(to -> class == OBERON_TYPE_RECORD || to -> class == OBERON_TYPE_POINTER)
        {
-               return;
+               char * full_name = jvm_get_class_full_name(to);
+               jvm_generate(p, 1, 1, "checkcast %s", full_name);
        }
+       else
+       {
+               char prefix = jvm_get_prefix(from);
+               char postfix = jvm_get_postfix(to);
+               int from_cell_size = jvm_cell_size_for_type(from);
+               int to_cell_size = jvm_cell_size_for_type(to);
 
-       jvm_generate(p, from_cell_size, to_cell_size, "%c2%c", prefix, postfix);
+               jvm_generate_comment(p, "cast type class from %i(%i) to %i(%i)", from -> class, from -> size, to -> class, to -> size);
+
+               if(prefix == postfix)
+               {
+                       return;
+               }
+
+               jvm_generate(p, from_cell_size, to_cell_size, "%c2%c", prefix, postfix);
+       }
 }
 
 static void
@@ -1342,17 +1366,20 @@ 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);
-                       push_item(p, item -> parent);
+                       assert(item -> parent -> is_item);
+                       push_item(p, (oberon_item_t *) item -> parent);
                        push_expr(p, item -> args);
                        jvm_generate(p, 1 + 1, cell_size, "%caload", postfix);
                        break;
                case MODE_FIELD:
-                       push_item(p, item -> parent);
+                       assert(item -> parent -> is_item);
+                       push_item(p, (oberon_item_t *) item -> parent);
                        jvm_generate_load(p, item -> result, item -> var -> gen_var);
                        break;
                case MODE_DEREF:
                        /* Все объекты в jvm представляются как указатели */
-                       push_item(p, item -> parent);
+                       assert(item -> parent -> is_item);
+                       push_item(p, (oberon_item_t *) item -> parent);
                        break;
                case MODE_NIL:
                        jvm_generate(p, 0, 1, "aconst_null");
@@ -1364,7 +1391,7 @@ push_item(gen_proc_t * p, oberon_item_t * item)
                        jvm_generate_push_float(p, item -> real, item -> result -> size);
                        break;
                case MODE_CAST:
-                       push_item(p, item -> parent);
+                       push_expr(p, item -> parent);
                        jvm_generate_cast_type(p, item -> parent -> result, item -> result);
                        break;
                default:
@@ -1629,13 +1656,15 @@ store_expr(gen_proc_t * p, oberon_expr_t * dst, oberon_expr_t * src)
                        ;
                        char postfix = jvm_get_postfix(src -> result);
                        int cell_size = jvm_cell_size_for_postfix(postfix);
-                       push_item(p, item -> parent);
+                       assert(item -> parent -> is_item);
+                       push_item(p, (oberon_item_t *) item -> parent);
                        push_expr(p, item -> args);
                        push_expr(p, src);
                        jvm_generate(p, 1 + 1 + cell_size, 0, "%castore", postfix);
                        break;
                case MODE_FIELD:
-                       push_item(p, item -> parent);
+                       assert(item -> parent -> is_item);
+                       push_item(p, (oberon_item_t *) item -> parent);
                        push_expr(p, src);
                        jvm_generate_store(p, src -> result, item -> var -> gen_var);
                        break;