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

[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..c131f7f750080b2ce9f3ace65639063f0617d548 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;
@@ -1562,7 +1570,7 @@ 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_ash(gen_proc_t * p, oberon_expr_t * a, oberon_expr_t * b, bool logical)
 {
        oberon_type_t * t = a -> result;
        int cell_size = jvm_cell_size_for_type(t);
@@ -1589,8 +1597,15 @@ jvm_generate_ash(gen_proc_t * p, oberon_expr_t * a, oberon_expr_t * b)
        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_abs(p, prefix);
+       if(logical)
+       {
+               jvm_generate(p, 2 * cell_size, cell_size, "%cushr", prefix);
+       }
+       else
+       {
+               jvm_generate(p, 2 * cell_size, cell_size, "%cshr", prefix);
+       }
        jvm_generate_label(p, label_end);
 }
 
@@ -1672,7 +1687,10 @@ push_operator(gen_proc_t * p, oberon_oper_t * oper)
                        break;
 
                case OP_ASH:
-                       jvm_generate_ash(p, oper -> left, oper -> right);
+                       jvm_generate_ash(p, oper -> left, oper -> right, false);
+                       break;
+               case OP_LSH:
+                       jvm_generate_ash(p, oper -> left, oper -> right, true);
                        break;
                default:
                        gen_error("push_oper: unk op %i", op);