X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fbackends%2Fjvm%2Fgenerator-jvm.c;h=af45a637eaca1fbbf4655e659cd3ec68f9eaaf18;hb=9a82efe08fea56335f331158344b17e6d5280a85;hp=c217ccb3d6f37ebb809bf076dcd35e62636d3c5e;hpb=33dd153448f426558fede7a951be657622163e76;p=dsw-obn.git

diff --git a/src/backends/jvm/generator-jvm.c b/src/backends/jvm/generator-jvm.c
index c217ccb..af45a63 100644
--- a/src/backends/jvm/generator-jvm.c
+++ b/src/backends/jvm/generator-jvm.c
@@ -1,5 +1,7 @@
 #include <stdio.h>
+#include <stdlib.h>
 #include <stdarg.h>
+#include <stdint.h>
 #include <stdbool.h>
 #include <string.h>
 #include <assert.h>
@@ -9,255 +11,476 @@
 #include "../../../include/oberon.h"
 #include "../../oberon-internals.h"
 #include "generator-jvm.h"
+#include "generator-jvm-basic.h"
 
-char *
-new_string(const char * format, ...)
-{
-	va_list ptr;
-	va_start(ptr, format);
+// ==========================================
+// ==========================================
+// ==========================================
 
-	char buf[1024];
-	vsnprintf(buf, 1024, format, ptr);
+gen_proc_t *
+jvm_create_proc(struct gen_class * class)
+{
+	gen_proc_t * p = GC_MALLOC(sizeof *p);
+	memset(p, 0, sizeof *p);
 
-	va_end(ptr);
+	struct gen_register_file * rf = GC_MALLOC(sizeof *rf);
+	memset(rf, 0, sizeof *rf);
 
-	char * result;
-	int size;
+	struct gen_stack * stack = GC_MALLOC(sizeof *stack);
+	memset(rf, 0, sizeof *stack);
 
-	size = strlen(buf);
-	result = GC_MALLOC(size + 1);
-	memset(result, 0, size);
-	strncpy(result, buf, size);
+	p -> rf = rf;
+	p -> stack = stack;
+	p -> class = class;
+	p -> label_id = 0;
 
-	return result;
+	return p;
 }
 
 void
-oberon_generator_init_context(oberon_context_t * ctx)
+jvm_generate_function_header(gen_proc_t * p, char * access, char * name, char * signature)
 {
-	gen_context_t * gen_context = GC_MALLOC(sizeof *gen_context);
-	memset(gen_context, 0, sizeof *gen_context);
+	struct gen_class * class;
+	class = p -> class;
 
-	ctx -> gen_context = gen_context;
+	/* Делаем процедуру текущей в этом классе */
+	assert(class -> p == NULL);
+	class -> p = p;
+
+	fprintf(class -> fp, ".method %s %s%s\n", access, name, signature);
 }
 
 void
-oberon_generator_destroy_context(oberon_context_t * ctx)
+jvm_generate_function_end(gen_proc_t * p)
 {
-	ctx -> gen_context = NULL;
+	struct gen_class * class;
+	class = p -> class;
+
+	assert(class -> p);
+	class -> p = NULL;
+
+	int pointer = p -> stack -> pointer;
+	int max_pointer = p -> stack -> max_pointer;
+	int locals = p -> rf -> num_used;
+	int max_locals = p -> rf -> max_used;
+
+	fprintf(class -> fp, "  .limit stack %i \t; current(%i)\n", max_pointer, pointer);
+	fprintf(class -> fp, "  .limit locals %i \t; current(%i)\n", max_locals, locals);
+	fprintf(class -> fp, ".end method\n\n");
 }
 
-static char * get_class_full_name(oberon_context_t * ctx, oberon_type_t * type);
+struct gen_class *
+jvm_create_class(char * full_name)
+{
+	struct gen_class * class = GC_MALLOC(sizeof *class);
+	memset(class, 0, sizeof *class);
 
-static char *
-get_descriptor(oberon_context_t * ctx, oberon_type_t * type)
+	char * fname = new_string("%s.j", full_name);
+	class -> full_name = new_string(full_name);
+	class -> fp = fopen(fname, "w");
+	assert(class -> fp);
+
+	return class;
+}
+
+static void
+jvm_destroy_class(struct gen_class * class)
 {
-	char * desc;
+	assert(class -> p == NULL);
+	fclose(class -> fp);
+}
 
-	switch(type -> class)
+static void
+jvm_stack_push(gen_proc_t * p, unsigned size)
+{
+	p -> stack -> pointer += size;
+	if(p -> stack -> pointer > p -> stack -> max_pointer)
 	{
-		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_RECORD:
-			desc = get_class_full_name(ctx, type);
-			return new_string("L%s;", desc);
-			break;
-		case OBERON_TYPE_ARRAY:
-			desc = get_descriptor(ctx, type -> base);
-			return new_string("[%s", desc);
-			break;
-		default:
-			oberon_error(ctx, "print_descriptor: unsupported type class %i", type -> class);
-			break;
+		p -> stack -> max_pointer = p -> stack -> pointer;
 	}
+}
 
-	return NULL;
+static void
+jvm_stack_pop(gen_proc_t * p, unsigned size)
+{
+	p -> stack -> pointer -= size;
+	assert(p -> stack -> pointer >= 0);
 }
 
-static char
-get_prefix(oberon_context_t * ctx, oberon_type_t * type)
+static void
+jvm_generate(gen_proc_t * p, unsigned get, unsigned push, char * format, ...)
 {
-	int size = type -> size;
-	switch(type -> class)
+	va_list ptr;
+	va_start(ptr, format);
+
+	jvm_stack_pop(p, get);
+	fprintf(p -> class -> fp, "  ");
+	vfprintf(p -> class -> fp, format, ptr);
+	jvm_stack_push(p, push);
+	fprintf(p -> class -> fp, " \t ;>>>> %i -- %i : current_stack(%i)\n", get, push, p -> stack -> pointer);
+
+	va_end(ptr);
+}
+
+static void
+jvm_generate_push_int(gen_proc_t * p, int64_t i)
+{
+	if(i == -1)
 	{
-		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;
+		jvm_generate(p, 0, 1, "iconst_m1");
+	}
+	else if(i >= 0 && i <= 5)
+	{
+		jvm_generate(p, 0, 1, "iconst_%li", i);
+	}
+	else if(i >= -128 && i <= 127)
+	{
+		jvm_generate(p, 0, 1, "bipush %li", i);
+	}
+	else if(i >= -32768 && i <= 32767)
+	{
+		jvm_generate(p, 0, 1, "sipush %li", i);
+	}
+	else if(i >= -2147483648 && i <= 2147483647)
+	{
+		jvm_generate(p, 0, 1, "ldc %li", i);
+	}
+	else
+	{
+		jvm_generate(p, 0, 2, "ldc2 %li", i);
+	}
+}
+
+static void
+jvm_generate_push_float(gen_proc_t * p, double f, int size)
+{
+	if(size <= 4)
+	{
+		if(f == 0.0)
+		{
+			jvm_generate(p, 0, 1, "fconst_0");
+		}
+		if(f == 1.0)
+		{
+			jvm_generate(p, 0, 1, "fconst_1");
+		}
+		if(f == 2.0)
+		{
+			jvm_generate(p, 0, 1, "fconst_2");
+		}
+		else
+		{
+			jvm_generate(p, 0, 1, "ldc %lf", f);
+		}
+	}
+	else
+	{
+		if(f == 0.0)
+		{
+			jvm_generate(p, 0, 2, "dconst_0");
+		}
+		if(f == 1.0)
+		{
+			jvm_generate(p, 0, 2, "dconst_1");
+		}
+		else
+		{
+			jvm_generate(p, 0, 2, "ldc2 %lf", f);
+		}
 	}
+}
 
-	oberon_error(ctx, "get_prefix: wat");
-	return '!';
+static gen_var_t *
+oberon_generator_new_var()
+{
+	gen_var_t * v = GC_MALLOC(sizeof *v);
+	memset(v, 0, sizeof *v);
+	return v;	
 }
 
-static char *
-get_field_full_name(oberon_context_t * ctx, oberon_object_t * x)
+static void
+jvm_generate_and_init_global_var(gen_var_t * v, struct gen_class * class, char * access, char * name, char * desc)
+{
+	assert(class -> p == NULL);
+	fprintf(class -> fp, ".field %s static %s %s\n\n", access, name, desc);
+
+	v -> storage = JVM_STORAGE_STATIC;
+	v -> full_name = new_string("%s/%s", class -> full_name, name);
+	v -> desc = new_string(desc);
+}
+
+static void
+jvm_generate_and_init_field(gen_var_t * v, struct gen_class * class, char * access, char * name, char * desc)
+{
+	assert(class -> p == NULL);
+	fprintf(class -> fp, ".field %s %s %s\n\n", access, name, desc);
+
+	v -> storage = JVM_STORAGE_FIELD;
+	v -> full_name = new_string("%s/%s", class -> full_name, name);
+	v -> desc = new_string(desc);
+}
+
+static void
+jvm_generate_and_init_local_var(gen_var_t * v, gen_proc_t * p, bool wide)
+{
+	v -> storage = JVM_STORAGE_REGISTER;
+	v -> reg = jvm_alloc_register_untyped(p -> rf, wide);
+}
+
+static void
+jvm_generate_and_init_named_local_var(gen_var_t * v, gen_proc_t * p, bool wide, char * name, char * desc)
 {
-	return new_string("%s/%s", x -> module -> name, x -> name);
+	jvm_generate_and_init_local_var(v, p, wide);
+	v -> desc = new_string(desc);
+	jvm_generate(p, 0, 0, ".var %i is %s %s from start to end", v -> reg, name, desc);
+}
+
+static int
+jvm_new_label_id(gen_proc_t * p)
+{
+	int label_id = p -> label_id;
+	p -> label_id += 1;
+	return label_id;
 }
 
 static char *
-get_class_full_name(oberon_context_t * ctx, oberon_type_t * type)
+jvm_get_label_name(int label_id)
 {
-	int rec_id;
-	char * name = NULL;
+	return new_string("L%i", label_id);
+}
 
-	switch(type -> class)
+static void
+jvm_generate_label(gen_proc_t * p, int label_id)
+{
+	jvm_generate(p, 0, 0, "L%i:", label_id);
+}
+
+static void
+jvm_generate_new_static(gen_proc_t * p, oberon_type_t * type);
+
+/*
+ * Функция jvm_generate_static_array_initialization генерирует код для
+ * статической инициализации массива. На входе массив, на выходе тот же массив.
+ * arrayref -- arrayref
+ */
+
+static void
+jvm_generate_static_array_initialization(gen_proc_t * p, oberon_type_t * type)
+{
+	/* for(int i = 0; i < a.length; i++) */
+	/*   a[i] := new(base); */
+	/*   init(a[i]) */
+
+	/* a := pop(array) */
+	gen_var_t * va = oberon_generator_new_var();
+	jvm_generate_and_init_local_var(va, p, false);
+	int reg_a = va -> reg;
+	/* ссылка уже на стеке */
+	jvm_generate(p, 1, 0, "astore %i", reg_a);
+
+	/* int i = 0; */
+	gen_var_t * vi = oberon_generator_new_var();
+	jvm_generate_and_init_local_var(vi, p, false);
+	int reg_i = vi -> reg;
+	jvm_generate(p, 0, 1, "iconst_0");
+	jvm_generate(p, 1, 0, "istore %i", reg_i);
+
+	/* int l := a.length */
+	gen_var_t * vl = oberon_generator_new_var();
+	jvm_generate_and_init_local_var(vl, p, false);
+	int reg_l = vl -> reg;
+	jvm_generate(p, 0, 1, "aload %i", reg_a);
+	jvm_generate(p, 1, 1, "arraylength");
+	jvm_generate(p, 1, 0, "istore %i", reg_l);
+
+	int label_start = jvm_new_label_id(p);
+	int label_end = jvm_new_label_id(p);
+
+	/* start: */
+	/* if (i >= l) goto end; */
+	/*   body*/
+	/*   i += 1;*/
+	/*   goto start;*/
+	/* end: */
+	/* push a */
+
+	jvm_generate_label(p, label_start);
+	jvm_generate(p, 0, 1, "iload %i", reg_i);
+	jvm_generate(p, 0, 1, "iload %i", reg_l);
+	jvm_generate(p, 2, 0, "if_icmpge L%i", label_end);
+
+	if(type -> base -> class == OBERON_TYPE_ARRAY)
 	{
-		case OBERON_TYPE_PROCEDURE:
-			name = new_string("SYSTEM$PROCEDURE");
+		/* Инициализируем следующую размерность */
+		jvm_generate(p, 0, 1, "aload %i", reg_a);
+		jvm_generate(p, 0, 1, "iload %i", reg_i);
+		jvm_generate(p, 0, 1, "aaload");		
+		jvm_generate_static_array_initialization(p, type -> base);
+		jvm_generate(p, 1, 0, "pop");
+	}
+	else if(type -> base -> class == OBERON_TYPE_RECORD)
+	{
+		jvm_generate(p, 0, 1, "aload %i", reg_a);
+		jvm_generate(p, 0, 1, "iload %i", reg_i);
+		jvm_generate_new_static(p, type -> base);
+		jvm_generate(p, 3, 0, "aastore");
+	}
+	else
+	{
+		assert(0);
+	}
 
-			char * desc;
-			desc = get_descriptor(ctx, type -> base);
-			name = new_string("%s$%s", name, desc);
+	/* i += 1; */
+	/* goto start */
 
-			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, 0, "iinc %i %i", reg_i, 1);
+	jvm_generate(p, 0, 0, "goto L%i", label_start);	
+	jvm_generate_label(p, label_end);
+
+	/* push(a) */
+	jvm_generate(p, 0, 1, "aload %i", reg_a);
+
+	/* TODO освобождение регистров */
+}
+
+static void
+jvm_generate_new_static(gen_proc_t * p, oberon_type_t * type)
+{
+	int dim;
+	char * cname;
+	char * desc;
+	oberon_type_t * base;
 
+	switch(type -> class)
+	{
+		case OBERON_TYPE_INTEGER:
+		case OBERON_TYPE_BOOLEAN:
+		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:
-			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);
+			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:
+			dim = 0;
+			base = type;
+			desc = jvm_get_descriptor(type);
+			while(base -> class == OBERON_TYPE_ARRAY)
+			{
+				dim += 1;
+				jvm_generate_push_int(p, base -> size);
+				base = base -> base;
+			}
+			jvm_generate(p, dim, 1, "multianewarray %s %i", desc, dim);
+
+			if(base -> class == OBERON_TYPE_RECORD)
+			{
+				jvm_generate_static_array_initialization(p, type);
+			}
 			break;
 		default:
-			oberon_error(ctx, "get_record_full_name: unk type class %i", type -> class);
+			gen_error("jvm_generate_new_static: unk type class %i", type -> class);
 			break;
 	}
-
-	return name;
 }
 
-static char *
-get_procedure_signature(oberon_context_t * ctx, oberon_type_t * proc)
+static void
+jvm_generate_store(gen_proc_t * p, oberon_type_t * src_type, gen_var_t * dst)
 {
-	char * signature;
-	char * desc;
+	char prefix;
+	int cell_size;
 
-	signature = new_string("(");
+	cell_size = jvm_cell_size_for_type(src_type);
 
-	int num = proc -> num_decl;
-	oberon_object_t * arg = proc -> decl;
-	for(int i = 0; i < num; i++)
+	switch(dst -> storage)
 	{
-		desc = get_descriptor(ctx, arg -> type);
-		signature = new_string("%s%s", signature, desc);
-		arg = arg -> next;
+		case JVM_STORAGE_REGISTER:
+			prefix = jvm_get_prefix(src_type);
+			jvm_generate(p, cell_size, 0, "%cstore %i", prefix, dst -> reg);
+			break;
+		case JVM_STORAGE_STATIC:
+			jvm_generate(p, cell_size, 0, "putstatic %s %s", dst -> full_name, dst -> desc);
+			break;
+		case JVM_STORAGE_FIELD:
+			jvm_generate(p, 1 + cell_size, 0, "putfield %s %s", dst -> full_name, dst -> desc);
+			break;
+		default:
+			gen_error("jvm_generate_store: unknow storage type %i", dst -> storage);
+			break;
 	}
+}
+
+// ==========================================
+// ==========================================
+// ==========================================
 
-	desc = get_descriptor(ctx, proc -> base);
-	signature = new_string("%s)%s", signature, desc);
+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);
 
-	return signature;
+	ctx -> gen_context = gen_context;
+}
+
+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(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(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, "  aload_0\n");
 	fprintf(fp, "  invokespecial java/lang/Object/<init>()V\n");
 	fprintf(fp, "  return\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_record_class(gen_module_t * m, oberon_type_t * rec)
 {
-	FILE * fp;
 	char * cname;
-	char * fname;
+	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(cname);
 
-	fp = fopen(fname, "w");
-
-	fprintf(fp, ".source %s\n", rec -> module -> name);
-	fprintf(fp, ".class  public %s\n", cname);
-	fprintf(fp, ".super  java/lang/Object\n\n");
+	fprintf(class -> fp, ".source %s\n", rec -> module -> name);
+	fprintf(class -> fp, ".class  public %s\n", cname);
+	fprintf(class -> fp, ".super  java/lang/Object\n\n");
 
-	rec -> gen_type -> fp = fp;
+	rec -> gen_type -> class = class;
 }
 
 void
@@ -276,38 +499,18 @@ oberon_generator_init_type(oberon_context_t * ctx, oberon_type_t * type)
 		case OBERON_TYPE_REAL:
 			break;
 		case OBERON_TYPE_RECORD:
-			oberon_generate_record_class(ctx, type);
+			;
+			gen_module_t * m;
+			m = type -> module -> gen_mod;
+			oberon_generate_record_class(m, type);
 			break;
 		case OBERON_TYPE_PROCEDURE:
-			oberon_generate_procedure_class(ctx, type);
+			oberon_generate_procedure_class(type);
 			break;
 		case OBERON_TYPE_POINTER:
-			assert(type -> base -> class == OBERON_TYPE_VOID);
 			break;
 		default:
-			oberon_error(ctx, "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;
-
-	name = x -> name;
-	desc = get_descriptor(ctx, x -> type);
-	switch(x -> class)
-	{
-		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);
+			gen_error("oberon_generator_init_type: unk calss %i", type -> class);
 			break;
 	}
 }
@@ -315,49 +518,84 @@ oberon_generate_object(oberon_context_t * ctx, FILE * fp, oberon_object_t * x)
 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);
+		gen_var_t * v = field -> gen_var;
+		char * name = field -> name;
+		char * desc = jvm_get_descriptor(field -> type);
+		jvm_generate_and_init_field(v, class, "public", name, desc);
 		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);
 
-	fclose(fp);
+	jvm_generate_function_header(p, "public", "<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");
+
+	num = rec -> num_decl;
+	field = rec -> decl;
+	for(int i = 0; i < num; i++)
+	{
+		if(field -> type -> class == OBERON_TYPE_RECORD
+			|| field -> type -> class == OBERON_TYPE_ARRAY)
+		{
+			jvm_generate(p, 0, 1, "aload_0");
+			jvm_generate_new_static(p, field -> type);
+			jvm_generate_store(p, field -> type, 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);
+	gen_var_t * v = oberon_generator_new_var();
 	var -> gen_var = v;
 
-	gen_module_t * m = ctx -> mod -> gen_mod;	
+	gen_module_t * m;
+	m = ctx -> mod -> gen_mod;
+
+	struct gen_class * class;
+	class = m -> class;
 
+	char * desc;
 	switch(var -> class)
 	{
 		case OBERON_CLASS_VAR_PARAM:
-			oberon_error(ctx, "generator: VAR-parameters not implemented");
+			gen_error("generator: VAR-parameters not implemented");
 			break;
 		case OBERON_CLASS_PARAM:
+			/* Заполняется при генерации функции */
+			/* смотри jvm_init_local_object() */
+			break;
 		case OBERON_CLASS_FIELD:
+			/* Заполняются при инициализации структуры */
+			/* смотри oberon_generator_init_record() */
 			break;
 		case OBERON_CLASS_VAR:
-			oberon_generate_object(ctx, m -> fp, var);
+			/* Локальные заполняются при генерации функции */			
+			/* смотри jvm_init_local_object() */
+			if(var -> local == 0)
+			{
+				desc = jvm_get_descriptor(var -> type);
+				jvm_generate_and_init_global_var(v, class, "public", var -> name, desc);
+			}
 			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;
 	}
 }
@@ -365,17 +603,12 @@ oberon_generator_init_var(oberon_context_t * ctx, oberon_object_t * var)
 void
 oberon_generator_init_proc(oberon_context_t * ctx, oberon_object_t * proc)
 {
-	gen_proc_t * p = GC_MALLOC(sizeof *p);
-	memset(p, 0, sizeof *p);
-	proc -> gen_proc = p;
-
-	struct gen_register_file * rf = GC_MALLOC(sizeof *rf);
-	memset(rf, 0, sizeof *rf);
-	p -> rf = rf;
+	struct gen_class * class = proc -> module -> gen_mod -> class;
+	proc -> gen_proc = jvm_create_proc(class);
 
 	if(proc -> local)
 	{
-		oberon_error(ctx, "generator: local procedures not implemented");
+		gen_error("generator: local procedures not implemented");
 	}
 }
 
@@ -386,150 +619,74 @@ 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);
+	struct gen_class * class;
+	class = jvm_create_class(mod -> name);
 
-	FILE * fp;
-	fp = fopen(fname, "w");
-	assert(fp != NULL);
+	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(fp, ".source %s\n", mod -> name);
-	fprintf(fp, ".class %s\n", mod -> name);
-	fprintf(fp, ".super java/lang/Object\n\n");
+	m -> class = class;
 
-	m -> fp = fp;
+	ctx -> gen_context -> current_m = m;
 }
 
-// =======================================================================
-//   GENERATOR
-// ======================================================================= 
+void
+oberon_generator_fini_module(oberon_module_t * mod)
+{
+	jvm_destroy_class(mod -> gen_mod -> class);
+}
 
 static void
-push_expr(oberon_context_t * ctx, FILE * fp, oberon_expr_t * expr);
+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");
+	struct gen_class * class = ctx -> mod -> gen_mod -> class;
+	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");
+	jvm_generate(p, 1, 0, "invokespecial java/lang/Object/<init>()V");
 }
 
 void
 oberon_generate_end_module(oberon_context_t * ctx)
 {
-	gen_module_t * m = ctx -> mod -> gen_mod;
-
-	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");
-}
-
-static int
-jvm_cell_size_for_type(oberon_type_t * type)
-{
-	if(type -> class == OBERON_TYPE_INTEGER
-		|| type -> class == OBERON_TYPE_REAL)
-	{
-		if(type -> size > 4)
-		{
-			return 2;
-		}
-	}
-
-	return 1;
-}
-
-static bool
-jvm_is_wide_type(oberon_type_t * type)
-{
-	int cell;
-	cell = jvm_cell_size_for_type(type);
-	assert(cell <= 2);
-	return (cell == 2);
-}
-
-static bool
-jvm_is_free_register(struct gen_register_file * rf, int i, bool wide)
-{
-	if(wide)
-	{
-		assert(i + 1 < MAX_REGISTERS);
-		return !(rf -> reg[i].used || rf -> reg[i + 1].used);
-	}
-	else
-	{
-		assert(i < MAX_REGISTERS);
-		return !(rf -> reg[i].used);
-	}
-}
-
-static int
-jvm_alloc_register(struct gen_register_file * rf, oberon_type_t * type)
-{
-	bool wide;
-	wide = jvm_is_wide_type(type);
-
-	int i = 0;
-	while(i < MAX_REGISTERS && !jvm_is_free_register(rf, i, wide))
-	{
-		i += 1;
-	}
-
-	if(wide)
-	{
-		assert(i + 1 <= MAX_REGISTERS);
-		rf -> num_used += 2;
-		rf -> reg[i].used = true;
-		rf -> reg[i + 1].used = true;
-		rf -> reg[i].used = true;
-		rf -> reg[i + 1].wide = false;
-	}
-	else
-	{
-		assert(i <= MAX_REGISTERS);
-		rf -> num_used += 2;
-		rf -> reg[i].used = true;
-		rf -> reg[i].wide = false;
-	}
+	struct gen_class * class = ctx -> mod -> gen_mod -> class;
+	gen_proc_t * p = class -> p;
 
-	if(rf -> num_used > rf -> max_used)
-	{
-		rf -> max_used = rf -> num_used;
-	}
-
-	return i;
+	jvm_generate(p, 0, 0, "return");
+	jvm_generate_function_end(class -> p);
 }
 
 static void
-jvm_init_local_object(oberon_context_t * ctx, FILE * fp, oberon_object_t * x)
+jvm_init_local_object(gen_proc_t * p, oberon_object_t * x)
 {
-	int reg;
-	gen_context_t * c;
 	gen_var_t * v;
+	bool wide;
 	char * desc;
+	struct gen_class * class;
 
-	c = ctx -> gen_context;
 	v = x -> gen_var;
-	desc = get_descriptor(ctx, x -> type);
+	class = p -> class;
+	wide = jvm_is_wide_type(x -> type);
+	desc = jvm_get_descriptor(x -> type);
+
+	// Убеждаемся что сейчас находимся в функции
+	assert(class -> p);
+	assert(x -> local);
 
-	reg = -1;
 	switch(x -> class)
 	{
 		case OBERON_CLASS_VAR:
 		case OBERON_CLASS_PARAM:
-			if(x -> local)
-			{
-				reg = jvm_alloc_register(c -> rf, x -> type);
-			}
-			v -> reg = reg;
-			fprintf(fp, ".var %i is %s %s from start to end\n", reg, x -> name, desc);
+			jvm_generate_and_init_named_local_var(v, p, wide, x -> name, desc);
 			break;
 		default:
-			oberon_error(ctx, "jvm_init_local_object: wat");
+			gen_error("jvm_init_local_object: wat");
 			break;
 	}
 }
@@ -537,278 +694,289 @@ jvm_init_local_object(oberon_context_t * ctx, FILE * fp, oberon_object_t * x)
 void
 oberon_generate_begin_proc(oberon_context_t * ctx, oberon_object_t * proc)
 {
-	gen_context_t * c;
-	gen_module_t * m;
 	gen_proc_t * p;
 	char * signature;
 
-	c = ctx -> gen_context;
-	m = ctx -> mod -> gen_mod;
 	p = proc -> gen_proc;
 
-	signature = get_procedure_signature(ctx, proc -> type);
-	fprintf(m -> fp, ".method public static %s%s\n", proc -> name, signature);
+	signature = jvm_get_procedure_signature(proc -> type);
 
-	/* Сохраняем регистровый файл в стеке */
-	p -> rf -> up = c -> rf;
-	c -> rf = p -> rf;
+	jvm_generate_function_header(p, "public static", proc -> name, signature);
 
 	oberon_object_t * var = proc -> type -> decl;
 	while(var)
 	{
-		jvm_init_local_object(ctx, m -> fp, var);
+		jvm_init_local_object(p, var);
 		var = var -> next;
 	}
-
-	fprintf(m -> fp, "start:\n");
 }
 
 void
 oberon_generate_end_proc(oberon_context_t * ctx)
 {
-	gen_context_t * c;
 	gen_module_t * m;
+	gen_proc_t * p;
 
-	c = ctx -> gen_context;
 	m = ctx -> mod -> gen_mod;
+	p = m -> class -> p;
 
-	fprintf(m -> fp, "end:\n");
-	fprintf(m -> fp, "  .limit stack 32\n");
-	fprintf(m -> fp, "  .limit locals %i\n", c -> rf -> max_used);
-	fprintf(m -> fp, ".end method\n\n");
-
-	/* Возвращаем исходный регистровый файл */
-	c -> rf = c -> rf -> up;
+	jvm_generate_function_end(p);
 }
 
-void
-oberon_generate_call_proc(oberon_context_t * ctx, oberon_expr_t * desig)
+static void
+jvm_generate_call_proc(gen_proc_t * p, oberon_expr_t * desig)
 {
+	assert(desig -> is_item);
+	assert(desig -> item.mode == MODE_CALL);
+	
 	oberon_object_t * proc;
-	gen_module_t * m;
 	char * fullname;
 	char * signature;
 
-	assert(desig -> is_item);
-	assert(desig -> item.mode == MODE_CALL);
-
-	m = ctx -> mod -> gen_mod;
 	proc = desig -> item.var;
-	fullname = get_field_full_name(ctx, proc);
-	signature = get_procedure_signature(ctx, proc -> type);
+	fullname = jvm_get_field_full_name(proc);
+	signature = jvm_get_procedure_signature(proc -> type);
+
+	int args_cells = 0;
+	int result_cells = jvm_cell_size_for_type(proc -> type -> base);
 
 	int num = desig -> item.num_args;
 	oberon_expr_t * arg = desig -> item.args;
 	for(int i = 0; i < num; i++)
 	{
-		push_expr(ctx, m -> fp, arg);
+		args_cells += jvm_cell_size_for_type(arg -> result);
+		push_expr(p, arg);
 		arg = arg -> next;
 	}
 
-	fprintf(m -> fp, "invokestatic %s%s\n", fullname, signature);
+	jvm_generate(p, args_cells, result_cells, "invokestatic %s%s", fullname, signature);
+}
+
+void
+oberon_generate_call_proc(oberon_context_t * ctx, oberon_expr_t * desig)
+{
+	jvm_generate_call_proc(ctx -> gen_context -> current_m -> class -> p, 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)
 	{
-		push_expr(ctx, m -> fp, expr);
-		prefix = get_prefix(ctx, expr -> result);
-		fprintf(m -> fp, "  %creturn\n", prefix);
+		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_push_var(gen_proc_t * p, oberon_object_t * var)
 {
-	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)
-	{
-		fprintf(fp, "sipush %li\n", i);		
-	}
-	else if(i >= -2147483648 && i <= 2147483647)
+	int cell_size = jvm_cell_size_for_type(var -> type);
+
+	if(var -> local)
 	{
-		fprintf(fp, "ldc %li\n", i);
+		int reg = var -> gen_var -> reg;
+		char prefix = jvm_get_prefix(var -> type);
+		jvm_generate(p, 0, cell_size, "%cload %i", prefix, reg);
 	}
 	else
 	{
-		fprintf(fp, "ldc2 %li\n", i);
+		char * fullname = jvm_get_field_full_name(var);
+		char * desc = jvm_get_descriptor(var -> type);
+		jvm_generate(p, 0, cell_size, "getstatic %s %s", fullname, desc);
 	}
 }
 
 static void
-push_float(FILE * fp, double f, int size)
+jvm_generate_expr_new_static(gen_proc_t * p, oberon_type_t * type, int num, oberon_expr_t * arg)
 {
-	if(size <= 4)
-	{
-		if(f == 0.0)
-		{
-			fprintf(fp, "fconst_0\n");
-		}
-		if(f == 1.0)
-		{
-			fprintf(fp, "fconst_1\n");
-		}
-		if(f == 2.0)
-		{
-			fprintf(fp, "fconst_2\n");
-		}
-		else
-		{
-			fprintf(fp, "ldc %lf\n", f);
-		}
-	}
-	else
-	{
-		if(f == 0.0)
-		{
-			fprintf(fp, "dconst_0\n");
-		}
-		if(f == 1.0)
-		{
-			fprintf(fp, "dconst_1\n");
-		}
-		else
-		{
-			fprintf(fp, "ldc2 %lf\n", f);
-		}
-	}
+	assert(num == 0);
+	jvm_generate_new_static(p, type);
 }
 
 static void
-push_var(oberon_context_t * ctx, FILE * fp, oberon_object_t * var)
+jvm_generate_expr_new_pointer(gen_proc_t * p, oberon_type_t * type, int num, oberon_expr_t * arg)
 {
-	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);
-	}
+	assert(type -> class == OBERON_TYPE_POINTER);
+	jvm_generate_expr_new_static(p, type -> base, num, arg);
 }
 
 static void
-push_item(oberon_context_t * ctx, FILE * fp, oberon_item_t * item)
+push_item(gen_proc_t * p, oberon_item_t * item)
 {
 	switch(item -> mode)
 	{
 		case MODE_VAR:
-			push_var(ctx, fp, item -> var);
+			jvm_push_var(p, item -> var);
 			break;
 		case MODE_INTEGER:
-			push_int(fp, item -> integer);
+			jvm_generate_push_int(p, item -> integer);
 			break;
 		case MODE_BOOLEAN:
-			push_int(fp, item -> boolean);
+			jvm_generate_push_int(p, item -> boolean);
 			break;
 		case MODE_CALL:
-			oberon_generate_call_proc(ctx, (oberon_expr_t *) item);
+			jvm_generate_call_proc(p, (oberon_expr_t *) item);
 			break;
 		case MODE_INDEX:
-			oberon_error(ctx, "push_item: TODO 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);
+			jvm_generate(p, 1 + 1, cell_size, "%caload", postfix);
 			break;
 		case MODE_FIELD:
-			oberon_error(ctx, "push_item: TODO field");
+			push_item(p, item -> parent);
+			char * field = jvm_get_field_full_name(item -> var);
+			char * desc = jvm_get_descriptor(item -> var -> type);
+			jvm_generate(p, 1, 1, "getfield %s %s", field, desc);
 			break;
 		case MODE_DEREF:
-			oberon_error(ctx, "push_item: TODO deref");
+			/* Все объекты представляются как увказатели */
+			push_item(p, item -> parent);
 			break;
 		case MODE_NIL:
-			fprintf(fp, "aconst_null\n");
+			jvm_generate(p, 0, 1, "aconst_null");
 			break;
 		case MODE_NEW:
-			oberon_error(ctx, "push_item: TODO new");
+			jvm_generate_expr_new_pointer(p, item -> result, item -> num_args, item -> args);
 			break;
 		case MODE_REAL:
-			push_float(fp, item -> real, item -> result -> size);
+			jvm_generate_push_float(p, item -> real, item -> result -> size);
 			break;
 		default:
-			oberon_error(ctx, "push_item: unk mode %i", item -> mode);
+			gen_error("push_item: unk mode %i", item -> mode);
 			break;
 	}
 }
 
 static void
-push_operator(oberon_context_t * ctx, FILE * fp, oberon_oper_t * oper)
+jvm_generate_logical_not(gen_proc_t * p)
+{
+	int label_done = jvm_new_label_id(p);
+	int label_false = jvm_new_label_id(p);
+	char * label_name_done = jvm_get_label_name(label_done);
+	char * label_name_false = jvm_get_label_name(label_false);
+
+	jvm_generate(p, 1, 0, "ifne %s", label_name_false);
+	jvm_generate(p, 0, 1, "iconst_1");
+	jvm_generate(p, 0, 0, "goto %s", label_name_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 void
+jvm_generate_compare_op(gen_proc_t * p, char prefix, 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 = "";
+	switch(op)
+	{
+		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;
+	}
+
+	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_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)
 {
-	char prefix = get_prefix(ctx, oper -> result);
-	switch(oper -> op)
+	int cell_size = jvm_cell_size_for_postfix(prefix);
+	switch(op)
 	{
 		case OP_UNARY_MINUS:
-			push_expr(ctx, fp, oper -> left);
-			fprintf(fp, "%cneg\n", prefix);
+			jvm_generate(p, cell_size, cell_size, "%cneg", prefix);
 			break;
 		case OP_BITWISE_NOT:
-			push_expr(ctx, fp, oper -> left);
-			push_int(fp, -1);
-			fprintf(fp, "%cxor\n", prefix);
+			jvm_generate_push_int(p, -1);
+			jvm_generate(p, 2 * cell_size, cell_size, "%cxor", prefix);
+			break;
+		case OP_LOGIC_NOT:
+			jvm_generate_logical_not(p);
+			break;
+		case OP_ABS:
+			jvm_generate_abs(p, prefix);
 			break;
 
 		case OP_ADD:
-			push_expr(ctx, fp, oper -> left);
-			push_expr(ctx, fp, oper -> right);
-			fprintf(fp, "%cadd\n", prefix);
+			jvm_generate(p, 2 * cell_size, cell_size, "%cadd", prefix);
 			break;
 		case OP_SUB:
-			push_expr(ctx, fp, oper -> left);
-			push_expr(ctx, fp, oper -> right);
-			fprintf(fp, "%csub\n", prefix);
+			jvm_generate(p, 2 * cell_size, cell_size, "%csub", prefix);
 			break;
 		case OP_MUL:
-			push_expr(ctx, fp, oper -> left);
-			push_expr(ctx, fp, oper -> right);
-			fprintf(fp, "%cmul\n", prefix);
+			jvm_generate(p, 2 * cell_size, cell_size, "%cmul", prefix);
 			break;
 		case OP_DIV:
-			push_expr(ctx, fp, oper -> left);
-			push_expr(ctx, fp, oper -> right);
-			fprintf(fp, "%cdiv\n", prefix);
+			jvm_generate(p, 2 * cell_size, cell_size, "%cdiv", prefix);
 			break;
 		case OP_MOD:
-			push_expr(ctx, fp, oper -> left);
-			push_expr(ctx, fp, oper -> right);
-			fprintf(fp, "%crem\n", prefix);
+			jvm_generate(p, 2 * cell_size, cell_size, "%crem", prefix);
 			break;
 		case OP_BITWISE_AND:
-			push_expr(ctx, fp, oper -> left);
-			push_expr(ctx, fp, oper -> right);
-			fprintf(fp, "%cand\n", prefix);
+			jvm_generate(p, 2 * cell_size, cell_size, "%cand", prefix);
 			break;
 		case OP_BITWISE_XOR:
-			push_expr(ctx, fp, oper -> left);
-			push_expr(ctx, fp, oper -> right);
-			fprintf(fp, "%cxor\n", prefix);
+			jvm_generate(p, 2 * cell_size, cell_size, "%cxor", prefix);
 			break;
 		case OP_BITWISE_OR:
-			push_expr(ctx, fp, oper -> left);
-			push_expr(ctx, fp, oper -> right);
-			fprintf(fp, "%cor\n", prefix);
+			jvm_generate(p, 2 * cell_size, cell_size, "%cor", prefix);
 			break;
 
 		case OP_EQ:
@@ -817,54 +985,151 @@ push_operator(oberon_context_t * ctx, FILE * fp, oberon_oper_t * oper)
 		case OP_LEQ:
 		case OP_GRT:
 		case OP_GEQ:
+			jvm_generate_compare_op(p, prefix, op);
+			break;
+		default:
+			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);
+	char * label_name_calc_b = jvm_get_label_name(label_calc_b);
+	char * label_name_done = jvm_get_label_name(label_done);
+
+	/* a OR b -- если a, то TRUE, иначе b */
+
+	push_expr(p, a);
+	jvm_generate(p, 1, 0, "ifne %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);
+	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);
+	char * label_name_false = jvm_get_label_name(label_false);
+	char * label_name_done = jvm_get_label_name(label_done);
+
+	/* a AND b -- если a, то b, иначе FALSE */
+
+	push_expr(p, a);
+	jvm_generate(p, 1, 0, "ifne %s", label_name_false);
+	push_expr(p, b);
+	jvm_generate(p, 0, 0, "goto %s", label_name_done);
+	jvm_generate_label(p, label_false);
+	jvm_generate(p, 0, 1, "iconst_0");
+	jvm_generate_label(p, label_done);
+}
+
+static void
+push_operator(gen_proc_t * p, oberon_oper_t * oper)
+{
+	char prefix = jvm_get_prefix(oper -> result);
+	int op = oper -> op;
+	switch(op)
+	{
+		case OP_UNARY_MINUS:
+		case OP_BITWISE_NOT:
 		case OP_LOGIC_NOT:
 		case OP_ABS:
-			oberon_error(ctx, "push_oper: TODO op %i", oper -> op);
+			push_expr(p, oper -> left);
+			jvm_generate_operator(p, prefix, op);
+			break;
+
+		case OP_ADD:
+		case OP_SUB:
+		case OP_MUL:
+		case OP_DIV:
+		case OP_MOD:
+		case OP_BITWISE_AND:
+		case OP_BITWISE_XOR:
+		case OP_BITWISE_OR:
+
+		case OP_EQ:
+		case OP_NEQ:
+		case OP_LSS:
+		case OP_LEQ:
+		case OP_GRT:
+		case OP_GEQ:
+			push_expr(p, oper -> left);
+			push_expr(p, oper -> right);
+			jvm_generate_operator(p, prefix, 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;
 		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;
+
+	if(dst -> result -> class == OBERON_TYPE_ARRAY
+		|| src -> result -> class == OBERON_TYPE_ARRAY)
+	{
+		gen_error("array copy not implemented");
+	}
+	else if(dst -> result -> class == OBERON_TYPE_RECORD
+		|| src -> result -> class == OBERON_TYPE_RECORD)
+	{
+		gen_error("record copy not implemented");
+	}
 
-	char prefix;
 	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);
-			}
+			push_expr(p, src);
+			jvm_generate_store(p, src -> result, item -> var -> gen_var);
+			break;
+		case MODE_INDEX:
+			;
+			char postfix = jvm_get_postfix(src -> result);
+			int cell_size = jvm_cell_size_for_postfix(postfix);
+			push_item(p, item -> parent);
+			push_expr(p, item -> args);
+			push_expr(p, src);
+			jvm_generate(p, 1 + 1 + cell_size, 0, "%castore", postfix);
+			break;
+		case MODE_FIELD:
+			push_item(p, item -> parent);
+			push_expr(p, src);
+			jvm_generate_store(p, src -> result, 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;
 	}
 }
@@ -873,10 +1138,12 @@ 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;
 
-	push_expr(ctx, m -> fp, src);
-	store_expr(ctx, m -> fp, dst);
+	store_expr(p, dst, src);
 }
 
 void