index af45a637eaca1fbbf4655e659cd3ec68f9eaaf18..dc79ea11cd0cbb656036a37d67d9a512c46517ae 100644 (file)
class -> p = p;
fprintf(class -> fp, ".method %s %s%s\n", access, name, signature);
class -> p = p;
fprintf(class -> fp, ".method %s %s%s\n", access, name, signature);
+ fprintf(class -> fp, " start:\n");
}
void
}
void
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, " .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");
}
fprintf(class -> fp, ".end method\n\n");
}
jvm_stack_pop(gen_proc_t * p, unsigned size)
{
p -> stack -> pointer -= size;
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
}
static void
}
static void
}
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)
+{
+ char prefix;
+ int cell_size;
-/*
- * Функция jvm_generate_static_array_initialization генерирует код для
- * статической инициализации массива. На входе массив, на выходе тот же массив.
- * arrayref -- arrayref
- */
+ 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
static void
-jvm_generate_static_array_initialization(gen_proc_t * p, oberon_type_t * type)
+jvm_generate_store(gen_proc_t * p, oberon_type_t * src_type, gen_var_t * dst)
{
{
- /* 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);
+ char prefix;
+ int cell_size;
- /* 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);
+ cell_size = jvm_cell_size_for_type(src_type);
- int label_start = jvm_new_label_id(p);
- int label_end = jvm_new_label_id(p);
+ 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);
- /* start: */
- /* if (i >= l) goto end; */
- /* body*/
- /* i += 1;*/
- /* goto start;*/
- /* end: */
- /* push a */
+/*
+ * Генерирует код для инициализации массива со статическим базовым типом
+ * ( aref -- )
+ */
- 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);
+static void
+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;
+ }
- if(type -> base -> class == OBERON_TYPE_ARRAY)
+ if(base -> class != OBERON_TYPE_RECORD)
{
{
- /* Инициализируем следующую размерность */
- 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);
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_static(p, type -> base);
- 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
-jvm_generate_new_static(gen_proc_t * p, oberon_type_t * type)
+jvm_generate_new(gen_proc_t * p, oberon_type_t * type, int num)
{
int dim;
char * cname;
{
int dim;
char * cname;
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");
desc = jvm_get_descriptor(type);
while(base -> class == OBERON_TYPE_ARRAY)
{
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;
dim += 1;
- jvm_generate_push_int(p, base -> size);
base = base -> base;
}
base = base -> base;
}
- jvm_generate(p, dim, 1, "multianewarray %s %i", desc, dim);
- if(base -> class == OBERON_TYPE_RECORD)
- {
- jvm_generate_static_array_initialization(p, type);
- }
+ 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;
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_store(gen_proc_t * p, oberon_type_t * src_type, gen_var_t * dst)
+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(dst -> 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, 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;
+ 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);
}
}
}
}
field = field -> next;
}
field = field -> next;
}
+ /* Стандартный конструктор класса */
+ /* Инициализирует внутренние статические записи и массивы */
gen_proc_t * p = jvm_create_proc(class);
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");
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++)
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");
|| 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_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);
jvm_generate(p, 0, 0, "return");
jvm_generate_function_end(p);
/* смотри 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)
{
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");
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);
+ }
+ }
+ x = x -> next;
+ }
}
void
}
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)
{
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_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);
-}
-static void
-jvm_generate_expr_new_pointer(gen_proc_t * p, oberon_type_t * type, int num, oberon_expr_t * arg)
-{
- assert(type -> class == OBERON_TYPE_POINTER);
- jvm_generate_expr_new_static(p, type -> base, num, arg);
+ jvm_generate_new(p, type -> base, num);
}
static void
}
static void
switch(item -> mode)
{
case MODE_VAR:
switch(item -> mode)
{
case MODE_VAR:
- jvm_push_var(p, item -> var);
+ jvm_generate_load(p, item -> result, item -> var -> gen_var);
break;
case MODE_INTEGER:
jvm_generate_push_int(p, item -> integer);
break;
case MODE_INTEGER:
jvm_generate_push_int(p, item -> integer);
break;
case MODE_FIELD:
push_item(p, item -> parent);
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:
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:
push_item(p, item -> parent);
break;
case MODE_NIL:
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)
{
- 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);
{
case MODE_VAR:
push_expr(p, src);