index 0db2cc88b29bf3454d99b390ea5ff4bc151e0804..a750b927fb170a568a27f0f5bc29fe1ab6bdf038 100644 (file)
break;
case JVM_STORAGE_FRAME:
case JVM_STORAGE_FRAME_PARAM:
- jvm_generate_load(p, p -> frame_v);
+ jvm_generate(p, 0, 1, "aload %i", p -> reg_frame[v -> level]);
break;
case JVM_STORAGE_FRAME_VAR:
case JVM_STORAGE_FRAME_PARAM_VAR:
- jvm_generate_load(p, p -> frame_v);
+ jvm_generate(p, 0, 1, "aload %i", p -> reg_frame[v -> level]);
jvm_generate(p, 1, 1, "getfield %s [%s", full_name, desc);
jvm_generate(p, 0, 1, "iconst_0");
break;
case JVM_STORAGE_FRAME_PARAM_VARPTR:
- jvm_generate_load(p, p -> frame_v);
+ jvm_generate(p, 0, 1, "aload %i", p -> reg_frame[v -> level]);
jvm_generate(p, 1, 1, "getfield %s [%s", full_name, desc);
- jvm_generate_load(p, p -> frame_v);
+ jvm_generate(p, 0, 1, "aload %i", p -> reg_frame[v -> level]);
jvm_generate(p, 1, 1, "getfield %s$offset I", full_name);
break;
default:
@@ -203,6 +203,7 @@ jvm_create_function_var(gen_proc_t * p, enum gen_storage storage, char * name, g
v -> name = new_string(name);
v -> type = t;
v -> p = p;
+ v -> level = p -> level;
switch(storage)
{
v -> name = new_string("$TEMP_%i$", v -> reg);
v -> type = t;
v -> p = p;
+ v -> level = p -> level;
return v;
}
}
else if(v -> storage == JVM_STORAGE_FRAME_PARAM_VARPTR)
{
- jvm_generate_load(p, p -> frame_v);
+ jvm_generate(p, 0, 1, "aload %i", p -> reg_frame[v -> level]);
jvm_generate(p, 0, 1, "aload %i", v -> reg);
jvm_generate(p, 1, 0, "putfield %s [%s", v -> full_name, v -> type -> desc);
- jvm_generate_load(p, p -> frame_v);
+ jvm_generate(p, 0, 1, "aload %i", p -> reg_frame[v -> level]);
jvm_generate(p, 0, 1, "iload %i", v -> reg + 1);
jvm_generate(p, 1, 0, "putfield %s$offset I", v -> full_name);
}
if(v -> storage == JVM_STORAGE_FRAME
|| v -> storage == JVM_STORAGE_FRAME_PARAM)
{
+ fprintf(fp, "; LEVEL %i\n", v -> level);
fprintf(fp, ".field public %s %s\n\n", v -> name, v -> type -> desc);
}
else if(v -> storage == JVM_STORAGE_FRAME_VAR
|| v -> storage == JVM_STORAGE_FRAME_PARAM_VAR)
{
+ fprintf(fp, "; LEVEL %i\n", v -> level);
fprintf(fp, ".field public %s [%s\n\n", v -> name, v -> type -> desc);
}
else if(v -> storage == JVM_STORAGE_FRAME_PARAM_VARPTR)
{
+ fprintf(fp, "; LEVEL %i\n", v -> level);
fprintf(fp, ".field public %s [%s\n", v -> name, v -> type -> desc);
fprintf(fp, ".field public %s$offset I\n\n", v -> name);
}
t -> desc = new_string("L%s;", class -> full_name);
v = jvm_create_function_var(p, JVM_STORAGE_REGISTER, "$FP$", t);
-
p -> frame_v = v;
- p -> frame_t = t;
+ printf("jvm_generate_procedure_frame: %p level %i\n", p -> reg_frame, p -> level);
+ p -> reg_frame[p -> level] = v -> reg;
}
void
{
jvm_generate_var(p -> frame_v);
jvm_generate_ldst_prepare(p, p -> frame_v);
- jvm_generate(p, 0, 1, "new %s", p -> frame_t -> class -> full_name);
+ jvm_generate(p, 0, 1, "new %s", p -> frame_v -> type -> class -> full_name);
jvm_generate(p, 1, 2, "dup");
- jvm_generate(p, 1, 0, "invokespecial %s/<init>()V", p -> frame_t -> class -> full_name);
+ jvm_generate(p, 1, 0, "invokespecial %s/<init>()V", p -> frame_v -> type -> class -> full_name);
jvm_generate_store(p, p -> frame_v);
}
+
+char *
+jvm_get_procedure_signature(oberon_type_t * ps)
+{
+ char * signature;
+ char * desc;
+ int num;
+ oberon_object_t * arg;
+
+ signature = new_string("(");
+
+ num = ps -> num_decl;
+ arg = ps -> decl;
+ for(int i = 0; i < num; i++)
+ {
+ desc = jvm_get_descriptor(arg -> type);
+ if(arg -> class == OBERON_CLASS_VAR_PARAM)
+ {
+ signature = new_string("%s[%sI", signature, desc);
+ }
+ else
+ {
+ signature = new_string("%s%s", signature, desc);
+ }
+ arg = arg -> next;
+ }
+
+ desc = jvm_get_descriptor(ps -> base);
+ signature = new_string("%s)%s", signature, desc);
+
+ return signature;
+}
+
+static char *
+jvm_get_frame_descriptor(oberon_object_t * proc)
+{
+ char * full_name = jvm_get_field_full_name_safe(proc);
+ return new_string("L%s$FRAME;", full_name);
+}
+
+static char *
+jvm_get_oberon_signature_static_links(oberon_object_t * parent)
+{
+ if(parent == NULL)
+ {
+ return "";
+ }
+
+ char * up = jvm_get_oberon_signature_static_links(parent -> parent);
+ char * desc = jvm_get_frame_descriptor(parent);
+ return new_string("%s%s", up, desc);
+}
+
+char *
+jvm_get_local_procedure_signature(oberon_object_t * proc)
+{
+ char * stlinks;
+ char * signature;
+ char * desc;
+ int num;
+ oberon_object_t * arg;
+ oberon_type_t * ps;
+
+ ps = proc -> type;
+
+ signature = new_string("(");
+
+ if(proc -> local)
+ {
+ stlinks = jvm_get_oberon_signature_static_links(proc -> parent);
+ signature = new_string("%s%s", signature, stlinks);
+ }
+
+ num = ps -> num_decl;
+ arg = ps -> decl;
+ for(int i = 0; i < num; i++)
+ {
+ desc = jvm_get_descriptor(arg -> type);
+ if(arg -> class == OBERON_CLASS_VAR_PARAM)
+ {
+ signature = new_string("%s[%sI", signature, desc);
+ }
+ else
+ {
+ signature = new_string("%s%s", signature, desc);
+ }
+ arg = arg -> next;
+ }
+
+ desc = jvm_get_descriptor(ps -> base);
+ signature = new_string("%s)%s", signature, desc);
+
+ return signature;
+}
+
+
+static void
+jvm_generate_staticlinks_recursive(gen_proc_t * p, oberon_object_t * parent, int level)
+{
+ if(parent == NULL)
+ {
+ return;
+ }
+
+ jvm_generate_staticlinks_recursive(p, parent -> parent, level - 1);
+ int reg = p -> reg_frame[level];
+ char * desc = jvm_get_frame_descriptor(parent);
+ jvm_generate(p, 0, 0, ".var %i is SL$%i %s from start to end", reg, level, desc);
+}
+
+void
+jvm_generate_staticlinks(oberon_object_t * proc)
+{
+ gen_proc_t * p;
+
+ p = proc -> gen_proc;
+
+ jvm_generate_staticlinks_recursive(p, proc -> parent, p -> level);
+}
+
+static void
+jvm_create_staticlinks_recursive(gen_proc_t * p, oberon_object_t * parent, int level)
+{
+ if(parent == NULL)
+ {
+ return;
+ }
+
+ jvm_create_staticlinks_recursive(p, parent -> parent, level - 1);
+ p -> reg_frame[level] = jvm_alloc_register_untyped(p -> rf, false);
+}
+
+void
+jvm_create_static_links(oberon_object_t * proc)
+{
+ gen_proc_t * p;
+ p = proc -> gen_proc;
+
+ int max_frames = 0;
+ oberon_object_t * prc = proc;
+ while(prc)
+ {
+ max_frames += 1;
+ prc = prc -> parent;
+ }
+
+ p -> max_frames = max_frames;
+ p -> reg_frame = GC_MALLOC(sizeof *p -> reg_frame);
+ memset(p -> reg_frame, 0, max_frames * sizeof *p -> reg_frame);
+
+ p -> level = max_frames - 1;
+ jvm_create_staticlinks_recursive(p, proc -> parent, p -> level);
+}
+
+static void
+jvm_generate_push_static_links_recursive(gen_proc_t * p, oberon_object_t * parent)
+{
+ if(parent == NULL)
+ {
+ return;
+ }
+
+ jvm_generate_push_static_links_recursive(p, parent -> parent);
+ int level = parent -> gen_proc -> level;
+ jvm_generate(p, 0, 1, "aload %i", p -> reg_frame[level]);
+}
+
+void
+jvm_generate_push_static_links(gen_proc_t * p, oberon_object_t * proc)
+{
+ jvm_generate_push_static_links_recursive(p, proc -> parent);
+}