index b46b27de1eedfd7066d64cd55f42f96b65128a77..d609ed8de96c216a30ac4ec9bceda90ec230583e 100644 (file)
va_end(ptr);
}
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(gen_proc_t * p, int64_t i)
{
static void
jvm_generate_push_int(gen_proc_t * p, int64_t i)
{
}
else
{
}
else
{
- jvm_generate(p, 0, 2, "ldc2 %li", i);
+ jvm_generate(p, 0, 2, "ldc2_w %li", i);
+ }
+}
+
+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_w %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");
+ }
}
}
}
}
}
else
{
}
else
{
- jvm_generate(p, 0, 2, "ldc2 %lf", f);
+ jvm_generate(p, 0, 2, "ldc2_w %lf", f);
}
}
}
}
}
}
jvm_generate(p, 0, 0, "L%i:", label_id);
}
jvm_generate(p, 0, 0, "L%i:", label_id);
}
+static void
+jvm_generate_load(gen_proc_t * p, oberon_type_t * src_type, gen_var_t * src)
+{
+ char prefix;
+ int cell_size;
+
+ cell_size = jvm_cell_size_for_type(src_type);
+
+ switch(src -> storage)
+ {
+ case JVM_STORAGE_REGISTER:
+ prefix = jvm_get_prefix(src_type);
+ jvm_generate(p, 0, cell_size, "%cload %i", prefix, src -> reg);
+ break;
+ case JVM_STORAGE_STATIC:
+ jvm_generate(p, 0, cell_size, "getstatic %s %s", src -> full_name, src -> desc);
+ break;
+ case JVM_STORAGE_FIELD:
+ jvm_generate(p, 1, cell_size, "getfield %s %s", src -> full_name, src -> desc);
+ break;
+ default:
+ gen_error("jvm_generate_load: unknow storage type %i", src -> storage);
+ break;
+ }
+}
+
+static void
+jvm_generate_store(gen_proc_t * p, oberon_type_t * src_type, gen_var_t * dst)
+{
+ char prefix;
+ int cell_size;
+
+ cell_size = jvm_cell_size_for_type(src_type);
+
+ switch(dst -> storage)
+ {
+ case JVM_STORAGE_REGISTER:
+ prefix = jvm_get_prefix(src_type);
+ jvm_generate(p, cell_size, 0, "%cstore %i", prefix, dst -> reg);
+ break;
+ case JVM_STORAGE_STATIC:
+ jvm_generate(p, cell_size, 0, "putstatic %s %s", dst -> full_name, dst -> desc);
+ break;
+ case JVM_STORAGE_FIELD:
+ jvm_generate(p, 1 + cell_size, 0, "putfield %s %s", dst -> full_name, dst -> desc);
+ break;
+ default:
+ gen_error("jvm_generate_store: unknow storage type %i", dst -> storage);
+ break;
+ }
+}
+
static void
jvm_generate_new(gen_proc_t * p, oberon_type_t * type, int num);
/*
static void
jvm_generate_new(gen_proc_t * p, oberon_type_t * type, int num);
/*
- * Функция jvm_generate_static_array_initialization генерирует код для
- * статической инициализации массива. На входе массив, на выходе тот же массив.
- * (arrayref -- arrayref)
+ * Генерирует код для инициализации массива со статическим базовым типом
+ * ( aref -- )
*/
static void
*/
static void
-jvm_generate_static_array_initialization(gen_proc_t * p, oberon_type_t * type)
-{
- /* for(int i = 0; i < a.length; i++) */
- /* a[i] := new(base); */
- /* init(a[i]) */
-
- /* a := pop(array) */
- gen_var_t * va = oberon_generator_new_var();
- jvm_generate_and_init_local_var(va, p, false);
- int reg_a = va -> reg;
- /* ссылка уже на стеке */
- jvm_generate(p, 1, 0, "astore %i", reg_a);
-
- /* int i = 0; */
- gen_var_t * vi = oberon_generator_new_var();
- jvm_generate_and_init_local_var(vi, p, false);
- int reg_i = vi -> reg;
- jvm_generate(p, 0, 1, "iconst_0");
- jvm_generate(p, 1, 0, "istore %i", reg_i);
+jvm_generate_array_initialization(gen_proc_t * p, oberon_type_t * arr)
+{
+ int dim = 0;
+ oberon_type_t * base = arr;
+ while(base -> class == OBERON_TYPE_ARRAY)
+ {
+ dim += 1;
+ base = base -> base;
+ }
- /* int l := a.length */
- gen_var_t * vl = oberon_generator_new_var();
- jvm_generate_and_init_local_var(vl, p, false);
- int reg_l = vl -> reg;
- jvm_generate(p, 0, 1, "aload %i", reg_a);
- jvm_generate(p, 1, 1, "arraylength");
- jvm_generate(p, 1, 0, "istore %i", reg_l);
-
- int label_start = jvm_new_label_id(p);
- int label_end = jvm_new_label_id(p);
-
- /* start: */
- /* if (i >= l) goto end; */
- /* body*/
- /* i += 1;*/
- /* goto start;*/
- /* end: */
- /* push a */
-
- jvm_generate_label(p, label_start);
- jvm_generate(p, 0, 1, "iload %i", reg_i);
- jvm_generate(p, 0, 1, "iload %i", reg_l);
- jvm_generate(p, 2, 0, "if_icmpge L%i", label_end);
-
- if(type -> base -> class == OBERON_TYPE_ARRAY)
- {
- /* Инициализируем следующую размерность */
- jvm_generate(p, 0, 1, "aload %i", reg_a);
- jvm_generate(p, 0, 1, "iload %i", reg_i);
- jvm_generate(p, 0, 1, "aaload");
- jvm_generate_static_array_initialization(p, type -> base);
+ if(base -> class != OBERON_TYPE_RECORD)
+ {
jvm_generate(p, 1, 0, "pop");
jvm_generate(p, 1, 0, "pop");
+ return;
}
}
- else if(type -> base -> class == OBERON_TYPE_RECORD)
+
+ 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++)
{
{
- jvm_generate(p, 0, 1, "aload %i", reg_a);
- jvm_generate(p, 0, 1, "iload %i", reg_i);
- jvm_generate_new(p, type -> base, 0);
- jvm_generate(p, 3, 0, "aastore");
+ 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);
}
}
- else
+
+ jvm_generate_load(p, arr, dst);
+ jvm_generate(p, 0, 1, "iload %i", loop[0].index -> reg);
+ for(int i = 1; i < dim; i++)
{
{
- assert(0);
+ 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");
- /* i += 1; */
- /* goto start */
-
- jvm_generate(p, 0, 0, "iinc %i %i", reg_i, 1);
- jvm_generate(p, 0, 0, "goto L%i", label_start);
- jvm_generate_label(p, label_end);
-
- /* push(a) */
- jvm_generate(p, 0, 1, "aload %i", reg_a);
-
- /* TODO освобождение регистров */
+ 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
}
static void
gen_error("jvm_generate_new_static: static alocation not allowed");
break;
case OBERON_TYPE_RECORD:
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");
cname = jvm_get_class_full_name(type);
jvm_generate(p, 0, 1, "new %s", cname);
jvm_generate(p, 1, 2, "dup");
assert(num == 0);
jvm_generate(p, dim, 1, "multianewarray %s %i", desc, dim);
assert(num == 0);
jvm_generate(p, dim, 1, "multianewarray %s %i", desc, dim);
-
- if(base -> class == OBERON_TYPE_RECORD)
- {
- jvm_generate_static_array_initialization(p, type);
- }
+ 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;
default:
gen_error("jvm_generate_new_static: unk type class %i", type -> class);
}
}
}
}
+/*
+ * Генерирует код для копирования полей из первой записи во вторую.
+ * ( aref_dst aref_src -- )
+ * dst := src;
+ */
+
static void
static void
-jvm_generate_load(gen_proc_t * p, oberon_type_t * src_type, gen_var_t * src)
+jvm_generate_copy_record(gen_proc_t * p, oberon_type_t * rec)
{
{
- char prefix;
- int cell_size;
+ 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);
+}
- cell_size = jvm_cell_size_for_type(src_type);
+/*
+ * Генерирует кода для копирования массивов.
+ * ( aref_dst aref_src -- )
+ * dst := src;
+ */
- switch(src -> storage)
+static void
+jvm_generate_copy_array(gen_proc_t * p, oberon_type_t * arr)
+{
+ int dim = 0;
+ oberon_type_t * base = arr;
+ while(base -> class == OBERON_TYPE_ARRAY)
{
{
- case JVM_STORAGE_REGISTER:
- prefix = jvm_get_prefix(src_type);
- jvm_generate(p, 0, cell_size, "%cload %i", prefix, src -> reg);
- break;
- case JVM_STORAGE_STATIC:
- jvm_generate(p, 0, cell_size, "getstatic %s %s", src -> full_name, src -> desc);
- break;
- case JVM_STORAGE_FIELD:
- jvm_generate(p, 1, cell_size, "getfield %s %s", src -> full_name, src -> desc);
- break;
- default:
- gen_error("jvm_generate_load: unknow storage type %i", src -> storage);
- break;
+ dim += 1;
+ base = base -> base;
}
}
-}
-static void
-jvm_generate_store(gen_proc_t * p, oberon_type_t * src_type, gen_var_t * dst)
-{
- char prefix;
- int cell_size;
+ 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);
+ }
- cell_size = jvm_cell_size_for_type(src_type);
+ if(base -> class == OBERON_TYPE_RECORD)
+ {
+ /* Получаем записи по индексам ( -- dst src ) */
- switch(dst -> storage)
+ 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
{
{
- case JVM_STORAGE_REGISTER:
- prefix = jvm_get_prefix(src_type);
- jvm_generate(p, cell_size, 0, "%cstore %i", prefix, dst -> reg);
- break;
- case JVM_STORAGE_STATIC:
- jvm_generate(p, cell_size, 0, "putstatic %s %s", dst -> full_name, dst -> desc);
- break;
- case JVM_STORAGE_FIELD:
- jvm_generate(p, 1 + cell_size, 0, "putfield %s %s", dst -> full_name, dst -> desc);
- break;
- default:
- gen_error("jvm_generate_store: unknow storage type %i", dst -> storage);
- break;
+ 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);
}
}
-}
-/*
- * Генерирует код для копирования полей из первой записи во вторую.
- * ( aref_dst aref_src -- )
- * dst := src;
- */
+ 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
static void
-jvm_generate_copy_record(gen_proc_t * p, oberon_type_t * rec)
+jvm_generate_push_procedure_pointer(gen_proc_t * p, oberon_object_t * proc)
{
{
- 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);
+ 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);
}
}
-
// ==========================================
// ==========================================
// ==========================================
// ==========================================
// ==========================================
// ==========================================
+static void
+push_item(gen_proc_t * p, oberon_item_t * item);
+
void
oberon_generator_init_context(oberon_context_t * ctx)
{
void
oberon_generator_init_context(oberon_context_t * ctx)
{
fprintf(fp, ".class public abstract %s\n", cname);
fprintf(fp, ".super java/lang/Object\n\n");
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");
fprintf(fp, " aload_0\n");
fprintf(fp, " invokespecial java/lang/Object/<init>()V\n");
fprintf(fp, " return\n");
jvm_destroy_class(class);
}
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, " return\n");
+ fprintf(fp, ".end method\n\n");
+
+ fprintf(fp, ".method static <clinit>()V\n");
+ fprintf(fp, " .limit stack 2\n");
+ fprintf(fp, " new %s\n", cname);
+ fprintf(fp, " dup\n");
+ fprintf(fp, " invokespecial %s/<init>()V\n", cname);
+ 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)
{
static void
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, ".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;
}
rec -> gen_type -> class = class;
}
case OBERON_TYPE_BOOLEAN:
case OBERON_TYPE_ARRAY:
case OBERON_TYPE_REAL:
case OBERON_TYPE_BOOLEAN:
case OBERON_TYPE_ARRAY:
case OBERON_TYPE_REAL:
+ case OBERON_TYPE_CHAR:
break;
case OBERON_TYPE_RECORD:
;
break;
case OBERON_TYPE_RECORD:
;
jvm_generate_function_header(p, "public", "<init>", "()V");
jvm_alloc_register_untyped(p -> rf, false);
jvm_generate(p, 0, 1, "aload_0");
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++)
num = rec -> num_decl;
field = rec -> decl;
for(int i = 0; i < num; i++)
}
else if(field -> type -> class == OBERON_TYPE_ARRAY)
{
}
else if(field -> type -> class == OBERON_TYPE_ARRAY)
{
- gen_error("copy array not implemented");
+ 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
{
}
else
{
/* смотри oberon_generator_init_record() */
break;
case OBERON_CLASS_VAR:
/* смотри oberon_generator_init_record() */
break;
case OBERON_CLASS_VAR:
- /* Локальные заполняются при генерации функции */
+ /* Локальные заполняются при генерации функции */
/* смотри jvm_init_local_object() */
if(var -> local == 0)
{
/* смотри jvm_init_local_object() */
if(var -> local == 0)
{
{
gen_error("generator: local procedures not implemented");
}
{
gen_error("generator: local procedures not implemented");
}
+
+ oberon_generate_procedure_pointer_class(proc);
}
void
}
void
jvm_generate_store(p, x -> type, x -> gen_var);
}
}
jvm_generate_store(p, x -> type, x -> gen_var);
}
}
+
x = x -> next;
}
}
x = x -> next;
}
}
}
}
}
}
+/*
+ * Генерирует код для получения размера измерения массива
+ * Аналог Обероновского 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)
{
void
oberon_generate_begin_proc(oberon_context_t * ctx, oberon_object_t * proc)
{
p = proc -> gen_proc;
signature = jvm_get_procedure_signature(proc -> type);
p = proc -> gen_proc;
signature = jvm_get_procedure_signature(proc -> type);
-
jvm_generate_function_header(p, "public static", proc -> name, signature);
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;
}
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
}
void
}
static void
}
static void
-jvm_generate_call_proc(gen_proc_t * p, oberon_expr_t * desig)
+jvm_generate_call_proc(gen_proc_t * p, oberon_item_t * desig)
{
{
- assert(desig -> is_item);
- assert(desig -> item.mode == MODE_CALL);
-
- oberon_object_t * proc;
- char * fullname;
- char * signature;
+ assert(desig -> var == NULL);
+ assert(desig -> mode == MODE_CALL);
- proc = desig -> item.var;
- fullname = jvm_get_field_full_name(proc);
- signature = jvm_get_procedure_signature(proc -> type);
+ char * signature = NULL;
+
+ bool direct_call = false;
+ if(desig -> parent -> mode == MODE_VAR)
+ {
+ if(desig -> parent -> var -> class == OBERON_CLASS_PROC)
+ {
+ direct_call = true;
+ }
+ }
+
+ printf("direct_call == %i\n", direct_call);
+
+ oberon_type_t * procsig;
+ procsig = desig -> parent -> result;
+ signature = jvm_get_procedure_signature(procsig);
+
+ if(direct_call == false)
+ {
+ /* Загружаем указатель на процедуру */
+ push_item(p, desig -> parent);
+ }
int args_cells = 0;
int args_cells = 0;
- int result_cells = jvm_cell_size_for_type(proc -> type -> base);
+ int result_cells = jvm_cell_size_for_type(procsig -> base);
- int num = desig -> item.num_args;
- oberon_expr_t * arg = desig -> item.args;
+ int num = desig -> num_args;
+ oberon_expr_t * arg = desig -> args;
for(int i = 0; i < num; i++)
{
args_cells += jvm_cell_size_for_type(arg -> result);
for(int i = 0; i < num; i++)
{
args_cells += jvm_cell_size_for_type(arg -> result);
arg = arg -> next;
}
arg = arg -> next;
}
- jvm_generate(p, args_cells, result_cells, "invokestatic %s%s", fullname, signature);
+ if(direct_call)
+ {
+ char * full_name = jvm_get_field_full_name(desig -> parent -> var);
+ jvm_generate(p, args_cells, result_cells, "invokestatic %s%s", full_name, signature);
+ }
+ else
+ {
+ char * cname = jvm_get_class_full_name(procsig);
+ jvm_generate(p, 1 + args_cells, result_cells, "invokevirtual %s/invoke%s", cname, signature);
+ }
}
void
oberon_generate_call_proc(oberon_context_t * ctx, oberon_expr_t * desig)
{
}
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);
+ assert(desig -> is_item);
+ jvm_generate_call_proc(ctx -> mod -> gen_mod -> class -> p, (oberon_item_t *) desig);
}
void
}
void
}
}
}
}
-static void
-jvm_push_var(gen_proc_t * p, oberon_object_t * var)
-{
- int cell_size = jvm_cell_size_for_type(var -> type);
-
- 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
- {
- 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);
- }
-}
-
static void
jvm_generate_expr_new_pointer(gen_proc_t * p, oberon_type_t * type, int num, oberon_expr_t * arg)
{
static void
jvm_generate_expr_new_pointer(gen_proc_t * p, oberon_type_t * type, int num, oberon_expr_t * arg)
{
@@ -927,40 +1326,75 @@ jvm_generate_expr_new_pointer(gen_proc_t * p, oberon_type_t * type, int num, obe
jvm_generate_new(p, type -> base, num);
}
jvm_generate_new(p, type -> base, num);
}
+static void
+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);
+ }
+ 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_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
push_item(gen_proc_t * p, oberon_item_t * item)
{
switch(item -> mode)
{
case MODE_VAR:
static void
push_item(gen_proc_t * p, oberon_item_t * item)
{
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:
break;
case MODE_INTEGER:
- jvm_generate_push_int(p, item -> integer);
+ case MODE_CHAR:
+ jvm_generate_push_int_size(p, item -> integer, item -> result -> size);
break;
case MODE_BOOLEAN:
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:
break;
case MODE_CALL:
- jvm_generate_call_proc(p, (oberon_expr_t *) item);
+ jvm_generate_call_proc(p, item);
break;
case MODE_INDEX:
;
char postfix = jvm_get_postfix(item -> result);
int cell_size = jvm_cell_size_for_postfix(postfix);
break;
case MODE_INDEX:
;
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_expr(p, item -> args);
jvm_generate(p, 1 + 1, cell_size, "%caload", postfix);
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);
+ 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:
break;
case MODE_DEREF:
- /* Все объекты представляются как увказатели */
- push_item(p, item -> parent);
+ /* Все объекты в jvm представляются как указатели */
+ assert(item -> parent -> is_item);
+ push_item(p, (oberon_item_t *) item -> parent);
break;
case MODE_NIL:
jvm_generate(p, 0, 1, "aconst_null");
break;
case MODE_NIL:
jvm_generate(p, 0, 1, "aconst_null");
int op = oper -> op;
switch(op)
{
int op = oper -> op;
switch(op)
{
+ case OP_CAST:
+ push_expr(p, oper -> left);
+ jvm_generate_cast_type(p, oper -> left -> result, oper -> result);
+ break;
case OP_UNARY_MINUS:
case OP_BITWISE_NOT:
case OP_LOGIC_NOT:
case OP_UNARY_MINUS:
case OP_BITWISE_NOT:
case OP_LOGIC_NOT:
if(dst -> result -> class == OBERON_TYPE_ARRAY
|| src -> result -> class == OBERON_TYPE_ARRAY)
{
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)
}
else if(dst -> result -> class == OBERON_TYPE_RECORD
|| src -> result -> class == OBERON_TYPE_RECORD)
;
char postfix = jvm_get_postfix(src -> result);
int cell_size = jvm_cell_size_for_postfix(postfix);
;
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_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;
push_expr(p, src);
jvm_generate_store(p, src -> result, item -> var -> gen_var);
break;