DEADSOFTWARE

Добавлена конструкция CASE
[dsw-obn.git] / src / backends / jvm / generator-jvm.c
index d99d1da62349514679fb9c298011c6c9fce099d1..a107efc119eca8a22afc620cbc912e8e284f86fa 100644 (file)
@@ -166,7 +166,7 @@ jvm_generate_push_int(gen_proc_t * p, int64_t i)
        }
        else
        {
-               jvm_generate(p, 0, 2, "ldc2 %li", i);
+               jvm_generate(p, 0, 2, "ldc2_w %li", i);
        }
 }
 
@@ -198,7 +198,7 @@ jvm_generate_push_int_size(gen_proc_t * p, int64_t i, int size)
        else
        {
                pushed_cell = 2;
-               jvm_generate(p, 0, 2, "ldc2 %li", i);
+               jvm_generate(p, 0, 2, "ldc2_w %li", i);
        }
 
        assert(size <= 8);
@@ -258,11 +258,29 @@ jvm_generate_push_float(gen_proc_t * p, double f, int size)
                }
                else
                {
-                       jvm_generate(p, 0, 2, "ldc2 %lf", f);
+                       jvm_generate(p, 0, 2, "ldc2_w %lf", f);
                }
        }
 }
 
+static void
+jvm_generate_push_string(gen_proc_t * p, char * str, int char_size)
+{
+       assert(char_size == 1);
+       int len = strlen(str);
+
+       jvm_generate_push_int(p, len + 1);
+       jvm_generate(p, 1, 1, "newarray byte");
+
+       for(int i = 0; i < len; i++)
+       {
+               jvm_generate(p, 1, 2, "dup");
+               jvm_generate_push_int(p, i);
+               jvm_generate_push_int(p, str[i]);
+               jvm_generate(p, 3, 0, "bastore");
+       }
+}
+
 static gen_var_t *
 oberon_generator_new_var()
 {
@@ -582,7 +600,7 @@ jvm_generate_copy_array(gen_proc_t * p, oberon_type_t * arr)
         * Входящие параметры заграблены.
         * Теперь генерируем эквивалентный код:
         *   int i = 0;
-        *   int len = dst.length
+        *   int len = src.length
         *   while(i < len)
         *   {
         *     ...
@@ -609,7 +627,7 @@ jvm_generate_copy_array(gen_proc_t * p, oberon_type_t * arr)
                jvm_generate(p, 0, 1, "iconst_0");
                jvm_generate(p, 1, 0, "istore %i", loop[i].index -> reg);
 
-               jvm_generate_load(p, arr, dst);
+               jvm_generate_load(p, arr, src);
                jvm_generate(p, 1, 1, "arraylength");
                jvm_generate(p, 1, 0, "istore %i", loop[i].length -> reg);
 
@@ -689,6 +707,9 @@ jvm_generate_push_procedure_pointer(gen_proc_t * p, oberon_object_t * proc)
 // ==========================================
 // ==========================================
 
+static void
+push_item(gen_proc_t * p, oberon_item_t * item);
+
 void
 oberon_generator_init_context(oberon_context_t * ctx)
 {
@@ -758,7 +779,14 @@ oberon_generate_procedure_pointer_class(oberon_object_t * proc)
        fprintf(fp, ".method <init>()V\n");
        fprintf(fp, "  aload_0\n");
        fprintf(fp, "  invokespecial %s/<init>()V\n", abscname);
-       fprintf(fp, "  aload_0\n");
+       fprintf(fp, "  return\n");
+       fprintf(fp, ".end method\n\n");
+
+       fprintf(fp, ".method static <clinit>()V\n");
+       fprintf(fp, "  .limit stack 2\n");
+       fprintf(fp, "  new %s\n", cname);
+       fprintf(fp, "  dup\n");
+       fprintf(fp, "  invokespecial %s/<init>()V\n", cname);
        fprintf(fp, "  putstatic %s/pointer %s\n", cname, absdesc);
        fprintf(fp, "  return\n");
        fprintf(fp, ".end method\n\n");
@@ -855,6 +883,9 @@ oberon_generator_init_type(oberon_context_t * ctx, oberon_type_t * type)
                case OBERON_TYPE_BOOLEAN:
                case OBERON_TYPE_ARRAY:
                case OBERON_TYPE_REAL:
+               case OBERON_TYPE_CHAR:
+               case OBERON_TYPE_STRING:
+               case OBERON_TYPE_SET:
                        break;
                case OBERON_TYPE_RECORD:
                        ;
@@ -1006,6 +1037,26 @@ oberon_generator_init_var(oberon_context_t * ctx, oberon_object_t * var)
        }
 }
 
+void
+oberon_generator_init_temp_var(oberon_context_t * ctx, oberon_object_t * var)
+{
+       assert(var -> class == OBERON_CLASS_VAR);
+
+       gen_var_t * v = oberon_generator_new_var();
+       var -> gen_var = v;
+
+       gen_module_t * m;
+       m = ctx -> mod -> gen_mod;
+
+       gen_proc_t * p;
+       p = m -> class -> p;
+
+       bool wide;
+       wide = jvm_is_wide_type(var -> type);
+
+       jvm_generate_and_init_local_var(v, p, wide);
+}
+
 void
 oberon_generator_init_proc(oberon_context_t * ctx, oberon_object_t * proc)
 {
@@ -1072,12 +1123,6 @@ oberon_generate_begin_module(oberon_context_t * ctx)
                                jvm_generate_store(p, x -> type, x -> gen_var);
                        }
                }
-               else if(x -> class == OBERON_CLASS_PROC)
-               {
-                       char * cname = jvm_get_field_full_name_safe(x);
-                       jvm_generate(p, 0, 1, "new %s", cname);
-                       jvm_generate(p, 1, 0, "invokespecial %s/<init>()V", cname);
-               }
 
                x = x -> next;
        }
@@ -1223,31 +1268,104 @@ oberon_generate_end_proc(oberon_context_t * ctx)
        jvm_generate_function_end(p);
 }
 
+gen_label_t *
+oberon_generator_reserve_label(oberon_context_t * ctx)
+{
+       gen_module_t * m;
+       gen_proc_t * p;
+       gen_label_t * l;
+
+       m = ctx -> mod -> gen_mod;
+       p = m -> class -> p;
+
+       l = GC_MALLOC(sizeof *l);
+       memset(l, 0, sizeof *l);
+
+       l -> id = jvm_new_label_id(p);
+       return l;
+}
+
+void
+oberon_generate_label(oberon_context_t * ctx, gen_label_t * l)
+{
+       gen_module_t * m;
+       gen_proc_t * p;
+
+       m = ctx -> mod -> gen_mod;
+       p = m -> class -> p;
+
+       jvm_generate_label(p, l -> id);
+}
+
+void
+oberon_generate_goto(oberon_context_t * ctx, gen_label_t * l)
+{
+       gen_module_t * m;
+       gen_proc_t * p;
+
+       m = ctx -> mod -> gen_mod;
+       p = m -> class -> p;
+
+       jvm_generate(p, 0, 0, "goto L%i", l -> id);
+}
+
+void
+oberon_generate_branch(oberon_context_t * ctx, oberon_expr_t * cond, bool gotoif, gen_label_t * l)
+{
+       gen_module_t * m;
+       gen_proc_t * p;
+
+       m = ctx -> mod -> gen_mod;
+       p = m -> class -> p;
+
+       push_expr(p, cond);
+
+       if(gotoif == false)
+       {
+               /* переход если false */
+               jvm_generate(p, 1, 0, "ifeq L%i", l -> id);
+       }
+       else
+       {
+               /* переход если true */
+               jvm_generate(p, 1, 0, "ifne L%i", l -> id);
+       }
+}
+
 static void
-jvm_generate_call_proc(gen_proc_t * p, oberon_expr_t * desig)
+jvm_generate_call_proc(gen_proc_t * p, oberon_item_t * desig)
 {
-       assert(desig -> is_item);
-       assert(desig -> item.mode == MODE_CALL);
-       
-       oberon_object_t * proc;
-       char * fullname;
-       char * signature;
+       assert(desig -> var == NULL);
+       assert(desig -> mode == MODE_CALL);
 
-       proc = desig -> item.var;
-       fullname = jvm_get_field_full_name(proc);
-       signature = jvm_get_procedure_signature(proc -> type);
+       char * signature = NULL;
+
+       bool direct_call = false;
+       if(desig -> parent -> mode == MODE_VAR)
+       {
+               if(desig -> parent -> var -> class == OBERON_CLASS_PROC)
+               {
+                       direct_call = true;
+               }
+       }
 
-       if(proc -> class != OBERON_CLASS_PROC)
+       printf("direct_call == %i\n", direct_call);
+
+       oberon_type_t * procsig;
+       procsig = desig -> parent -> result;
+       signature = jvm_get_procedure_signature(procsig);
+
+       if(direct_call == false)
        {
                /* Загружаем указатель на процедуру */
-               jvm_generate_load(p, proc -> type, proc -> gen_var);
+               push_item(p, desig -> parent);
        }
 
        int args_cells = 0;
-       int result_cells = jvm_cell_size_for_type(proc -> type -> base);
+       int result_cells = jvm_cell_size_for_type(procsig -> base);
 
-       int num = desig -> item.num_args;
-       oberon_expr_t * arg = desig -> item.args;
+       int num = desig -> num_args;
+       oberon_expr_t * arg = desig -> args;
        for(int i = 0; i < num; i++)
        {
                args_cells += jvm_cell_size_for_type(arg -> result);
@@ -1255,23 +1373,23 @@ jvm_generate_call_proc(gen_proc_t * p, oberon_expr_t * desig)
                arg = arg -> next;
        }
 
-       if(proc -> class == OBERON_CLASS_PROC)
+       if(direct_call)
        {
-               /* Обычная статическая процедура */
-               jvm_generate(p, args_cells, result_cells, "invokestatic %s%s", fullname, signature);            
+               char * full_name = jvm_get_field_full_name(desig -> parent -> var);
+               jvm_generate(p, args_cells, result_cells, "invokestatic %s%s", full_name, signature);
        }
        else
        {
-               /* Процедура-переменная */
-               char * class = jvm_get_class_full_name(proc -> type);
-               jvm_generate(p, 1 + args_cells, result_cells, "invokevirtual %s/invoke%s", class, signature);
+               char * cname = jvm_get_class_full_name(procsig);
+               jvm_generate(p, 1 + args_cells, result_cells, "invokevirtual %s/invoke%s", cname, signature);
        }
 }
 
 void
 oberon_generate_call_proc(oberon_context_t * ctx, oberon_expr_t * desig)
 {
-       jvm_generate_call_proc(ctx -> mod -> gen_mod -> class -> p, desig);
+       assert(desig -> is_item);
+       jvm_generate_call_proc(ctx -> mod -> gen_mod -> class -> p, (oberon_item_t *) desig);
 }
 
 void
@@ -1315,19 +1433,27 @@ jvm_generate_expr_new_pointer(gen_proc_t * p, oberon_type_t * type, int num, obe
 static void
 jvm_generate_cast_type(gen_proc_t * p, oberon_type_t * from, oberon_type_t * to)
 {
-       char prefix = jvm_get_prefix(from);
-       char postfix = jvm_get_postfix(to);
-       int from_cell_size = jvm_cell_size_for_type(from);
-       int to_cell_size = jvm_cell_size_for_type(to);
-
-       jvm_generate_comment(p, "cast type class from %i(%i) to %i(%i)", from -> class, from -> size, to -> class, to -> size);
-
-       if(prefix == postfix)
+       if(to -> class == OBERON_TYPE_RECORD || to -> class == OBERON_TYPE_POINTER)
        {
-               return;
+               char * full_name = jvm_get_class_full_name(to);
+               jvm_generate(p, 1, 1, "checkcast %s", full_name);
        }
+       else
+       {
+               char prefix = jvm_get_prefix(from);
+               char postfix = jvm_get_postfix(to);
+               int from_cell_size = jvm_cell_size_for_type(from);
+               int to_cell_size = jvm_cell_size_for_type(to);
+
+               jvm_generate_comment(p, "cast type class from %i(%i) to %i(%i)", from -> class, from -> size, to -> class, to -> size);
 
-       jvm_generate(p, from_cell_size, to_cell_size, "%c2%c", prefix, postfix);
+               if(prefix == postfix)
+               {
+                       return;
+               }
+
+               jvm_generate(p, from_cell_size, to_cell_size, "%c2%c", prefix, postfix);
+       }
 }
 
 static void
@@ -1346,13 +1472,15 @@ push_item(gen_proc_t * p, oberon_item_t * item)
                        }
                        break;
                case MODE_INTEGER:
+               case MODE_CHAR:
+               case MODE_SET:
                        jvm_generate_push_int_size(p, item -> integer, item -> result -> size);
                        break;
                case MODE_BOOLEAN:
                        jvm_generate_push_int_size(p, item -> boolean, item -> result -> size);
                        break;
                case MODE_CALL:
-                       jvm_generate_call_proc(p, (oberon_expr_t *) item);
+                       jvm_generate_call_proc(p, item);
                        break;
                case MODE_INDEX:
                        ;
@@ -1382,9 +1510,8 @@ push_item(gen_proc_t * p, oberon_item_t * item)
                case MODE_REAL:
                        jvm_generate_push_float(p, item -> real, item -> result -> size);
                        break;
-               case MODE_CAST:
-                       push_expr(p, item -> parent);
-                       jvm_generate_cast_type(p, item -> parent -> result, item -> result);
+               case MODE_STRING:
+                       jvm_generate_push_string(p, item -> string, item -> result -> size);
                        break;
                default:
                        gen_error("push_item: unk mode %i", item -> mode);
@@ -1416,18 +1543,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, 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:
@@ -1452,26 +1571,61 @@ jvm_generate_compare_op(gen_proc_t * p, 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);
 }
 
 static void
-jvm_generate_operator(gen_proc_t * p, char prefix, int op)
+jvm_generate_operator(gen_proc_t * p, oberon_type_t * t, int op)
 {
-       int cell_size = jvm_cell_size_for_postfix(prefix);
+       char prefix = jvm_get_prefix(t);
+       int cell_size = jvm_cell_size_for_type(t);
        switch(op)
        {
                case OP_UNARY_MINUS:
                        jvm_generate(p, cell_size, cell_size, "%cneg", prefix);
                        break;
-               case OP_BITWISE_NOT:
-                       jvm_generate_push_int(p, -1);
+               case OP_COMPLEMENTATION:
+                       jvm_generate_push_int_size(p, -1, t -> size);
                        jvm_generate(p, 2 * cell_size, cell_size, "%cxor", prefix);
                        break;
                case OP_LOGIC_NOT:
@@ -1496,14 +1650,19 @@ jvm_generate_operator(gen_proc_t * p, char prefix, int op)
                case OP_MOD:
                        jvm_generate(p, 2 * cell_size, cell_size, "%crem", prefix);
                        break;
-               case OP_BITWISE_AND:
+               case OP_UNION:
+                       jvm_generate(p, 2 * cell_size, cell_size, "%cor", prefix);
+                       break;
+               case OP_INTERSECTION:
                        jvm_generate(p, 2 * cell_size, cell_size, "%cand", prefix);
                        break;
-               case OP_BITWISE_XOR:
+               case OP_DIFFERENCE:
+                       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);
                        break;
-               case OP_BITWISE_OR:
-                       jvm_generate(p, 2 * cell_size, cell_size, "%cor", prefix);
+               case OP_SYM_DIFFERENCE:
+                       jvm_generate(p, 2 * cell_size, cell_size, "%cxor", prefix);
                        break;
 
                case OP_EQ:
@@ -1512,7 +1671,7 @@ jvm_generate_operator(gen_proc_t * p, char prefix, int op)
                case OP_LEQ:
                case OP_GRT:
                case OP_GEQ:
-                       jvm_generate_compare_op(p, prefix, op);
+                       jvm_generate_compare_op(p, t, op);
                        break;
                default:
                        gen_error("jvm_generate_operator: unk op %i", op);
@@ -1531,7 +1690,7 @@ jvm_generate_logical_or(gen_proc_t * p, oberon_expr_t * a, oberon_expr_t * b)
        /* a OR b -- если a, то TRUE, иначе b */
 
        push_expr(p, a);
-       jvm_generate(p, 1, 0, "ifne %s", label_name_calc_b);
+       jvm_generate(p, 1, 0, "ifeq %s", label_name_calc_b);
        jvm_generate(p, 0, 1, "iconst_1");
        jvm_generate(p, 0, 0, "goto %s", label_name_done);
        jvm_generate_label(p, label_calc_b);
@@ -1550,7 +1709,7 @@ jvm_generate_logical_and(gen_proc_t * p, oberon_expr_t * a, oberon_expr_t * b)
        /* a AND b -- если a, то b, иначе FALSE */
 
        push_expr(p, a);
-       jvm_generate(p, 1, 0, "ifne %s", label_name_false);
+       jvm_generate(p, 1, 0, "ifeq %s", label_name_false);
        push_expr(p, b);
        jvm_generate(p, 0, 0, "goto %s", label_name_done);
        jvm_generate_label(p, label_false);
@@ -1558,19 +1717,112 @@ jvm_generate_logical_and(gen_proc_t * p, oberon_expr_t * a, oberon_expr_t * b)
        jvm_generate_label(p, label_done);
 }
 
+static void
+jvm_generate_range(gen_proc_t * p, oberon_expr_t * a, oberon_expr_t * b)
+{
+       /* { a } == 1 << a */
+       /* { a..b } == (a <= b) ? ((2 << b) - (1 << a)) : (0); */
+
+       char prefix;
+       int cell_size;
+       oberon_type_t * t;
+       gen_var_t * ra;
+       gen_var_t * rb;
+       int label_else;
+       int label_end;
+       bool wide;
+
+       t = a -> result;
+       cell_size = jvm_cell_size_for_type(t);
+       prefix = jvm_get_prefix(t);
+
+       if(b == NULL)
+       {
+               jvm_generate_push_int_size(p, 1, t -> size);
+               push_expr(p, a);
+               jvm_generate(p, 2 * cell_size, cell_size, "%cshl", prefix);
+       }
+       else
+       {
+               wide = jvm_is_wide_type(t);
+               ra = oberon_generator_new_var();
+               rb = oberon_generator_new_var();
+               jvm_generate_and_init_local_var(ra, p, wide);
+               jvm_generate_and_init_local_var(rb, p, wide);
+               label_else = jvm_new_label_id(p);
+               label_end = jvm_new_label_id(p);
+
+               push_expr(p, a);
+               jvm_generate_store(p, t, ra);
+               push_expr(p, b);
+               jvm_generate_store(p, t, rb);
+
+               jvm_generate_load(p, t, ra);
+               jvm_generate_load(p, t, rb);
+               jvm_generate(p, 2 * cell_size, 0, "if_%ccmpgt L%i", prefix, label_else);
+
+               jvm_generate_push_int_size(p, 2, t -> size);
+               jvm_generate_load(p, t, rb);
+               jvm_generate(p, 2 * cell_size, cell_size, "%cshl", prefix);
+               jvm_generate_push_int_size(p, 2, t -> size);
+               jvm_generate_load(p, t, ra);
+               jvm_generate(p, 2 * cell_size, cell_size, "%cshl", prefix);
+               jvm_generate(p, 2 * cell_size, cell_size, "%csub", prefix);
+               jvm_generate(p, 0, 0, "goto L%i", label_end);
+
+               jvm_generate_label(p, label_else);
+               jvm_generate_push_int_size(p, 0, t -> size);
+               jvm_generate_label(p, label_end);
+       }
+
+       /* TODO free registers */
+}
+
+static void
+jvm_generate_in(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);
+
+       jvm_generate_push_int_size(p, 1, t -> size);
+       push_expr(p, a);
+       jvm_generate(p, 2 * cell_size, cell_size, "%cshl", prefix);
+       push_expr(p, b);        
+       jvm_generate(p, 2 * cell_size, cell_size, "%cand", prefix);
+
+       if(cell_size > 1)
+       {
+               jvm_generate(p, cell_size, 0, "lcmp");
+       }
+
+       jvm_generate(p, 1, 0, "ifeq L%i", label_else);
+       jvm_generate(p, 0, 1, "iconst_1");
+       jvm_generate(p, 0, 0, "goto L%i", label_end);
+       jvm_generate_label(p, label_else);
+       jvm_generate(p, 0, 1, "iconst_0");      
+       jvm_generate_label(p, label_end);
+}
+
 static void
 push_operator(gen_proc_t * p, oberon_oper_t * oper)
 {
-       char prefix = jvm_get_prefix(oper -> result);
+       oberon_type_t * preq = oper -> left -> result;
        int op = oper -> op;
        switch(op)
        {
+               case OP_CAST:
+                       push_expr(p, oper -> left);
+                       jvm_generate_cast_type(p, oper -> left -> result, oper -> result);
+                       break;
+               case OP_COMPLEMENTATION:
                case OP_UNARY_MINUS:
-               case OP_BITWISE_NOT:
                case OP_LOGIC_NOT:
                case OP_ABS:
                        push_expr(p, oper -> left);
-                       jvm_generate_operator(p, prefix, op);
+                       jvm_generate_operator(p, preq, op);
                        break;
 
                case OP_ADD:
@@ -1578,9 +1830,11 @@ push_operator(gen_proc_t * p, oberon_oper_t * oper)
                case OP_MUL:
                case OP_DIV:
                case OP_MOD:
-               case OP_BITWISE_AND:
-               case OP_BITWISE_XOR:
-               case OP_BITWISE_OR:
+
+               case OP_UNION:
+               case OP_INTERSECTION:
+               case OP_DIFFERENCE:
+               case OP_SYM_DIFFERENCE:
 
                case OP_EQ:
                case OP_NEQ:
@@ -1590,7 +1844,7 @@ push_operator(gen_proc_t * p, oberon_oper_t * oper)
                case OP_GEQ:
                        push_expr(p, oper -> left);
                        push_expr(p, oper -> right);
-                       jvm_generate_operator(p, prefix, op);
+                       jvm_generate_operator(p, preq, op);
                        break;
 
                case OP_LOGIC_OR:
@@ -1599,6 +1853,19 @@ push_operator(gen_proc_t * p, oberon_oper_t * oper)
                case OP_LOGIC_AND:
                        jvm_generate_logical_and(p, oper -> left, oper -> right);
                        break;
+
+               case OP_IS:
+                       preq = oper -> right -> result;
+                       char * cname = jvm_get_class_full_name(preq);
+                       push_expr(p, oper -> left);
+                       jvm_generate(p, 1, 1, "instanceof %s", cname);
+                       break;
+               case OP_RANGE:
+                       jvm_generate_range(p, oper -> left, oper -> right);
+                       break;
+               case OP_IN:
+                       jvm_generate_in(p, oper -> left, oper -> right);
+                       break;
                default:
                        gen_error("push_oper: unk op %i", op);
                        break;