Иправлен(?) мемори коррапшн

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

diff --git a/src/backends/jvm/generator-jvm-basic.c b/src/backends/jvm/generator-jvm-basic.c
index aad9747f25cbf4d091e86db1f0ea9a3d098753dc..27f1c56390802b409621ef18779d6781c6f10595 100644 (file)
--- a/src/backends/jvm/generator-jvm-basic.c
+++ b/src/backends/jvm/generator-jvm-basic.c
@@ -53,10 +53,11 @@ jvm_get_descriptor(oberon_type_t * type)
 
        switch(type -> class)
        {
-               case OBERON_TYPE_VOID:
+               case OBERON_TYPE_NOTYPE:
                        return new_string("V");
                        break;
                case OBERON_TYPE_INTEGER:
+               case OBERON_TYPE_SET:
                        switch(type -> size)
                        {
                                case 1:
@@ -125,6 +126,26 @@ jvm_get_descriptor(oberon_type_t * type)
                        desc = jvm_get_descriptor(type -> base);
                        return new_string("[%s", desc);
                        break;
+               case OBERON_TYPE_STRING:
+                       switch(type -> size)
+                       {
+                               case 1:
+                                       return new_string("[B");
+                                       break;
+                               case 2:
+                                       return new_string("[C");
+                                       break;
+                               case 4:
+                                       return new_string("[I");
+                                       break;
+                               case 8:
+                                       return new_string("[J");
+                                       break;
+                               default:
+                                       gen_error("jvm_get_descriptor: unsupported string size %i", type -> size);
+                                       break;
+                       }
+                       break;
                default:
                        gen_error("jvm_get_descriptor: unsupported type class %i", type -> class);
                        break;
@@ -133,6 +154,29 @@ jvm_get_descriptor(oberon_type_t * type)
        return NULL;
 }
 
+char *
+jvm_get_descriptor_safe(oberon_type_t * type)
+{
+       switch(type -> class)
+       {
+               case OBERON_TYPE_POINTER:
+                       return new_string("PTR%s", jvm_get_descriptor_safe(type -> base));
+                       break;
+               case OBERON_TYPE_PROCEDURE:
+               case OBERON_TYPE_RECORD:
+                       return jvm_get_class_full_name(type);
+                       break;
+               case OBERON_TYPE_ARRAY:
+                       return new_string("A%s", jvm_get_descriptor_safe(type -> base));
+                       break;
+               default:
+                       return jvm_get_descriptor(type);
+                       break;
+       }
+
+       return NULL;
+}
+
 char
 jvm_get_prefix(oberon_type_t * type)
 {
@@ -142,19 +186,22 @@ jvm_get_prefix(oberon_type_t * type)
                case OBERON_TYPE_BOOLEAN:
                case OBERON_TYPE_INTEGER:
                case OBERON_TYPE_CHAR:
+               case OBERON_TYPE_SET:
                        return (size <= 4) ? ('i') : ('l');
                        break;
                case OBERON_TYPE_PROCEDURE:
                case OBERON_TYPE_ARRAY:
                case OBERON_TYPE_RECORD:
                case OBERON_TYPE_POINTER:
+               case OBERON_TYPE_STRING:
+               case OBERON_TYPE_NIL:
                        return 'a';
                        break;
                case OBERON_TYPE_REAL:
                        return (size <= 4) ? ('f') : ('d');
                        break;
                default:
-                       gen_error("jvm_get_prefix: wat");
+                       gen_error("jvm_get_prefix: wat %i", type -> class);
                        return '!';
                        break;
        }
@@ -170,6 +217,7 @@ jvm_get_postfix(oberon_type_t * type)
                        return 'b';
                        break;
                case OBERON_TYPE_INTEGER:
+               case OBERON_TYPE_SET:
                        switch(size)
                        {
                                case 1:
@@ -213,6 +261,8 @@ jvm_get_postfix(oberon_type_t * type)
                case OBERON_TYPE_ARRAY:
                case OBERON_TYPE_RECORD:
                case OBERON_TYPE_POINTER:
+               case OBERON_TYPE_STRING:
+               case OBERON_TYPE_NIL:
                        return 'a';
                        break;
                case OBERON_TYPE_REAL:
@@ -226,17 +276,45 @@ jvm_get_postfix(oberon_type_t * type)
        return '!';
 }
 
+char *
+jvm_get_name(oberon_object_t * x)
+{
+       switch(x -> class)
+       {
+               case OBERON_CLASS_VAR:
+               case OBERON_CLASS_VAR_PARAM:
+               case OBERON_CLASS_PARAM:
+               case OBERON_CLASS_FIELD:
+                       return new_string(x -> name);
+               case OBERON_CLASS_PROC:
+                       if(x -> parent)
+                       {
+                               return new_string("%s$%s", jvm_get_name(x -> parent), x -> name);
+                       }
+                       else
+                       {
+                               return new_string(x -> name);
+                       }
+               default:
+                       gen_error("jvm_get_name: wat");
+       }
+
+       return NULL;
+}
+
 char *
 jvm_get_field_full_name(oberon_object_t * x)
 {
+       char * parent;
        switch(x -> class)
        {
                case OBERON_CLASS_VAR:
+                       return new_string("%s/%s", x -> module -> name, jvm_get_name(x));
                case OBERON_CLASS_PROC:
-                       return new_string("%s/%s", x -> module -> name, x -> name);
-               case OBERON_CLASS_FIELD:;
-                       char * rec_name = jvm_get_class_full_name(x -> parent_type);
-                       return new_string("%s/%s", rec_name, x -> name);
+                       return new_string("%s/%s", x -> module -> name, jvm_get_name(x));
+               case OBERON_CLASS_FIELD:
+                       parent = jvm_get_class_full_name(x -> parent_type);
+                       return new_string("%s/%s", parent, jvm_get_name(x));
                case OBERON_CLASS_MODULE:
                        return new_string(x -> module -> name);
                default:
@@ -283,14 +361,15 @@ jvm_get_class_full_name(oberon_type_t * type)
                        name = new_string("SYSTEM$PROCEDURE");
 
                        char * desc;
-                       desc = jvm_get_descriptor(type -> base);
+                       desc = jvm_get_descriptor_safe(type -> base);
                        name = new_string("%s$%s", name, desc);
 
                        int num = type -> num_decl;
                        oberon_object_t * arg = type -> decl;
+
                        for(int i = 0; i < num; i++)
                        {
-                               desc = jvm_get_descriptor(arg -> type);
+                               desc = jvm_get_descriptor_safe(arg -> type);
                                name = new_string("%s%s", name, desc);
                                arg = arg -> next;
                        }
@@ -308,40 +387,23 @@ jvm_get_class_full_name(oberon_type_t * type)
        return name;
 }
 
-char *
-jvm_get_procedure_signature(oberon_type_t * proc)
-{
-       char * signature;
-       char * desc;
-
-       signature = new_string("(");
-
-       int num = proc -> num_decl;
-       oberon_object_t * arg = proc -> decl;
-       for(int i = 0; i < num; i++)
-       {
-               desc = jvm_get_descriptor(arg -> type);
-               signature = new_string("%s%s", signature, desc);
-               arg = arg -> next;
-       }
-
-       desc = jvm_get_descriptor(proc -> base);
-       signature = new_string("%s)%s", signature, desc);
-
-       return signature;
-}
-
 int
 jvm_cell_size_for_type(oberon_type_t * type)
 {
        if(type -> class == OBERON_TYPE_INTEGER
-               || type -> class == OBERON_TYPE_REAL)
+               || type -> class == OBERON_TYPE_REAL
+               || type -> class == OBERON_TYPE_CHAR
+               || type -> class == OBERON_TYPE_SET)
        {
                if(type -> size > 4)
                {
                        return 2;
                }
        }
+       else if(type -> class == OBERON_TYPE_NOTYPE)
+       {
+               return 0;
+       }
 
        return 1;
 }