X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fbackends%2Fjvm%2Fgenerator-jvm.c;h=4b5b9474c0a2f006c99e15c5e4251e37763785b1;hb=5f233e3ecee9f82dcf0db94e525f1a70caa67e6f;hp=99a4673199d8e432ddb0c98c4e0f397426625cff;hpb=3c5fc198fb0f72bd8ec70aef8f2b4987bb702f79;p=dsw-obn.git

diff --git a/src/backends/jvm/generator-jvm.c b/src/backends/jvm/generator-jvm.c
index 99a4673..4b5b947 100644
--- a/src/backends/jvm/generator-jvm.c
+++ b/src/backends/jvm/generator-jvm.c
@@ -48,6 +48,7 @@ jvm_generate_function_header(gen_proc_t * p, char * access, char * name, char *
 	class -> p = p;
 
 	fprintf(class -> fp, ".method %s %s%s\n", access, name, signature);
+	fprintf(class -> fp, "  start:\n");
 }
 
 void
@@ -59,8 +60,14 @@ jvm_generate_function_end(gen_proc_t * p)
 	assert(class -> p);
 	class -> p = NULL;
 
-	fprintf(class -> fp, "  .limit stack %i\n", p -> stack -> max_pointer);
-	fprintf(class -> fp, "  .limit locals %i\n", p -> rf -> max_used);
+	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:\n");
 	fprintf(class -> fp, ".end method\n\n");
 }
 
@@ -99,7 +106,11 @@ static void
 jvm_stack_pop(gen_proc_t * p, unsigned size)
 {
 	p -> stack -> pointer -= size;
-	assert(p -> stack -> pointer >= 0);
+
+	if(p -> stack -> pointer < 0)
+	{
+		printf("WARING: stack pointer %i\n", p -> stack -> pointer);
+	}
 }
 
 static void
@@ -111,8 +122,8 @@ jvm_generate(gen_proc_t * p, unsigned get, unsigned push, char * format, ...)
 	jvm_stack_pop(p, get);
 	fprintf(p -> class -> fp, "  ");
 	vfprintf(p -> class -> fp, format, ptr);
-	fprintf(p -> class -> fp, "\n");
 	jvm_stack_push(p, push);
+	fprintf(p -> class -> fp, " \t ;>>>> %i -- %i : current_stack(%i)\n", get, push, p -> stack -> pointer);
 
 	va_end(ptr);
 }
@@ -185,6 +196,51 @@ jvm_generate_push_float(gen_proc_t * p, double f, int size)
 	}
 }
 
+static gen_var_t *
+oberon_generator_new_var()
+{
+	gen_var_t * v = GC_MALLOC(sizeof *v);
+	memset(v, 0, sizeof *v);
+	return v;	
+}
+
+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)
+{
+	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)
 {
@@ -206,9 +262,100 @@ jvm_generate_label(gen_proc_t * p, int label_id)
 }
 
 static void
-jvm_generate_new_static(gen_proc_t * p, oberon_type_t * type)
+jvm_generate_new(gen_proc_t * p, oberon_type_t * type, int num);
+
+/*
+ * Функция 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)
+	{
+		/* Инициализируем следующую размерность */
+		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(p, type -> base, 0);
+		jvm_generate(p, 3, 0, "aastore");
+	}
+	else
+	{
+		assert(0);
+	}
+
+	/* i += 1; */
+	/* goto start */
+
+	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(gen_proc_t * p, oberon_type_t * type, int num)
 {
+	int dim;
 	char * cname;
+	char * desc;
+	oberon_type_t * base;
 
 	switch(type -> class)
 	{
@@ -217,7 +364,7 @@ jvm_generate_new_static(gen_proc_t * p, oberon_type_t * type)
 		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:
 			cname = jvm_get_class_full_name(type);
@@ -226,7 +373,32 @@ jvm_generate_new_static(gen_proc_t * p, oberon_type_t * type)
 			jvm_generate(p, 1, 0, "invokespecial %s/<init>()V", cname);
 			break;
 		case OBERON_TYPE_ARRAY:
-			gen_error("jvm_generate_new_static: TODO array");
+			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);
+
+			if(base -> class == OBERON_TYPE_RECORD)
+			{
+				jvm_generate_static_array_initialization(p, type);
+			}
 			break;
 		default:
 			gen_error("jvm_generate_new_static: unk type class %i", type -> class);
@@ -234,6 +406,32 @@ jvm_generate_new_static(gen_proc_t * p, oberon_type_t * type)
 	}
 }
 
+static void
+jvm_generate_load(gen_proc_t * p, oberon_type_t * src_type, gen_var_t * src)
+{
+	char prefix;
+	int cell_size;
+
+	cell_size = jvm_cell_size_for_type(src_type);
+
+	switch(src -> storage)
+	{
+		case JVM_STORAGE_REGISTER:
+			prefix = jvm_get_prefix(src_type);
+			jvm_generate(p, 0, cell_size, "%cload %i", prefix, src -> reg);
+			break;
+		case JVM_STORAGE_STATIC:
+			jvm_generate(p, 0, cell_size, "getstatic %s %s", src -> full_name, src -> desc);
+			break;
+		case JVM_STORAGE_FIELD:
+			jvm_generate(p, 1, cell_size, "getfield %s %s", src -> full_name, src -> desc);
+			break;
+		default:
+			gen_error("jvm_generate_load: unknow storage type %i", src -> storage);
+			break;
+	}
+}
+
 static void
 jvm_generate_store(gen_proc_t * p, oberon_type_t * src_type, gen_var_t * dst)
 {
@@ -260,49 +458,154 @@ jvm_generate_store(gen_proc_t * p, oberon_type_t * src_type, gen_var_t * dst)
 	}
 }
 
-static gen_var_t *
-oberon_generator_new_var()
-{
-	gen_var_t * v = GC_MALLOC(sizeof *v);
-	memset(v, 0, sizeof *v);
-	return v;	
-}
+/*
+ * Генерирует код для копирования полей из первой записи во вторую.
+ *  ( aref_dst aref_src -- )
+ *  dst := src;
+ */
 
 static void
-jvm_generate_and_init_global_var(gen_var_t * v, struct gen_class * class, char * access, char * name, char * desc)
+jvm_generate_copy_record(gen_proc_t * p, oberon_type_t * rec)
 {
-	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);
+	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);
 }
 
+/*
+ * Генерирует кода для копирования массивов.
+ * ( aref_dst aref_src -- )
+ * dst := src;
+ */
+
 static void
-jvm_generate_and_init_field(gen_var_t * v, struct gen_class * class, char * access, char * name, char * desc)
+jvm_generate_copy_array(gen_proc_t * p, oberon_type_t * arr)
 {
-	assert(class -> p == NULL);
-	fprintf(class -> fp, ".field %s %s %s\n\n", access, name, desc);
+	int dim = 0;
+	oberon_type_t * base = arr;
+	while(base -> class == OBERON_TYPE_ARRAY)
+	{
+		dim += 1;
+		base = base -> base;
+	}
 
-	v -> storage = JVM_STORAGE_FIELD;
-	v -> full_name = new_string("%s/%s", class -> full_name, name);
-	v -> desc = new_string(desc);
-}
+	struct {
+		gen_var_t * index;
+		gen_var_t * length;
+		int start;
+		int end;
+	} loop[dim];
+
+	gen_var_t * dst = oberon_generator_new_var();
+	gen_var_t * src = oberon_generator_new_var();
+	jvm_generate_and_init_local_var(dst, p, false);
+	jvm_generate_and_init_local_var(src, p, false);
+
+	jvm_generate_store(p, arr, src);
+	jvm_generate_store(p, arr, dst);
+
+	/* Входящие параметры заграблены
+	 * Теперь генерируем эквивалентный код:
+	 *   int i = 0;
+	 *   int len = dst.length
+	 *   while(i < len)
+	 *   {
+	 *     ...
+	 *     {
+	 *       copy from src[i, ...] to dst[i, ...];
+	 *     }
+	 *     ...
+	 *     i += 1;
+	 *   }
+	 * Где "..." такой же код (начало и конец) для следующей размерности.
+	 */
+
+	for(int i = 0; i < dim; i++)
+	{
+		loop[i].index = oberon_generator_new_var();
+		loop[i].length = oberon_generator_new_var();
+		loop[i].start = jvm_new_label_id(p);
+		loop[i].end = jvm_new_label_id(p);
+		jvm_generate_and_init_local_var(loop[i].index, p, false);
+		jvm_generate_and_init_local_var(loop[i].length, p, false);
+
+		/* TODO преределать через jvm_generate_load{{store}} */
+
+		jvm_generate(p, 0, 1, "iconst_0");
+		jvm_generate(p, 1, 0, "istore %i", loop[i].index -> reg);
+
+		jvm_generate_load(p, arr, dst);
+		jvm_generate(p, 1, 1, "arraylength");
+		jvm_generate(p, 1, 0, "istore %i", loop[i].length -> reg);
+
+		/* if(i >= len) goto end; */
+		jvm_generate_label(p, loop[i].start);
+		jvm_generate(p, 0, 1, "iload %i", loop[i].index -> reg);
+		jvm_generate(p, 0, 1, "iload %i", loop[i].length -> reg);
+		jvm_generate(p, 2, 0, "if_icmpge L%i", loop[i].end);
+	}
 
-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);
-}
+	if(base -> class == OBERON_TYPE_ARRAY)
+	{
+		// Вся эта шляпа уже должна знать о всех размерностях
+		gen_error("jvm_generate_copy_array: wat");
+	}
+	else if(base -> class == OBERON_TYPE_RECORD)
+	{
+		/* Получаем записи по индексам ( -- dst src ) */
 
-static void
-jvm_generate_and_init_named_local_var(gen_var_t * v, gen_proc_t * p, bool wide, char * name, char * desc)
-{
-	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);
+		jvm_generate_load(p, arr, dst);
+		for(int i = 0; i < dim; i++)
+		{
+			jvm_generate(p, 0, 1, "iload %i", loop[i].index -> reg);
+			jvm_generate(p, 2, 1, "aaload");
+		}
+
+		jvm_generate_load(p, arr, src);
+		for(int i = 0; i < dim; i++)
+		{
+			jvm_generate(p, 0, 1, "iload %i", loop[i].index -> reg);
+			jvm_generate(p, 2, 1, "aaload");
+		}
+
+		/* Копируем записи ( dst src -- ) */
+		jvm_generate_copy_record(p, base);
+	}
+	else
+	{
+		char postfix = jvm_get_postfix(base);
+		int cell_size = jvm_cell_size_for_postfix(postfix);
+
+		/* Получаем массивы и индексы ( -- dst i src i ) */
+
+		jvm_generate_load(p, arr, dst);
+		jvm_generate(p, 0, 1, "iload %i", loop[0].index -> reg);
+		for(int i = 1; i < dim; i++)
+		{
+			jvm_generate(p, 2, 1, "aaload");
+			jvm_generate(p, 0, 1, "iload %i", loop[i].index -> reg);
+		}
+
+		jvm_generate_load(p, arr, src);
+		jvm_generate(p, 0, 1, "iload %i", loop[0].index -> reg);
+		for(int i = 1; i < dim; i++)
+		{
+			jvm_generate(p, 2, 1, "aaload");
+			jvm_generate(p, 0, 1, "iload %i", loop[i].index -> reg);
+		}
+
+		/* Копируем значения ( dst i src i -- ) */
+		jvm_generate(p, 2, cell_size, "%caload", postfix);
+		jvm_generate(p, 2 + cell_size, 0, "%castore", postfix);
+	}
+
+	for(int i = dim - 1; i >= 0; i--)
+	{
+		jvm_generate(p, 0, 0, "iinc %i 1", loop[i].index -> reg);
+		jvm_generate(p, 0, 0, "goto L%i", loop[i].start);
+		jvm_generate_label(p, loop[i].end);
+	}
 }
 
 // ==========================================
@@ -422,13 +725,13 @@ oberon_generator_init_record(oberon_context_t * ctx, oberon_type_t * rec)
 		field = field -> next;
 	}
 
+	/* Стандартный конструктор класса */
+	/* Инициализирует внутренние статические записи и массивы */
 	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");
-
 	num = rec -> num_decl;
 	field = rec -> decl;
 	for(int i = 0; i < num; i++)
@@ -437,12 +740,53 @@ oberon_generator_init_record(oberon_context_t * ctx, oberon_type_t * rec)
 			|| field -> type -> class == OBERON_TYPE_ARRAY)
 		{
 			jvm_generate(p, 0, 1, "aload_0");
-			jvm_generate_new_static(p, field -> type);
+			jvm_generate_new(p, field -> type, 0);
 			jvm_generate_store(p, field -> type, 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);
+	gen_var_t * copy_dst = oberon_generator_new_var();
+	gen_var_t * copy_src = oberon_generator_new_var();
+	char * desc = jvm_get_descriptor(rec);
+	char * signature = new_string("(%s%s)V", desc, desc);
+	jvm_generate_function_header(p, "public static", "$COPY$", signature);
+	jvm_generate_and_init_named_local_var(copy_dst, p, false, "dst", desc);
+	jvm_generate_and_init_named_local_var(copy_src, p, false, "src", desc);
+	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, rec, copy_dst);
+			jvm_generate_load(p, field -> type, field -> gen_var);
+			jvm_generate_load(p, rec, copy_src);
+			jvm_generate_load(p, field -> type, field -> gen_var);
+			jvm_generate_copy_record(p, field -> type);
+		}
+		else if(field -> type -> class == OBERON_TYPE_ARRAY)
+		{
+			jvm_generate_load(p, rec, copy_dst);
+			jvm_generate_load(p, field -> type, field -> gen_var);
+			jvm_generate_load(p, rec, copy_src);
+			jvm_generate_load(p, field -> type, field -> gen_var);
+			jvm_generate_copy_array(p, field -> type);
+		}
+		else
+		{
+			jvm_generate_load(p, rec, copy_dst);
+			jvm_generate_load(p, rec, copy_src);
+			jvm_generate_load(p, field -> type, field -> gen_var);
+			jvm_generate_store(p, field -> type, field -> gen_var);
+		}
+		field = field -> next;
+	}
 	jvm_generate(p, 0, 0, "return");
 	jvm_generate_function_end(p);
 
@@ -540,6 +884,22 @@ oberon_generate_begin_module(oberon_context_t * ctx)
 	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");
+
+	/* Инициализация переменных объявленных в модуле */
+	oberon_object_t * x = ctx -> mod -> decl -> list -> next;
+	while(x != NULL)
+	{
+		if(x -> class == OBERON_CLASS_VAR)
+		{
+			if(x -> type -> class == OBERON_TYPE_ARRAY
+				|| x -> type -> class == OBERON_TYPE_RECORD)
+			{
+				jvm_generate_new(p, x -> type, 0);
+				jvm_generate_store(p, x -> type, x -> gen_var);
+			}
+		}
+		x = x -> next;
+	}
 }
 
 void
@@ -673,36 +1033,17 @@ oberon_generate_return(oberon_context_t * ctx, oberon_expr_t * expr)
 }
 
 static void
-jvm_push_var(gen_proc_t * p, oberon_object_t * var)
+jvm_generate_expr_new_pointer(gen_proc_t * p, oberon_type_t * type, int num, oberon_expr_t * arg)
 {
-	int cell_size = jvm_cell_size_for_type(var -> type);
+	assert(type -> class == OBERON_TYPE_POINTER);
 
-	if(var -> local)
-	{
-		int reg = var -> gen_var -> reg;
-		char prefix = jvm_get_prefix(var -> type);
-		jvm_generate(p, 0, cell_size, "%cload %i", prefix, reg);
-	}
-	else
+	for(int i = 0; i < num; 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);
+		push_expr(p, arg);
+		arg = arg -> next;
 	}
-}
 
-static void
-jvm_generate_expr_new_static(gen_proc_t * p, oberon_type_t * type, int num, oberon_expr_t * arg)
-{
-	assert(num == 0);
-	jvm_generate_new_static(p, type);
-}
-
-static void
-jvm_generate_expr_new_pointer(gen_proc_t * p, oberon_type_t * type, int num, oberon_expr_t * arg)
-{
-	assert(type -> class == OBERON_TYPE_POINTER);
-	jvm_generate_expr_new_static(p, type -> base, num, arg);
+	jvm_generate_new(p, type -> base, num);
 }
 
 static void
@@ -711,7 +1052,7 @@ push_item(gen_proc_t * p, oberon_item_t * item)
 	switch(item -> mode)
 	{
 		case MODE_VAR:
-			jvm_push_var(p, item -> var);
+			jvm_generate_load(p, item -> result, item -> var -> gen_var);
 			break;
 		case MODE_INTEGER:
 			jvm_generate_push_int(p, item -> integer);
@@ -723,16 +1064,19 @@ push_item(gen_proc_t * p, oberon_item_t * item)
 			jvm_generate_call_proc(p, (oberon_expr_t *) item);
 			break;
 		case MODE_INDEX:
-			gen_error("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:
 			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);
+			jvm_generate_load(p, item -> result, item -> var -> gen_var);
 			break;
 		case MODE_DEREF:
-			/* Все объекты представляются как увказатели */
+			/* Все объекты в jvm представляются как указатели */
 			push_item(p, item -> parent);
 			break;
 		case MODE_NIL:
@@ -770,7 +1114,7 @@ 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_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);
 }
 
@@ -781,7 +1125,7 @@ jvm_generate_compare_op(gen_proc_t * p, char prefix, int op)
 	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_prefix(prefix);
+	int cell_size = 2 * jvm_cell_size_for_postfix(prefix);
 
 	assert(prefix == 'i' || prefix == 'a');
 
@@ -822,7 +1166,7 @@ jvm_generate_compare_op(gen_proc_t * p, char prefix, int op)
 static void
 jvm_generate_operator(gen_proc_t * p, char prefix, int op)
 {
-	int cell_size = jvm_cell_size_for_prefix(prefix);
+	int cell_size = jvm_cell_size_for_postfix(prefix);
 	switch(op)
 	{
 		case OP_UNARY_MINUS:
@@ -982,14 +1326,34 @@ store_expr(gen_proc_t * p, oberon_expr_t * dst, oberon_expr_t * src)
 	assert(dst -> is_item);
 	oberon_item_t * item = (oberon_item_t *) dst;
 
-	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:
 			push_expr(p, src);
 			jvm_generate_store(p, src -> result, item -> var -> gen_var);
 			break;
 		case MODE_INDEX:
-			gen_error("store_expr: TODO 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);
@@ -1002,52 +1366,6 @@ store_expr(gen_proc_t * p, oberon_expr_t * dst, oberon_expr_t * src)
 	}
 }
 
-/*
-static void
-store_expr(gen_proc_t * p, oberon_expr_t * dst, oberon_expr_t * src)
-{
-	assert(dst -> is_item);
-	oberon_item_t * item = (oberon_item_t *) dst;
-
-	int cell_size = jvm_cell_size_for_type(src -> result);
-
-	char prefix;
-	switch(item -> mode)
-	{
-		case MODE_VAR:
-			push_expr(p, src);
-			if(item -> var -> local)
-			{
-				int reg = item -> var -> gen_var -> reg;
-				prefix = jvm_get_prefix(item -> result);
-				jvm_generate(p, cell_size, 0, "%cstore %i", prefix, reg);
-			}
-			else
-			{
-				char * fullname = jvm_get_field_full_name(item -> var);
-				char * desc = jvm_get_descriptor(item -> result);
-				jvm_generate(p, cell_size, 0, "putstatic %s %s", fullname, desc);
-			}
-			break;
-		case MODE_INDEX:
-			gen_error("store_expr: TODO index");
-			break;
-		case MODE_FIELD:
-			{
-				char * fullname = jvm_get_field_full_name(item -> var);
-				char * desc = jvm_get_descriptor(item -> result);
-				push_item(p, item -> parent);
-				push_expr(p, src);
-				jvm_generate(p, 1 + cell_size, 0, "putfield %s %s", fullname, desc);
-			}
-			break;
-		default:
-			gen_error("store_expr: unk mode %i", item -> mode);
-			break;
-	}
-}
-*/
-
 void
 oberon_generate_assign(oberon_context_t * ctx, oberon_expr_t * src, oberon_expr_t * dst)
 {