DEADSOFTWARE

Добавлены строки в отладочную информацию класса (быстрохак)
[dsw-obn.git] / src / backends / jvm / generator-jvm.c
index 2a2abcdcd3632f1b73a22aecc2135138f8e94523..f26c9513e000ca18cc3203fc0e67155b3111398c 100644 (file)
 #include <stdio.h>
+#include <stdlib.h>
 #include <stdarg.h>
+#include <stdint.h>
 #include <stdbool.h>
 #include <string.h>
 #include <assert.h>
 
 #include <gc.h>
 
-#include "../../../include/oberon.h"
 #include "../../oberon-internals.h"
+#include "../../oberon-type-compat.h"
+#include "../../generator.h"
 #include "generator-jvm.h"
+#include "generator-jvm-abi.h"
+#include "generator-jvm-asm.h"
+#include "generator-jvm-basic.h"
 
-char *
-new_string(const char * format, ...)
-{
-       va_list ptr;
-       va_start(ptr, format);
+static void
+push_item(gen_proc_t * p, oberon_item_t * item);
 
-       char buf[1024];
-       vsnprintf(buf, 1024, format, ptr);
+static void
+jvm_generate_new(gen_proc_t * p, oberon_type_t * type, int num);
 
-       va_end(ptr);
+static void
+jvm_generate_cast_prefix(gen_proc_t * p, char prefix, char postfix)
+{
+       if((prefix == 'b' || prefix == 's') && (postfix = 'l' || postfix == 'd'))
+       {
+               prefix = 'i';
+       }
 
-       char * result;
-       int size;
+       if(prefix == postfix)
+       {
+               return;
+       }
 
-       size = strlen(buf);
-       result = GC_MALLOC(size + 1);
-       memset(result, 0, size);
-       strncpy(result, buf, size);
+       if((prefix == 'l' || prefix == 'd') && (postfix == 'b' || postfix == 's'))
+       {
+               jvm_generate(p, 2, 1, "%c2i", prefix);
+               prefix = 'i';
+       }
 
-       return result;
+       int from_cell_size = jvm_cell_size_for_postfix(prefix);
+       int to_cell_size = jvm_cell_size_for_postfix(postfix);
+       jvm_generate(p, from_cell_size, to_cell_size, "%c2%c", prefix, postfix);
 }
 
-void
-oberon_generator_init_context(oberon_context_t * ctx)
+static void
+jvm_generate_cast_type(gen_proc_t * p, oberon_type_t * from, oberon_type_t * to)
 {
-       gen_context_t * gen_context = GC_MALLOC(sizeof *gen_context);
-       memset(gen_context, 0, sizeof *gen_context);
+       if(to -> class == OBERON_TYPE_RECORD || to -> class == OBERON_TYPE_POINTER)
+       {
+               if(to -> class == OBERON_TYPE_POINTER && to -> base -> class == OBERON_TYPE_RECORD)
+               {
+                       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);
+               jvm_generate_cast_prefix(p, prefix, postfix);
+       }
+}
 
-       ctx -> gen_context = gen_context;
+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/floatToRawIntBits(F)I");
+                       jvm_generate_cast_prefix(p, 'i', postfix);
+               }
+               else
+               {
+                       jvm_generate(p, 2, 2, "invokestatic java/lang/Double/doubleToRawLongBits(D)J");
+                       jvm_generate_cast_prefix(p, 'l', postfix);
+               }
+       }
+       else if((from -> class == OBERON_TYPE_INTEGER || from -> class == OBERON_TYPE_SYSTEM_BYTE)
+               && to -> class == OBERON_TYPE_REAL)
+       {
+               char prefix = jvm_get_prefix(from);
+               if(to -> size <= 4)
+               {
+                       jvm_generate_cast_prefix(p, prefix, 'i');
+                       jvm_generate(p, 1, 1, "invokestatic java/lang/Float/intBitsToFloat(I)F");
+               }
+               else
+               {
+                       jvm_generate_cast_prefix(p, prefix, 'l');
+                       jvm_generate(p, 2, 2, "invokestatic java/lang/Double/longBitsToDouble(J)D");
+               }
+       }
+       else
+       {
+               jvm_generate_cast_type(p, from, to);
+       }
 }
 
-void
-oberon_generator_destroy_context(oberon_context_t * ctx)
+static void
+check_index(gen_proc_t * p, oberon_type_t * index_type)
 {
-       ctx -> gen_context = NULL;
+       // TODO проверка валидности границ
+       char prefix = jvm_get_prefix(index_type);
+       jvm_generate_cast_prefix(p, prefix, 'i');
 }
 
-static char * get_class_full_name(oberon_context_t * ctx, oberon_type_t * type);
+/*
+ * Генерирует код для инициализации массива со статическим базовым типом
+ * ( aref -- )
+ */
 
-static char *
-get_descriptor(oberon_context_t * ctx, oberon_type_t * type)
+static void
+jvm_generate_array_initialization(gen_proc_t * p, oberon_type_t * arr)
+{
+       int dim = 0;
+       oberon_type_t * base = arr;
+       while(base -> class == OBERON_TYPE_ARRAY)
+       {
+               dim += 1;
+               base = base -> base;
+       }
+
+       if(base -> class != OBERON_TYPE_RECORD)
+       {
+               jvm_generate(p, 1, 0, "pop");
+               return;
+       }
+
+       struct {
+               int reg_index;
+               int reg_length;
+               int start;
+               int end;
+       } loop[dim];
+
+       int reg_dst;
+       reg_dst = jvm_alloc_register_untyped(p -> rf, false);
+       jvm_generate(p, 1, 0, "astore %i", reg_dst);
+
+       /*
+        * Входящие параметры заграблены.
+        * Теперь генерируем эквивалентный код:
+        *   int i = 0;
+        *   int len = dst.length
+        *   while(i < len)
+        *   {
+        *     ...
+        *     {
+        *       dst[i, ...] = new record;
+        *     }
+        *     ...
+        *     i += 1;
+        *   }
+        * Где "..." такой же код (начало и конец) для следующей размерности.
+        */
+
+       for(int i = 0; i < dim; i++)
+       {
+               loop[i].reg_index = jvm_alloc_register_untyped(p -> rf, false);
+               loop[i].reg_length = jvm_alloc_register_untyped(p -> rf, false);
+               loop[i].start = jvm_new_label_id(p);
+               loop[i].end = jvm_new_label_id(p);
+
+               jvm_generate(p, 0, 1, "iconst_0");
+               jvm_generate(p, 1, 0, "istore %i", loop[i].reg_index);
+
+               jvm_generate(p, 0, 1, "aload %i", reg_dst);
+               jvm_generate(p, 1, 1, "arraylength");
+               jvm_generate(p, 1, 0, "istore %i", loop[i].reg_length);
+
+               /* if(i >= len) goto end; */
+               jvm_generate_label(p, loop[i].start);
+               jvm_generate(p, 0, 1, "iload %i", loop[i].reg_index);
+               jvm_generate(p, 0, 1, "iload %i", loop[i].reg_length);
+               jvm_generate(p, 2, 0, "if_icmpge L%i", loop[i].end);
+       }
+
+       jvm_generate(p, 0, 1, "aload %i", reg_dst);
+       jvm_generate(p, 0, 1, "iload %i", loop[0].reg_index);
+       for(int i = 1; i < dim; i++)
+       {
+               jvm_generate(p, 2, 1, "aaload");
+               jvm_generate(p, 0, 1, "iload %i", loop[i].reg_index);
+       }
+       jvm_generate_new(p, base, 0);
+       jvm_generate(p, 3, 0, "aastore");
+
+       for(int i = dim - 1; i >= 0; i--)
+       {
+               jvm_generate(p, 0, 0, "iinc %i 1", loop[i].reg_index);
+               jvm_generate(p, 0, 0, "goto L%i", loop[i].start);
+               jvm_generate_label(p, loop[i].end);
+       }
+}
+
+static void
+jvm_generate_new(gen_proc_t * p, oberon_type_t * type, int num)
 {
+       int dim;
+       char * cname;
        char * desc;
+       oberon_type_t * base;
 
        switch(type -> class)
        {
-               case OBERON_TYPE_VOID:
-                       return new_string("V");
-                       break;
                case OBERON_TYPE_INTEGER:
-                       switch(type -> size)
-                       {
-                               case 1:
-                                       return new_string("B");
-                                       break;
-                               case 2:
-                                       return new_string("S");
-                                       break;
-                               case 4:
-                                       return new_string("I");
-                                       break;
-                               case 8:
-                                       return new_string("J");
-                                       break;
-                               default:
-                                       oberon_error(ctx, "get_descriptor: unsupported int size %i", type -> size);
-                                       break;
-                       }
-                       break;
-               case OBERON_TYPE_REAL:
-                       switch(type -> size)
-                       {
-                               case 4:
-                                       return new_string("F");
-                                       break;
-                               case 8:
-                                       return new_string("D");
-                                       break;
-                               default:
-                                       oberon_error(ctx, "get_descriptor: unsupported float size %i", type -> size);
-                                       break;
-                       }
-                       break;
                case OBERON_TYPE_BOOLEAN:
-                       return new_string("Z");
-                       break;
                case OBERON_TYPE_PROCEDURE:
+               case OBERON_TYPE_REAL:
+               case OBERON_TYPE_POINTER:
+                       gen_error("jvm_generate_new_static: static alocation not allowed");
+                       break;
                case OBERON_TYPE_RECORD:
-                       desc = get_class_full_name(ctx, type);
-                       return new_string("L%s;", desc);
+                       assert(num == 0);
+                       cname = jvm_get_class_full_name(type);
+                       jvm_generate(p, 0, 1, "new %s", cname);
+                       jvm_generate(p, 1, 2, "dup");
+                       jvm_generate(p, 1, 0, "invokespecial %s/<init>()V", cname);
                        break;
                case OBERON_TYPE_ARRAY:
-                       desc = get_descriptor(ctx, type -> base);
-                       return new_string("[%s", desc);
+                       dim = 0;
+                       base = type;
+                       desc = jvm_get_descriptor(type);
+                       while(base -> class == OBERON_TYPE_ARRAY)
+                       {
+                               if(num > 0)
+                               {
+                                       assert(base -> size == 0);
+                                       num -= 1;
+                               }
+                               else
+                               {
+                                       assert(base -> size > 0);
+                                       jvm_generate_push_int(p, base -> size);
+                               }
+                               dim += 1;
+                               base = base -> base;
+                       }
+
+                       assert(num == 0);
+                       jvm_generate(p, dim, 1, "multianewarray %s %i", desc, dim);
+                       jvm_generate(p, 1, 2, "dup");
+                       jvm_generate_array_initialization(p, type);
                        break;
                default:
-                       oberon_error(ctx, "print_descriptor: unsupported type class %i", type -> class);
+                       gen_error("jvm_generate_new_static: unk type class %i", type -> class);
                        break;
        }
+}
+
+/*
+ * Генерирует код для копирования полей из первой записи во вторую.
+ *  ( aref_dst aref_src -- )
+ *  dst := src;
+ */
 
-       return NULL;
+static void
+jvm_generate_copy_record(gen_proc_t * p, oberon_type_t * rec)
+{
+       assert(rec -> class == OBERON_TYPE_RECORD);
+       char * desc = jvm_get_descriptor(rec);
+       char * cname = jvm_get_class_full_name(rec);
+       jvm_generate(p, 1 + 1, 0, "invokestatic %s/$COPY$(%s%s)V", cname, desc, desc);
 }
 
-static char
-get_prefix(oberon_context_t * ctx, oberon_type_t * type)
+/*
+ * Генерирует кода для копирования массивов.
+ * ( aref_dst aref_src -- )
+ * dst := src;
+ */
+
+static void
+jvm_generate_copy_array(gen_proc_t * p, oberon_type_t * arr)
 {
-       int size = type -> size;
-       switch(type -> class)
+       int dim = 0;
+       oberon_type_t * base = arr;
+       while(base -> class == OBERON_TYPE_ARRAY)
        {
-               case OBERON_TYPE_BOOLEAN:
-               case OBERON_TYPE_INTEGER:
-                       return (size <= 4) ? ('i') : ('l');
-                       break;
-               case OBERON_TYPE_PROCEDURE:
-               case OBERON_TYPE_ARRAY:
-               case OBERON_TYPE_RECORD:
-               case OBERON_TYPE_POINTER:
-                       return 'a';
-                       break;
-               case OBERON_TYPE_REAL:
-                       return (size <= 4) ? ('f') : ('d');
-                       break;
+               dim += 1;
+               base = base -> base;
        }
 
-       oberon_error(ctx, "get_prefix: wat");
-       return '!';
-}
+       struct {
+               int reg_index;
+               int reg_length;
+               int start;
+               int end;
+       } loop[dim];
+
+       int reg_dst = jvm_alloc_register_untyped(p -> rf, false);
+       int reg_src = jvm_alloc_register_untyped(p -> rf, false);
+       jvm_generate(p, 1, 0, "astore %i", reg_src);
+       jvm_generate(p, 1, 0, "astore %i", reg_dst);
+
+       /*
+        * Входящие параметры заграблены.
+        * Теперь генерируем эквивалентный код:
+        *   int i = 0;
+        *   int len = src.length
+        *   while(i < len)
+        *   {
+        *     ...
+        *     {
+        *       copy from src[i, ...] to dst[i, ...];
+        *     }
+        *     ...
+        *     i += 1;
+        *   }
+        * Где "..." такой же код (начало и конец) для следующей размерности.
+        */
+
+       for(int i = 0; i < dim; i++)
+       {
+               loop[i].reg_index = jvm_alloc_register_untyped(p -> rf, false);
+               loop[i].reg_length = jvm_alloc_register_untyped(p -> rf, false);
+               loop[i].start = jvm_new_label_id(p);
+               loop[i].end = jvm_new_label_id(p);
+
+               jvm_generate(p, 0, 1, "iconst_0");
+               jvm_generate(p, 1, 0, "istore %i", loop[i].reg_index);
+
+               jvm_generate(p, 0, 1, "aload %i", reg_src);
+               jvm_generate(p, 1, 1, "arraylength");
+               jvm_generate(p, 1, 0, "istore %i", loop[i].reg_length);
+
+               /* if(i >= len) goto end; */
+               jvm_generate_label(p, loop[i].start);
+               jvm_generate(p, 0, 1, "iload %i", loop[i].reg_index);
+               jvm_generate(p, 0, 1, "iload %i", loop[i].reg_length);
+               jvm_generate(p, 2, 0, "if_icmpge L%i", loop[i].end);
+       }
 
-static char *
-get_field_full_name(oberon_context_t * ctx, oberon_object_t * x)
-{
-       return new_string("%s/%s", x -> module -> name, x -> name);
-}
+       if(base -> class == OBERON_TYPE_RECORD)
+       {
+               /* Получаем записи по индексам ( -- dst src ) */
 
-static char *
-get_class_full_name(oberon_context_t * ctx, oberon_type_t * type)
-{
-       int rec_id;
-       char * name = NULL;
+               jvm_generate(p, 0, 1, "aload %i", reg_dst);
+               for(int i = 0; i < dim; i++)
+               {
+                       jvm_generate(p, 0, 1, "iload %i", loop[i].reg_index);
+                       jvm_generate(p, 2, 1, "aaload");
+               }
 
-       switch(type -> class)
+               jvm_generate(p, 0, 1, "aload %i", reg_src);
+               for(int i = 0; i < dim; i++)
+               {
+                       jvm_generate(p, 0, 1, "iload %i", loop[i].reg_index);
+                       jvm_generate(p, 2, 1, "aaload");
+               }
+
+               /* Копируем записи ( dst src -- ) */
+               jvm_generate_copy_record(p, base);
+       }
+       else
        {
-               case OBERON_TYPE_PROCEDURE:
-                       name = new_string("SYSTEM$PROCEDURE");
+               char postfix = jvm_get_postfix(base);
+               int cell_size = jvm_cell_size_for_postfix(postfix);
 
-                       char * desc;
-                       desc = get_descriptor(ctx, type -> base);
-                       name = new_string("%s$%s", name, desc);
+               /* Получаем массивы и индексы ( -- dst i src i ) */
 
-                       int num = type -> num_decl;
-                       oberon_object_t * arg = type -> decl;
-                       for(int i = 0; i < num; i++)
-                       {
-                               desc = get_descriptor(ctx, arg -> type);
-                               name = new_string("%s%s", name, desc);
-                               arg = arg -> next;
-                       }
+               jvm_generate(p, 0, 1, "aload %i", reg_dst);
+               jvm_generate(p, 0, 1, "iload %i", loop[0].reg_index);
+               for(int i = 1; i < dim; i++)
+               {
+                       jvm_generate(p, 2, 1, "aaload");
+                       jvm_generate(p, 0, 1, "iload %i", loop[i].reg_index);
+               }
 
-                       break;
-               case OBERON_TYPE_RECORD:
-                       assert(type -> module);
-                       assert(type -> module -> gen_mod);
-                       rec_id = type -> gen_type -> rec_id;
-                       name = new_string("%s$RECORD%i", type -> module -> name, rec_id);
-                       break;
-               default:
-                       oberon_error(ctx, "get_record_full_name: unk type class %i", type -> class);
-                       break;
+               jvm_generate(p, 0, 1, "aload %i", reg_src);
+               jvm_generate(p, 0, 1, "iload %i", loop[0].reg_index);
+               for(int i = 1; i < dim; i++)
+               {
+                       jvm_generate(p, 2, 1, "aaload");
+                       jvm_generate(p, 0, 1, "iload %i", loop[i].reg_index);
+               }
+
+               /* Копируем значения ( dst i src i -- ) */
+               jvm_generate(p, 2, cell_size, "%caload", postfix);
+               jvm_generate(p, 2 + cell_size, 0, "%castore", postfix);
        }
 
-       return name;
+       for(int i = dim - 1; i >= 0; i--)
+       {
+               jvm_generate(p, 0, 0, "iinc %i 1", loop[i].reg_index);
+               jvm_generate(p, 0, 0, "goto L%i", loop[i].start);
+               jvm_generate_label(p, loop[i].end);
+       }
 }
 
-static char *
-get_procedure_signature(oberon_context_t * ctx, oberon_type_t * proc)
+static void
+jvm_generate_push_procedure_pointer(gen_proc_t * p, oberon_object_t * proc)
 {
-       char * signature;
-       char * desc;
-
-       signature = new_string("(");
+       char * full_name = jvm_get_field_full_name_safe(proc);
+       char * desc = jvm_get_descriptor(proc -> type);
+       jvm_generate(p, 0, 1, "getstatic %s/pointer %s", full_name, desc);
+}
 
-       int num = proc -> num_decl;
-       oberon_object_t * arg = proc -> decl;
-       for(int i = 0; i < num; i++)
-       {
-               desc = get_descriptor(ctx, arg -> type);
-               signature = new_string("%s%s", signature, desc);
-               arg = arg -> next;
-       }
+void
+oberon_generator_init_context(oberon_context_t * ctx)
+{
+       gen_context_t * gen_context = GC_MALLOC(sizeof *gen_context);
+       memset(gen_context, 0, sizeof *gen_context);
 
-       desc = get_descriptor(ctx, proc -> base);
-       signature = new_string("%s)%s", signature, desc);
+       ctx -> gen_context = gen_context;
+       gen_context -> dir = ".";
+}
 
-       return signature;
+void
+oberon_generator_destroy_context(oberon_context_t * ctx)
+{
 }
 
 static void
-oberon_generate_procedure_class(oberon_context_t * ctx, oberon_type_t * proc)
+oberon_generate_procedure_class(const char * dir, oberon_type_t * proc)
 {
        FILE * fp;
        char * cname;
-       char * fname;
        char * signature;
+       struct gen_class * class; 
 
-       cname = get_class_full_name(ctx, proc);
-       fname = new_string("%s.j", cname);
-
-       fp = fopen(fname, "w");
+       cname = jvm_get_class_full_name(proc);
+       class = jvm_create_class(dir, cname);
+       fp = class -> fp;
 
        fprintf(fp, ".source SYSTEM\n");
        fprintf(fp, ".class  public abstract %s\n", cname);
        fprintf(fp, ".super  java/lang/Object\n\n");
 
-       signature = get_procedure_signature(ctx, proc);
-
-       fprintf(fp, ".method public <init>()V\n");
+       fprintf(fp, ".method <init>()V\n");
        fprintf(fp, "  aload_0\n");
        fprintf(fp, "  invokespecial java/lang/Object/<init>()V\n");
        fprintf(fp, "  return\n");
-       fprintf(fp, ".end method\n");
+       fprintf(fp, ".end method\n\n");
+
+       signature = jvm_get_procedure_signature(proc);
 
        fprintf(fp, ".method public abstract invoke%s\n", signature);
        fprintf(fp, ".end method\n\n");
 
-       fclose(fp);
+       jvm_destroy_class(class);
 }
 
 static void
-oberon_generate_record_class(oberon_context_t * ctx, oberon_type_t * rec)
+oberon_generate_procedure_pointer_class(const char * dir, oberon_object_t * proc)
 {
        FILE * fp;
        char * cname;
-       char * fname;
+       char * abscname;
+       char * absdesc;
+       char * signature;
+       struct gen_class * class;
+
+       cname = jvm_get_field_full_name_safe(proc);
+       class = jvm_create_class(dir, cname);
+       abscname = jvm_get_class_full_name(proc -> type);
+       absdesc = jvm_get_descriptor(proc -> type);
+       fp = class -> fp;
+
+       fprintf(fp, ".source %s\n", proc -> module -> name);
+       fprintf(fp, ".class  public %s\n", cname);
+       fprintf(fp, ".super  %s\n\n", abscname);
+
+       fprintf(fp, ".field public static pointer %s\n\n", absdesc);
+
+       fprintf(fp, ".method private <init>()V\n");
+       fprintf(fp, "  aload_0\n");
+       fprintf(fp, "  invokespecial %s/<init>()V\n", abscname);
+       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");
+
+       signature = jvm_get_procedure_signature(proc -> type);
+
+       gen_proc_t * p = jvm_create_proc(class);
+       jvm_generate_function_header(p, "public", "invoke", signature);
+       jvm_alloc_register_untyped(p -> rf, false);
+
+       int use_size = 0;
+       int num = proc -> type -> num_decl;
+       oberon_object_t * param = proc -> type -> decl;
+       for(int i = 0; i < num; i++)
+       {
+               gen_type_t * t = param -> type -> gen_type;
+               if(param -> class == OBERON_CLASS_VAR_PARAM)
+               {
+                       int reg = jvm_alloc_register_untyped(p -> rf, true);
+                       jvm_generate(p, 0, 1, "aload %i", reg);
+                       jvm_generate(p, 0, 1, "iload %i", reg + 1);
+               }
+               else
+               {
+                       int reg = jvm_alloc_register_untyped(p -> rf, t -> wide);
+                       jvm_generate(p, 0, t -> cell_size, "%cload %i", t -> prefix, reg);
+               }
+               use_size += t -> cell_size;
+               param = param -> next;
+       }
+       
+       char * full_name = jvm_get_field_full_name(proc);
+       int cell_size = jvm_cell_size_for_type(proc -> type -> base);
+       jvm_generate(p, use_size, cell_size, "invokestatic %s%s", full_name, signature);
+
+       if(proc -> type -> base -> class == OBERON_TYPE_NOTYPE)
+       {
+               jvm_generate(p, 0, 0, "return");
+       }
+       else
+       {
+               char prefix = jvm_get_prefix(proc -> type -> base);
+               jvm_generate(p, cell_size, 0, "%creturn", prefix);
+       }
+
+       jvm_generate_function_end(p);
+
+       jvm_destroy_class(class);
+}
+
+static void
+oberon_generate_record_class(const char * dir, gen_module_t * m, oberon_type_t * rec)
+{
+       char * cname;
+       struct gen_class * class;
 
        /* Устанавливаем новоый id */
-       rec -> gen_type -> rec_id = rec -> module -> gen_mod -> rec_id;
-       rec -> module -> gen_mod -> rec_id += 1;
+       rec -> gen_type -> rec_id = m -> rec_id;
+       m -> rec_id += 1;
 
-       cname = get_class_full_name(ctx, rec);
-       fname = new_string("%s.j", cname);
+       cname = jvm_get_class_full_name(rec);
+       class = jvm_create_class(dir, cname);
 
-       fp = fopen(fname, "w");
+       fprintf(class -> fp, ".source %s\n", rec -> module -> name);
+       fprintf(class -> fp, ".class  public %s\n", cname);
 
-       fprintf(fp, ".source %s\n", rec -> module -> name);
-       fprintf(fp, ".class  public %s\n", cname);
-       fprintf(fp, ".super  java/lang/Object\n\n");
+       if(rec -> base == NULL)
+       {
+               fprintf(class -> fp, ".super  java/lang/Object\n\n");
+       }
+       else
+       {
+               class -> base = rec -> base -> gen_type -> class;
+               fprintf(class -> fp, ".super  %s\n\n", class -> base -> full_name);
+       }
 
-       rec -> gen_type -> fp = fp;
+       rec -> gen_type -> class = class;
 }
 
 void
@@ -267,111 +567,258 @@ oberon_generator_init_type(oberon_context_t * ctx, oberon_type_t * type)
        memset(t, 0, sizeof *t);
        type -> gen_type = t;
 
+       gen_context_t * c;
+       c = ctx -> gen_context;
+
+       gen_module_t * m;
        switch(type -> class)
        {
-               case OBERON_TYPE_VOID:
+               case OBERON_TYPE_NOTYPE:
                case OBERON_TYPE_INTEGER:
                case OBERON_TYPE_BOOLEAN:
                case OBERON_TYPE_ARRAY:
+               case OBERON_TYPE_POINTER:
                case OBERON_TYPE_REAL:
+               case OBERON_TYPE_CHAR:
+               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:
-                       oberon_generate_record_class(ctx, type);
+                       m = type -> module -> gen_mod;
+                       t -> full_name = jvm_get_class_full_name(type);
+                       oberon_generate_record_class(c -> dir, m, type);
                        break;
                case OBERON_TYPE_PROCEDURE:
-                       oberon_generate_procedure_class(ctx, type);
-                       break;
-               case OBERON_TYPE_POINTER:
-                       assert(type -> base -> class == OBERON_TYPE_VOID);
+                       oberon_generate_procedure_class(c -> dir, type);
                        break;
                default:
-                       oberon_error(ctx, "oberon_generator_init_type: unk calss %i", type -> class);
+                       gen_error("oberon_generator_init_type: unk calss %i", type -> class);
                        break;
        }
-}
 
-static void
-oberon_generate_object(oberon_context_t * ctx, FILE * fp, oberon_object_t * x)
-{
-       char * name;
-       char * desc;
+       if(type -> class != OBERON_TYPE_NOTYPE)
+       {
+               t -> wide = jvm_is_wide_type(type);
+               t -> prefix = jvm_get_prefix(type);
+               t -> postfix = jvm_get_postfix(type);
+       }
 
-       name = x -> name;
-       desc = get_descriptor(ctx, x -> type);
-       switch(x -> class)
+       if((type -> class == OBERON_TYPE_POINTER && type -> base -> class == OBERON_TYPE_RECORD) ||
+               type -> class == OBERON_TYPE_PROCEDURE ||
+               type -> class == OBERON_TYPE_RECORD ||
+               type -> class == OBERON_TYPE_SYSTEM_PTR)
        {
-               case OBERON_CLASS_VAR:
-                       fprintf(fp, ".field public static %s %s\n\n", name, desc);
-                       break;
-               case OBERON_CLASS_FIELD:
-                       fprintf(fp, ".field public %s %s\n\n", name, desc);
-                       break;
-               default:
-                       oberon_error(ctx, "oberon_generate_object: unk class %i", x -> class);
-                       break;
+               t -> full_name = jvm_get_class_full_name(type);
+       }
+
+       t -> cell_size = jvm_cell_size_for_type(type);
+
+       if(type -> class != OBERON_TYPE_NIL)
+       {
+               t -> desc = jvm_get_descriptor(type);
        }
 }
 
 void
 oberon_generator_init_record(oberon_context_t * ctx, oberon_type_t * rec)
 {
-       FILE * fp;
-
-       fp = rec -> gen_type -> fp;
+       struct gen_class * class;
+       class = rec -> gen_type -> class;
 
        int num = rec -> num_decl;
        oberon_object_t * field = rec -> decl;
        for(int i = 0; i < num; i++)
        {
-               oberon_generate_object(ctx, fp, field);
+               jvm_generate_var(field -> gen_var);
                field = field -> next;
        }
 
-       fprintf(fp, ".method public <init>()V\n");
-       fprintf(fp, "  aload_0\n");
-       fprintf(fp, "  invokespecial java/lang/Object/<init>()V\n");
-       fprintf(fp, "  return\n");
-       fprintf(fp, ".end method\n");
+       /* Стандартный конструктор класса */
+       /* Инициализирует внутренние статические записи и массивы */
+       gen_proc_t * p = jvm_create_proc(class);
+       jvm_generate_function_header(p, "public", "<init>", "()V");
+       jvm_alloc_register_untyped(p -> rf, false);
+       jvm_generate(p, 0, 1, "aload_0");
+       if(class -> base)
+       {
+               jvm_generate(p, 1, 0, "invokespecial %s/<init>()V", class -> base -> full_name);
+       }
+       else
+       {
+               jvm_generate(p, 1, 0, "invokespecial java/lang/Object/<init>()V");
+       }
+       num = rec -> num_decl;
+       field = rec -> decl;
+       for(int i = 0; i < num; i++)
+       {
+               jvm_generate(p, 0, 1, "aload_0");
+               jvm_generate_var_initialization(p, field -> gen_var);
 
-       fclose(fp);
+               if(field -> type -> class == OBERON_TYPE_RECORD
+                       || field -> type -> class == OBERON_TYPE_ARRAY)
+               {
+                       jvm_generate(p, 0, 1, "aload_0");
+                       jvm_generate_ldst_prepare(p, field -> gen_var);
+                       jvm_generate_new(p, field -> type, 0);
+                       jvm_generate_store(p, field -> gen_var);
+               }
+               field = field -> next;
+       }
+       jvm_generate(p, 0, 0, "return");
+       jvm_generate_function_end(p);
+
+       /* Метод для копирования полей класса */
+       /* reg0 == src -> reg1 == dst */
+       p = jvm_create_proc(class);
+       char * signature = new_string("(%s%s)V", rec -> gen_type -> desc, rec -> gen_type -> desc);
+       jvm_generate_function_header(p, "public static", "$COPY$", signature);
+
+       gen_var_t * copy_dst = jvm_create_function_var(p, JVM_STORAGE_REGISTER, "dst", rec -> gen_type);
+       gen_var_t * copy_src = jvm_create_function_var(p, JVM_STORAGE_REGISTER, "src", rec -> gen_type);
+       jvm_generate_var(copy_dst);
+       jvm_generate_var(copy_src);
+       jvm_generate_var_initialization(p, copy_dst);
+       jvm_generate_var_initialization(p, copy_src);
+
+       if(rec -> base)
+       {
+               jvm_generate_load(p, copy_dst);
+               jvm_generate_load(p, copy_src);
+               jvm_generate_copy_record(p, rec -> base);
+       }
+
+       num = rec -> num_decl;
+       field = rec -> decl;
+       for(int i = 0; i < num; i++)
+       {
+               if(field -> type -> class == OBERON_TYPE_RECORD)
+               {
+                       jvm_generate_load(p, copy_dst);
+                       jvm_generate_load(p, field -> gen_var);
+                       jvm_generate_load(p, copy_src);
+                       jvm_generate_load(p, field -> gen_var);
+                       jvm_generate_copy_record(p, field -> type);
+               }
+               else if(field -> type -> class == OBERON_TYPE_ARRAY)
+               {
+                       jvm_generate_load(p, copy_dst);
+                       jvm_generate_load(p, field -> gen_var);
+                       jvm_generate_load(p, copy_src);
+                       jvm_generate_load(p, field -> gen_var);
+                       jvm_generate_copy_array(p, field -> type);
+               }
+               else
+               {
+                       jvm_generate_load(p, copy_dst);
+                       jvm_generate_ldst_prepare(p, field -> gen_var);
+                       jvm_generate_load(p, copy_src);
+                       jvm_generate_load(p, field -> gen_var);
+                       jvm_generate_store(p, field -> gen_var);
+               }
+               field = field -> next;
+       }
+       jvm_generate(p, 0, 0, "return");
+       jvm_generate_function_end(p);
+
+       jvm_destroy_class(class);
 }
 
 void
 oberon_generator_init_var(oberon_context_t * ctx, oberon_object_t * var)
 {
-       gen_var_t * v = GC_MALLOC(sizeof *v);
-       memset(v, 0, sizeof *v);
-       var -> gen_var = v;
+       gen_module_t * m;
+       m = ctx -> mod -> gen_mod;
+
+       struct gen_class * class;
+       class = m -> class;
 
-       gen_module_t * m = ctx -> mod -> gen_mod;       
+       gen_proc_t * p;
+       struct gen_class * c;
+       char * name = var -> name;
+       gen_type_t * t = var -> type -> gen_type;
+
+       assert(name);
+       if(t == NULL)
+       {
+               gen_error("uninitialized type class %i", var -> type -> class);
+       }
 
        switch(var -> class)
        {
+               case OBERON_CLASS_VAR_PARAM:
+                       p = var -> parent -> gen_proc;
+                       var -> gen_var = jvm_create_function_var(p, JVM_STORAGE_FRAME_PARAM_VARPTR, name, t);
+                       break;
                case OBERON_CLASS_PARAM:
+                       p = var -> parent -> gen_proc;
+                       var -> gen_var = jvm_create_function_var(p, JVM_STORAGE_FRAME_PARAM_VAR, name, t);
+                       break;
                case OBERON_CLASS_FIELD:
+                       c = var -> parent_type -> gen_type -> class;
+                       var -> gen_var = jvm_create_class_var(c, JVM_STORAGE_FIELD_VAR, name, t);
                        break;
                case OBERON_CLASS_VAR:
-                       oberon_generate_object(ctx, m -> fp, var);
+                       if(var -> local)
+                       {
+                               p = var -> parent -> gen_proc;
+                               var -> gen_var = jvm_create_function_var(p, JVM_STORAGE_FRAME_VAR, name, t);
+                       }
+                       else
+                       {
+                               var -> gen_var = jvm_create_class_var(class, JVM_STORAGE_STATIC_VAR, name, t);
+                               jvm_generate_var(var -> gen_var);
+                       }
                        break;
                default:
-                       oberon_error(ctx, "oberon_generator_init_var: unk var class %i", var -> class);
+                       gen_error("oberon_generator_init_var: unk var class %i", var -> class);
                        break;
        }
 }
 
-void
-oberon_generator_init_proc(oberon_context_t * ctx, oberon_object_t * proc)
+static void
+oberon_generate_static_initialization(gen_proc_t * p, oberon_object_t * x)
 {
-       gen_proc_t * p = GC_MALLOC(sizeof *p);
-       memset(p, 0, sizeof *p);
-       proc -> gen_proc = p;
-
-       if(proc -> local)
+       if(x -> type -> class == OBERON_TYPE_ARRAY
+               || x -> type -> class == OBERON_TYPE_RECORD)
        {
-               oberon_error(ctx, "generator: local procedures not implemented");
+               jvm_generate_ldst_prepare(p, x -> gen_var);
+               jvm_generate_new(p, x -> type, 0);
+               jvm_generate_store(p, x -> gen_var);
        }
 }
 
+void
+oberon_generator_init_temp_var(oberon_context_t * ctx, oberon_object_t * var)
+{
+       assert(var -> class == OBERON_CLASS_VAR);
+
+       gen_module_t * m;
+       m = ctx -> mod -> gen_mod;
+
+       gen_proc_t * p;
+       p = m -> class -> p;
+
+       gen_type_t * t;
+       t = var -> type -> gen_type;
+
+       var -> gen_var = jvm_create_function_temp_var(p, t);
+       jvm_generate_var(var -> gen_var);
+       jvm_generate_var_initialization(p, var -> gen_var);
+       oberon_generate_static_initialization(p, var);
+}
+
+void
+oberon_generator_init_proc(oberon_context_t * ctx, oberon_object_t * proc)
+{
+       struct gen_class * class = proc -> module -> gen_mod -> class;
+       proc -> gen_proc = jvm_create_proc(class);
+       proc -> gen_proc -> full_name = jvm_get_field_full_name_safe(proc);
+       jvm_create_static_links(proc);
+}
+
 void
 oberon_generator_init_module(oberon_context_t * ctx, oberon_module_t * mod)
 {
@@ -379,275 +826,961 @@ oberon_generator_init_module(oberon_context_t * ctx, oberon_module_t * mod)
        memset(m, 0, sizeof *m);
        mod -> gen_mod = m;
 
-       int fnamesz = strlen(mod -> name) + 3;
-       char fname[fnamesz + 1];
-       snprintf(fname, fnamesz, "%s.j", mod -> name);
+       gen_context_t * c;
+       c = ctx -> gen_context;
 
-       FILE * fp;
-       fp = fopen(fname, "w");
-       assert(fp != NULL);
+       struct gen_class * class;
+       class = jvm_create_class(c -> dir, mod -> name);
+
+       fprintf(class -> fp, ".source %s\n", mod -> name);
+       fprintf(class -> fp, ".class %s\n", mod -> name);
+       fprintf(class -> fp, ".super java/lang/Object\n\n");
+
+       fprintf(class -> fp, ".field private static $INITIALIZED$ Z\n\n");
+
+       m -> class = class;
 
-       fprintf(fp, ".source %s\n", mod -> name);
-       fprintf(fp, ".class %s\n", mod -> name);
-       fprintf(fp, ".super java/lang/Object\n\n");
+       c -> current_m = m;
+}
 
-       m -> fp = fp;
+void
+oberon_generator_fini_module(oberon_module_t * mod)
+{
+       jvm_destroy_class(mod -> gen_mod -> class);
 }
 
-// =======================================================================
-//   GENERATOR
-// ======================================================================= 
+static void
+push_expr(gen_proc_t * p, oberon_expr_t * expr);
 
 void
 oberon_generate_begin_module(oberon_context_t * ctx)
 {
-       gen_module_t * m = ctx -> mod -> gen_mod;
-       fprintf(m -> fp, ".method public <init>()V\n");
-       fprintf(m -> fp, "  aload_0\n");
-       fprintf(m -> fp, "  invokespecial java/lang/Object/<init>()V\n");
+       gen_proc_t * p;
+       int label_cont;
+       struct gen_class * class;
+
+       class = ctx -> mod -> gen_mod -> class;
+
+       p = jvm_create_proc(class);
+       jvm_generate_function_header(p, "public static", "BEGIN", "()V");
+
+       label_cont = jvm_new_label_id(p);
+       jvm_generate(p, 0, 1, "getstatic %s/$INITIALIZED$ Z", class -> full_name);
+       jvm_generate(p, 1, 0, "ifeq L%i", label_cont);
+       jvm_generate(p, 0, 0, "return");
+       jvm_generate_label(p, label_cont);
+
+       jvm_generate(p, 0, 1, "iconst_1");
+       jvm_generate(p, 1, 0, "putstatic %s/$INITIALIZED$ Z", class -> full_name);
+
+       /* Инициализация переменных объявленных в модуле */
+       oberon_object_t * x = ctx -> mod -> decl -> list -> next;
+       while(x != NULL)
+       {
+               if(x -> class == OBERON_CLASS_MODULE)
+               {
+                       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)
+               {
+                       jvm_generate_var_initialization(p, x -> gen_var);
+                       oberon_generate_static_initialization(p, x);
+               }
+
+               x = x -> next;
+       }
 }
 
 void
 oberon_generate_end_module(oberon_context_t * ctx)
 {
-       gen_module_t * m = ctx -> mod -> gen_mod;
+       struct gen_class * class = ctx -> mod -> gen_mod -> class;
+       gen_proc_t * p = class -> p;
+
+       jvm_generate(p, 0, 0, "return");
+       jvm_generate_function_end(class -> p);
+
+       p = jvm_create_proc(class);
+       jvm_generate_function_header(p, "private", "<init>", "()V");
+       jvm_alloc_register_untyped(p -> rf, false);
+       jvm_generate(p, 0, 1, "aload_0");
+       jvm_generate(p, 1, 0, "invokespecial java/lang/Object/<init>()V");
+       jvm_generate(p, 0, 0, "return");
+       jvm_generate_function_end(class -> p);
+}
 
-       fprintf(m -> fp, "  .limit stack 32\n");
-       fprintf(m -> fp, "  .limit locals 32\n");
-       fprintf(m -> fp, "  return\n");
-       fprintf(m -> fp, ".end method\n");
+/*
+ * Генерирует код для получения размера измерения массива
+ * Аналог Обероновского LEN(v, n); где n = 0 - первое измерение.
+ * ( aref -- int )
+ */
+
+static void
+jvm_generate_array_len(gen_proc_t * p, int dim)
+{
+       while(dim > 0)
+       {
+               jvm_generate(p, 0, 1, "iconst_0");
+               jvm_generate(p, 2, 1, "aaload");
+               dim -= 1;
+       }
+       jvm_generate(p, 1, 1, "arraylength");
+}
+
+static void
+jvm_generate_array_duplicate_and_replace(gen_proc_t * p, gen_var_t * v, oberon_type_t * arr)
+{
+       jvm_generate_ldst_prepare(p, v);
+
+       int dim = 0;
+       oberon_type_t * base = arr;
+       while(base -> class == OBERON_TYPE_ARRAY)
+       {
+               if(base -> size == 0)
+               {
+                       jvm_generate_load(p, v);
+                       jvm_generate_array_len(p, dim);
+                       dim += 1;
+               }
+               base = base -> base;
+       }
+
+       jvm_generate_new(p, arr, dim);
+       jvm_generate(p, 1, 2, "dup");
+       jvm_generate_load(p, v);
+       jvm_generate_copy_array(p, arr);
+       jvm_generate_store(p, v);
+}
+
+static void
+jvm_generate_record_duplicate_and_replace(gen_proc_t * p, gen_var_t * v, oberon_type_t * rec)
+{
+       jvm_generate_ldst_prepare(p, v);
+       jvm_generate_new(p, rec, 0);
+       jvm_generate(p, 1, 2, "dup");
+       jvm_generate_load(p, v);
+       jvm_generate_copy_record(p, rec);
+       jvm_generate_store(p, v);
+}
+
+static void
+jvm_generate_local_object(gen_proc_t * p, oberon_object_t * x)
+{
+       gen_var_t * v;
+       struct gen_class * class;
+
+       v = x -> gen_var;
+       class = p -> class;
+
+       // Убеждаемся что сейчас находимся в функции
+       assert(class -> p);
+       assert(x -> local);
+
+       switch(x -> class)
+       {
+               case OBERON_CLASS_VAR_PARAM:
+               case OBERON_CLASS_PARAM:
+               case OBERON_CLASS_VAR:
+                       jvm_generate_var(v);
+                       break;
+               case OBERON_CLASS_CONST:
+               case OBERON_CLASS_TYPE:
+               case OBERON_CLASS_PROC:
+                       break;
+               default:
+                       gen_error("jvm_generate_local_initialization: wat class %i", x -> class);
+                       break;
+       }
+}
+
+static void
+jvm_generate_local_initialization(gen_proc_t * p, oberon_object_t * x)
+{
+       gen_var_t * v;
+       struct gen_class * class;
+
+       v = x -> gen_var;
+       class = p -> class;
+
+       // Убеждаемся что сейчас находимся в функции
+       assert(class -> p);
+       assert(x -> local);
+
+       switch(x -> class)
+       {
+               case OBERON_CLASS_VAR_PARAM:
+                       jvm_generate_var_initialization(p, v);
+                       break;
+               case OBERON_CLASS_PARAM:
+                       jvm_generate_var_initialization(p, v);
+                       if(x -> type -> class == OBERON_TYPE_ARRAY)
+                       {
+                               jvm_generate_array_duplicate_and_replace(p, v, x -> type);
+                       }
+                       else if(x -> type -> class == OBERON_TYPE_RECORD)
+                       {                               
+                               jvm_generate_record_duplicate_and_replace(p, v, x -> type);
+                       }
+                       break;
+               case OBERON_CLASS_VAR:
+                       jvm_generate_var_initialization(p, v);
+                       oberon_generate_static_initialization(p, x);
+                       break;
+               case OBERON_CLASS_CONST:
+               case OBERON_CLASS_TYPE:
+               case OBERON_CLASS_PROC:
+                       break;
+               default:
+                       gen_error("jvm_generate_local_initialization: wat class %i", x -> class);
+                       break;
+       }
 }
 
 void
 oberon_generate_begin_proc(oberon_context_t * ctx, oberon_object_t * proc)
 {
-       gen_module_t * m;
+       gen_proc_t * p;
+       char * name;
        char * signature;
+       oberon_object_t * var;
+
+       p = proc -> gen_proc;
+
+       if(proc -> local)
+       {
+               signature = jvm_get_local_procedure_signature(proc);
+       }
+       else
+       {
+               oberon_generate_procedure_pointer_class(p -> class -> dir, proc);
+               signature = jvm_get_procedure_signature(proc -> type);
+       }
+
+       name = jvm_get_name(proc);
+       p -> ret_prefix = jvm_get_prefix(proc -> type -> base);
+       jvm_generate_function_header(p, "public static", name, signature);
+
+       if(proc -> local)
+       {
+               jvm_generate_staticlinks(proc);
+       }
+
+       jvm_generate_procedure_frame(proc);
+
+       /* Создание параметров и переменных */
+       var = proc -> scope -> list -> next;
+       while(var)
+       {
+               jvm_generate_local_object(p, var);
+               var = var -> next;
+       }
+
+       jvm_generate_frame_initialization(p);
+
+       /* Инициализация парамеров и переменных */
+       var = proc -> scope -> list -> next;
+       while(var)
+       {
+               jvm_generate_local_initialization(p, var);
+               var = var -> next;
+       }
+}
+
+void
+oberon_generate_end_proc(oberon_context_t * ctx)
+{
+       gen_module_t * m;
+       gen_proc_t * p;
 
        m = ctx -> mod -> gen_mod;
-       signature = get_procedure_signature(ctx, proc -> type);
+       p = m -> class -> p;
 
-       fprintf(m -> fp, ".method public static %s%s\n", proc -> name, signature);
+       oberon_generate_trap(ctx, -4);
+
+       if(p -> ret_prefix == ' ')
+       {
+               jvm_generate(p, 0, 0, "return");
+       }
+       else
+       {
+               int sz = jvm_cell_size_for_postfix(p -> ret_prefix);
+               switch(p -> ret_prefix)
+               {
+                       case 'a':
+                               jvm_generate(p, 0, 1, "aconst_null");
+                               break;
+                       case 'l':
+                               jvm_generate_push_int_size(p, 0, 8);
+                               break;
+                       case 'f':
+                               jvm_generate_push_float(p, 0, 4);
+                               break;
+                       case 'd':
+                               jvm_generate_push_float(p, 0, 8);
+                               break;
+                       default:
+                               jvm_generate_push_int(p, 0);
+                               break;
+               }
+               jvm_generate(p, sz, 0, "%creturn", p -> ret_prefix);
+       }
+
+       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_call_proc(oberon_context_t * ctx, oberon_expr_t * desig)
+oberon_generate_label(oberon_context_t * ctx, gen_label_t * l)
 {
-       printf("call proc\n");
+       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_end_proc(oberon_context_t * ctx)
+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);
 
-       fprintf(m -> fp, "  .limit stack 32\n");
-       fprintf(m -> fp, "  .limit locals 32\n");
-       fprintf(m -> fp, ".end method\n\n");
+       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
+push_varptr(gen_proc_t * p, oberon_expr_t * expr)
+{
+       assert(expr -> is_item);
+
+       switch(expr -> item.mode)
+       {
+               case MODE_VAR:
+                       jvm_generate_ldst_prepare(p, expr -> item.var -> gen_var);
+                       break;
+               case MODE_INDEX:
+                       push_item(p, expr -> item.parent);
+                       push_expr(p, expr -> item.args);
+                       check_index(p, expr -> item.args -> result);
+                       break;
+               case MODE_FIELD:
+                       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;
+       }
+}
+
+static void
+jvm_generate_call_proc(gen_proc_t * p, oberon_item_t * desig)
+{
+       assert(desig -> var == NULL);
+       assert(desig -> mode == MODE_CALL);
+
+       bool direct_call = false;
+       if(desig -> parent -> mode == MODE_VAR)
+       {
+               if(desig -> parent -> var -> class == OBERON_CLASS_PROC)
+               {
+                       direct_call = true;
+               }
+       }
+
+       oberon_type_t * procsig;
+       procsig = desig -> parent -> result;
+
+       if(direct_call == false)
+       {
+               /* Загружаем указатель на процедуру */
+               push_item(p, desig -> parent);
+       }
+
+       if(direct_call)
+       {
+               jvm_generate_push_static_links(p, desig -> parent -> var);
+       }
+
+       int args_cells = 0;
+       int result_cells = jvm_cell_size_for_type(procsig -> base);
+
+       int num = desig -> num_args;
+       oberon_expr_t * arg = desig -> args;
+       oberon_object_t * param = procsig -> decl;
+       for(int i = 0; i < num; i++)
+       {
+               if(param -> class == OBERON_CLASS_VAR_PARAM)
+               {
+                       args_cells += 2;
+                       push_varptr(p, arg);
+               }
+               else
+               {
+                       args_cells += jvm_cell_size_for_type(arg -> result);
+                       push_expr(p, arg);
+               }
+               arg = arg -> next;
+               param = param -> next;
+       }
+
+       if(direct_call)
+       {
+               char * full_name = jvm_get_field_full_name(desig -> parent -> var);
+               char * signature = jvm_get_local_procedure_signature(desig -> parent -> var);
+               jvm_generate(p, args_cells, result_cells, "invokestatic %s%s", full_name, signature);
+       }
+       else
+       {
+               char * cname = jvm_get_class_full_name(procsig);
+               char * signature = jvm_get_procedure_signature(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)
+{
+       assert(desig -> is_item);
+       jvm_generate_call_proc(ctx -> mod -> gen_mod -> class -> p, (oberon_item_t *) desig);
 }
 
 void
 oberon_generate_return(oberon_context_t * ctx, oberon_expr_t * expr)
 {
        gen_module_t * m;
+       gen_proc_t * p;
+       char prefix;
+       int cell_size;
 
        m = ctx -> mod -> gen_mod;
+       p = m -> class -> p;
 
        if(expr)
        {
-               oberon_error(ctx, "oberon_generate_return: TODO return expr");
+               push_expr(p, expr);
+               prefix = jvm_get_prefix(expr -> result);
+               cell_size = jvm_cell_size_for_type(expr -> result);
+               jvm_generate(p, cell_size, 0, "%creturn", prefix);
        }
        else
        {
-               fprintf(m -> fp, "  return\n");
+               jvm_generate(p, 0, 0, "return");
        }
 }
 
 static void
-push_int(FILE * fp, long i)
+jvm_generate_expr_new_pointer(gen_proc_t * p, oberon_type_t * type, int num, oberon_expr_t * arg)
 {
-       if(i == -1)
-       {
-               fprintf(fp, "iconst_m1\n");
-       }
-       else if(i >= 0 && i <= 5)
-       {
-               fprintf(fp, "iconst_%li\n", i);
-       }
-       else if(i >= -128 && i <= 127)
-       {
-               fprintf(fp, "bipush %li\n", i);
-       }
-       else if(i >= -32768 && i <= 32767)
+       assert(type -> class == OBERON_TYPE_POINTER);
+
+       for(int i = 0; i < num; i++)
        {
-               fprintf(fp, "sipush %li\n", i);         
+               push_expr(p, arg);
+               check_index(p, arg -> result);
+               arg = arg -> next;
        }
-       else if(i >= -2147483648 && i <= 2147483647)
+
+       jvm_generate_new(p, type -> base, num);
+}
+
+static void
+push_item(gen_proc_t * p, oberon_item_t * item)
+{
+       switch(item -> mode)
        {
-               fprintf(fp, "ldc %li\n", i);
+               case MODE_VAR:
+                       if(item -> var -> class == OBERON_CLASS_PROC)
+                       {
+                               jvm_generate_push_procedure_pointer(p, item -> var);
+                       }
+                       else
+                       {
+                               jvm_generate_load(p, item -> var -> gen_var);
+                       }
+                       break;
+               case MODE_INTEGER:
+               case MODE_BOOLEAN:
+               case MODE_CHAR:
+               case MODE_SET:
+                       jvm_generate_push_int_size(p, item -> integer, item -> result -> size);
+                       break;
+               case MODE_CALL:
+                       jvm_generate_call_proc(p, item);
+                       break;
+               case MODE_INDEX:
+                       ;
+                       char postfix = jvm_get_postfix(item -> result);
+                       int cell_size = jvm_cell_size_for_postfix(postfix);
+                       push_item(p, item -> parent);
+                       push_expr(p, item -> args);
+                       check_index(p, item -> args -> result);
+                       jvm_generate(p, 1 + 1, cell_size, "%caload", postfix);
+                       break;
+               case MODE_FIELD:
+                       push_item(p, item -> parent);
+                       jvm_generate_load(p, item -> var -> gen_var);
+                       break;
+               case MODE_DEREF:
+                       /* Все объекты в jvm представляются как указатели */
+                       push_item(p, item -> parent);
+                       break;
+               case MODE_NIL:
+                       jvm_generate(p, 0, 1, "aconst_null");
+                       break;
+               case MODE_NEW:
+                       jvm_generate_expr_new_pointer(p, item -> result, item -> num_args, item -> args);
+                       break;
+               case MODE_REAL:
+                       jvm_generate_push_float(p, item -> real, item -> result -> size);
+                       break;
+               case MODE_STRING:
+                       jvm_generate_push_string(p, item -> string, item -> result -> size);
+                       break;
+               case MODE_LEN:
+                       push_item(p, item -> parent);
+                       jvm_generate_array_len(p, item -> integer);
+                       jvm_generate_cast_prefix(p, 'i', jvm_get_postfix(item -> result));
+                       break;
+               case MODE_AS:
+                       push_item(p, item -> parent);
+                       jvm_generate_cast_type(p, item -> parent -> result, item -> result);
+                       break;
+               default:
+                       gen_error("push_item: unk mode %i", item -> mode);
+                       break;
        }
-       else
+}
+
+static void
+jvm_generate_logical_not(gen_proc_t * p)
+{
+       int label_done = jvm_new_label_id(p);
+       int label_false = jvm_new_label_id(p);
+
+       jvm_generate(p, 1, 0, "ifne L%i", label_false);
+       jvm_generate(p, 0, 1, "iconst_1");
+       jvm_generate(p, 0, 0, "goto L%i", label_done);
+       jvm_generate_label(p, label_false);
+       jvm_generate(p, 0, 1, "iconst_0");
+       jvm_generate_label(p, label_done);
+}
+
+static void
+jvm_generate_abs(gen_proc_t * p, char prefix)
+{
+       char t = jvm_get_type_of_prefix(prefix);
+       int cell_size = jvm_cell_size_for_postfix(prefix);
+       jvm_generate(p, cell_size, cell_size, "invokestatic java/lang/Math/abs(%c)%c", t, t);
+}
+
+static char *
+jvm_get_compare_postfix(int op)
+{
+       char * cmpop = "";
+       switch(op)
        {
-               fprintf(fp, "ldc2 %li\n", i);
+               case OP_EQ:
+                       cmpop = "eq";
+                       break;
+               case OP_NEQ:
+                       cmpop = "ne";
+                       break;
+               case OP_LSS:
+                       cmpop = "lt";
+                       break;
+               case OP_LEQ:
+                       cmpop = "le";
+                       break;
+               case OP_GRT:
+                       cmpop = "gt";
+                       break;
+               case OP_GEQ:
+                       cmpop = "ge";
+                       break;
+               default:
+                       gen_error("jvm_generate_compare_op: wat");
+                       break;
        }
+       return cmpop;
 }
 
 static void
-push_float(FILE * fp, double f, int size)
+jvm_generate_compare_op(gen_proc_t * p, oberon_type_t * t, int op)
 {
-       if(size <= 4)
+       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')
        {
-               if(f == 0.0)
-               {
-                       fprintf(fp, "fconst_0\n");
-               }
-               if(f == 1.0)
-               {
-                       fprintf(fp, "fconst_1\n");
-               }
-               if(f == 2.0)
+               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)
                {
-                       fprintf(fp, "fconst_2\n");
+                       fop = 'l';
                }
                else
                {
-                       fprintf(fp, "ldc %lf\n", f);
+                       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
+       else if(prefix == 'a')
        {
-               if(f == 0.0)
-               {
-                       fprintf(fp, "dconst_0\n");
-               }
-               if(f == 1.0)
+               if(oberon_is_array_of_char_type(t) || oberon_is_string_type(t))
                {
-                       fprintf(fp, "dconst_1\n");
+                       jvm_generate(p, 2, 1, "invokestatic SYSTEM/STRCMP([B[B)I");
+                       jvm_generate(p, 1, 0, "if%s L%i", cmpop, label_true);
                }
                else
                {
-                       fprintf(fp, "ldc2 %lf\n", f);
+                       jvm_generate(p, 1, 0, "if_acmp%s L%i", cmpop, label_true);
                }
        }
-}
-
-static void push_expr(oberon_context_t * ctx, FILE * fp, oberon_expr_t * expr);
-
-static void
-push_var(oberon_context_t * ctx, FILE * fp, oberon_object_t * var)
-{
-       if(var -> local)
-       {
-               int reg = var -> gen_var -> reg;
-               char prefix = get_prefix(ctx, var -> type);
-               fprintf(fp, "%cload %i\n", prefix, reg);
-       }
        else
        {
-               char * fullname = get_field_full_name(ctx, var);
-               char * desc = get_descriptor(ctx, var -> type);
-               fprintf(fp, "getstatic %s %s\n", fullname, desc);
+               jvm_generate(p, 2 * cell_size, 0, "if_%ccmp%s L%i", prefix, cmpop, label_true);
        }
+
+       jvm_generate(p, 0, 1, "iconst_0");
+       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
-push_item(oberon_context_t * ctx, FILE * fp, oberon_item_t * item)
+jvm_generate_operator(gen_proc_t * p, oberon_type_t * t, int op)
 {
-       switch(item -> mode)
+       char prefix = jvm_get_prefix(t);
+       int cell_size = jvm_cell_size_for_type(t);
+       switch(op)
        {
-               case MODE_VAR:
-                       push_var(ctx, fp, item -> var);
+               case OP_UNARY_MINUS:
+                       jvm_generate(p, cell_size, cell_size, "%cneg", prefix);
                        break;
-               case MODE_INTEGER:
-                       push_int(fp, item -> integer);
+               case OP_COMPLEMENTATION:
+                       jvm_generate_push_int_size(p, -1, t -> size);
+                       jvm_generate(p, 2 * cell_size, cell_size, "%cxor", prefix);
                        break;
-               case MODE_BOOLEAN:
-                       push_int(fp, item -> boolean);
+               case OP_LOGIC_NOT:
+                       jvm_generate_logical_not(p);
                        break;
-               case MODE_CALL:
-                       oberon_error(ctx, "push_item: TODO call");
+               case OP_ABS:
+                       jvm_generate_abs(p, prefix);
                        break;
-               case MODE_INDEX:
-                       oberon_error(ctx, "push_item: TODO index");
+               case OP_CAP:
+                       jvm_generate(p, cell_size, cell_size, "invokestatic java/lang/Character/toUpperCase(I)I");
                        break;
-               case MODE_FIELD:
-                       oberon_error(ctx, "push_item: TODO field");
+
+               case OP_ADD:
+                       jvm_generate(p, 2 * cell_size, cell_size, "%cadd", prefix);
                        break;
-               case MODE_DEREF:
-                       oberon_error(ctx, "push_item: TODO deref");
+               case OP_SUB:
+                       jvm_generate(p, 2 * cell_size, cell_size, "%csub", prefix);
                        break;
-               case MODE_NIL:
-                       fprintf(fp, "aconst_null\n");
+               case OP_MUL:
+                       jvm_generate(p, 2 * cell_size, cell_size, "%cmul", prefix);
                        break;
-               case MODE_NEW:
-                       oberon_error(ctx, "push_item: TODO new");
+               case OP_DIV:
+                       jvm_generate(p, 2 * cell_size, cell_size, "%cdiv", prefix);
                        break;
-               case MODE_REAL:
-                       push_float(fp, item -> real, item -> result -> size);
+               case OP_MOD:
+                       jvm_generate(p, 2 * cell_size, cell_size, "%crem", prefix);
+                       break;
+               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_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);
+                       break;
+               case OP_SYM_DIFFERENCE:
+                       jvm_generate(p, 2 * cell_size, cell_size, "%cxor", prefix);
+                       break;
+
+               case OP_EQ:
+               case OP_NEQ:
+               case OP_LSS:
+               case OP_LEQ:
+               case OP_GRT:
+               case OP_GEQ:
+                       jvm_generate_compare_op(p, t, op);
                        break;
                default:
-                       oberon_error(ctx, "push_item: unk mode %i", item -> mode);
+                       gen_error("jvm_generate_operator: unk op %i", op);
+                       break;
+       }       
+}
+
+static void
+jvm_generate_logical_or(gen_proc_t * p, oberon_expr_t * a, oberon_expr_t * b)
+{
+       int label_calc_b = jvm_new_label_id(p);
+       int label_done = jvm_new_label_id(p);
+
+       /* a OR b -- если a, то TRUE, иначе b */
+
+       push_expr(p, a);
+       jvm_generate(p, 1, 0, "ifeq L%i", label_calc_b);
+       jvm_generate(p, 0, 1, "iconst_1");
+       jvm_generate(p, 0, 0, "goto L%i", label_done);
+       jvm_generate_label(p, label_calc_b);
+       push_expr(p, b);
+       jvm_generate_label(p, label_done);
+}
+
+static void
+jvm_generate_logical_and(gen_proc_t * p, oberon_expr_t * a, oberon_expr_t * b)
+{
+       int label_false = jvm_new_label_id(p);
+       int label_done = jvm_new_label_id(p);
+
+       /* a AND b -- если a, то b, иначе FALSE */
+
+       push_expr(p, a);
+       jvm_generate(p, 1, 0, "ifeq L%i", label_false);
+       push_expr(p, b);
+       jvm_generate(p, 0, 0, "goto L%i", label_done);
+       jvm_generate_label(p, label_false);
+       jvm_generate(p, 0, 1, "iconst_0");
+       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 * type;
+       gen_var_t * ra;
+       gen_var_t * rb;
+       int label_else;
+       int label_end;
+
+       type = a -> result;
+       cell_size = jvm_cell_size_for_type(type);
+       prefix = jvm_get_prefix(type);
+
+       if(b == NULL)
+       {
+               jvm_generate_push_int_size(p, 1, type -> size);
+               push_expr(p, a);
+               jvm_generate(p, 2 * cell_size, cell_size, "%cshl", prefix);
+       }
+       else
+       {
+               ra = jvm_create_function_temp_var(p, type -> gen_type);
+               rb = jvm_create_function_temp_var(p, type -> gen_type);
+               jvm_generate_var(ra);
+               jvm_generate_var(rb);
+               jvm_generate_var_initialization(p, ra);
+               jvm_generate_var_initialization(p, rb);
+               label_else = jvm_new_label_id(p);
+               label_end = jvm_new_label_id(p);
+
+               push_expr(p, a);
+               jvm_generate_store(p, ra);
+               push_expr(p, b);
+               jvm_generate_store(p, rb);
+
+               jvm_generate_load(p, ra);
+               jvm_generate_load(p, rb);
+               jvm_generate(p, 2 * cell_size, 0, "if_%ccmpgt L%i", prefix, label_else);
+
+               jvm_generate_push_int_size(p, 2, type -> size);
+               jvm_generate_load(p, rb);
+               jvm_generate(p, 2 * cell_size, cell_size, "%cshl", prefix);
+               jvm_generate_push_int_size(p, 2, type -> size);
+               jvm_generate_load(p, 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, type -> 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);
+
+       /* (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);
+       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
+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);
+       char dt = jvm_get_type_of_prefix(prefix);
+
+       push_expr(p, a);
+       jvm_generate_cast_type(p, a -> result, t);
+       push_expr(p, b);
+       jvm_generate_cast_type(p, b -> result, t);
+
+       char * opname;
+       switch(op)
+       {
+               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(p, 2 * cell_size, cell_size, "invokestatic SYSTEM/%s(%c%c)%c", opname, dt, dt, dt);
 }
 
 static void
-push_operator(oberon_context_t * ctx, FILE * fp, oberon_oper_t * oper)
+jvm_generate_entier(gen_proc_t * p, oberon_expr_t * x, oberon_type_t * res)
 {
-       char prefix = get_prefix(ctx, oper -> result);
-       switch(oper -> op)
+       char prefix = jvm_get_prefix(x -> result);
+       char postfix = jvm_get_postfix(res);
+
+       push_expr(p, x);
+       jvm_generate_cast_prefix(p, prefix, 'd');
+       jvm_generate(p, 2, 2, "invokestatic java/lang/Math/floor(D)D");
+       jvm_generate_cast_prefix(p, 'd', postfix);
+}
+
+static void
+push_operator(gen_proc_t * p, oberon_oper_t * oper)
+{
+       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_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:
-                       push_expr(ctx, fp, oper -> left);
-                       fprintf(fp, "%cneg\n", prefix);
+               case OP_LOGIC_NOT:
+               case OP_ABS:
+               case OP_CAP:
+                       push_expr(p, oper -> left);
+                       jvm_generate_operator(p, preq, op);
                        break;
-               case OP_BITWISE_NOT:
-                       push_expr(ctx, fp, oper -> left);
-                       push_int(fp, -1);
-                       fprintf(fp, "%cxor\n", prefix);
+               case OP_ENTIER:
+                       jvm_generate_entier(p, oper -> left, oper -> result);
                        break;
 
                case OP_ADD:
-                       push_expr(ctx, fp, oper -> left);
-                       push_expr(ctx, fp, oper -> right);
-                       fprintf(fp, "%cadd\n", prefix);
-                       break;
                case OP_SUB:
-                       push_expr(ctx, fp, oper -> left);
-                       push_expr(ctx, fp, oper -> right);
-                       fprintf(fp, "%csub\n", prefix);
-                       break;
                case OP_MUL:
-                       push_expr(ctx, fp, oper -> left);
-                       push_expr(ctx, fp, oper -> right);
-                       fprintf(fp, "%cmul\n", prefix);
-                       break;
                case OP_DIV:
-                       push_expr(ctx, fp, oper -> left);
-                       push_expr(ctx, fp, oper -> right);
-                       fprintf(fp, "%cdiv\n", prefix);
-                       break;
                case OP_MOD:
-                       push_expr(ctx, fp, oper -> left);
-                       push_expr(ctx, fp, oper -> right);
-                       fprintf(fp, "%crem\n", prefix);
-                       break;
-               case OP_BITWISE_AND:
-                       push_expr(ctx, fp, oper -> left);
-                       push_expr(ctx, fp, oper -> right);
-                       fprintf(fp, "%cand\n", prefix);
-                       break;
-               case OP_BITWISE_XOR:
-                       push_expr(ctx, fp, oper -> left);
-                       push_expr(ctx, fp, oper -> right);
-                       fprintf(fp, "%cxor\n", prefix);
-                       break;
-               case OP_BITWISE_OR:
-                       push_expr(ctx, fp, oper -> left);
-                       push_expr(ctx, fp, oper -> right);
-                       fprintf(fp, "%cor\n", prefix);
-                       break;
+
+               case OP_UNION:
+               case OP_INTERSECTION:
+               case OP_DIFFERENCE:
+               case OP_SYM_DIFFERENCE:
 
                case OP_EQ:
                case OP_NEQ:
@@ -655,54 +1788,102 @@ push_operator(oberon_context_t * ctx, FILE * fp, oberon_oper_t * oper)
                case OP_LEQ:
                case OP_GRT:
                case OP_GEQ:
-               case OP_LOGIC_NOT:
-               case OP_ABS:
-                       oberon_error(ctx, "push_oper: TODO op %i", oper -> op);
+                       push_expr(p, oper -> left);
+                       push_expr(p, oper -> right);
+                       jvm_generate_operator(p, preq, op);
+                       break;
+
+               case OP_LOGIC_OR:
+                       jvm_generate_logical_or(p, oper -> left, oper -> right);
+                       break;
+               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;
+
+               case OP_ASH:
+               case OP_LSH:
+               case OP_ROT:
+                       jvm_generate_shift(p, op, oper -> left, oper -> right);
                        break;
                default:
-                       oberon_error(ctx, "push_oper: unk op %i", oper -> op);
+                       gen_error("push_oper: unk op %i", op);
                        break;
        }
 }
 
 static void
-push_expr(oberon_context_t * ctx, FILE * fp, oberon_expr_t * expr)
+push_expr(gen_proc_t * p, oberon_expr_t * expr)
 {
        if(expr -> is_item)
        {
-               push_item(ctx, fp, (oberon_item_t *) expr);
+               push_item(p, (oberon_item_t *) expr);
        }
        else
        {
-               push_operator(ctx, fp, (oberon_oper_t *) expr);
+               push_operator(p, (oberon_oper_t *) expr);
        }
 }
 
 static void
-store_expr(oberon_context_t * ctx, FILE * fp, oberon_expr_t * expr)
+store_expr(gen_proc_t * p, oberon_expr_t * dst, oberon_expr_t * src)
 {
-       assert(expr -> is_item);
-       oberon_item_t * item = (oberon_item_t *) expr;
+       assert(dst -> is_item);
+       oberon_item_t * item = (oberon_item_t *) dst;
 
-       char prefix;
-       switch(item -> mode)
+       if(dst -> result -> class == OBERON_TYPE_ARRAY
+               || src -> result -> class == OBERON_TYPE_ARRAY)
+       {
+               push_expr(p, dst);
+               push_expr(p, src);
+               jvm_generate_copy_array(p, dst -> result);
+       }
+       else if(dst -> result -> class == OBERON_TYPE_RECORD
+               || src -> result -> class == OBERON_TYPE_RECORD)
+       {
+               push_expr(p, dst);
+               push_expr(p, src);
+               jvm_generate_copy_record(p, dst -> result);
+       }
+       else switch(item -> mode)
        {
                case MODE_VAR:
-                       if(item -> var -> local)
-                       {
-                               int reg = item -> var -> gen_var -> reg;
-                               prefix = get_prefix(ctx, item -> result);
-                               fprintf(fp, "%cstore %i\n", prefix, reg);
-                       }
-                       else
-                       {
-                               char * fullname = get_field_full_name(ctx, item -> var);
-                               char * desc = get_descriptor(ctx, item -> result);
-                               fprintf(fp, "putstatic %s %s\n", fullname, desc);
-                       }
+                       jvm_generate_ldst_prepare(p, item -> var -> gen_var);
+                       push_expr(p, src);
+                       jvm_generate_store(p, item -> var -> gen_var);
+                       break;
+               case MODE_INDEX:
+                       ;
+                       char postfix = jvm_get_postfix(src -> result);
+                       int cell_size = jvm_cell_size_for_postfix(postfix);
+                       assert(item -> parent -> is_item);
+                       push_item(p, (oberon_item_t *) item -> parent);
+                       push_expr(p, item -> args);
+                       check_index(p, item -> args -> result);
+                       push_expr(p, src);
+                       jvm_generate(p, 1 + 1 + cell_size, 0, "%castore", postfix);
+                       break;
+               case MODE_FIELD:
+                       assert(item -> parent -> is_item);
+                       push_item(p, (oberon_item_t *) item -> parent);
+                       jvm_generate_ldst_prepare(p, item -> var -> gen_var);
+                       push_expr(p, src);
+                       jvm_generate_store(p, item -> var -> gen_var);
                        break;
                default:
-                       oberon_error(ctx, "store_expr: unk mode %i", item -> mode);
+                       gen_error("store_expr: unk mode %i", item -> mode);
                        break;
        }
 }
@@ -711,34 +1892,117 @@ void
 oberon_generate_assign(oberon_context_t * ctx, oberon_expr_t * src, oberon_expr_t * dst)
 {
        gen_module_t * m;
+       gen_proc_t * p;
+
+       m = ctx -> mod -> gen_mod;
+       p = m -> class -> p;
+
+       store_expr(p, dst, src);
+}
+
+void
+oberon_generate_copy(oberon_context_t * ctx, oberon_expr_t * src, oberon_expr_t * dst)
+{
+       gen_module_t * m;
+       gen_proc_t * p;
+       char * desc;
+
+       m = ctx -> mod -> gen_mod;
+       p = m -> class -> p;
+
+       push_expr(p, src);
+       push_expr(p, dst);
+
+       desc = jvm_get_descriptor(dst -> result);
+
+       jvm_generate(p, 2, 0, "invokestatic SYSTEM/COPY(%s%s)V", desc, desc);
+}
+
+void
+oberon_generate_assert(oberon_context_t * ctx, oberon_expr_t * cond)
+{
+       gen_module_t * m;
+       gen_proc_t * p;
+
+       m = ctx -> mod -> gen_mod;
+       p = m -> class -> p;
+
+       push_expr(p, cond);
+       jvm_generate(p, 1, 0, "invokestatic SYSTEM/ASSERT(Z)V");
+}
+
+void
+oberon_generate_assert_n(oberon_context_t * ctx, oberon_expr_t * cond, int64_t n)
+{
+       gen_module_t * m;
+       gen_proc_t * p;
+
+       m = ctx -> mod -> gen_mod;
+       p = m -> class -> p;
+
+       push_expr(p, cond);
+       jvm_generate_push_int_size(p, n, 8);
+       jvm_generate(p, 1 + 2, 0, "invokestatic SYSTEM/ASSERT(ZJ)V");
+}
+
+void
+oberon_generate_trap(oberon_context_t * ctx, int64_t n)
+{
+       gen_module_t * m;
+       gen_proc_t * p;
+
        m = ctx -> mod -> gen_mod;
+       p = m -> class -> p;
 
-       push_expr(ctx, m -> fp, src);
-       store_expr(ctx, m -> fp, dst);
+       jvm_generate_push_int_size(p, n, 8);
+       jvm_generate(p, 2, 0, "invokestatic SYSTEM/TRAP(J)V");
 }
 
 void
-oberon_generate_code(oberon_context_t * ctx)
+oberon_generate_halt(oberon_context_t * ctx, int64_t n)
 {
-       printf("generate code\n");
+       gen_module_t * m;
+       gen_proc_t * p;
+
+       m = ctx -> mod -> gen_mod;
+       p = m -> class -> p;
+
+       jvm_generate_push_int_size(p, n, 8);
+       jvm_generate(p, 2, 0, "invokestatic SYSTEM/HALT(J)V");
 }
 
 void
-oberon_generator_dump(oberon_context_t * ctx, char * path)
+oberon_set_out_directory(oberon_context_t * ctx, const char * path)
 {
-       printf("jit: dump code\n");
+       gen_context_t * c;
+
+       c = ctx -> gen_context;
+
+       c -> dir = new_string(path);
 }
 
-void *
-oberon_generator_get_procedure(oberon_context_t * ctx, const char * name)
+void
+oberon_set_typecheck(oberon_object_t * var, bool enable)
 {
-       printf("jit: get pointer to procedure %s\n", name);
-       return NULL;
+       var -> gen_var -> typecheck = enable;
+       var -> gen_var -> forcetype = (enable) ? (var -> type -> gen_type) : (NULL);
 }
 
-void *
-oberon_generator_get_var(oberon_context_t * ctx, const char * name)
+void oberon_set_line(oberon_context_t * ctx, int line)
 {
-       printf("jit: get pointer to var %s\n", name);
-       return NULL;
+       gen_module_t * m;
+       gen_proc_t * p;
+
+        m = ctx -> mod -> gen_mod;
+       if(m != NULL)
+       {
+               p = m -> class -> p;
+
+               if(p != NULL)
+               {
+                       jvm_generate(p, 0, 0, ".line %i", line);
+               }
+
+               m -> line = line;
+       }
 }