index 99a4673199d8e432ddb0c98c4e0f397426625cff..af45a637eaca1fbbf4655e659cd3ec68f9eaaf18 100644 (file)
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 method\n\n");
}
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 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)
{
jvm_generate(p, 0, 0, "L%i:", label_id);
}
+static void
+jvm_generate_new_static(gen_proc_t * p, oberon_type_t * type);
+
+/*
+ * Функция jvm_generate_static_array_initialization генерирует код для
+ * статической инициализации массива. На входе массив, на выходе тот же массив.
+ * arrayref -- arrayref
+ */
+
+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);
+
+ /* 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);
+ jvm_generate(p, 1, 0, "pop");
+ }
+ else if(type -> 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_new_static(p, type -> base);
+ jvm_generate(p, 3, 0, "aastore");
+ }
+ else
+ {
+ assert(0);
+ }
+
+ /* 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 освобождение регистров */
+}
+
static void
jvm_generate_new_static(gen_proc_t * p, oberon_type_t * type)
{
+ int dim;
char * cname;
+ char * desc;
+ oberon_type_t * base;
switch(type -> class)
{
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:
cname = jvm_get_class_full_name(type);
jvm_generate(p, 1, 0, "invokespecial %s/<init>()V", cname);
break;
case OBERON_TYPE_ARRAY:
- gen_error("jvm_generate_new_static: TODO array");
+ dim = 0;
+ base = type;
+ desc = jvm_get_descriptor(type);
+ while(base -> class == OBERON_TYPE_ARRAY)
+ {
+ dim += 1;
+ jvm_generate_push_int(p, base -> size);
+ 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);
+ }
break;
default:
gen_error("jvm_generate_new_static: unk type class %i", type -> class);
}
}
-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);
-}
-
// ==========================================
// ==========================================
// ==========================================
jvm_generate_call_proc(p, (oberon_expr_t *) item);
break;
case MODE_INDEX:
- gen_error("push_item: TODO index");
+ ;
+ char postfix = jvm_get_postfix(item -> result);
+ int cell_size = jvm_cell_size_for_postfix(postfix);
+ push_item(p, item -> parent);
+ push_expr(p, item -> args);
+ jvm_generate(p, 1 + 1, cell_size, "%caload", postfix);
break;
case MODE_FIELD:
push_item(p, item -> parent);
jvm_generate_abs(gen_proc_t * p, char prefix)
{
char t = jvm_get_type_of_prefix(prefix);
- int cell_size = jvm_cell_size_for_prefix(prefix);
+ int cell_size = jvm_cell_size_for_postfix(prefix);
jvm_generate(p, cell_size, cell_size, "invokestatic java/lang/Math/abs(%c)%c", t, t);
}
int label_done = jvm_new_label_id(p);
char * label_name_true = jvm_get_label_name(label_true);
char * label_name_done = jvm_get_label_name(label_done);
- int cell_size = 2 * jvm_cell_size_for_prefix(prefix);
+ int cell_size = 2 * jvm_cell_size_for_postfix(prefix);
assert(prefix == 'i' || prefix == 'a');
static void
jvm_generate_operator(gen_proc_t * p, char prefix, int op)
{
- int cell_size = jvm_cell_size_for_prefix(prefix);
+ int cell_size = jvm_cell_size_for_postfix(prefix);
switch(op)
{
case OP_UNARY_MINUS:
assert(dst -> is_item);
oberon_item_t * item = (oberon_item_t *) dst;
+ if(dst -> result -> class == OBERON_TYPE_ARRAY
+ || src -> result -> class == OBERON_TYPE_ARRAY)
+ {
+ gen_error("array copy not implemented");
+ }
+ else if(dst -> result -> class == OBERON_TYPE_RECORD
+ || src -> result -> class == OBERON_TYPE_RECORD)
+ {
+ gen_error("record copy not implemented");
+ }
+
switch(item -> mode)
{
case MODE_VAR:
jvm_generate_store(p, src -> result, item -> var -> gen_var);
break;
case MODE_INDEX:
- gen_error("store_expr: TODO index");
+ ;
+ char postfix = jvm_get_postfix(src -> result);
+ int cell_size = jvm_cell_size_for_postfix(postfix);
+ push_item(p, 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_item(p, item -> parent);
}
}
-/*
-static void
-store_expr(gen_proc_t * p, oberon_expr_t * dst, oberon_expr_t * src)
-{
- assert(dst -> is_item);
- oberon_item_t * item = (oberon_item_t *) dst;
-
- int cell_size = jvm_cell_size_for_type(src -> result);
-
- char prefix;
- switch(item -> mode)
- {
- case MODE_VAR:
- push_expr(p, src);
- if(item -> var -> local)
- {
- int reg = item -> var -> gen_var -> reg;
- prefix = jvm_get_prefix(item -> result);
- jvm_generate(p, cell_size, 0, "%cstore %i", prefix, reg);
- }
- else
- {
- char * fullname = jvm_get_field_full_name(item -> var);
- char * desc = jvm_get_descriptor(item -> result);
- jvm_generate(p, cell_size, 0, "putstatic %s %s", fullname, desc);
- }
- break;
- case MODE_INDEX:
- gen_error("store_expr: TODO index");
- break;
- case MODE_FIELD:
- {
- char * fullname = jvm_get_field_full_name(item -> var);
- char * desc = jvm_get_descriptor(item -> result);
- push_item(p, item -> parent);
- push_expr(p, src);
- jvm_generate(p, 1 + cell_size, 0, "putfield %s %s", fullname, desc);
- }
- break;
- default:
- gen_error("store_expr: unk mode %i", item -> mode);
- break;
- }
-}
-*/
-
void
oberon_generate_assign(oberon_context_t * ctx, oberon_expr_t * src, oberon_expr_t * dst)
{