index d609ed8de96c216a30ac4ec9bceda90ec230583e..065d9634c48a73b4b3900e63a17fd3e6f5a7ff6e 100644 (file)
#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"
-// ==========================================
-// ==========================================
-// ==========================================
-
-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);
- fprintf(class -> fp, " start:\n");
-}
-
-void
-jvm_generate_function_end(gen_proc_t * p)
-{
- 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:\n");
- 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
-jvm_stack_pop(gen_proc_t * p, unsigned size)
-{
- p -> stack -> pointer -= size;
-
- if(p -> stack -> pointer < 0)
- {
- printf("WARING: stack pointer %i\n", p -> stack -> pointer);
- }
-}
-
-static void
-jvm_generate(gen_proc_t * p, unsigned get, unsigned push, char * format, ...)
-{
- 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_comment(gen_proc_t * p, char * format, ...)
-{
- va_list ptr;
- va_start(ptr, format);
-
- fprintf(p -> class -> fp, " ;;;; ");
- vfprintf(p -> class -> fp, format, ptr);
- fprintf(p -> class -> fp, "\n");
-
- va_end(ptr);
-}
-
-static void
-jvm_generate_push_int(gen_proc_t * p, int64_t i)
-{
- if(i == -1)
- {
- 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_w %li", i);
- }
-}
-
-static void
-jvm_generate_push_int_size(gen_proc_t * p, int64_t i, int size)
-{
- int pushed_cell = 1;
-
- if(i == -1)
- {
- 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
- {
- pushed_cell = 2;
- jvm_generate(p, 0, 2, "ldc2_w %li", i);
- }
-
- assert(size <= 8);
- if(size > 4 && pushed_cell == 1)
- {
- jvm_generate(p, pushed_cell, 2, "i2l");
- }
- else if(size <= 4)
- {
- if(pushed_cell > 1)
- {
- jvm_generate(p, 2, 1, "l2i");
- }
-
- if(size == 2)
- {
- jvm_generate(p, 1, 1, "i2s");
- }
- else if(size == 1)
- {
- jvm_generate(p, 1, 1, "i2b");
- }
- }
-}
-
-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_w %lf", f);
- }
- }
-}
-
-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)
-{
- 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
-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)
-{
- char prefix;
- int cell_size;
-
- cell_size = jvm_cell_size_for_type(src_type);
-
- switch(dst -> storage)
- {
- 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;
- }
-}
+push_item(gen_proc_t * p, oberon_item_t * item);
static void
jvm_generate_new(gen_proc_t * p, oberon_type_t * type, int num);
}
struct {
- gen_var_t * index;
- gen_var_t * length;
+ int reg_index;
+ int reg_length;
int start;
int end;
} loop[dim];
- gen_var_t * dst = oberon_generator_new_var();
- jvm_generate_and_init_local_var(dst, p, false);
- jvm_generate_store(p, arr, dst);
+ int reg_dst;
+ reg_dst = jvm_alloc_register_untyped(p -> rf, false);
+ jvm_generate(p, 1, 0, "astore %i", reg_dst);
/*
* Входящие параметры заграблены.
for(int i = 0; i < dim; i++)
{
- loop[i].index = oberon_generator_new_var();
- loop[i].length = oberon_generator_new_var();
+ 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_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(p, 1, 0, "istore %i", loop[i].reg_index);
- jvm_generate_load(p, arr, dst);
+ jvm_generate(p, 0, 1, "aload %i", reg_dst);
jvm_generate(p, 1, 1, "arraylength");
- jvm_generate(p, 1, 0, "istore %i", loop[i].length -> reg);
+ 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].index -> reg);
- jvm_generate(p, 0, 1, "iload %i", loop[i].length -> reg);
+ jvm_generate(p, 0, 1, "iload %i", loop[i].reg_index);
+ jvm_generate(p, 0, 1, "iload %i", loop[i].reg_length);
jvm_generate(p, 2, 0, "if_icmpge L%i", loop[i].end);
}
- jvm_generate_load(p, arr, dst);
- jvm_generate(p, 0, 1, "iload %i", loop[0].index -> reg);
+ 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].index -> reg);
+ jvm_generate(p, 0, 1, "iload %i", loop[i].reg_index);
}
jvm_generate_new(p, base, 0);
jvm_generate(p, 3, 0, "aastore");
for(int i = dim - 1; i >= 0; i--)
{
- jvm_generate(p, 0, 0, "iinc %i 1", loop[i].index -> reg);
+ 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);
}
}
struct {
- gen_var_t * index;
- gen_var_t * length;
+ int reg_index;
+ int reg_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 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 = dst.length
+ * int len = src.length
* while(i < len)
* {
* ...
for(int i = 0; i < dim; i++)
{
- loop[i].index = oberon_generator_new_var();
- loop[i].length = oberon_generator_new_var();
+ 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_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(p, 1, 0, "istore %i", loop[i].reg_index);
- jvm_generate_load(p, arr, dst);
+ jvm_generate(p, 0, 1, "aload %i", reg_src);
jvm_generate(p, 1, 1, "arraylength");
- jvm_generate(p, 1, 0, "istore %i", loop[i].length -> reg);
+ 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].index -> reg);
- jvm_generate(p, 0, 1, "iload %i", loop[i].length -> reg);
+ 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);
}
{
/* Получаем записи по индексам ( -- dst src ) */
- jvm_generate_load(p, arr, dst);
+ 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].index -> reg);
+ jvm_generate(p, 0, 1, "iload %i", loop[i].reg_index);
jvm_generate(p, 2, 1, "aaload");
}
- jvm_generate_load(p, arr, src);
+ 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].index -> reg);
+ jvm_generate(p, 0, 1, "iload %i", loop[i].reg_index);
jvm_generate(p, 2, 1, "aaload");
}
/* Получаем массивы и индексы ( -- dst i src i ) */
- jvm_generate_load(p, arr, dst);
- jvm_generate(p, 0, 1, "iload %i", loop[0].index -> reg);
+ 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].index -> reg);
+ jvm_generate(p, 0, 1, "iload %i", loop[i].reg_index);
}
- jvm_generate_load(p, arr, src);
- jvm_generate(p, 0, 1, "iload %i", loop[0].index -> reg);
+ 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].index -> reg);
+ jvm_generate(p, 0, 1, "iload %i", loop[i].reg_index);
}
/* Копируем значения ( dst i src i -- ) */
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, "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);
}
jvm_generate(p, 0, 1, "getstatic %s/pointer %s", full_name, desc);
}
-// ==========================================
-// ==========================================
-// ==========================================
-
-static void
-push_item(gen_proc_t * p, oberon_item_t * item);
-
void
oberon_generator_init_context(oberon_context_t * ctx)
{
fprintf(fp, ".field public static pointer %s\n\n", absdesc);
- fprintf(fp, ".method <init>()V\n");
+ fprintf(fp, ".method private <init>()V\n");
fprintf(fp, " aload_0\n");
fprintf(fp, " invokespecial %s/<init>()V\n", abscname);
fprintf(fp, " return\n");
signature = jvm_get_procedure_signature(proc -> type);
- gen_proc_t * p;
- gen_var_t * this_v;
-
- p = jvm_create_proc(class);
+ gen_proc_t * p = jvm_create_proc(class);
jvm_generate_function_header(p, "public", "invoke", signature);
+ jvm_alloc_register_untyped(p -> rf, false);
- this_v = oberon_generator_new_var();
- jvm_generate_and_init_local_var(this_v, p, false);
-
- gen_var_t * v;
int use_size = 0;
int num = proc -> type -> num_decl;
- oberon_object_t * arg = proc -> type -> decl;
+ oberon_object_t * param = proc -> type -> decl;
for(int i = 0; i < num; i++)
{
- v = oberon_generator_new_var();
- bool wide = jvm_is_wide_type(arg -> type);
- char * desc = jvm_get_descriptor(arg -> type);
- jvm_generate_and_init_named_local_var(v, p, wide, arg -> name, desc);
-
- jvm_generate_load(p, arg -> type, v);
-
- use_size += (wide) ? (2) : (1);
-
- arg = arg -> next;
+ gen_type_t * t = param -> type -> gen_type;
+ if(param -> class == OBERON_CLASS_VAR_PARAM)
+ {
+ int reg = jvm_alloc_register_untyped(p -> rf, true);
+ jvm_generate(p, 0, 1, "aload %i", reg);
+ jvm_generate(p, 0, 1, "iload %i", reg + 1);
+ }
+ else
+ {
+ int reg = jvm_alloc_register_untyped(p -> rf, t -> wide);
+ jvm_generate(p, 0, t -> cell_size, "%cload %i", t -> prefix, reg);
+ }
+ use_size += t -> cell_size;
+ param = param -> next;
}
-
+
char * full_name = jvm_get_field_full_name(proc);
int cell_size = jvm_cell_size_for_type(proc -> type -> base);
-
jvm_generate(p, use_size, cell_size, "invokestatic %s%s", full_name, signature);
if(proc -> type -> base -> class == OBERON_TYPE_VOID)
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:
+ case OBERON_TYPE_POINTER:
case OBERON_TYPE_REAL:
case OBERON_TYPE_CHAR:
+ case OBERON_TYPE_STRING:
+ case OBERON_TYPE_SET:
break;
case OBERON_TYPE_RECORD:
;
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;
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 * desc = jvm_get_descriptor(field -> type);
- jvm_generate_and_init_field(v, class, "public", name, desc);
+ jvm_generate_var(field -> gen_var);
field = field -> next;
}
field = rec -> decl;
for(int i = 0; i < num; i++)
{
+ jvm_generate(p, 0, 1, "aload_0");
+ jvm_generate_var_initialization(p, field -> gen_var);
+
if(field -> type -> class == OBERON_TYPE_RECORD
|| field -> type -> class == OBERON_TYPE_ARRAY)
{
jvm_generate(p, 0, 1, "aload_0");
+ jvm_generate_ldst_prepare(p, field -> gen_var);
jvm_generate_new(p, field -> type, 0);
- jvm_generate_store(p, field -> type, field -> gen_var);
+ jvm_generate_store(p, field -> gen_var);
}
field = field -> next;
}
/* Метод для копирования полей класса */
/* 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);
+ 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(copy_dst, p, false, "dst", desc);
- jvm_generate_and_init_named_local_var(copy_src, p, false, "src", desc);
+
+ gen_var_t * copy_dst = jvm_create_function_var(p, JVM_STORAGE_REGISTER, "dst", rec -> gen_type);
+ gen_var_t * copy_src = jvm_create_function_var(p, JVM_STORAGE_REGISTER, "src", rec -> gen_type);
+ jvm_generate_var(copy_dst);
+ jvm_generate_var(copy_src);
+ jvm_generate_var_initialization(p, copy_dst);
+ jvm_generate_var_initialization(p, copy_src);
+
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_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, 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_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, 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);
+ 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;
}
void
oberon_generator_init_var(oberon_context_t * ctx, oberon_object_t * var)
{
- gen_var_t * v = oberon_generator_new_var();
- var -> gen_var = v;
-
gen_module_t * m;
m = ctx -> mod -> gen_mod;
struct gen_class * class;
class = m -> class;
- char * desc;
+ gen_proc_t * p;
+ struct gen_class * c;
+ char * name = var -> name;
+ gen_type_t * t = var -> type -> gen_type;
switch(var -> class)
{
case OBERON_CLASS_VAR_PARAM:
- gen_error("generator: VAR-parameters not implemented");
+ p = var -> parent -> gen_proc;
+ var -> gen_var = jvm_create_function_var(p, JVM_STORAGE_FRAME_PARAM_VARPTR, name, t);
break;
case OBERON_CLASS_PARAM:
- /* Заполняется при генерации функции */
- /* смотри jvm_init_local_object() */
+ p = var -> parent -> gen_proc;
+ var -> gen_var = jvm_create_function_var(p, JVM_STORAGE_FRAME_PARAM_VAR, name, t);
break;
case OBERON_CLASS_FIELD:
- /* Заполняются при инициализации структуры */
- /* смотри oberon_generator_init_record() */
+ c = var -> parent_type -> gen_type -> class;
+ var -> gen_var = jvm_create_class_var(c, JVM_STORAGE_FIELD_VAR, name, t);
break;
case OBERON_CLASS_VAR:
- /* Локальные заполняются при генерации функции */
- /* смотри jvm_init_local_object() */
- if(var -> local == 0)
+ if(var -> local)
{
- desc = jvm_get_descriptor(var -> type);
- jvm_generate_and_init_global_var(v, class, "public", var -> name, desc);
+ p = var -> parent -> gen_proc;
+ var -> gen_var = jvm_create_function_var(p, JVM_STORAGE_FRAME_VAR, name, t);
+ }
+ else
+ {
+ var -> gen_var = jvm_create_class_var(class, JVM_STORAGE_STATIC_VAR, name, t);
+ jvm_generate_var(var -> gen_var);
}
break;
default:
}
}
+void
+oberon_generator_init_temp_var(oberon_context_t * ctx, oberon_object_t * var)
+{
+ assert(var -> class == OBERON_CLASS_VAR);
+
+ gen_module_t * m;
+ m = ctx -> mod -> gen_mod;
+
+ gen_proc_t * p;
+ p = m -> class -> p;
+
+ gen_type_t * t;
+ t = var -> type -> gen_type;
+
+ var -> gen_var = jvm_create_function_temp_var(p, t);
+ jvm_generate_var(var -> gen_var);
+ jvm_generate_var_initialization(p, var -> gen_var);
+}
+
void
oberon_generator_init_proc(oberon_context_t * ctx, oberon_object_t * proc)
{
struct gen_class * class = proc -> module -> gen_mod -> class;
proc -> gen_proc = jvm_create_proc(class);
-
- if(proc -> local)
- {
- gen_error("generator: local procedures not implemented");
- }
-
- oberon_generate_procedure_pointer_class(proc);
+ proc -> gen_proc -> full_name = jvm_get_field_full_name_safe(proc);
+ jvm_create_static_links(proc);
}
void
{
if(x -> class == OBERON_CLASS_VAR)
{
+ jvm_generate_var_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 -> type, x -> gen_var);
+ jvm_generate_store(p, x -> gen_var);
}
}
jvm_generate_function_end(class -> p);
}
-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;
- wide = jvm_is_wide_type(x -> type);
- desc = jvm_get_descriptor(x -> type);
-
- // Убеждаемся что сейчас находимся в функции
- assert(class -> p);
- assert(x -> local);
-
- switch(x -> class)
- {
- case OBERON_CLASS_VAR:
- case OBERON_CLASS_PARAM:
- jvm_generate_and_init_named_local_var(v, p, wide, x -> name, desc);
- break;
- default:
- gen_error("jvm_init_local_object: wat");
- break;
- }
-}
-
/*
* Генерирует код для получения размера измерения массива
* Аналог Обероновского LEN(v, n); где n = 0 - первое измерение.
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, arr, v);
+ jvm_generate_load(p, v);
jvm_generate_array_len(p, dim);
dim += 1;
}
@@ -1163,57 +788,137 @@ jvm_generate_array_duplicate_and_replace(gen_proc_t * p, gen_var_t * v, oberon_t
jvm_generate_new(p, arr, dim);
jvm_generate(p, 1, 2, "dup");
- jvm_generate_load(p, arr, v);
+ jvm_generate_load(p, v);
jvm_generate_copy_array(p, arr);
- jvm_generate_store(p, arr, v);
+ 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, rec, v);
+ jvm_generate_load(p, v);
jvm_generate_copy_record(p, rec);
- jvm_generate_store(p, rec, v);
+ jvm_generate_store(p, v);
+}
+
+static void
+jvm_generate_local_object(gen_proc_t * p, oberon_object_t * x)
+{
+ gen_var_t * v;
+ struct gen_class * class;
+
+ v = x -> gen_var;
+ class = p -> class;
+
+ // Убеждаемся что сейчас находимся в функции
+ assert(class -> p);
+ assert(x -> local);
+
+ switch(x -> class)
+ {
+ case OBERON_CLASS_VAR_PARAM:
+ case OBERON_CLASS_PARAM:
+ case OBERON_CLASS_VAR:
+ jvm_generate_var(v);
+ break;
+ case OBERON_CLASS_PROC:
+ break;
+ default:
+ gen_error("jvm_generate_local_initialization: wat");
+ break;
+ }
+}
+
+static void
+jvm_generate_local_initialization(gen_proc_t * p, oberon_object_t * x)
+{
+ gen_var_t * v;
+ struct gen_class * class;
+
+ v = x -> gen_var;
+ class = p -> class;
+
+ // Убеждаемся что сейчас находимся в функции
+ assert(class -> p);
+ assert(x -> local);
+
+ switch(x -> class)
+ {
+ case OBERON_CLASS_VAR_PARAM:
+ case OBERON_CLASS_PARAM:
+ case OBERON_CLASS_VAR:
+ jvm_generate_var_initialization(p, v);
+ break;
+ case OBERON_CLASS_PROC:
+ break;
+ default:
+ gen_error("jvm_generate_local_initialization: wat");
+ break;
+ }
+
+ if(x -> class == OBERON_CLASS_PARAM)
+ {
+ if(x -> type -> class == OBERON_TYPE_ARRAY)
+ {
+ jvm_generate_array_duplicate_and_replace(p, v, x -> type);
+ }
+ else if(x -> type -> class == OBERON_TYPE_RECORD)
+ {
+ jvm_generate_record_duplicate_and_replace(p, v, x -> type);
+ }
+ }
}
void
oberon_generate_begin_proc(oberon_context_t * ctx, oberon_object_t * proc)
{
gen_proc_t * p;
+ char * name;
char * signature;
+ oberon_object_t * var;
p = proc -> gen_proc;
- signature = jvm_get_procedure_signature(proc -> type);
- jvm_generate_function_header(p, "public static", proc -> name, signature);
+ if(proc -> local)
+ {
+ signature = jvm_get_local_procedure_signature(proc);
+ }
+ else
+ {
+ oberon_generate_procedure_pointer_class(proc);
+ signature = jvm_get_procedure_signature(proc -> type);
+ }
+
+ name = jvm_get_name(proc);
+ jvm_generate_function_header(p, "public static", name, signature);
+
+ if(proc -> local)
+ {
+ jvm_generate_staticlinks(proc);
+ }
- /* Выделение регистров под параметры и переменные */
- oberon_object_t * var = proc -> type -> decl;
+ jvm_generate_procedure_frame(proc);
+
+ /* Создание парамеров и переменных */
+ var = proc -> scope -> list -> next;
while(var)
{
- jvm_init_local_object(p, var);
+ jvm_generate_local_object(p, var);
var = var -> next;
}
- /* Копирование статических/открытых массивов и записей */
- var = proc -> type -> decl;
+ jvm_generate_frame_initialization(p);
+
+ /* Инициализация парамеров и переменных */
+ var = proc -> scope -> list -> next;
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);
- }
- }
+ jvm_generate_local_initialization(p, var);
var = var -> next;
- }
+ }
}
void
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
+push_varptr(gen_proc_t * p, oberon_expr_t * expr)
+{
+ assert(expr -> is_item);
+
+ switch(expr -> item.mode)
+ {
+ case MODE_VAR:
+ jvm_generate_ldst_prepare(p, expr -> item.var -> gen_var);
+ break;
+ case MODE_INDEX:
+ push_item(p, (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)
{
oberon_type_t * procsig;
procsig = desig -> parent -> result;
- signature = jvm_get_procedure_signature(procsig);
if(direct_call == false)
{
push_item(p, desig -> parent);
}
+ if(direct_call)
+ {
+ jvm_generate_push_static_links(p, desig -> parent -> var);
+ }
+
int args_cells = 0;
int result_cells = jvm_cell_size_for_type(procsig -> base);
int num = desig -> num_args;
oberon_expr_t * arg = desig -> args;
+ oberon_object_t * param = procsig -> decl;
for(int i = 0; i < num; i++)
{
- 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;
+ param = param -> next;
}
if(direct_call)
{
char * full_name = jvm_get_field_full_name(desig -> parent -> var);
+ char * signature = jvm_get_local_procedure_signature(desig -> parent -> var);
jvm_generate(p, args_cells, result_cells, "invokestatic %s%s", full_name, signature);
}
else
{
char * cname = jvm_get_class_full_name(procsig);
+ char * signature = jvm_get_procedure_signature(procsig);
jvm_generate(p, 1 + args_cells, result_cells, "invokevirtual %s/invoke%s", cname, signature);
}
}
}
else
{
- jvm_generate_load(p, item -> result, item -> var -> gen_var);
+ jvm_generate_load(p, item -> var -> gen_var);
}
break;
case MODE_INTEGER:
+ case MODE_BOOLEAN:
case MODE_CHAR:
+ case MODE_SET:
jvm_generate_push_int_size(p, item -> integer, item -> result -> size);
break;
- case MODE_BOOLEAN:
- jvm_generate_push_int_size(p, item -> boolean, item -> result -> size);
- break;
case MODE_CALL:
jvm_generate_call_proc(p, item);
break;
case MODE_FIELD:
assert(item -> parent -> is_item);
push_item(p, (oberon_item_t *) item -> parent);
- jvm_generate_load(p, item -> result, item -> var -> gen_var);
+ jvm_generate_load(p, item -> var -> gen_var);
break;
case MODE_DEREF:
/* Все объекты в jvm представляются как указатели */
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;
{
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, 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(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:
gen_error("jvm_generate_compare_op: wat");
break;
}
+ return cmpop;
+}
+
+static void
+jvm_generate_compare_op(gen_proc_t * p, oberon_type_t * t, int op)
+{
+ char prefix = jvm_get_prefix(t);
+ int label_true = jvm_new_label_id(p);
+ int label_done = jvm_new_label_id(p);
+ int cell_size = jvm_cell_size_for_type(t);
+ char * cmpop = jvm_get_compare_postfix(op);
+
+ if(prefix == 'l')
+ {
+ jvm_generate(p, 2 * cell_size, 1, "lcmp");
+ jvm_generate(p, 1, 1, "if%s L%i", cmpop, label_true);
+ }
+ else if(prefix == 'f' || prefix == 'd')
+ {
+ char fop;
+ if(op == OP_EQ || op == OP_NEQ || op == OP_GRT || op == OP_GEQ)
+ {
+ fop = 'l';
+ }
+ else
+ {
+ fop = 'g';
+ }
+ jvm_generate(p, 2 * cell_size, 1, "%ccmp%c", prefix, fop);
+ jvm_generate(p, 1, 1, "if%s L%i", cmpop, label_true);
+ }
+ else
+ {
+ jvm_generate(p, 2 * cell_size, 0, "if_%ccmp%s L%i", prefix, cmpop, label_true);
+ }
- jvm_generate(p, cell_size, 0, "if_%ccmp%s %s", prefix, cmpop, label_name_true);
jvm_generate(p, 0, 1, "iconst_0");
- jvm_generate(p, 0, 0, "goto %s", label_name_done);
+ jvm_generate(p, 0, 0, "goto L%i", label_done);
jvm_generate_label(p, label_true);
jvm_generate(p, 0, 1, "iconst_1");
jvm_generate_label(p, label_done);
}
static void
-jvm_generate_operator(gen_proc_t * p, char prefix, int op)
+jvm_generate_operator(gen_proc_t * p, oberon_type_t * t, int op)
{
- int cell_size = jvm_cell_size_for_postfix(prefix);
+ char prefix = jvm_get_prefix(t);
+ int cell_size = jvm_cell_size_for_type(t);
switch(op)
{
case OP_UNARY_MINUS:
jvm_generate(p, cell_size, cell_size, "%cneg", prefix);
break;
- case OP_BITWISE_NOT:
- jvm_generate_push_int(p, -1);
+ case OP_COMPLEMENTATION:
+ jvm_generate_push_int_size(p, -1, t -> size);
jvm_generate(p, 2 * cell_size, cell_size, "%cxor", prefix);
break;
case OP_LOGIC_NOT:
case OP_MOD:
jvm_generate(p, 2 * cell_size, cell_size, "%crem", prefix);
break;
- case OP_BITWISE_AND:
+ case OP_UNION:
+ jvm_generate(p, 2 * cell_size, cell_size, "%cor", prefix);
+ break;
+ case OP_INTERSECTION:
jvm_generate(p, 2 * cell_size, cell_size, "%cand", prefix);
break;
- case OP_BITWISE_XOR:
+ case OP_DIFFERENCE:
+ jvm_generate_push_int_size(p, -1, t -> size);
jvm_generate(p, 2 * cell_size, cell_size, "%cxor", prefix);
+ jvm_generate(p, 2 * cell_size, cell_size, "%cand", prefix);
break;
- case OP_BITWISE_OR:
- jvm_generate(p, 2 * cell_size, cell_size, "%cor", prefix);
+ case OP_SYM_DIFFERENCE:
+ jvm_generate(p, 2 * cell_size, cell_size, "%cxor", prefix);
break;
case OP_EQ:
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);
@@ -1544,15 +1383,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);
- 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, 1, 0, "ifeq L%i", label_calc_b);
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);
@@ -1563,24 +1400,111 @@ 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);
+ jvm_generate(p, 1, 0, "ifeq L%i", label_false);
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);
}
+static void
+jvm_generate_range(gen_proc_t * p, oberon_expr_t * a, oberon_expr_t * b)
+{
+ /* { a } == 1 << a */
+ /* { a..b } == (a <= b) ? ((2 << b) - (1 << a)) : (0); */
+
+ char prefix;
+ int cell_size;
+ oberon_type_t * type;
+ gen_var_t * ra;
+ gen_var_t * rb;
+ int label_else;
+ int label_end;
+
+ type = a -> result;
+ cell_size = jvm_cell_size_for_type(type);
+ prefix = jvm_get_prefix(type);
+
+ if(b == NULL)
+ {
+ jvm_generate_push_int_size(p, 1, type -> size);
+ push_expr(p, a);
+ jvm_generate(p, 2 * cell_size, cell_size, "%cshl", prefix);
+ }
+ else
+ {
+ ra = jvm_create_function_temp_var(p, type -> gen_type);
+ rb = jvm_create_function_temp_var(p, type -> gen_type);
+ jvm_generate_var(ra);
+ jvm_generate_var(rb);
+ jvm_generate_var_initialization(p, ra);
+ jvm_generate_var_initialization(p, rb);
+ label_else = jvm_new_label_id(p);
+ label_end = jvm_new_label_id(p);
+
+ push_expr(p, a);
+ jvm_generate_store(p, ra);
+ push_expr(p, b);
+ jvm_generate_store(p, rb);
+
+ jvm_generate_load(p, ra);
+ jvm_generate_load(p, rb);
+ jvm_generate(p, 2 * cell_size, 0, "if_%ccmpgt L%i", prefix, label_else);
+
+ jvm_generate_push_int_size(p, 2, type -> size);
+ jvm_generate_load(p, rb);
+ jvm_generate(p, 2 * cell_size, cell_size, "%cshl", prefix);
+ jvm_generate_push_int_size(p, 2, type -> size);
+ jvm_generate_load(p, ra);
+ jvm_generate(p, 2 * cell_size, cell_size, "%cshl", prefix);
+ jvm_generate(p, 2 * cell_size, cell_size, "%csub", prefix);
+ jvm_generate(p, 0, 0, "goto L%i", label_end);
+
+ jvm_generate_label(p, label_else);
+ jvm_generate_push_int_size(p, 0, type -> size);
+ jvm_generate_label(p, label_end);
+ }
+
+ /* TODO free registers */
+}
+
+static void
+jvm_generate_in(gen_proc_t * p, oberon_expr_t * a, oberon_expr_t * b)
+{
+ oberon_type_t * t = a -> result;
+ int cell_size = jvm_cell_size_for_type(t);
+ char prefix = jvm_get_prefix(t);
+ int label_else = jvm_new_label_id(p);
+ int label_end = jvm_new_label_id(p);
+
+ jvm_generate_push_int_size(p, 1, t -> size);
+ push_expr(p, a);
+ jvm_generate(p, 2 * cell_size, cell_size, "%cshl", prefix);
+ push_expr(p, b);
+ jvm_generate(p, 2 * cell_size, cell_size, "%cand", prefix);
+
+ if(cell_size > 1)
+ {
+ jvm_generate(p, cell_size, 0, "lcmp");
+ }
+
+ jvm_generate(p, 1, 0, "ifeq L%i", label_else);
+ jvm_generate(p, 0, 1, "iconst_1");
+ jvm_generate(p, 0, 0, "goto L%i", label_end);
+ jvm_generate_label(p, label_else);
+ jvm_generate(p, 0, 1, "iconst_0");
+ jvm_generate_label(p, label_end);
+}
+
static void
push_operator(gen_proc_t * p, oberon_oper_t * oper)
{
- char prefix = jvm_get_prefix(oper -> result);
+ oberon_type_t * preq = oper -> left -> result;
int op = oper -> op;
switch(op)
{
push_expr(p, oper -> left);
jvm_generate_cast_type(p, oper -> left -> result, oper -> result);
break;
+ case OP_COMPLEMENTATION:
case OP_UNARY_MINUS:
- case OP_BITWISE_NOT:
case OP_LOGIC_NOT:
case OP_ABS:
push_expr(p, oper -> left);
- jvm_generate_operator(p, prefix, op);
+ jvm_generate_operator(p, preq, op);
break;
case OP_ADD:
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_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:
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;
else switch(item -> mode)
{
case MODE_VAR:
+ jvm_generate_ldst_prepare(p, item -> var -> gen_var);
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:
;
case MODE_FIELD:
assert(item -> parent -> is_item);
push_item(p, (oberon_item_t *) item -> parent);
+ jvm_generate_ldst_prepare(p, item -> var -> gen_var);
push_expr(p, src);
- jvm_generate_store(p, 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);