index f111fd16eff755440676a4b6a6e433713cc43b4b..b17711bd5627d68a54b5dd06c4a475023a1a204a 100644 (file)
jvm_generate_function_end(p);
}
+gen_label_t *
+oberon_generator_reserve_label(oberon_context_t * ctx)
+{
+ gen_module_t * m;
+ gen_proc_t * p;
+ gen_label_t * l;
+
+ m = ctx -> mod -> gen_mod;
+ p = m -> class -> p;
+
+ l = GC_MALLOC(sizeof *l);
+ memset(l, 0, sizeof *l);
+
+ l -> id = jvm_new_label_id(p);
+ return l;
+}
+
+void
+oberon_generate_label(oberon_context_t * ctx, gen_label_t * l)
+{
+ gen_module_t * m;
+ gen_proc_t * p;
+
+ m = ctx -> mod -> gen_mod;
+ p = m -> class -> p;
+
+ jvm_generate_label(p, l -> id);
+}
+
+void
+oberon_generate_goto(oberon_context_t * ctx, gen_label_t * l)
+{
+ gen_module_t * m;
+ gen_proc_t * p;
+
+ m = ctx -> mod -> gen_mod;
+ p = m -> class -> p;
+
+ jvm_generate(p, 0, 0, "goto L%i", l -> id);
+}
+
+void
+oberon_generate_branch(oberon_context_t * ctx, oberon_expr_t * cond, bool gotoif, gen_label_t * l)
+{
+ gen_module_t * m;
+ gen_proc_t * p;
+
+ m = ctx -> mod -> gen_mod;
+ p = m -> class -> p;
+
+ push_expr(p, cond);
+
+ if(gotoif == false)
+ {
+ /* переход если false */
+ jvm_generate(p, 1, 0, "ifeq L%i", l -> id);
+ }
+ else
+ {
+ /* переход если true */
+ jvm_generate(p, 1, 0, "ifne L%i", l -> id);
+ }
+}
+
static void
jvm_generate_call_proc(gen_proc_t * p, oberon_item_t * desig)
{
}
static void
-jvm_generate_compare_op(gen_proc_t * p, char prefix, int op)
+jvm_generate_compare_op(gen_proc_t * p, oberon_type_t * t, char prefix, int op)
{
int label_true = jvm_new_label_id(p);
int label_done = jvm_new_label_id(p);
}
static void
-jvm_generate_operator(gen_proc_t * p, char prefix, int op)
+jvm_generate_operator(gen_proc_t * p, oberon_type_t * t, char prefix, int op)
{
int cell_size = jvm_cell_size_for_postfix(prefix);
switch(op)
case OP_LEQ:
case OP_GRT:
case OP_GEQ:
- jvm_generate_compare_op(p, prefix, op);
+ jvm_generate_compare_op(p, t, prefix, op);
break;
default:
gen_error("jvm_generate_operator: unk op %i", op);
@@ -1602,6 +1666,7 @@ jvm_generate_logical_and(gen_proc_t * p, oberon_expr_t * a, oberon_expr_t * b)
static void
push_operator(gen_proc_t * p, oberon_oper_t * oper)
{
+ oberon_type_t * preq = oper -> left -> result;
char prefix = jvm_get_prefix(oper -> result);
int op = oper -> op;
switch(op)
case OP_LOGIC_NOT:
case OP_ABS:
push_expr(p, oper -> left);
- jvm_generate_operator(p, prefix, op);
+ jvm_generate_operator(p, preq, prefix, op);
break;
case OP_ADD:
case OP_GEQ:
push_expr(p, oper -> left);
push_expr(p, oper -> right);
- jvm_generate_operator(p, prefix, op);
+ jvm_generate_operator(p, preq, prefix, op);
break;
case OP_LOGIC_OR: