Добавлены функции ASH и ODD, к другим добавлена свёртка констант

[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 189d8d275421b67a4fc2081d664c37ccf4149fc7..c2fd9abd4662bef894b32ae159650e7cdcb4baa2 100644 (file)
--- a/src/backends/jvm/generator-jvm.c
+++ b/src/backends/jvm/generator-jvm.c
@@ -1349,6 +1349,9 @@ jvm_generate_operator(gen_proc_t * p, oberon_type_t * t, int op)
                case OP_ABS:
                        jvm_generate_abs(p, prefix);
                        break;
+               case OP_CAP:
+                       jvm_generate(p, cell_size, cell_size, "invokestatic java/lang/Character/toUpperCase(I)I");
+                       break;
 
                case OP_ADD:
                        jvm_generate(p, 2 * cell_size, cell_size, "%cadd", prefix);
@@ -1372,6 +1375,7 @@ jvm_generate_operator(gen_proc_t * p, oberon_type_t * t, int op)
                        jvm_generate(p, 2 * cell_size, cell_size, "%cand", prefix);
                        break;
                case OP_DIFFERENCE:
+                       /* (a - b) == a & ~b */
                        jvm_generate_push_int_size(p, -1, t -> size);
                        jvm_generate(p, 2 * cell_size, cell_size, "%cxor", prefix);
                        jvm_generate(p, 2 * cell_size, cell_size, "%cand", prefix);
@@ -1498,6 +1502,7 @@ jvm_generate_in(gen_proc_t * p, oberon_expr_t * a, oberon_expr_t * b)
        int label_else = jvm_new_label_id(p);
        int label_end = jvm_new_label_id(p);
 
+       /* (a IN b) == (1 << a) & b */
        jvm_generate_push_int_size(p, 1, t -> size);
        push_expr(p, a);
        jvm_generate(p, 2 * cell_size, cell_size, "%cshl", prefix);
@@ -1517,6 +1522,39 @@ jvm_generate_in(gen_proc_t * p, oberon_expr_t * a, oberon_expr_t * b)
        jvm_generate_label(p, label_end);
 }
 
+static void
+jvm_generate_ash(gen_proc_t * p, 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 */
+
+       push_expr(p, a);
+       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(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);    
+       jvm_generate(p, 2 * cell_size, cell_size, "%cshr", prefix);
+       jvm_generate_label(p, label_end);
+}
+
 static void
 push_operator(gen_proc_t * p, oberon_oper_t * oper)
 {
@@ -1532,6 +1570,7 @@ push_operator(gen_proc_t * p, oberon_oper_t * oper)
                case OP_UNARY_MINUS:
                case OP_LOGIC_NOT:
                case OP_ABS:
+               case OP_CAP:
                        push_expr(p, oper -> left);
                        jvm_generate_operator(p, preq, op);
                        break;
@@ -1577,6 +1616,10 @@ push_operator(gen_proc_t * p, oberon_oper_t * oper)
                case OP_IN:
                        jvm_generate_in(p, oper -> left, oper -> right);
                        break;
+
+               case OP_ASH:
+                       jvm_generate_ash(p, oper -> left, oper -> right);
+                       break;
                default:
                        gen_error("push_oper: unk op %i", op);
                        break;