index 1d4f9702a8254b2a2064743f2a320c075176d742..1225a86a23b4a0f1479b6a8fc0a0265b574a654b 100644 (file)
class -> p = p;
fprintf(class -> fp, ".method %s %s%s\n", access, name, signature);
+ fprintf(class -> fp, " start:\n");
}
void
assert(class -> p);
class -> p = NULL;
- fprintf(class -> fp, " .limit stack %i\n", p -> stack -> max_pointer);
- fprintf(class -> fp, " .limit locals %i\n", p -> rf -> max_used);
+ int pointer = p -> stack -> pointer;
+ int max_pointer = p -> stack -> max_pointer;
+ int locals = p -> rf -> num_used;
+ int max_locals = p -> rf -> max_used;
+
+ fprintf(class -> fp, " .limit stack %i \t; current(%i)\n", max_pointer, pointer);
+ fprintf(class -> fp, " .limit locals %i \t; current(%i)\n", max_locals, locals);
+ fprintf(class -> fp, " end:\n");
fprintf(class -> fp, ".end method\n\n");
}
jvm_stack_pop(gen_proc_t * p, unsigned size)
{
p -> stack -> pointer -= size;
- assert(p -> stack -> pointer >= 0);
+
+ if(p -> stack -> pointer < 0)
+ {
+ printf("WARING: stack pointer %i\n", p -> stack -> pointer);
+ }
}
static void
jvm_stack_pop(p, get);
fprintf(p -> class -> fp, " ");
vfprintf(p -> class -> fp, format, ptr);
- fprintf(p -> class -> fp, "\n");
jvm_stack_push(p, push);
+ fprintf(p -> class -> fp, " \t ;>>>> %i -- %i : current_stack(%i)\n", get, push, p -> stack -> pointer);
+
+ va_end(ptr);
+}
+
+static void
+jvm_generate_comment(gen_proc_t * p, char * format, ...)
+{
+ va_list ptr;
+ va_start(ptr, format);
+
+ fprintf(p -> class -> fp, " ;;;; ");
+ vfprintf(p -> class -> fp, format, ptr);
+ fprintf(p -> class -> fp, "\n");
va_end(ptr);
}
}
}
+static void
+jvm_generate_push_int_size(gen_proc_t * p, int64_t i, int size)
+{
+ int pushed_cell = 1;
+
+ if(i == -1)
+ {
+ jvm_generate(p, 0, 1, "iconst_m1");
+ }
+ else if(i >= 0 && i <= 5)
+ {
+ jvm_generate(p, 0, 1, "iconst_%li", i);
+ }
+ else if(i >= -128 && i <= 127)
+ {
+ jvm_generate(p, 0, 1, "bipush %li", i);
+ }
+ else if(i >= -32768 && i <= 32767)
+ {
+ jvm_generate(p, 0, 1, "sipush %li", i);
+ }
+ else if(i >= -2147483648 && i <= 2147483647)
+ {
+ jvm_generate(p, 0, 1, "ldc %li", i);
+ }
+ else
+ {
+ pushed_cell = 2;
+ jvm_generate(p, 0, 2, "ldc2 %li", i);
+ }
+
+ assert(size <= 8);
+ if(size > 4 && pushed_cell == 1)
+ {
+ jvm_generate(p, pushed_cell, 2, "i2l");
+ }
+ else if(size <= 4)
+ {
+ if(pushed_cell > 1)
+ {
+ jvm_generate(p, 2, 1, "l2i");
+ }
+
+ if(size == 2)
+ {
+ jvm_generate(p, 1, 1, "i2s");
+ }
+ else if(size == 1)
+ {
+ jvm_generate(p, 1, 1, "i2b");
+ }
+ }
+}
+
static void
jvm_generate_push_float(gen_proc_t * p, double f, int size)
{
}
}
+static gen_var_t *
+oberon_generator_new_var()
+{
+ gen_var_t * v = GC_MALLOC(sizeof *v);
+ memset(v, 0, sizeof *v);
+ return v;
+}
+
+static void
+jvm_generate_and_init_global_var(gen_var_t * v, struct gen_class * class, char * access, char * name, char * desc)
+{
+ assert(class -> p == NULL);
+ fprintf(class -> fp, ".field %s static %s %s\n\n", access, name, desc);
+
+ v -> storage = JVM_STORAGE_STATIC;
+ v -> full_name = new_string("%s/%s", class -> full_name, name);
+ v -> desc = new_string(desc);
+}
+
+static void
+jvm_generate_and_init_field(gen_var_t * v, struct gen_class * class, char * access, char * name, char * desc)
+{
+ assert(class -> p == NULL);
+ fprintf(class -> fp, ".field %s %s %s\n\n", access, name, desc);
+
+ v -> storage = JVM_STORAGE_FIELD;
+ v -> full_name = new_string("%s/%s", class -> full_name, name);
+ v -> desc = new_string(desc);
+}
+
+static void
+jvm_generate_and_init_local_var(gen_var_t * v, gen_proc_t * p, bool wide)
+{
+ v -> storage = JVM_STORAGE_REGISTER;
+ v -> reg = jvm_alloc_register_untyped(p -> rf, wide);
+}
+
+static void
+jvm_generate_and_init_named_local_var(gen_var_t * v, gen_proc_t * p, bool wide, char * name, char * desc)
+{
+ jvm_generate_and_init_local_var(v, p, wide);
+ v -> desc = new_string(desc);
+ jvm_generate(p, 0, 0, ".var %i is %s %s from start to end", v -> reg, name, desc);
+}
+
static int
jvm_new_label_id(gen_proc_t * p)
{
}
static void
-jvm_generate_new_static(gen_proc_t * p, oberon_type_t * type)
+jvm_generate_load(gen_proc_t * p, oberon_type_t * src_type, gen_var_t * src)
{
- int dim;
- char * cname;
- char * desc;
+ char prefix;
+ int cell_size;
- switch(type -> class)
+ cell_size = jvm_cell_size_for_type(src_type);
+
+ switch(src -> storage)
{
- case OBERON_TYPE_INTEGER:
- case OBERON_TYPE_BOOLEAN:
- case OBERON_TYPE_PROCEDURE:
- case OBERON_TYPE_REAL:
- case OBERON_TYPE_POINTER:
- gen_error("jvm_generate_new_static: static alocation not allowed");
+ case JVM_STORAGE_REGISTER:
+ prefix = jvm_get_prefix(src_type);
+ jvm_generate(p, 0, cell_size, "%cload %i", prefix, src -> reg);
break;
- case OBERON_TYPE_RECORD:
- cname = jvm_get_class_full_name(type);
- jvm_generate(p, 0, 1, "new %s", cname);
- jvm_generate(p, 1, 2, "dup");
- jvm_generate(p, 1, 0, "invokespecial %s/<init>()V", cname);
+ case JVM_STORAGE_STATIC:
+ jvm_generate(p, 0, cell_size, "getstatic %s %s", src -> full_name, src -> desc);
break;
- case OBERON_TYPE_ARRAY:
- dim = 0;
- desc = jvm_get_descriptor(type);
- while(type -> class == OBERON_TYPE_ARRAY)
- {
- dim += 1;
- jvm_generate_push_int(p, type -> size);
- type = type -> base;
- }
- jvm_generate(p, dim, 1, "multianewarray %s %i", desc, dim);
+ case JVM_STORAGE_FIELD:
+ jvm_generate(p, 1, cell_size, "getfield %s %s", src -> full_name, src -> desc);
break;
default:
- gen_error("jvm_generate_new_static: unk type class %i", type -> class);
+ gen_error("jvm_generate_load: unknow storage type %i", src -> storage);
break;
}
}
@@ -270,49 +380,309 @@ jvm_generate_store(gen_proc_t * p, oberon_type_t * src_type, gen_var_t * dst)
}
}
-static gen_var_t *
-oberon_generator_new_var()
+static void
+jvm_generate_new(gen_proc_t * p, oberon_type_t * type, int num);
+
+/*
+ * Генерирует код для инициализации массива со статическим базовым типом
+ * ( aref -- )
+ */
+
+static void
+jvm_generate_array_initialization(gen_proc_t * p, oberon_type_t * arr)
{
- gen_var_t * v = GC_MALLOC(sizeof *v);
- memset(v, 0, sizeof *v);
- return v;
+ int dim = 0;
+ oberon_type_t * base = arr;
+ while(base -> class == OBERON_TYPE_ARRAY)
+ {
+ dim += 1;
+ base = base -> base;
+ }
+
+ if(base -> class != OBERON_TYPE_RECORD)
+ {
+ jvm_generate(p, 1, 0, "pop");
+ return;
+ }
+
+ struct {
+ gen_var_t * index;
+ gen_var_t * length;
+ int start;
+ int end;
+ } loop[dim];
+
+ gen_var_t * dst = oberon_generator_new_var();
+ jvm_generate_and_init_local_var(dst, p, false);
+ jvm_generate_store(p, arr, dst);
+
+ /*
+ * Входящие параметры заграблены.
+ * Теперь генерируем эквивалентный код:
+ * int i = 0;
+ * int len = dst.length
+ * while(i < len)
+ * {
+ * ...
+ * {
+ * dst[i, ...] = new record;
+ * }
+ * ...
+ * i += 1;
+ * }
+ * Где "..." такой же код (начало и конец) для следующей размерности.
+ */
+
+ for(int i = 0; i < dim; i++)
+ {
+ loop[i].index = oberon_generator_new_var();
+ loop[i].length = oberon_generator_new_var();
+ loop[i].start = jvm_new_label_id(p);
+ loop[i].end = jvm_new_label_id(p);
+ jvm_generate_and_init_local_var(loop[i].index, p, false);
+ jvm_generate_and_init_local_var(loop[i].length, p, false);
+
+ /* TODO преределать через jvm_generate_load{{store}} */
+
+ jvm_generate(p, 0, 1, "iconst_0");
+ jvm_generate(p, 1, 0, "istore %i", loop[i].index -> reg);
+
+ jvm_generate_load(p, arr, dst);
+ jvm_generate(p, 1, 1, "arraylength");
+ jvm_generate(p, 1, 0, "istore %i", loop[i].length -> reg);
+
+ /* if(i >= len) goto end; */
+ jvm_generate_label(p, loop[i].start);
+ jvm_generate(p, 0, 1, "iload %i", loop[i].index -> reg);
+ jvm_generate(p, 0, 1, "iload %i", loop[i].length -> reg);
+ jvm_generate(p, 2, 0, "if_icmpge L%i", loop[i].end);
+ }
+
+ jvm_generate_load(p, arr, dst);
+ jvm_generate(p, 0, 1, "iload %i", loop[0].index -> reg);
+ for(int i = 1; i < dim; i++)
+ {
+ jvm_generate(p, 2, 1, "aaload");
+ jvm_generate(p, 0, 1, "iload %i", loop[i].index -> reg);
+ }
+ jvm_generate_new(p, base, 0);
+ jvm_generate(p, 3, 0, "aastore");
+
+ for(int i = dim - 1; i >= 0; i--)
+ {
+ jvm_generate(p, 0, 0, "iinc %i 1", loop[i].index -> reg);
+ jvm_generate(p, 0, 0, "goto L%i", loop[i].start);
+ jvm_generate_label(p, loop[i].end);
+ }
}
static void
-jvm_generate_and_init_global_var(gen_var_t * v, struct gen_class * class, char * access, char * name, char * desc)
+jvm_generate_new(gen_proc_t * p, oberon_type_t * type, int num)
{
- assert(class -> p == NULL);
- fprintf(class -> fp, ".field %s static %s %s\n\n", access, name, desc);
+ int dim;
+ char * cname;
+ char * desc;
+ oberon_type_t * base;
- v -> storage = JVM_STORAGE_STATIC;
- v -> full_name = new_string("%s/%s", class -> full_name, name);
- v -> desc = new_string(desc);
+ switch(type -> class)
+ {
+ case OBERON_TYPE_INTEGER:
+ case OBERON_TYPE_BOOLEAN:
+ case OBERON_TYPE_PROCEDURE:
+ case OBERON_TYPE_REAL:
+ case OBERON_TYPE_POINTER:
+ gen_error("jvm_generate_new_static: static alocation not allowed");
+ break;
+ case OBERON_TYPE_RECORD:
+ assert(num == 0);
+ cname = jvm_get_class_full_name(type);
+ jvm_generate(p, 0, 1, "new %s", cname);
+ jvm_generate(p, 1, 2, "dup");
+ jvm_generate(p, 1, 0, "invokespecial %s/<init>()V", cname);
+ break;
+ case OBERON_TYPE_ARRAY:
+ dim = 0;
+ base = type;
+ desc = jvm_get_descriptor(type);
+ while(base -> class == OBERON_TYPE_ARRAY)
+ {
+ if(num > 0)
+ {
+ assert(base -> size == 0);
+ num -= 1;
+ }
+ else
+ {
+ assert(base -> size > 0);
+ jvm_generate_push_int(p, base -> size);
+ }
+ dim += 1;
+ base = base -> base;
+ }
+
+ assert(num == 0);
+ jvm_generate(p, dim, 1, "multianewarray %s %i", desc, dim);
+ jvm_generate(p, 1, 2, "dup");
+ jvm_generate_array_initialization(p, type);
+ break;
+ default:
+ gen_error("jvm_generate_new_static: unk type class %i", type -> class);
+ break;
+ }
}
+/*
+ * Генерирует код для копирования полей из первой записи во вторую.
+ * ( aref_dst aref_src -- )
+ * dst := src;
+ */
+
static void
-jvm_generate_and_init_field(gen_var_t * v, struct gen_class * class, char * access, char * name, char * desc)
+jvm_generate_copy_record(gen_proc_t * p, oberon_type_t * rec)
{
- assert(class -> p == NULL);
- fprintf(class -> fp, ".field %s %s %s\n\n", access, name, desc);
-
- v -> storage = JVM_STORAGE_FIELD;
- v -> full_name = new_string("%s/%s", class -> full_name, name);
- v -> desc = new_string(desc);
+ assert(rec -> class == OBERON_TYPE_RECORD);
+ char * desc = jvm_get_descriptor(rec);
+ char * cname = jvm_get_class_full_name(rec);
+ jvm_generate(p, 1 + 1, 0, "invokestatic %s/$COPY$(%s%s)V", cname, desc, desc);
}
+/*
+ * Генерирует кода для копирования массивов.
+ * ( aref_dst aref_src -- )
+ * dst := src;
+ */
+
static void
-jvm_generate_and_init_local_var(gen_var_t * v, gen_proc_t * p, bool wide)
+jvm_generate_copy_array(gen_proc_t * p, oberon_type_t * arr)
{
- v -> storage = JVM_STORAGE_REGISTER;
- v -> reg = jvm_alloc_register_untyped(p -> rf, wide);
+ int dim = 0;
+ oberon_type_t * base = arr;
+ while(base -> class == OBERON_TYPE_ARRAY)
+ {
+ dim += 1;
+ base = base -> base;
+ }
+
+ struct {
+ gen_var_t * index;
+ gen_var_t * length;
+ int start;
+ int end;
+ } loop[dim];
+
+ gen_var_t * dst = oberon_generator_new_var();
+ gen_var_t * src = oberon_generator_new_var();
+ jvm_generate_and_init_local_var(dst, p, false);
+ jvm_generate_and_init_local_var(src, p, false);
+
+ jvm_generate_store(p, arr, src);
+ jvm_generate_store(p, arr, dst);
+
+ /*
+ * Входящие параметры заграблены.
+ * Теперь генерируем эквивалентный код:
+ * int i = 0;
+ * int len = dst.length
+ * while(i < len)
+ * {
+ * ...
+ * {
+ * copy from src[i, ...] to dst[i, ...];
+ * }
+ * ...
+ * i += 1;
+ * }
+ * Где "..." такой же код (начало и конец) для следующей размерности.
+ */
+
+ for(int i = 0; i < dim; i++)
+ {
+ loop[i].index = oberon_generator_new_var();
+ loop[i].length = oberon_generator_new_var();
+ loop[i].start = jvm_new_label_id(p);
+ loop[i].end = jvm_new_label_id(p);
+ jvm_generate_and_init_local_var(loop[i].index, p, false);
+ jvm_generate_and_init_local_var(loop[i].length, p, false);
+
+ /* TODO преределать через jvm_generate_load{{store}} */
+
+ jvm_generate(p, 0, 1, "iconst_0");
+ jvm_generate(p, 1, 0, "istore %i", loop[i].index -> reg);
+
+ jvm_generate_load(p, arr, dst);
+ jvm_generate(p, 1, 1, "arraylength");
+ jvm_generate(p, 1, 0, "istore %i", loop[i].length -> reg);
+
+ /* if(i >= len) goto end; */
+ jvm_generate_label(p, loop[i].start);
+ jvm_generate(p, 0, 1, "iload %i", loop[i].index -> reg);
+ jvm_generate(p, 0, 1, "iload %i", loop[i].length -> reg);
+ jvm_generate(p, 2, 0, "if_icmpge L%i", loop[i].end);
+ }
+
+ if(base -> class == OBERON_TYPE_RECORD)
+ {
+ /* Получаем записи по индексам ( -- dst src ) */
+
+ jvm_generate_load(p, arr, dst);
+ for(int i = 0; i < dim; i++)
+ {
+ jvm_generate(p, 0, 1, "iload %i", loop[i].index -> reg);
+ jvm_generate(p, 2, 1, "aaload");
+ }
+
+ jvm_generate_load(p, arr, src);
+ for(int i = 0; i < dim; i++)
+ {
+ jvm_generate(p, 0, 1, "iload %i", loop[i].index -> reg);
+ jvm_generate(p, 2, 1, "aaload");
+ }
+
+ /* Копируем записи ( dst src -- ) */
+ jvm_generate_copy_record(p, base);
+ }
+ else
+ {
+ char postfix = jvm_get_postfix(base);
+ int cell_size = jvm_cell_size_for_postfix(postfix);
+
+ /* Получаем массивы и индексы ( -- dst i src i ) */
+
+ jvm_generate_load(p, arr, dst);
+ jvm_generate(p, 0, 1, "iload %i", loop[0].index -> reg);
+ for(int i = 1; i < dim; i++)
+ {
+ jvm_generate(p, 2, 1, "aaload");
+ jvm_generate(p, 0, 1, "iload %i", loop[i].index -> reg);
+ }
+
+ jvm_generate_load(p, arr, src);
+ jvm_generate(p, 0, 1, "iload %i", loop[0].index -> reg);
+ for(int i = 1; i < dim; i++)
+ {
+ jvm_generate(p, 2, 1, "aaload");
+ jvm_generate(p, 0, 1, "iload %i", loop[i].index -> reg);
+ }
+
+ /* Копируем значения ( dst i src i -- ) */
+ jvm_generate(p, 2, cell_size, "%caload", postfix);
+ jvm_generate(p, 2 + cell_size, 0, "%castore", postfix);
+ }
+
+ for(int i = dim - 1; i >= 0; i--)
+ {
+ jvm_generate(p, 0, 0, "iinc %i 1", loop[i].index -> reg);
+ jvm_generate(p, 0, 0, "goto L%i", loop[i].start);
+ jvm_generate_label(p, loop[i].end);
+ }
}
static void
-jvm_generate_and_init_named_local_var(gen_var_t * v, gen_proc_t * p, bool wide, char * name, char * desc)
+jvm_generate_push_procedure_pointer(gen_proc_t * p, oberon_object_t * proc)
{
- jvm_generate_and_init_local_var(v, p, wide);
- v -> desc = new_string(desc);
- jvm_generate(p, 0, 0, ".var %i is %s %s from start to end", v -> reg, name, desc);
+ char * full_name = jvm_get_field_full_name_safe(proc);
+ char * desc = jvm_get_descriptor(proc -> type);
+ jvm_generate(p, 0, 1, "getstatic %s/pointer %s", full_name, desc);
}
// ==========================================
fprintf(fp, ".class public abstract %s\n", cname);
fprintf(fp, ".super java/lang/Object\n\n");
- fprintf(fp, ".method public <init>()V\n");
+ fprintf(fp, ".method <init>()V\n");
fprintf(fp, " aload_0\n");
fprintf(fp, " invokespecial java/lang/Object/<init>()V\n");
fprintf(fp, " return\n");
jvm_destroy_class(class);
}
+static void
+oberon_generate_procedure_pointer_class(oberon_object_t * proc)
+{
+ FILE * fp;
+ char * cname;
+ char * abscname;
+ char * absdesc;
+ char * signature;
+ struct gen_class * class;
+
+ cname = jvm_get_field_full_name_safe(proc);
+ class = jvm_create_class(cname);
+ abscname = jvm_get_class_full_name(proc -> type);
+ absdesc = jvm_get_descriptor(proc -> type);
+ fp = class -> fp;
+
+ fprintf(fp, ".source %s\n", proc -> module -> name);
+ fprintf(fp, ".class public %s\n", cname);
+ fprintf(fp, ".super %s\n\n", abscname);
+
+ fprintf(fp, ".field public static pointer %s\n\n", absdesc);
+
+ fprintf(fp, ".method <init>()V\n");
+ fprintf(fp, " aload_0\n");
+ fprintf(fp, " invokespecial %s/<init>()V\n", abscname);
+ fprintf(fp, " aload_0\n");
+ fprintf(fp, " putstatic %s/pointer %s\n", cname, absdesc);
+ fprintf(fp, " return\n");
+ fprintf(fp, ".end method\n\n");
+
+ signature = jvm_get_procedure_signature(proc -> type);
+
+ gen_proc_t * p;
+ gen_var_t * this_v;
+
+ p = jvm_create_proc(class);
+ jvm_generate_function_header(p, "public", "invoke", signature);
+
+ this_v = oberon_generator_new_var();
+ jvm_generate_and_init_local_var(this_v, p, false);
+
+ gen_var_t * v;
+ int use_size = 0;
+ int num = proc -> type -> num_decl;
+ oberon_object_t * arg = proc -> type -> decl;
+ for(int i = 0; i < num; i++)
+ {
+ v = oberon_generator_new_var();
+ bool wide = jvm_is_wide_type(arg -> type);
+ char * desc = jvm_get_descriptor(arg -> type);
+ jvm_generate_and_init_named_local_var(v, p, wide, arg -> name, desc);
+
+ jvm_generate_load(p, arg -> type, v);
+
+ use_size += (wide) ? (2) : (1);
+
+ arg = arg -> next;
+ }
+
+ char * full_name = jvm_get_field_full_name(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)
+ {
+ jvm_generate(p, 0, 0, "return");
+ }
+ else
+ {
+ char prefix = jvm_get_prefix(proc -> type -> base);
+ jvm_generate(p, cell_size, 0, "%creturn", prefix);
+ }
+
+ jvm_generate_function_end(p);
+
+ jvm_destroy_class(class);
+}
+
static void
oberon_generate_record_class(gen_module_t * m, oberon_type_t * rec)
{
field = field -> next;
}
+ /* Стандартный конструктор класса */
+ /* Инициализирует внутренние статические записи и массивы */
gen_proc_t * p = jvm_create_proc(class);
-
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");
-
num = rec -> num_decl;
field = rec -> decl;
for(int i = 0; i < num; i++)
|| field -> type -> class == OBERON_TYPE_ARRAY)
{
jvm_generate(p, 0, 1, "aload_0");
- jvm_generate_new_static(p, field -> type);
+ jvm_generate_new(p, field -> type, 0);
jvm_generate_store(p, field -> type, field -> gen_var);
}
field = field -> next;
- }
+ }
+ jvm_generate(p, 0, 0, "return");
+ jvm_generate_function_end(p);
+ /* Метод для копирования полей класса */
+ /* reg0 == src -> reg1 == dst */
+ p = jvm_create_proc(class);
+ gen_var_t * copy_dst = oberon_generator_new_var();
+ gen_var_t * copy_src = oberon_generator_new_var();
+ char * desc = jvm_get_descriptor(rec);
+ char * signature = new_string("(%s%s)V", desc, desc);
+ jvm_generate_function_header(p, "public static", "$COPY$", signature);
+ jvm_generate_and_init_named_local_var(copy_dst, p, false, "dst", desc);
+ jvm_generate_and_init_named_local_var(copy_src, p, false, "src", desc);
+ num = rec -> num_decl;
+ field = rec -> decl;
+ for(int i = 0; i < num; i++)
+ {
+ if(field -> type -> class == OBERON_TYPE_RECORD)
+ {
+ jvm_generate_load(p, rec, copy_dst);
+ jvm_generate_load(p, field -> type, field -> gen_var);
+ jvm_generate_load(p, rec, copy_src);
+ jvm_generate_load(p, field -> type, field -> gen_var);
+ jvm_generate_copy_record(p, field -> type);
+ }
+ else if(field -> type -> class == OBERON_TYPE_ARRAY)
+ {
+ jvm_generate_load(p, rec, copy_dst);
+ jvm_generate_load(p, field -> type, field -> gen_var);
+ jvm_generate_load(p, rec, copy_src);
+ jvm_generate_load(p, field -> type, field -> gen_var);
+ jvm_generate_copy_array(p, field -> type);
+ }
+ else
+ {
+ jvm_generate_load(p, rec, copy_dst);
+ jvm_generate_load(p, rec, copy_src);
+ jvm_generate_load(p, field -> type, field -> gen_var);
+ jvm_generate_store(p, field -> type, field -> gen_var);
+ }
+ field = field -> next;
+ }
jvm_generate(p, 0, 0, "return");
jvm_generate_function_end(p);
/* смотри oberon_generator_init_record() */
break;
case OBERON_CLASS_VAR:
- /* Локальные заполняются при генерации функции */
+ /* Локальные заполняются при генерации функции */
/* смотри jvm_init_local_object() */
if(var -> local == 0)
{
{
gen_error("generator: local procedures not implemented");
}
+
+ oberon_generate_procedure_pointer_class(proc);
}
void
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");
+
+ /* Инициализация переменных объявленных в модуле */
+ oberon_object_t * x = ctx -> mod -> decl -> list -> next;
+ while(x != NULL)
+ {
+ if(x -> class == OBERON_CLASS_VAR)
+ {
+ if(x -> type -> class == OBERON_TYPE_ARRAY
+ || x -> type -> class == OBERON_TYPE_RECORD)
+ {
+ jvm_generate_new(p, x -> type, 0);
+ jvm_generate_store(p, x -> type, x -> gen_var);
+ }
+ }
+ else if(x -> class == OBERON_CLASS_PROC)
+ {
+ char * cname = jvm_get_field_full_name_safe(x);
+ jvm_generate(p, 0, 1, "new %s", cname);
+ jvm_generate(p, 1, 0, "invokespecial %s/<init>()V", cname);
+ }
+
+ x = x -> next;
+ }
}
void
}
}
+/*
+ * Генерирует код для получения размера измерения массива
+ * Аналог Обероновского LEN(v, n); где n = 0 - первое измерение.
+ * ( aref -- int )
+ */
+
+static void
+jvm_generate_array_len(gen_proc_t * p, int dim)
+{
+ while(dim > 0)
+ {
+ jvm_generate(p, 0, 1, "iconst_0");
+ jvm_generate(p, 2, 1, "aaload");
+ dim -= 1;
+ }
+ jvm_generate(p, 1, 1, "arraylength");
+}
+
+static void
+jvm_generate_array_duplicate_and_replace(gen_proc_t * p, gen_var_t * v, oberon_type_t * arr)
+{
+ int dim = 0;
+ oberon_type_t * base = arr;
+ while(base -> class == OBERON_TYPE_ARRAY)
+ {
+ if(base -> size == 0)
+ {
+ jvm_generate_load(p, arr, v);
+ jvm_generate_array_len(p, dim);
+ dim += 1;
+ }
+ base = base -> base;
+ }
+
+ jvm_generate_new(p, arr, dim);
+ jvm_generate(p, 1, 2, "dup");
+ jvm_generate_load(p, arr, v);
+ jvm_generate_copy_array(p, arr);
+ jvm_generate_store(p, arr, v);
+}
+
+static void
+jvm_generate_record_duplicate_and_replace(gen_proc_t * p, gen_var_t * v, oberon_type_t * rec)
+{
+ jvm_generate_new(p, rec, 0);
+ jvm_generate(p, 1, 2, "dup");
+ jvm_generate_load(p, rec, v);
+ jvm_generate_copy_record(p, rec);
+ jvm_generate_store(p, rec, v);
+}
+
void
oberon_generate_begin_proc(oberon_context_t * ctx, oberon_object_t * proc)
{
p = proc -> gen_proc;
signature = jvm_get_procedure_signature(proc -> type);
-
jvm_generate_function_header(p, "public static", proc -> name, signature);
+ /* Выделение регистров под параметры и переменные */
oberon_object_t * var = proc -> type -> decl;
while(var)
{
jvm_init_local_object(p, var);
var = var -> next;
}
+
+ /* Копирование статических/открытых массивов и записей */
+ var = proc -> type -> decl;
+ while(var)
+ {
+ if(var -> class == OBERON_CLASS_PARAM || var -> class == OBERON_CLASS_VAR_PARAM)
+ {
+ if(var -> type -> class == OBERON_TYPE_ARRAY)
+ {
+ jvm_generate_array_duplicate_and_replace(p, var -> gen_var, var -> type);
+ }
+ else if(var -> type -> class == OBERON_TYPE_RECORD)
+ {
+ jvm_generate_record_duplicate_and_replace(p, var -> gen_var, var -> type);
+ }
+ }
+ var = var -> next;
+ }
}
void
fullname = jvm_get_field_full_name(proc);
signature = jvm_get_procedure_signature(proc -> type);
+ if(proc -> class != OBERON_CLASS_PROC)
+ {
+ /* Загружаем указатель на процедуру */
+ jvm_generate_load(p, proc -> type, proc -> gen_var);
+ }
+
int args_cells = 0;
int result_cells = jvm_cell_size_for_type(proc -> type -> base);
arg = arg -> next;
}
- jvm_generate(p, args_cells, result_cells, "invokestatic %s%s", fullname, signature);
+ if(proc -> class == OBERON_CLASS_PROC)
+ {
+ /* Обычная статическая процедура */
+ jvm_generate(p, args_cells, result_cells, "invokestatic %s%s", fullname, signature);
+ }
+ else
+ {
+ /* Процедура-переменная */
+ char * class = jvm_get_class_full_name(proc -> type);
+ jvm_generate(p, 1 + args_cells, result_cells, "invokevirtual %s/invoke%s", class, signature);
+ }
}
void
oberon_generate_call_proc(oberon_context_t * ctx, oberon_expr_t * desig)
{
- jvm_generate_call_proc(ctx -> gen_context -> current_m -> class -> p, desig);
+ jvm_generate_call_proc(ctx -> mod -> gen_mod -> class -> p, desig);
}
void
}
static void
-jvm_push_var(gen_proc_t * p, oberon_object_t * var)
+jvm_generate_expr_new_pointer(gen_proc_t * p, oberon_type_t * type, int num, oberon_expr_t * arg)
{
- int cell_size = jvm_cell_size_for_type(var -> type);
+ assert(type -> class == OBERON_TYPE_POINTER);
- if(var -> local)
- {
- int reg = var -> gen_var -> reg;
- char prefix = jvm_get_prefix(var -> type);
- jvm_generate(p, 0, cell_size, "%cload %i", prefix, reg);
- }
- else
+ for(int i = 0; i < num; i++)
{
- char * fullname = jvm_get_field_full_name(var);
- char * desc = jvm_get_descriptor(var -> type);
- jvm_generate(p, 0, cell_size, "getstatic %s %s", fullname, desc);
+ push_expr(p, arg);
+ arg = arg -> next;
}
-}
-static void
-jvm_generate_expr_new_static(gen_proc_t * p, oberon_type_t * type, int num, oberon_expr_t * arg)
-{
- assert(num == 0);
- jvm_generate_new_static(p, type);
+ jvm_generate_new(p, type -> base, num);
}
static void
-jvm_generate_expr_new_pointer(gen_proc_t * p, oberon_type_t * type, int num, oberon_expr_t * arg)
+jvm_generate_cast_type(gen_proc_t * p, oberon_type_t * from, oberon_type_t * to)
{
- assert(type -> class == OBERON_TYPE_POINTER);
- jvm_generate_expr_new_static(p, type -> base, num, arg);
+ 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)
+ {
+ return;
+ }
+
+ jvm_generate(p, from_cell_size, to_cell_size, "%c2%c", prefix, postfix);
}
static void
switch(item -> mode)
{
case MODE_VAR:
- jvm_push_var(p, item -> var);
+ if(item -> var -> class == OBERON_CLASS_PROC)
+ {
+ jvm_generate_push_procedure_pointer(p, item -> var);
+ }
+ else
+ {
+ jvm_generate_load(p, item -> result, item -> var -> gen_var);
+ }
break;
case MODE_INTEGER:
- jvm_generate_push_int(p, item -> integer);
+ jvm_generate_push_int_size(p, item -> integer, item -> result -> size);
break;
case MODE_BOOLEAN:
- jvm_generate_push_int(p, item -> boolean);
+ jvm_generate_push_int_size(p, item -> boolean, item -> result -> size);
break;
case MODE_CALL:
jvm_generate_call_proc(p, (oberon_expr_t *) item);
break;
case MODE_FIELD:
push_item(p, item -> parent);
- char * field = jvm_get_field_full_name(item -> var);
- char * desc = jvm_get_descriptor(item -> var -> type);
- jvm_generate(p, 1, 1, "getfield %s %s", field, desc);
+ jvm_generate_load(p, item -> result, item -> var -> gen_var);
break;
case MODE_DEREF:
- /* Ð\92Ñ\81е обÑ\8aекÑ\82Ñ\8b пÑ\80едÑ\81Ñ\82авлÑ\8fÑ\8eÑ\82Ñ\81Ñ\8f как Ñ\83вказатели */
+ /* Ð\92Ñ\81е обÑ\8aекÑ\82Ñ\8b в jvm пÑ\80едÑ\81Ñ\82авлÑ\8fÑ\8eÑ\82Ñ\81Ñ\8f как Ñ\83казатели */
push_item(p, item -> parent);
break;
case MODE_NIL:
case MODE_REAL:
jvm_generate_push_float(p, item -> real, item -> result -> size);
break;
+ case MODE_CAST:
+ push_item(p, item -> parent);
+ jvm_generate_cast_type(p, item -> parent -> result, item -> result);
+ break;
default:
gen_error("push_item: unk mode %i", item -> mode);
break;
if(dst -> result -> class == OBERON_TYPE_ARRAY
|| src -> result -> class == OBERON_TYPE_ARRAY)
{
- gen_error("array copy not implemented");
+ push_expr(p, dst);
+ push_expr(p, src);
+ jvm_generate_copy_array(p, dst -> result);
}
else if(dst -> result -> class == OBERON_TYPE_RECORD
|| src -> result -> class == OBERON_TYPE_RECORD)
{
- gen_error("record copy not implemented");
+ push_expr(p, dst);
+ push_expr(p, src);
+ jvm_generate_copy_record(p, dst -> result);
}
-
- switch(item -> mode)
+ else switch(item -> mode)
{
case MODE_VAR:
push_expr(p, src);