Добавлены функции SYSTEM.CC и SYSTEM.VAL

[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 bf5200bd786daafe7cff702b2731eb2b0552343a..1281c19426745d43a4982a24e92a26c834445bb7 100644 (file)
--- a/src/backends/jvm/generator-jvm.c
+++ b/src/backends/jvm/generator-jvm.c
@@ -492,6 +492,8 @@ oberon_generator_init_type(oberon_context_t * ctx, oberon_type_t * type)
                case OBERON_TYPE_STRING:
                case OBERON_TYPE_SET:
                case OBERON_TYPE_NIL:
+               case OBERON_TYPE_SYSTEM_BYTE:
+               case OBERON_TYPE_SYSTEM_PTR:
                        break;
                case OBERON_TYPE_RECORD:
                        m = type -> module -> gen_mod;
@@ -750,7 +752,10 @@ oberon_generate_begin_module(oberon_context_t * ctx)
        {
                if(x -> class == OBERON_CLASS_MODULE)
                {
-                       jvm_generate(p, 0, 0, "invokestatic %s/BEGIN()V", x -> module -> gen_mod -> class -> full_name);
+                       if(!x -> module -> intrinsic)
+                       {
+                               jvm_generate(p, 0, 0, "invokestatic %s/BEGIN()V", x -> module -> gen_mod -> class -> full_name);
+                       }
                }
                else if(x -> class == OBERON_CLASS_VAR)
                {
@@ -938,7 +943,7 @@ oberon_generate_begin_proc(oberon_context_t * ctx, oberon_object_t * proc)
 
        jvm_generate_procedure_frame(proc);
 
-       /* Создание парамеров и переменных */
+       /* Создание паÑ\80амеÑ\82Ñ\80ов и пеÑ\80еменнÑ\8bÑ\85 */
        var = proc -> scope -> list -> next;
        while(var)
        {
@@ -1044,13 +1049,16 @@ push_varptr(gen_proc_t * p, oberon_expr_t * expr)
                        jvm_generate_ldst_prepare(p, expr -> item.var -> gen_var);
                        break;
                case MODE_INDEX:
-                       push_item(p, (oberon_item_t *) expr -> item.parent);
+                       push_item(p, expr -> item.parent);
                        push_expr(p, expr -> item.args);
                        break;
                case MODE_FIELD:
-                       push_item(p, (oberon_item_t *) expr -> item.parent);
+                       push_item(p, expr -> item.parent);
                        jvm_generate_ldst_prepare(p, expr -> item.var -> gen_var);
                        break;
+               case MODE_DEREF:
+                       push_varptr(p, (oberon_expr_t *) expr -> item.parent);
+                       break;
                default:
                        gen_error("push_varptr: wat %i", expr -> item.mode);
                        break;
@@ -1199,6 +1207,30 @@ jvm_generate_cast_type(gen_proc_t * p, oberon_type_t * from, oberon_type_t * to)
        }
 }
 
+static void
+jvm_generate_hard_cast_type(gen_proc_t * p, oberon_type_t * from, oberon_type_t * to)
+{
+       if(from -> class == OBERON_TYPE_REAL
+               && (to -> class == OBERON_TYPE_INTEGER || to -> class == OBERON_TYPE_SYSTEM_BYTE))
+       {
+               char postfix = jvm_get_postfix(to);
+               if(from -> size <= 4)
+               {
+                       jvm_generate(p, 1, 1, "invokestatic java/lang/Float/floatToIntBits(F)I");
+                       jvm_generate_cast_prefix(p, 'I', postfix);
+               }
+               else
+               {
+                       jvm_generate(p, 2, 2, "invokestatic java/lang/Double/floatToIntBits(D)J");
+                       jvm_generate_cast_prefix(p, 'J', postfix);
+               }
+       }
+       else
+       {
+               jvm_generate_cast_type(p, from, to);
+       }
+}
+
 static void
 push_item(gen_proc_t * p, oberon_item_t * item)
 {
@@ -1562,36 +1594,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)
+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_cast_type(p, b -> result, t);
+
+       char * opname;
+       switch(op)
        {
-               jvm_generate(p, cell_size, 2 * cell_size, "dup2");
+               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_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);
+       jvm_generate(p, 2 * cell_size, cell_size, "invokestatic SYSTEM/%s(%c%c)%c", opname, dt, dt, dt);
 }
 
 static void
@@ -1617,6 +1648,10 @@ push_operator(gen_proc_t * p, oberon_oper_t * oper)
                        push_expr(p, oper -> left);
                        jvm_generate_cast_type(p, oper -> left -> result, oper -> result);
                        break;
+               case OP_HARDCAST:
+                       push_expr(p, oper -> left);
+                       jvm_generate_hard_cast_type(p, oper -> left -> result, oper -> result);
+                       break;
                case OP_COMPLEMENTATION:
                case OP_UNARY_MINUS:
                case OP_LOGIC_NOT:
@@ -1672,7 +1707,9 @@ push_operator(gen_proc_t * p, oberon_oper_t * oper)
                        break;
 
                case OP_ASH:
-                       jvm_generate_ash(p, oper -> left, oper -> right);
+               case OP_LSH:
+               case OP_ROT:
+                       jvm_generate_shift(p, op, oper -> left, oper -> right);
                        break;
                default:
                        gen_error("push_oper: unk op %i", op);