Добавлена функция SYSTEM.ROT

[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 c131f7f750080b2ce9f3ace65639063f0617d548..c063e2fc7fcc03ddd8c2150e03cca24c2220a96a 100644 (file)
--- a/src/backends/jvm/generator-jvm.c
+++ b/src/backends/jvm/generator-jvm.c
@@ -1570,43 +1570,35 @@ jvm_generate_in(gen_proc_t * p, oberon_expr_t * a, oberon_expr_t * b)
 }
 
 static void
-jvm_generate_ash(gen_proc_t * p, oberon_expr_t * a, oberon_expr_t * b, bool logical)
+jvm_generate_shift(gen_proc_t * p, int op, oberon_expr_t * a, oberon_expr_t * b)
 {
        oberon_type_t * t = a -> result;
        int cell_size = jvm_cell_size_for_type(t);
        char prefix = jvm_get_prefix(t);
-       int label_else = jvm_new_label_id(p);
-       int label_end = jvm_new_label_id(p);
-
-       /* if b < 0 then a << b else a >> b end */
+       char dt = jvm_get_type_of_prefix(prefix);
 
        push_expr(p, a);
+       jvm_generate_cast_type(p, a -> result, t);
        push_expr(p, b);
-       if(cell_size == 1)
-       {
-               jvm_generate(p, cell_size, 2 * cell_size, "dup");
-       }
-       else
-       {
-               jvm_generate(p, cell_size, 2 * cell_size, "dup2");
-       }
-       jvm_generate_push_int_size(p, 0, t -> size);
-       jvm_generate_compare_op(p, t, OP_LSS);
+       jvm_generate_cast_type(p, b -> result, t);
 
-       jvm_generate(p, cell_size, 0, "ifne L%i", label_else);
-       jvm_generate(p, 2 * cell_size, cell_size, "%cshl", prefix);
-       jvm_generate(p, 0, 0, "goto L%i", label_end);
-       jvm_generate_label(p, label_else);
-       jvm_generate_abs(p, prefix);
-       if(logical)
-       {
-               jvm_generate(p, 2 * cell_size, cell_size, "%cushr", prefix);
-       }
-       else
+       char * opname;
+       switch(op)
        {
-               jvm_generate(p, 2 * cell_size, cell_size, "%cshr", prefix);
+               case OP_ASH:
+                       opname = "ASH";
+                       break;
+               case OP_LSH:
+                       opname = "LSH";
+                       break;
+               case OP_ROT:
+                       opname = "ROT";
+                       break;
+               default:
+                       gen_error("jvm_generate_shift: invalid op %i", op);
        }
-       jvm_generate_label(p, label_end);
+
+       jvm_generate(p, 2 * cell_size, cell_size, "invokestatic SYSTEM/%s(%c%c)%c", opname, dt, dt, dt);
 }
 
 static void
@@ -1687,10 +1679,9 @@ push_operator(gen_proc_t * p, oberon_oper_t * oper)
                        break;
 
                case OP_ASH:
-                       jvm_generate_ash(p, oper -> left, oper -> right, false);
-                       break;
                case OP_LSH:
-                       jvm_generate_ash(p, oper -> left, oper -> right, true);
+               case OP_ROT:
+                       jvm_generate_shift(p, op, oper -> left, oper -> right);
                        break;
                default:
                        gen_error("push_oper: unk op %i", op);