JVM: Исправлено сравнение LongInt, Real и LongReal

[dsw-obn.git] / src / backends / jvm / generator-jvm.c

diff --git a/src/backends/jvm/generator-jvm.c b/src/backends/jvm/generator-jvm.c
index f111fd16eff755440676a4b6a6e433713cc43b4b..0295e47c145d4081113e9271d78c12af4da5e2a8 100644 (file)
--- a/src/backends/jvm/generator-jvm.c
+++ b/src/backends/jvm/generator-jvm.c
@@ -1247,6 +1247,70 @@ oberon_generate_end_proc(oberon_context_t * ctx)
        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)
 {
@@ -1457,18 +1521,10 @@ jvm_generate_abs(gen_proc_t * p, char prefix)
        jvm_generate(p, cell_size, cell_size, "invokestatic java/lang/Math/abs(%c)%c", t, t);
 }
 
-static void
-jvm_generate_compare_op(gen_proc_t * p, char prefix, int op)
+static char *
+jvm_get_compare_postfix(int op)
 {
-       int label_true = jvm_new_label_id(p);
-       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_postfix(prefix);
-
-       assert(prefix == 'i' || prefix == 'a');
-
-       const char * cmpop = "";
+       char * cmpop = "";
        switch(op)
        {
                case OP_EQ:
@@ -1493,17 +1549,51 @@ jvm_generate_compare_op(gen_proc_t * p, char prefix, int op)
                        gen_error("jvm_generate_compare_op: wat");
                        break;
        }
+       return cmpop;
+}
+
+static void
+jvm_generate_compare_op(gen_proc_t * p, oberon_type_t * t, int op)
+{
+       char prefix = jvm_get_prefix(t);
+       int label_true = jvm_new_label_id(p);
+       int label_done = jvm_new_label_id(p);
+       int cell_size = jvm_cell_size_for_type(t);
+       char * cmpop = jvm_get_compare_postfix(op);
+
+       if(prefix == 'l')
+       {
+               jvm_generate(p, 2 * cell_size, 1, "lcmp");
+               jvm_generate(p, 1, 1, "if%s L%i", cmpop, label_true);
+       }
+       else if(prefix == 'f' || prefix == 'd')
+       {
+               char fop;
+               if(op == OP_EQ || op == OP_NEQ || op == OP_GRT || op == OP_GEQ)
+               {
+                       fop = 'l';
+               }
+               else
+               {
+                       fop = 'g';
+               }
+               jvm_generate(p, 2 * cell_size, 1, "%ccmp%c", prefix, fop);
+               jvm_generate(p, 1, 1, "if%s L%i", cmpop, label_true);
+       }
+       else
+       {
+               jvm_generate(p, 2 * cell_size, 0, "if_%ccmp%s L%i", prefix, cmpop, label_true);
+       }
 
-       jvm_generate(p, cell_size, 0, "if_%ccmp%s %s", prefix, cmpop, label_name_true);
        jvm_generate(p, 0, 1, "iconst_0");
-       jvm_generate(p, 0, 0, "goto %s", label_name_done);
+       jvm_generate(p, 0, 0, "goto L%i", label_done);
        jvm_generate_label(p, label_true);
        jvm_generate(p, 0, 1, "iconst_1");
        jvm_generate_label(p, label_done);
 }
 
 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)
@@ -1553,7 +1643,7 @@ jvm_generate_operator(gen_proc_t * p, char prefix, int op)
                case OP_LEQ:
                case OP_GRT:
                case OP_GEQ:
-                       jvm_generate_compare_op(p, prefix, op);
+                       jvm_generate_compare_op(p, t, op);
                        break;
                default:
                        gen_error("jvm_generate_operator: unk op %i", op);
@@ -1602,6 +1692,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)
@@ -1615,7 +1706,7 @@ push_operator(gen_proc_t * p, oberon_oper_t * oper)
                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:
@@ -1635,7 +1726,7 @@ push_operator(gen_proc_t * p, oberon_oper_t * oper)
                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: