Правила совместимости типов приведены в соответствие со страндатром

[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 9d5e1f4af7d58e970c49a0ad2665e0488ff36488..21ad4db6c1a2a9aa3dcc2cb24b4088f2c2fafc93 100644 (file)
--- 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
@@ -1136,8 +1141,11 @@ jvm_generate_cast_type(gen_proc_t * p, oberon_type_t * from, oberon_type_t * to)
 {
        if(to -> class == OBERON_TYPE_RECORD || to -> class == OBERON_TYPE_POINTER)
        {
-               char * full_name = jvm_get_class_full_name(to);
-               jvm_generate(p, 1, 1, "checkcast %s", full_name);
+               if(to -> class == OBERON_TYPE_POINTER && to -> base -> class == OBERON_TYPE_RECORD)
+               {
+                       char * full_name = jvm_get_class_full_name(to);
+                       jvm_generate(p, 1, 1, "checkcast %s", full_name);
+               }
        }
        else
        {
@@ -1636,3 +1644,75 @@ oberon_generate_assign(oberon_context_t * ctx, oberon_expr_t * src, oberon_expr_
 
        store_expr(p, dst, src);
 }
+
+void
+oberon_generate_copy(oberon_context_t * ctx, oberon_expr_t * src, oberon_expr_t * dst)
+{
+       gen_module_t * m;
+       gen_proc_t * p;
+       char * desc;
+
+       m = ctx -> mod -> gen_mod;
+       p = m -> class -> p;
+
+       push_expr(p, src);
+       push_expr(p, dst);
+
+       desc = jvm_get_descriptor(dst -> result);
+
+       jvm_generate(p, 2, 0, "invokestatic SYSTEM/COPY(%s%s)V", desc, desc);
+}
+
+void
+oberon_generate_assert(oberon_context_t * ctx, oberon_expr_t * cond)
+{
+       gen_module_t * m;
+       gen_proc_t * p;
+
+       m = ctx -> mod -> gen_mod;
+       p = m -> class -> p;
+
+       push_expr(p, cond);
+       jvm_generate(p, 1, 0, "invokestatic SYSTEM/ASSERT(Z)V");
+}
+
+void
+oberon_generate_assert_n(oberon_context_t * ctx, oberon_expr_t * cond, int64_t n)
+{
+       gen_module_t * m;
+       gen_proc_t * p;
+
+       m = ctx -> mod -> gen_mod;
+       p = m -> class -> p;
+
+       push_expr(p, cond);
+       jvm_generate_push_int_size(p, n, 8);
+       jvm_generate(p, 1 + 2, 0, "invokestatic SYSTEM/ASSERT(ZJ)V");
+}
+
+void
+oberon_generate_trap(oberon_context_t * ctx, int64_t n)
+{
+       gen_module_t * m;
+       gen_proc_t * p;
+
+       m = ctx -> mod -> gen_mod;
+       p = m -> class -> p;
+
+       jvm_generate_push_int_size(p, n, 8);
+       jvm_generate(p, 2, 0, "invokestatic SYSTEM/TRAP(J)V");
+}
+
+void
+oberon_generate_halt(oberon_context_t * ctx, int64_t n)
+{
+       gen_module_t * m;
+       gen_proc_t * p;
+
+       m = ctx -> mod -> gen_mod;
+       p = m -> class -> p;
+
+       jvm_generate_push_int_size(p, n, 8);
+       jvm_generate(p, 2, 0, "invokestatic SYSTEM/HALT(J)V");
+}
+