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 b17711bd5627d68a54b5dd06c4a475023a1a204a..0295e47c145d4081113e9271d78c12af4da5e2a8 100644 (file)
--- a/src/backends/jvm/generator-jvm.c
+++ b/src/backends/jvm/generator-jvm.c
@@ -1521,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, oberon_type_t * t, 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:
@@ -1557,10 +1549,44 @@ jvm_generate_compare_op(gen_proc_t * p, oberon_type_t * t, 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);
@@ -1617,7 +1643,7 @@ jvm_generate_operator(gen_proc_t * p, oberon_type_t * t, char prefix, int op)
                case OP_LEQ:
                case OP_GRT:
                case OP_GEQ:
-                       jvm_generate_compare_op(p, t, prefix, op);
+                       jvm_generate_compare_op(p, t, op);
                        break;
                default:
                        gen_error("jvm_generate_operator: unk op %i", op);