index 1d4f9702a8254b2a2064743f2a320c075176d742..da8b06b29f5142a7ea9b25cdd2e6c8ed18a00bb8 100644 (file)
#include "../../../include/oberon.h"
#include "../../oberon-internals.h"
#include "generator-jvm.h"
#include "../../../include/oberon.h"
#include "../../oberon-internals.h"
#include "generator-jvm.h"
+#include "generator-jvm-abi.h"
+#include "generator-jvm-asm.h"
#include "generator-jvm-basic.h"
#include "generator-jvm-basic.h"
-// ==========================================
-// ==========================================
-// ==========================================
-
-gen_proc_t *
-jvm_create_proc(struct gen_class * class)
-{
- gen_proc_t * p = GC_MALLOC(sizeof *p);
- memset(p, 0, sizeof *p);
-
- struct gen_register_file * rf = GC_MALLOC(sizeof *rf);
- memset(rf, 0, sizeof *rf);
-
- struct gen_stack * stack = GC_MALLOC(sizeof *stack);
- memset(rf, 0, sizeof *stack);
-
- p -> rf = rf;
- p -> stack = stack;
- p -> class = class;
- p -> label_id = 0;
-
- return p;
-}
-
-void
-jvm_generate_function_header(gen_proc_t * p, char * access, char * name, char * signature)
-{
- struct gen_class * class;
- class = p -> class;
-
- /* Делаем процедуру текущей в этом классе */
- assert(class -> p == NULL);
- class -> p = p;
-
- fprintf(class -> fp, ".method %s %s%s\n", access, name, signature);
-}
-
-void
-jvm_generate_function_end(gen_proc_t * p)
-{
- struct gen_class * class;
- class = p -> class;
-
- 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);
- fprintf(class -> fp, ".end method\n\n");
-}
-
-struct gen_class *
-jvm_create_class(char * full_name)
-{
- struct gen_class * class = GC_MALLOC(sizeof *class);
- memset(class, 0, sizeof *class);
-
- 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)
-{
- assert(class -> p == NULL);
- fclose(class -> fp);
-}
-
-static void
-jvm_stack_push(gen_proc_t * p, unsigned size)
-{
- p -> stack -> pointer += size;
- if(p -> stack -> pointer > p -> stack -> max_pointer)
- {
- p -> stack -> max_pointer = p -> stack -> pointer;
- }
-}
-
static void
static void
-jvm_stack_pop(gen_proc_t * p, unsigned size)
-{
- p -> stack -> pointer -= size;
- assert(p -> stack -> pointer >= 0);
-}
+push_item(gen_proc_t * p, oberon_item_t * item);
static void
static void
-jvm_generate(gen_proc_t * p, unsigned get, unsigned push, char * format, ...)
-{
- va_list ptr;
- va_start(ptr, format);
+jvm_generate_new(gen_proc_t * p, oberon_type_t * type, int num);
- 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);
-
- va_end(ptr);
-}
+/*
+ * Генерирует код для инициализации массива со статическим базовым типом
+ * ( aref -- )
+ */
static void
static void
-jvm_generate_push_int(gen_proc_t * p, int64_t i)
+jvm_generate_array_initialization(gen_proc_t * p, oberon_type_t * arr)
{
{
- if(i == -1)
- {
- jvm_generate(p, 0, 1, "iconst_m1");
- }
- else if(i >= 0 && i <= 5)
+ int dim = 0;
+ oberon_type_t * base = arr;
+ while(base -> class == OBERON_TYPE_ARRAY)
{
{
- jvm_generate(p, 0, 1, "iconst_%li", i);
+ dim += 1;
+ base = base -> base;
}
}
- 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)
+
+ if(base -> class != OBERON_TYPE_RECORD)
{
{
- jvm_generate(p, 0, 1, "ldc %li", i);
+ jvm_generate(p, 1, 0, "pop");
+ return;
}
}
- else
+
+ 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++)
{
{
- jvm_generate(p, 0, 2, "ldc2 %li", 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);
}
}
-}
-static void
-jvm_generate_push_float(gen_proc_t * p, double f, int size)
-{
- if(size <= 4)
+ 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++)
{
{
- 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);
- }
+ jvm_generate(p, 2, 1, "aaload");
+ jvm_generate(p, 0, 1, "iload %i", loop[i].reg_index);
}
}
- else
+ jvm_generate_new(p, base, 0);
+ jvm_generate(p, 3, 0, "aastore");
+
+ for(int i = dim - 1; i >= 0; i--)
{
{
- 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);
- }
+ 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 int
-jvm_new_label_id(gen_proc_t * p)
-{
- int label_id = p -> label_id;
- p -> label_id += 1;
- return label_id;
-}
-
-static char *
-jvm_get_label_name(int label_id)
-{
- return new_string("L%i", label_id);
-}
-
-static void
-jvm_generate_label(gen_proc_t * p, int label_id)
-{
- jvm_generate(p, 0, 0, "L%i:", label_id);
-}
-
static void
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)
{
int dim;
char * cname;
char * desc;
{
int dim;
char * cname;
char * desc;
+ oberon_type_t * base;
switch(type -> class)
{
switch(type -> class)
{
gen_error("jvm_generate_new_static: static alocation not allowed");
break;
case OBERON_TYPE_RECORD:
gen_error("jvm_generate_new_static: static alocation not allowed");
break;
case OBERON_TYPE_RECORD:
+ assert(num == 0);
cname = jvm_get_class_full_name(type);
jvm_generate(p, 0, 1, "new %s", cname);
jvm_generate(p, 1, 2, "dup");
cname = jvm_get_class_full_name(type);
jvm_generate(p, 0, 1, "new %s", cname);
jvm_generate(p, 1, 2, "dup");
break;
case OBERON_TYPE_ARRAY:
dim = 0;
break;
case OBERON_TYPE_ARRAY:
dim = 0;
+ base = type;
desc = jvm_get_descriptor(type);
desc = jvm_get_descriptor(type);
- while(type -> class == OBERON_TYPE_ARRAY)
+ 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;
dim += 1;
- jvm_generate_push_int(p, type -> size);
- type = type -> base;
+ base = base -> base;
}
}
+
+ assert(num == 0);
jvm_generate(p, dim, 1, "multianewarray %s %i", desc, dim);
jvm_generate(p, dim, 1, "multianewarray %s %i", desc, dim);
+ jvm_generate(p, 1, 2, "dup");
+ jvm_generate_array_initialization(p, type);
break;
default:
gen_error("jvm_generate_new_static: unk type class %i", type -> class);
break;
default:
gen_error("jvm_generate_new_static: unk type class %i", type -> class);
}
}
}
}
+/*
+ * Генерирует код для копирования полей из первой записи во вторую.
+ * ( aref_dst aref_src -- )
+ * dst := src;
+ */
+
static void
static void
-jvm_generate_store(gen_proc_t * p, oberon_type_t * src_type, gen_var_t * dst)
+jvm_generate_copy_record(gen_proc_t * p, oberon_type_t * rec)
{
{
- char prefix;
- int cell_size;
+ 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;
+ */
- cell_size = jvm_cell_size_for_type(src_type);
+static void
+jvm_generate_copy_array(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;
+ }
- switch(dst -> storage)
+ 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++)
{
{
- 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;
+ 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 gen_var_t *
-oberon_generator_new_var()
-{
- gen_var_t * v = GC_MALLOC(sizeof *v);
- memset(v, 0, sizeof *v);
- return v;
-}
+ if(base -> class == OBERON_TYPE_RECORD)
+ {
+ /* Получаем записи по индексам ( -- dst src ) */
-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);
+ 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");
+ }
- v -> storage = JVM_STORAGE_STATIC;
- v -> full_name = new_string("%s/%s", class -> full_name, name);
- v -> desc = new_string(desc);
-}
+ 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");
+ }
-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);
+ /* Копируем записи ( dst src -- ) */
+ jvm_generate_copy_record(p, base);
+ }
+ else
+ {
+ char postfix = jvm_get_postfix(base);
+ int cell_size = jvm_cell_size_for_postfix(postfix);
- v -> storage = JVM_STORAGE_FIELD;
- v -> full_name = new_string("%s/%s", class -> full_name, name);
- v -> desc = new_string(desc);
-}
+ /* Получаем массивы и индексы ( -- dst i src i ) */
-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);
+ 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(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);
+ }
+
+ 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
}
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_push_procedure_pointer(gen_proc_t * p, oberon_object_t * proc)
{
{
- 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);
+ 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);
}
}
-// ==========================================
-// ==========================================
-// ==========================================
-
void
oberon_generator_init_context(oberon_context_t * ctx)
{
void
oberon_generator_init_context(oberon_context_t * ctx)
{
fprintf(fp, ".class public abstract %s\n", cname);
fprintf(fp, ".super java/lang/Object\n\n");
fprintf(fp, ".class public abstract %s\n", cname);
fprintf(fp, ".super java/lang/Object\n\n");
- 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, " aload_0\n");
fprintf(fp, " invokespecial java/lang/Object/<init>()V\n");
fprintf(fp, " return\n");
jvm_destroy_class(class);
}
jvm_destroy_class(class);
}
+static void
+oberon_generate_procedure_pointer_class(oberon_object_t * proc)
+{
+ FILE * fp;
+ char * cname;
+ char * abscname;
+ char * absdesc;
+ char * signature;
+ struct gen_class * class;
+
+ cname = jvm_get_field_full_name_safe(proc);
+ class = jvm_create_class(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 <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_var_t * v = oberon_generator_new_var();
+ gen_type_t * t = param -> type -> gen_type;
+ use_size += t -> cell_size;
+ if(param -> class == OBERON_CLASS_VAR_PARAM)
+ {
+ jvm_generate_and_init_var_param(p, v, param -> name, t);
+ jvm_generate_ldst_prepare(p, v);
+ }
+ else
+ {
+ jvm_generate_and_init_named_local_var(p, v, param -> name, t);
+ jvm_generate_load(p, v);
+ }
+ 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_VOID)
+ {
+ 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(gen_module_t * m, oberon_type_t * rec)
{
static void
oberon_generate_record_class(gen_module_t * m, oberon_type_t * rec)
{
fprintf(class -> fp, ".source %s\n", rec -> module -> name);
fprintf(class -> fp, ".class public %s\n", cname);
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");
+
+ 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 -> class = class;
}
rec -> gen_type -> class = class;
}
memset(t, 0, sizeof *t);
type -> gen_type = t;
memset(t, 0, sizeof *t);
type -> gen_type = t;
+ if(type -> class != OBERON_TYPE_VOID)
+ {
+ t -> wide = jvm_is_wide_type(type);
+ t -> prefix = jvm_get_prefix(type);
+ t -> postfix = jvm_get_postfix(type);
+ }
+ t -> cell_size = jvm_cell_size_for_type(type);
+ t -> desc = jvm_get_descriptor(type);
+
switch(type -> class)
{
case OBERON_TYPE_VOID:
case OBERON_TYPE_INTEGER:
case OBERON_TYPE_BOOLEAN:
case OBERON_TYPE_ARRAY:
switch(type -> class)
{
case OBERON_TYPE_VOID:
case OBERON_TYPE_INTEGER:
case OBERON_TYPE_BOOLEAN:
case OBERON_TYPE_ARRAY:
+ case OBERON_TYPE_POINTER:
case OBERON_TYPE_REAL:
case OBERON_TYPE_REAL:
+ case OBERON_TYPE_CHAR:
+ case OBERON_TYPE_STRING:
+ case OBERON_TYPE_SET:
break;
case OBERON_TYPE_RECORD:
;
break;
case OBERON_TYPE_RECORD:
;
case OBERON_TYPE_PROCEDURE:
oberon_generate_procedure_class(type);
break;
case OBERON_TYPE_PROCEDURE:
oberon_generate_procedure_class(type);
break;
- case OBERON_TYPE_POINTER:
- break;
default:
gen_error("oberon_generator_init_type: unk calss %i", type -> class);
break;
default:
gen_error("oberon_generator_init_type: unk calss %i", type -> class);
break;
oberon_object_t * field = rec -> decl;
for(int i = 0; i < num; i++)
{
oberon_object_t * field = rec -> decl;
for(int i = 0; i < num; i++)
{
- gen_var_t * v = field -> gen_var;
char * name = field -> name;
char * name = field -> name;
- char * desc = jvm_get_descriptor(field -> type);
- jvm_generate_and_init_field(v, class, "public", name, desc);
+ gen_var_t * v = field -> gen_var;
+ gen_type_t * t = field -> type -> gen_type;
+ jvm_generate_and_init_field(class, v, name, t);
field = field -> next;
}
field = field -> next;
}
+ /* Стандартный конструктор класса */
+ /* Инициализирует внутренние статические записи и массивы */
gen_proc_t * p = jvm_create_proc(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_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");
-
+ 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++)
{
num = rec -> num_decl;
field = rec -> decl;
for(int i = 0; i < num; i++)
{
+ jvm_generate(p, 0, 1, "aload_0");
+ jvm_generate_variable_initialization(p, field -> gen_var);
+
if(field -> type -> class == OBERON_TYPE_RECORD
|| field -> type -> class == OBERON_TYPE_ARRAY)
{
jvm_generate(p, 0, 1, "aload_0");
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);
+ 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;
}
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 * signature = new_string("(%s%s)V", rec -> gen_type -> desc, rec -> gen_type -> desc);
+ jvm_generate_function_header(p, "public static", "$COPY$", signature);
+ jvm_generate_and_init_named_local_var(p, copy_dst, "dst", rec -> gen_type);
+ jvm_generate_and_init_named_local_var(p, copy_src, "src", rec -> gen_type);
+ 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_generate(p, 0, 0, "return");
jvm_generate_function_end(p);
struct gen_class * class;
class = m -> class;
struct gen_class * class;
class = m -> class;
- char * desc;
switch(var -> class)
{
case OBERON_CLASS_VAR_PARAM:
switch(var -> class)
{
case OBERON_CLASS_VAR_PARAM:
- gen_error("generator: VAR-parameters not implemented");
- break;
case OBERON_CLASS_PARAM:
/* Заполняется при генерации функции */
/* смотри jvm_init_local_object() */
case OBERON_CLASS_PARAM:
/* Заполняется при генерации функции */
/* смотри jvm_init_local_object() */
/* смотри oberon_generator_init_record() */
break;
case OBERON_CLASS_VAR:
/* смотри oberon_generator_init_record() */
break;
case OBERON_CLASS_VAR:
- /* Локальные заполняются при генерации функции */
+ /* Локальные заполняются при генерации функции */
/* смотри jvm_init_local_object() */
/* смотри jvm_init_local_object() */
- if(var -> local == 0)
+ if(var -> local == false)
{
{
- desc = jvm_get_descriptor(var -> type);
- jvm_generate_and_init_global_var(v, class, "public", var -> name, desc);
+ jvm_generate_and_init_global_var(class, v, var -> name, var -> type -> gen_type);
}
break;
default:
}
break;
default:
}
}
}
}
+void
+oberon_generator_init_temp_var(oberon_context_t * ctx, oberon_object_t * var)
+{
+ assert(var -> class == OBERON_CLASS_VAR);
+
+ gen_var_t * v = oberon_generator_new_var();
+ var -> gen_var = v;
+
+ gen_module_t * m;
+ m = ctx -> mod -> gen_mod;
+
+ gen_proc_t * p;
+ p = m -> class -> p;
+
+ jvm_generate_and_init_local_var(p, v, var -> type -> gen_type);
+}
+
void
oberon_generator_init_proc(oberon_context_t * ctx, oberon_object_t * proc)
{
void
oberon_generator_init_proc(oberon_context_t * ctx, oberon_object_t * proc)
{
{
gen_error("generator: local procedures not implemented");
}
{
gen_error("generator: local procedures not implemented");
}
+ else
+ {
+ oberon_generate_procedure_pointer_class(proc);
+ }
}
void
}
void
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_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)
+ {
+ jvm_generate_variable_initialization(p, x -> gen_var);
+ if(x -> type -> class == OBERON_TYPE_ARRAY
+ || x -> type -> class == OBERON_TYPE_RECORD)
+ {
+ jvm_generate_ldst_prepare(p, x -> gen_var);
+ jvm_generate_new(p, x -> type, 0);
+ jvm_generate_store(p, x -> gen_var);
+ }
+ }
+
+ x = x -> next;
+ }
}
void
}
void
jvm_generate_function_end(class -> p);
}
jvm_generate_function_end(class -> p);
}
+/*
+ * Генерирует код для получения размера измерения массива
+ * Аналог Обероновского 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_init_local_object(gen_proc_t * p, oberon_object_t * x)
{
gen_var_t * v;
static void
jvm_init_local_object(gen_proc_t * p, oberon_object_t * x)
{
gen_var_t * v;
- bool wide;
- char * desc;
struct gen_class * class;
v = x -> gen_var;
class = p -> class;
struct gen_class * class;
v = x -> gen_var;
class = p -> class;
- wide = jvm_is_wide_type(x -> type);
- desc = jvm_get_descriptor(x -> type);
// Убеждаемся что сейчас находимся в функции
assert(class -> p);
// Убеждаемся что сейчас находимся в функции
assert(class -> p);
switch(x -> class)
{
switch(x -> class)
{
+ case OBERON_CLASS_VAR_PARAM:
+ jvm_generate_and_init_var_param(p, v, x -> name, x -> type -> gen_type);
+ break;
case OBERON_CLASS_VAR:
case OBERON_CLASS_PARAM:
case OBERON_CLASS_VAR:
case OBERON_CLASS_PARAM:
- jvm_generate_and_init_named_local_var(v, p, wide, x -> name, desc);
+ jvm_generate_and_init_named_local_var(p, v, x -> name, x -> type -> gen_type);
break;
default:
gen_error("jvm_init_local_object: wat");
break;
default:
gen_error("jvm_init_local_object: wat");
}
}
}
}
+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:
+ break;
+ case OBERON_CLASS_VAR:
+ jvm_generate_variable_initialization(p, v);
+ break;
+ case OBERON_CLASS_PARAM:
+ jvm_generate_param_initialization(p, v);
+ break;
+ default:
+ gen_error("jvm_generate_local_initialization: wat");
+ break;
+ }
+}
+
void
oberon_generate_begin_proc(oberon_context_t * ctx, oberon_object_t * proc)
{
void
oberon_generate_begin_proc(oberon_context_t * ctx, oberon_object_t * proc)
{
p = proc -> gen_proc;
signature = jvm_get_procedure_signature(proc -> type);
p = proc -> gen_proc;
signature = jvm_get_procedure_signature(proc -> type);
-
jvm_generate_function_header(p, "public static", proc -> name, signature);
jvm_generate_function_header(p, "public static", proc -> name, signature);
- oberon_object_t * var = proc -> type -> decl;
+ /* Выделение регистров под параметры и переменные */
+ oberon_object_t * var = proc -> scope -> list -> next;
while(var)
{
jvm_init_local_object(p, var);
var = var -> next;
}
while(var)
{
jvm_init_local_object(p, var);
var = var -> next;
}
+
+ /* Инициализация */
+ var = proc -> scope -> list -> next;
+ while(var)
+ {
+ jvm_generate_local_initialization(p, var);
+ var = var -> next;
+ }
+
+ /* Копирование статических/открытых массивов и записей */
+ var = proc -> type -> decl;
+ while(var)
+ {
+ if(var -> class == OBERON_CLASS_PARAM || var -> class == OBERON_CLASS_VAR_PARAM)
+ {
+ if(var -> type -> class == OBERON_TYPE_ARRAY)
+ {
+ jvm_generate_array_duplicate_and_replace(p, var -> gen_var, var -> type);
+ }
+ else if(var -> type -> class == OBERON_TYPE_RECORD)
+ {
+ jvm_generate_record_duplicate_and_replace(p, var -> gen_var, var -> type);
+ }
+ }
+ var = var -> next;
+ }
}
void
}
void
jvm_generate_function_end(p);
}
jvm_generate_function_end(p);
}
+gen_label_t *
+oberon_generator_reserve_label(oberon_context_t * ctx)
+{
+ gen_module_t * m;
+ gen_proc_t * p;
+ gen_label_t * l;
+
+ m = ctx -> mod -> gen_mod;
+ p = m -> class -> p;
+
+ l = GC_MALLOC(sizeof *l);
+ memset(l, 0, sizeof *l);
+
+ l -> id = jvm_new_label_id(p);
+ return l;
+}
+
+void
+oberon_generate_label(oberon_context_t * ctx, gen_label_t * l)
+{
+ gen_module_t * m;
+ gen_proc_t * p;
+
+ m = ctx -> mod -> gen_mod;
+ p = m -> class -> p;
+
+ jvm_generate_label(p, l -> id);
+}
+
+void
+oberon_generate_goto(oberon_context_t * ctx, gen_label_t * l)
+{
+ gen_module_t * m;
+ gen_proc_t * p;
+
+ m = ctx -> mod -> gen_mod;
+ p = m -> class -> p;
+
+ jvm_generate(p, 0, 0, "goto L%i", l -> id);
+}
+
+void
+oberon_generate_branch(oberon_context_t * ctx, oberon_expr_t * cond, bool gotoif, gen_label_t * l)
+{
+ gen_module_t * m;
+ gen_proc_t * p;
+
+ m = ctx -> mod -> gen_mod;
+ p = m -> class -> p;
+
+ push_expr(p, cond);
+
+ if(gotoif == false)
+ {
+ /* переход если false */
+ jvm_generate(p, 1, 0, "ifeq L%i", l -> id);
+ }
+ else
+ {
+ /* переход если true */
+ jvm_generate(p, 1, 0, "ifne L%i", l -> id);
+ }
+}
+
static void
static void
-jvm_generate_call_proc(gen_proc_t * p, oberon_expr_t * desig)
+push_varptr(gen_proc_t * p, oberon_expr_t * expr)
{
{
- assert(desig -> is_item);
- assert(desig -> item.mode == MODE_CALL);
-
- oberon_object_t * proc;
- char * fullname;
- char * signature;
+ assert(expr -> is_item);
- proc = desig -> item.var;
- fullname = jvm_get_field_full_name(proc);
- signature = jvm_get_procedure_signature(proc -> type);
+ switch(expr -> item.mode)
+ {
+ case MODE_VAR:
+ jvm_generate_ldst_prepare(p, expr -> item.var -> gen_var);
+ break;
+ case MODE_INDEX:
+ push_item(p, (oberon_item_t *) expr -> item.parent);
+ push_expr(p, expr -> item.args);
+ break;
+ case MODE_FIELD:
+ push_item(p, (oberon_item_t *) expr -> item.parent);
+ jvm_generate_ldst_prepare(p, expr -> item.var -> gen_var);
+ 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);
+
+ char * signature = NULL;
+
+ bool direct_call = false;
+ if(desig -> parent -> mode == MODE_VAR)
+ {
+ if(desig -> parent -> var -> class == OBERON_CLASS_PROC)
+ {
+ direct_call = true;
+ }
+ }
+
+ printf("direct_call == %i\n", direct_call);
+
+ oberon_type_t * procsig;
+ procsig = desig -> parent -> result;
+ signature = jvm_get_procedure_signature(procsig);
+
+ if(direct_call == false)
+ {
+ /* Загружаем указатель на процедуру */
+ push_item(p, desig -> parent);
+ }
int args_cells = 0;
int args_cells = 0;
- int result_cells = jvm_cell_size_for_type(proc -> type -> base);
+ int result_cells = jvm_cell_size_for_type(procsig -> base);
- int num = desig -> item.num_args;
- oberon_expr_t * arg = desig -> item.args;
+ int num = desig -> num_args;
+ oberon_expr_t * arg = desig -> args;
+ oberon_object_t * param = procsig -> decl;
for(int i = 0; i < num; i++)
{
for(int i = 0; i < num; i++)
{
- args_cells += jvm_cell_size_for_type(arg -> result);
- push_expr(p, arg);
+ 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;
arg = arg -> next;
+ param = param -> next;
}
}
- jvm_generate(p, args_cells, result_cells, "invokestatic %s%s", fullname, signature);
+ if(direct_call)
+ {
+ char * full_name = jvm_get_field_full_name(desig -> parent -> var);
+ jvm_generate(p, args_cells, result_cells, "invokestatic %s%s", full_name, signature);
+ }
+ else
+ {
+ char * cname = jvm_get_class_full_name(procsig);
+ jvm_generate(p, 1 + args_cells, result_cells, "invokevirtual %s/invoke%s", cname, signature);
+ }
}
void
oberon_generate_call_proc(oberon_context_t * ctx, oberon_expr_t * desig)
{
}
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);
+ assert(desig -> is_item);
+ jvm_generate_call_proc(ctx -> mod -> gen_mod -> class -> p, (oberon_item_t *) desig);
}
void
}
void
}
static void
}
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);
+ jvm_generate_new(p, type -> base, num);
}
static void
}
static void
-jvm_generate_expr_new_pointer(gen_proc_t * p, oberon_type_t * type, int num, oberon_expr_t * arg)
+jvm_generate_cast_type(gen_proc_t * p, oberon_type_t * from, oberon_type_t * to)
{
{
- assert(type -> class == OBERON_TYPE_POINTER);
- jvm_generate_expr_new_static(p, type -> base, num, arg);
+ if(to -> class == OBERON_TYPE_RECORD || to -> class == OBERON_TYPE_POINTER)
+ {
+ char * full_name = jvm_get_class_full_name(to);
+ jvm_generate(p, 1, 1, "checkcast %s", full_name);
+ }
+ else
+ {
+ char prefix = jvm_get_prefix(from);
+ char postfix = jvm_get_postfix(to);
+ int from_cell_size = jvm_cell_size_for_type(from);
+ int to_cell_size = jvm_cell_size_for_type(to);
+
+ jvm_generate_comment(p, "cast type class from %i(%i) to %i(%i)", from -> class, from -> size, to -> class, to -> size);
+
+ if(prefix == postfix)
+ {
+ return;
+ }
+
+ jvm_generate(p, from_cell_size, to_cell_size, "%c2%c", prefix, postfix);
+ }
}
static void
}
static void
switch(item -> mode)
{
case MODE_VAR:
switch(item -> mode)
{
case MODE_VAR:
- jvm_push_var(p, item -> 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:
break;
case MODE_INTEGER:
- jvm_generate_push_int(p, item -> integer);
+ case MODE_CHAR:
+ case MODE_SET:
+ jvm_generate_push_int_size(p, item -> integer, item -> result -> size);
break;
case MODE_BOOLEAN:
break;
case MODE_BOOLEAN:
- jvm_generate_push_int(p, item -> boolean);
+ jvm_generate_push_int_size(p, item -> boolean, item -> result -> size);
break;
case MODE_CALL:
break;
case MODE_CALL:
- jvm_generate_call_proc(p, (oberon_expr_t *) item);
+ 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);
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);
+ assert(item -> parent -> is_item);
+ push_item(p, (oberon_item_t *) item -> parent);
push_expr(p, item -> args);
jvm_generate(p, 1 + 1, cell_size, "%caload", postfix);
break;
case MODE_FIELD:
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);
+ assert(item -> parent -> is_item);
+ push_item(p, (oberon_item_t *) item -> parent);
+ jvm_generate_load(p, item -> var -> gen_var);
break;
case MODE_DEREF:
break;
case MODE_DEREF:
- /* Все объекты представляются как увказатели */
- push_item(p, item -> parent);
+ /* Все объекты в jvm представляются как указатели */
+ assert(item -> parent -> is_item);
+ push_item(p, (oberon_item_t *) item -> parent);
break;
case MODE_NIL:
jvm_generate(p, 0, 1, "aconst_null");
break;
case MODE_NIL:
jvm_generate(p, 0, 1, "aconst_null");
case MODE_REAL:
jvm_generate_push_float(p, item -> real, item -> result -> size);
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;
default:
gen_error("push_item: unk mode %i", item -> mode);
break;
default:
gen_error("push_item: unk mode %i", item -> mode);
break;
{
int label_done = jvm_new_label_id(p);
int label_false = jvm_new_label_id(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, 1, 0, "ifne L%i", label_false);
jvm_generate(p, 0, 1, "iconst_1");
jvm_generate(p, 0, 1, "iconst_1");
- jvm_generate(p, 0, 0, "goto %s", label_name_done);
+ jvm_generate(p, 0, 0, "goto L%i", label_done);
jvm_generate_label(p, label_false);
jvm_generate(p, 0, 1, "iconst_0");
jvm_generate_label(p, label_done);
jvm_generate_label(p, label_false);
jvm_generate(p, 0, 1, "iconst_0");
jvm_generate_label(p, label_done);
jvm_generate(p, cell_size, cell_size, "invokestatic java/lang/Math/abs(%c)%c", t, t);
}
jvm_generate(p, cell_size, cell_size, "invokestatic java/lang/Math/abs(%c)%c", t, t);
}
-static void
-jvm_generate_compare_op(gen_proc_t * p, char prefix, int op)
+static char *
+jvm_get_compare_postfix(int op)
{
{
- int label_true = jvm_new_label_id(p);
- int label_done = jvm_new_label_id(p);
- char * label_name_true = jvm_get_label_name(label_true);
- char * label_name_done = jvm_get_label_name(label_done);
- int cell_size = 2 * jvm_cell_size_for_postfix(prefix);
-
- assert(prefix == 'i' || prefix == 'a');
-
- const char * cmpop = "";
+ char * cmpop = "";
switch(op)
{
case OP_EQ:
switch(op)
{
case OP_EQ:
gen_error("jvm_generate_compare_op: wat");
break;
}
gen_error("jvm_generate_compare_op: wat");
break;
}
+ return cmpop;
+}
+
+static void
+jvm_generate_compare_op(gen_proc_t * p, oberon_type_t * t, int op)
+{
+ char prefix = jvm_get_prefix(t);
+ int label_true = jvm_new_label_id(p);
+ int label_done = jvm_new_label_id(p);
+ int cell_size = jvm_cell_size_for_type(t);
+ char * cmpop = jvm_get_compare_postfix(op);
+
+ if(prefix == 'l')
+ {
+ jvm_generate(p, 2 * cell_size, 1, "lcmp");
+ jvm_generate(p, 1, 1, "if%s L%i", cmpop, label_true);
+ }
+ else if(prefix == 'f' || prefix == 'd')
+ {
+ char fop;
+ if(op == OP_EQ || op == OP_NEQ || op == OP_GRT || op == OP_GEQ)
+ {
+ fop = 'l';
+ }
+ else
+ {
+ fop = 'g';
+ }
+ jvm_generate(p, 2 * cell_size, 1, "%ccmp%c", prefix, fop);
+ jvm_generate(p, 1, 1, "if%s L%i", cmpop, label_true);
+ }
+ else
+ {
+ jvm_generate(p, 2 * cell_size, 0, "if_%ccmp%s L%i", prefix, cmpop, label_true);
+ }
- jvm_generate(p, cell_size, 0, "if_%ccmp%s %s", prefix, cmpop, label_name_true);
jvm_generate(p, 0, 1, "iconst_0");
jvm_generate(p, 0, 1, "iconst_0");
- jvm_generate(p, 0, 0, "goto %s", label_name_done);
+ jvm_generate(p, 0, 0, "goto L%i", label_done);
jvm_generate_label(p, label_true);
jvm_generate(p, 0, 1, "iconst_1");
jvm_generate_label(p, label_done);
}
static void
jvm_generate_label(p, label_true);
jvm_generate(p, 0, 1, "iconst_1");
jvm_generate_label(p, label_done);
}
static void
-jvm_generate_operator(gen_proc_t * p, char prefix, int op)
+jvm_generate_operator(gen_proc_t * p, oberon_type_t * t, int op)
{
{
- int cell_size = jvm_cell_size_for_postfix(prefix);
+ char prefix = jvm_get_prefix(t);
+ int cell_size = jvm_cell_size_for_type(t);
switch(op)
{
case OP_UNARY_MINUS:
jvm_generate(p, cell_size, cell_size, "%cneg", prefix);
break;
switch(op)
{
case OP_UNARY_MINUS:
jvm_generate(p, cell_size, cell_size, "%cneg", prefix);
break;
- case OP_BITWISE_NOT:
- jvm_generate_push_int(p, -1);
+ case OP_COMPLEMENTATION:
+ jvm_generate_push_int_size(p, -1, t -> size);
jvm_generate(p, 2 * cell_size, cell_size, "%cxor", prefix);
break;
case OP_LOGIC_NOT:
jvm_generate(p, 2 * cell_size, cell_size, "%cxor", prefix);
break;
case OP_LOGIC_NOT:
case OP_MOD:
jvm_generate(p, 2 * cell_size, cell_size, "%crem", prefix);
break;
case OP_MOD:
jvm_generate(p, 2 * cell_size, cell_size, "%crem", prefix);
break;
- case OP_BITWISE_AND:
+ case OP_UNION:
+ jvm_generate(p, 2 * cell_size, cell_size, "%cor", prefix);
+ break;
+ case OP_INTERSECTION:
jvm_generate(p, 2 * cell_size, cell_size, "%cand", prefix);
break;
jvm_generate(p, 2 * cell_size, cell_size, "%cand", prefix);
break;
- case OP_BITWISE_XOR:
+ case OP_DIFFERENCE:
+ jvm_generate_push_int_size(p, -1, t -> size);
jvm_generate(p, 2 * cell_size, cell_size, "%cxor", prefix);
jvm_generate(p, 2 * cell_size, cell_size, "%cxor", prefix);
+ jvm_generate(p, 2 * cell_size, cell_size, "%cand", prefix);
break;
break;
- case OP_BITWISE_OR:
- jvm_generate(p, 2 * cell_size, cell_size, "%cor", prefix);
+ case OP_SYM_DIFFERENCE:
+ jvm_generate(p, 2 * cell_size, cell_size, "%cxor", prefix);
break;
case OP_EQ:
break;
case OP_EQ:
case OP_LEQ:
case OP_GRT:
case OP_GEQ:
case OP_LEQ:
case OP_GRT:
case OP_GEQ:
- jvm_generate_compare_op(p, prefix, op);
+ jvm_generate_compare_op(p, t, op);
break;
default:
gen_error("jvm_generate_operator: unk op %i", op);
break;
default:
gen_error("jvm_generate_operator: unk op %i", op);
@@ -898,15 +1364,13 @@ 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);
{
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);
/* a OR b -- если a, то TRUE, иначе b */
push_expr(p, a);
- jvm_generate(p, 1, 0, "ifne %s", label_name_calc_b);
+ jvm_generate(p, 1, 0, "ifeq L%i", label_calc_b);
jvm_generate(p, 0, 1, "iconst_1");
jvm_generate(p, 0, 1, "iconst_1");
- jvm_generate(p, 0, 0, "goto %s", label_name_done);
+ jvm_generate(p, 0, 0, "goto L%i", label_done);
jvm_generate_label(p, label_calc_b);
push_expr(p, b);
jvm_generate_label(p, label_done);
jvm_generate_label(p, label_calc_b);
push_expr(p, b);
jvm_generate_label(p, label_done);
@@ -917,33 +1381,122 @@ 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);
{
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);
/* a AND b -- если a, то b, иначе FALSE */
push_expr(p, a);
- jvm_generate(p, 1, 0, "ifne %s", label_name_false);
+ jvm_generate(p, 1, 0, "ifeq L%i", label_false);
push_expr(p, b);
push_expr(p, b);
- jvm_generate(p, 0, 0, "goto %s", label_name_done);
+ jvm_generate(p, 0, 0, "goto L%i", label_done);
jvm_generate_label(p, label_false);
jvm_generate(p, 0, 1, "iconst_0");
jvm_generate_label(p, 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 = oberon_generator_new_var();
+ rb = oberon_generator_new_var();
+ jvm_generate_and_init_local_var(p, ra, type -> gen_type);
+ jvm_generate_and_init_local_var(p, rb, type -> gen_type);
+ 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);
+
+ jvm_generate_push_int_size(p, 1, t -> size);
+ push_expr(p, a);
+ jvm_generate(p, 2 * cell_size, cell_size, "%cshl", prefix);
+ push_expr(p, b);
+ jvm_generate(p, 2 * cell_size, cell_size, "%cand", prefix);
+
+ if(cell_size > 1)
+ {
+ jvm_generate(p, cell_size, 0, "lcmp");
+ }
+
+ jvm_generate(p, 1, 0, "ifeq L%i", label_else);
+ jvm_generate(p, 0, 1, "iconst_1");
+ jvm_generate(p, 0, 0, "goto L%i", label_end);
+ jvm_generate_label(p, label_else);
+ jvm_generate(p, 0, 1, "iconst_0");
+ jvm_generate_label(p, label_end);
+}
+
static void
push_operator(gen_proc_t * p, oberon_oper_t * oper)
{
static void
push_operator(gen_proc_t * p, oberon_oper_t * oper)
{
- char prefix = jvm_get_prefix(oper -> result);
+ oberon_type_t * preq = oper -> left -> result;
int op = oper -> op;
switch(op)
{
int op = oper -> op;
switch(op)
{
+ case OP_CAST:
+ push_expr(p, oper -> left);
+ jvm_generate_cast_type(p, oper -> left -> result, oper -> result);
+ break;
+ case OP_COMPLEMENTATION:
case OP_UNARY_MINUS:
case OP_UNARY_MINUS:
- case OP_BITWISE_NOT:
case OP_LOGIC_NOT:
case OP_ABS:
push_expr(p, oper -> left);
case OP_LOGIC_NOT:
case OP_ABS:
push_expr(p, oper -> left);
- jvm_generate_operator(p, prefix, op);
+ jvm_generate_operator(p, preq, op);
break;
case OP_ADD:
break;
case OP_ADD:
case OP_MUL:
case OP_DIV:
case OP_MOD:
case OP_MUL:
case OP_DIV:
case OP_MOD:
- case OP_BITWISE_AND:
- case OP_BITWISE_XOR:
- case OP_BITWISE_OR:
+
+ case OP_UNION:
+ case OP_INTERSECTION:
+ case OP_DIFFERENCE:
+ case OP_SYM_DIFFERENCE:
case OP_EQ:
case OP_NEQ:
case OP_EQ:
case OP_NEQ:
case OP_GEQ:
push_expr(p, oper -> left);
push_expr(p, oper -> right);
case OP_GEQ:
push_expr(p, oper -> left);
push_expr(p, oper -> right);
- jvm_generate_operator(p, prefix, op);
+ jvm_generate_operator(p, preq, op);
break;
case OP_LOGIC_OR:
break;
case OP_LOGIC_OR:
case OP_LOGIC_AND:
jvm_generate_logical_and(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;
default:
gen_error("push_oper: unk op %i", op);
break;
default:
gen_error("push_oper: unk op %i", op);
break;
if(dst -> result -> class == OBERON_TYPE_ARRAY
|| src -> result -> class == OBERON_TYPE_ARRAY)
{
if(dst -> result -> class == OBERON_TYPE_ARRAY
|| src -> result -> class == OBERON_TYPE_ARRAY)
{
- gen_error("array copy not implemented");
+ 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)
{
}
else if(dst -> result -> class == OBERON_TYPE_RECORD
|| src -> result -> class == OBERON_TYPE_RECORD)
{
- gen_error("record copy not implemented");
+ push_expr(p, dst);
+ push_expr(p, src);
+ jvm_generate_copy_record(p, dst -> result);
}
}
-
- switch(item -> mode)
+ else switch(item -> mode)
{
case MODE_VAR:
{
case MODE_VAR:
+ jvm_generate_ldst_prepare(p, item -> var -> gen_var);
push_expr(p, src);
push_expr(p, src);
- jvm_generate_store(p, src -> result, item -> var -> gen_var);
+ 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);
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);
+ assert(item -> parent -> is_item);
+ push_item(p, (oberon_item_t *) 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_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);
+ 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);
push_expr(p, src);
- jvm_generate_store(p, src -> result, item -> var -> gen_var);
+ jvm_generate_store(p, item -> var -> gen_var);
break;
default:
gen_error("store_expr: unk mode %i", item -> mode);
break;
default:
gen_error("store_expr: unk mode %i", item -> mode);