index a107efc119eca8a22afc620cbc912e8e284f86fa..f26c9513e000ca18cc3203fc0e67155b3111398c 100644 (file)
#include <gc.h>
-#include "../../../include/oberon.h"
#include "../../oberon-internals.h"
+#include "../../oberon-type-compat.h"
+#include "../../generator.h"
#include "generator-jvm.h"
+#include "generator-jvm-abi.h"
+#include "generator-jvm-asm.h"
#include "generator-jvm-basic.h"
-// ==========================================
-// ==========================================
-// ==========================================
-
-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);
-}
+push_item(gen_proc_t * p, oberon_item_t * item);
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;
- }
-}
+jvm_generate_new(gen_proc_t * p, oberon_type_t * type, int num);
static void
-jvm_stack_pop(gen_proc_t * p, unsigned size)
+jvm_generate_cast_prefix(gen_proc_t * p, char prefix, char postfix)
{
- p -> stack -> pointer -= size;
-
- if(p -> stack -> pointer < 0)
+ if((prefix == 'b' || prefix == 's') && (postfix = 'l' || postfix == 'd'))
{
- printf("WARING: stack pointer %i\n", p -> stack -> pointer);
+ prefix = 'i';
}
-}
-
-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)
+ if(prefix == postfix)
{
- jvm_generate(p, 0, 1, "ldc %li", i);
+ return;
}
- else
+
+ if((prefix == 'l' || prefix == 'd') && (postfix == 'b' || postfix == 's'))
{
- jvm_generate(p, 0, 2, "ldc2_w %li", i);
+ jvm_generate(p, 2, 1, "%c2i", prefix);
+ prefix = 'i';
}
+
+ int from_cell_size = jvm_cell_size_for_postfix(prefix);
+ int to_cell_size = jvm_cell_size_for_postfix(postfix);
+ jvm_generate(p, from_cell_size, to_cell_size, "%c2%c", prefix, postfix);
}
static void
-jvm_generate_push_int_size(gen_proc_t * p, int64_t i, int size)
+jvm_generate_cast_type(gen_proc_t * p, oberon_type_t * from, oberon_type_t * to)
{
- 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)
+ if(to -> class == OBERON_TYPE_RECORD || to -> class == OBERON_TYPE_POINTER)
{
- jvm_generate(p, 0, 1, "ldc %li", i);
+ if(to -> class == OBERON_TYPE_POINTER && to -> base -> class == OBERON_TYPE_RECORD)
+ {
+ char * full_name = jvm_get_class_full_name(to);
+ jvm_generate(p, 1, 1, "checkcast %s", full_name);
+ }
}
else
{
- 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");
- }
+ char prefix = jvm_get_prefix(from);
+ char postfix = jvm_get_postfix(to);
+ jvm_generate_cast_prefix(p, prefix, postfix);
}
}
static void
-jvm_generate_push_float(gen_proc_t * p, double f, int size)
+jvm_generate_hard_cast_type(gen_proc_t * p, oberon_type_t * from, oberon_type_t * to)
{
- if(size <= 4)
+ if(from -> class == OBERON_TYPE_REAL
+ && (to -> class == OBERON_TYPE_INTEGER || to -> class == OBERON_TYPE_SYSTEM_BYTE))
{
- 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)
+ char postfix = jvm_get_postfix(to);
+ if(from -> size <= 4)
{
- jvm_generate(p, 0, 1, "fconst_2");
+ jvm_generate(p, 1, 1, "invokestatic java/lang/Float/floatToRawIntBits(F)I");
+ jvm_generate_cast_prefix(p, 'i', postfix);
}
else
{
- jvm_generate(p, 0, 1, "ldc %lf", f);
+ jvm_generate(p, 2, 2, "invokestatic java/lang/Double/doubleToRawLongBits(D)J");
+ jvm_generate_cast_prefix(p, 'l', postfix);
}
}
- else
+ else if((from -> class == OBERON_TYPE_INTEGER || from -> class == OBERON_TYPE_SYSTEM_BYTE)
+ && to -> class == OBERON_TYPE_REAL)
{
- if(f == 0.0)
- {
- jvm_generate(p, 0, 2, "dconst_0");
- }
- if(f == 1.0)
+ char prefix = jvm_get_prefix(from);
+ if(to -> size <= 4)
{
- jvm_generate(p, 0, 2, "dconst_1");
+ jvm_generate_cast_prefix(p, prefix, 'i');
+ jvm_generate(p, 1, 1, "invokestatic java/lang/Float/intBitsToFloat(I)F");
}
else
{
- jvm_generate(p, 0, 2, "ldc2_w %lf", f);
+ jvm_generate_cast_prefix(p, prefix, 'l');
+ jvm_generate(p, 2, 2, "invokestatic java/lang/Double/longBitsToDouble(J)D");
}
}
-}
-
-static void
-jvm_generate_push_string(gen_proc_t * p, char * str, int char_size)
-{
- assert(char_size == 1);
- int len = strlen(str);
-
- jvm_generate_push_int(p, len + 1);
- jvm_generate(p, 1, 1, "newarray byte");
-
- for(int i = 0; i < len; i++)
- {
- jvm_generate(p, 1, 2, "dup");
- jvm_generate_push_int(p, i);
- jvm_generate_push_int(p, str[i]);
- jvm_generate(p, 3, 0, "bastore");
- }
-}
-
-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)
+ else
{
- 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;
+ jvm_generate_cast_type(p, from, to);
}
}
static void
-jvm_generate_store(gen_proc_t * p, oberon_type_t * src_type, gen_var_t * dst)
+check_index(gen_proc_t * p, oberon_type_t * index_type)
{
- 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;
- }
+ // TODO проверка валидности границ
+ char prefix = jvm_get_prefix(index_type);
+ jvm_generate_cast_prefix(p, prefix, 'i');
}
-static void
-jvm_generate_new(gen_proc_t * p, oberon_type_t * type, int num);
-
/*
* Генерирует код для инициализации массива со статическим базовым типом
* ( aref -- )
}
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);
/*
* Входящие параметры заграблены.
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, src);
+ 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)
{
memset(gen_context, 0, sizeof *gen_context);
ctx -> gen_context = gen_context;
+ gen_context -> dir = ".";
}
void
}
static void
-oberon_generate_procedure_class(oberon_type_t * proc)
+oberon_generate_procedure_class(const char * dir, oberon_type_t * proc)
{
FILE * fp;
char * cname;
struct gen_class * class;
cname = jvm_get_class_full_name(proc);
- class = jvm_create_class(cname);
+ class = jvm_create_class(dir, cname);
fp = class -> fp;
fprintf(fp, ".source SYSTEM\n");
}
static void
-oberon_generate_procedure_pointer_class(oberon_object_t * proc)
+oberon_generate_procedure_pointer_class(const char * dir, oberon_object_t * proc)
{
FILE * fp;
char * cname;
struct gen_class * class;
cname = jvm_get_field_full_name_safe(proc);
- class = jvm_create_class(cname);
+ class = jvm_create_class(dir, cname);
abscname = jvm_get_class_full_name(proc -> type);
absdesc = jvm_get_descriptor(proc -> type);
fp = class -> fp;
fprintf(fp, ".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)
+ if(proc -> type -> base -> class == OBERON_TYPE_NOTYPE)
{
jvm_generate(p, 0, 0, "return");
}
}
static void
-oberon_generate_record_class(gen_module_t * m, oberon_type_t * rec)
+oberon_generate_record_class(const char * dir, gen_module_t * m, oberon_type_t * rec)
{
char * cname;
struct gen_class * class;
m -> rec_id += 1;
cname = jvm_get_class_full_name(rec);
- class = jvm_create_class(cname);
+ class = jvm_create_class(dir, cname);
fprintf(class -> fp, ".source %s\n", rec -> module -> name);
fprintf(class -> fp, ".class public %s\n", cname);
memset(t, 0, sizeof *t);
type -> gen_type = t;
+ gen_context_t * c;
+ c = ctx -> gen_context;
+
+ gen_module_t * m;
switch(type -> class)
{
- case OBERON_TYPE_VOID:
+ case OBERON_TYPE_NOTYPE:
case OBERON_TYPE_INTEGER:
case OBERON_TYPE_BOOLEAN:
case OBERON_TYPE_ARRAY:
+ case OBERON_TYPE_POINTER:
case OBERON_TYPE_REAL:
case OBERON_TYPE_CHAR:
case OBERON_TYPE_STRING:
case OBERON_TYPE_SET:
+ case OBERON_TYPE_NIL:
+ case OBERON_TYPE_SYSTEM_BYTE:
+ case OBERON_TYPE_SYSTEM_PTR:
break;
case OBERON_TYPE_RECORD:
- ;
- gen_module_t * m;
m = type -> module -> gen_mod;
- oberon_generate_record_class(m, type);
+ t -> full_name = jvm_get_class_full_name(type);
+ oberon_generate_record_class(c -> dir, m, type);
break;
case OBERON_TYPE_PROCEDURE:
- oberon_generate_procedure_class(type);
- break;
- case OBERON_TYPE_POINTER:
+ oberon_generate_procedure_class(c -> dir, type);
break;
default:
gen_error("oberon_generator_init_type: unk calss %i", type -> class);
break;
}
+
+ if(type -> class != OBERON_TYPE_NOTYPE)
+ {
+ t -> wide = jvm_is_wide_type(type);
+ t -> prefix = jvm_get_prefix(type);
+ t -> postfix = jvm_get_postfix(type);
+ }
+
+ if((type -> class == OBERON_TYPE_POINTER && type -> base -> class == OBERON_TYPE_RECORD) ||
+ type -> class == OBERON_TYPE_PROCEDURE ||
+ type -> class == OBERON_TYPE_RECORD ||
+ type -> class == OBERON_TYPE_SYSTEM_PTR)
+ {
+ t -> full_name = jvm_get_class_full_name(type);
+ }
+
+ t -> cell_size = jvm_cell_size_for_type(type);
+
+ if(type -> class != OBERON_TYPE_NIL)
+ {
+ t -> desc = jvm_get_descriptor(type);
+ }
}
void
oberon_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);
+
+ if(rec -> base)
+ {
+ jvm_generate_load(p, copy_dst);
+ jvm_generate_load(p, copy_src);
+ jvm_generate_copy_record(p, rec -> base);
+ }
+
num = rec -> num_decl;
field = rec -> decl;
for(int i = 0; i < num; i++)
{
if(field -> type -> class == OBERON_TYPE_RECORD)
{
- jvm_generate_load(p, 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;
+
+ assert(name);
+ if(t == NULL)
+ {
+ gen_error("uninitialized type class %i", var -> type -> class);
+ }
+
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:
}
}
+static void
+oberon_generate_static_initialization(gen_proc_t * p, oberon_object_t * x)
+{
+ 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);
+ }
+}
+
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;
- bool wide;
- wide = jvm_is_wide_type(var -> type);
+ gen_type_t * t;
+ t = var -> type -> gen_type;
- jvm_generate_and_init_local_var(v, p, wide);
+ var -> gen_var = jvm_create_function_temp_var(p, t);
+ jvm_generate_var(var -> gen_var);
+ jvm_generate_var_initialization(p, var -> gen_var);
+ oberon_generate_static_initialization(p, var);
}
void
{
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
memset(m, 0, sizeof *m);
mod -> gen_mod = m;
+ gen_context_t * c;
+ c = ctx -> gen_context;
+
struct gen_class * class;
- class = jvm_create_class(mod -> name);
+ class = jvm_create_class(c -> dir, mod -> name);
fprintf(class -> fp, ".source %s\n", mod -> name);
fprintf(class -> fp, ".class %s\n", mod -> name);
fprintf(class -> fp, ".super java/lang/Object\n\n");
+ fprintf(class -> fp, ".field private static $INITIALIZED$ Z\n\n");
+
m -> class = class;
- ctx -> gen_context -> current_m = m;
+ c -> current_m = m;
}
void
void
oberon_generate_begin_module(oberon_context_t * ctx)
{
- struct gen_class * class = ctx -> mod -> gen_mod -> class;
- gen_proc_t * p = jvm_create_proc(class);
+ gen_proc_t * p;
+ int label_cont;
+ struct gen_class * class;
- jvm_generate_function_header(p, "public", "<init>", "()V");
- jvm_alloc_register_untyped(p -> rf, false);
- jvm_generate(p, 0, 1, "aload_0");
- jvm_generate(p, 1, 0, "invokespecial java/lang/Object/<init>()V");
+ class = ctx -> mod -> gen_mod -> class;
+
+ p = jvm_create_proc(class);
+ jvm_generate_function_header(p, "public static", "BEGIN", "()V");
+
+ label_cont = jvm_new_label_id(p);
+ jvm_generate(p, 0, 1, "getstatic %s/$INITIALIZED$ Z", class -> full_name);
+ jvm_generate(p, 1, 0, "ifeq L%i", label_cont);
+ jvm_generate(p, 0, 0, "return");
+ jvm_generate_label(p, label_cont);
+
+ jvm_generate(p, 0, 1, "iconst_1");
+ jvm_generate(p, 1, 0, "putstatic %s/$INITIALIZED$ Z", class -> full_name);
/* Инициализация переменных объявленных в модуле */
oberon_object_t * x = ctx -> mod -> decl -> list -> next;
while(x != NULL)
{
- if(x -> class == OBERON_CLASS_VAR)
+ if(x -> class == OBERON_CLASS_MODULE)
{
- if(x -> type -> class == OBERON_TYPE_ARRAY
- || x -> type -> class == OBERON_TYPE_RECORD)
+ if(!x -> module -> intrinsic)
{
- jvm_generate_new(p, x -> type, 0);
- jvm_generate_store(p, x -> type, x -> gen_var);
+ jvm_generate(p, 0, 0, "invokestatic %s/BEGIN()V", x -> module -> gen_mod -> class -> full_name);
}
}
+ else if(x -> class == OBERON_CLASS_VAR)
+ {
+ jvm_generate_var_initialization(p, x -> gen_var);
+ oberon_generate_static_initialization(p, x);
+ }
x = x -> next;
}
gen_proc_t * p = class -> p;
jvm_generate(p, 0, 0, "return");
- 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;
- }
+ jvm_generate_function_end(class -> p);
+
+ p = jvm_create_proc(class);
+ jvm_generate_function_header(p, "private", "<init>", "()V");
+ jvm_alloc_register_untyped(p -> rf, false);
+ jvm_generate(p, 0, 1, "aload_0");
+ jvm_generate(p, 1, 0, "invokespecial java/lang/Object/<init>()V");
+ jvm_generate(p, 0, 0, "return");
+ jvm_generate_function_end(class -> p);
}
/*
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;
}
@@ -1203,57 +950,143 @@ 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_CONST:
+ case OBERON_CLASS_TYPE:
+ case OBERON_CLASS_PROC:
+ break;
+ default:
+ gen_error("jvm_generate_local_initialization: wat class %i", x -> class);
+ break;
+ }
+}
+
+static void
+jvm_generate_local_initialization(gen_proc_t * p, oberon_object_t * x)
+{
+ gen_var_t * v;
+ struct gen_class * class;
+
+ v = x -> gen_var;
+ class = p -> class;
+
+ // Убеждаемся что сейчас находимся в функции
+ assert(class -> p);
+ assert(x -> local);
+
+ switch(x -> class)
+ {
+ case OBERON_CLASS_VAR_PARAM:
+ jvm_generate_var_initialization(p, v);
+ break;
+ case OBERON_CLASS_PARAM:
+ jvm_generate_var_initialization(p, v);
+ if(x -> type -> class == OBERON_TYPE_ARRAY)
+ {
+ jvm_generate_array_duplicate_and_replace(p, v, x -> type);
+ }
+ else if(x -> type -> class == OBERON_TYPE_RECORD)
+ {
+ jvm_generate_record_duplicate_and_replace(p, v, x -> type);
+ }
+ break;
+ case OBERON_CLASS_VAR:
+ jvm_generate_var_initialization(p, v);
+ oberon_generate_static_initialization(p, x);
+ break;
+ case OBERON_CLASS_CONST:
+ case OBERON_CLASS_TYPE:
+ case OBERON_CLASS_PROC:
+ break;
+ default:
+ gen_error("jvm_generate_local_initialization: wat class %i", x -> class);
+ break;
+ }
}
void
oberon_generate_begin_proc(oberon_context_t * ctx, oberon_object_t * proc)
{
gen_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(p -> class -> dir, proc);
+ signature = jvm_get_procedure_signature(proc -> type);
+ }
+
+ name = jvm_get_name(proc);
+ p -> ret_prefix = jvm_get_prefix(proc -> type -> base);
+ jvm_generate_function_header(p, "public static", name, signature);
+
+ if(proc -> local)
+ {
+ jvm_generate_staticlinks(proc);
+ }
+
+ jvm_generate_procedure_frame(proc);
- /* Ð\92Ñ\8bделение Ñ\80егиÑ\81Ñ\82Ñ\80ов под паÑ\80амеÑ\82Ñ\80Ñ\8b и пеÑ\80еменнÑ\8bе */
- oberon_object_t * var = proc -> type -> decl;
+ /* Создание паÑ\80амеÑ\82Ñ\80ов и пеÑ\80еменнÑ\8bÑ\85 */
+ 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
m = ctx -> mod -> gen_mod;
p = m -> class -> p;
+ oberon_generate_trap(ctx, -4);
+
+ if(p -> ret_prefix == ' ')
+ {
+ jvm_generate(p, 0, 0, "return");
+ }
+ else
+ {
+ int sz = jvm_cell_size_for_postfix(p -> ret_prefix);
+ switch(p -> ret_prefix)
+ {
+ case 'a':
+ jvm_generate(p, 0, 1, "aconst_null");
+ break;
+ case 'l':
+ jvm_generate_push_int_size(p, 0, 8);
+ break;
+ case 'f':
+ jvm_generate_push_float(p, 0, 4);
+ break;
+ case 'd':
+ jvm_generate_push_float(p, 0, 8);
+ break;
+ default:
+ jvm_generate_push_int(p, 0);
+ break;
+ }
+ jvm_generate(p, sz, 0, "%creturn", p -> ret_prefix);
+ }
+
jvm_generate_function_end(p);
}
@@ -1332,14 +1195,40 @@ oberon_generate_branch(oberon_context_t * ctx, oberon_expr_t * cond, bool gotoif
}
}
+static void
+push_varptr(gen_proc_t * p, oberon_expr_t * expr)
+{
+ assert(expr -> is_item);
+
+ switch(expr -> item.mode)
+ {
+ case MODE_VAR:
+ jvm_generate_ldst_prepare(p, expr -> item.var -> gen_var);
+ break;
+ case MODE_INDEX:
+ push_item(p, expr -> item.parent);
+ push_expr(p, expr -> item.args);
+ check_index(p, expr -> item.args -> result);
+ break;
+ case MODE_FIELD:
+ push_item(p, expr -> item.parent);
+ jvm_generate_ldst_prepare(p, expr -> item.var -> gen_var);
+ break;
+ case MODE_DEREF:
+ push_varptr(p, (oberon_expr_t *) expr -> item.parent);
+ break;
+ default:
+ gen_error("push_varptr: wat %i", expr -> item.mode);
+ break;
+ }
+}
+
static void
jvm_generate_call_proc(gen_proc_t * p, oberon_item_t * desig)
{
assert(desig -> var == NULL);
assert(desig -> mode == MODE_CALL);
- char * signature = NULL;
-
bool direct_call = false;
if(desig -> parent -> mode == MODE_VAR)
{
}
}
- 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);
}
+ 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);
}
}
@@ -1424,38 +1327,13 @@ jvm_generate_expr_new_pointer(gen_proc_t * p, oberon_type_t * type, int num, obe
for(int i = 0; i < num; i++)
{
push_expr(p, arg);
+ check_index(p, arg -> result);
arg = arg -> next;
}
jvm_generate_new(p, type -> base, num);
}
-static void
-jvm_generate_cast_type(gen_proc_t * p, oberon_type_t * from, oberon_type_t * to)
-{
- 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
push_item(gen_proc_t * p, oberon_item_t * item)
{
}
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;
;
char postfix = jvm_get_postfix(item -> result);
int cell_size = jvm_cell_size_for_postfix(postfix);
- assert(item -> parent -> is_item);
- push_item(p, (oberon_item_t *) item -> parent);
+ push_item(p, item -> parent);
push_expr(p, item -> args);
+ check_index(p, item -> args -> result);
jvm_generate(p, 1 + 1, cell_size, "%caload", postfix);
break;
case MODE_FIELD:
- assert(item -> parent -> is_item);
- push_item(p, (oberon_item_t *) item -> parent);
- jvm_generate_load(p, item -> result, item -> var -> gen_var);
+ push_item(p, item -> parent);
+ jvm_generate_load(p, item -> var -> gen_var);
break;
case MODE_DEREF:
/* Все объекты в jvm представляются как указатели */
- assert(item -> parent -> is_item);
- push_item(p, (oberon_item_t *) item -> parent);
+ push_item(p, item -> parent);
break;
case MODE_NIL:
jvm_generate(p, 0, 1, "aconst_null");
case MODE_STRING:
jvm_generate_push_string(p, item -> string, item -> result -> size);
break;
+ case MODE_LEN:
+ push_item(p, item -> parent);
+ jvm_generate_array_len(p, item -> integer);
+ jvm_generate_cast_prefix(p, 'i', jvm_get_postfix(item -> result));
+ break;
+ case MODE_AS:
+ push_item(p, item -> parent);
+ jvm_generate_cast_type(p, item -> parent -> result, item -> result);
+ break;
default:
gen_error("push_item: unk mode %i", item -> mode);
break;
{
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, 2 * cell_size, 1, "%ccmp%c", prefix, fop);
jvm_generate(p, 1, 1, "if%s L%i", cmpop, label_true);
}
+ else if(prefix == 'a')
+ {
+ if(oberon_is_array_of_char_type(t) || oberon_is_string_type(t))
+ {
+ jvm_generate(p, 2, 1, "invokestatic SYSTEM/STRCMP([B[B)I");
+ jvm_generate(p, 1, 0, "if%s L%i", cmpop, label_true);
+ }
+ else
+ {
+ jvm_generate(p, 1, 0, "if_acmp%s L%i", cmpop, label_true);
+ }
+ }
else
{
jvm_generate(p, 2 * cell_size, 0, "if_%ccmp%s L%i", prefix, cmpop, label_true);
case OP_ABS:
jvm_generate_abs(p, prefix);
break;
+ case OP_CAP:
+ jvm_generate(p, cell_size, cell_size, "invokestatic java/lang/Character/toUpperCase(I)I");
+ break;
case OP_ADD:
jvm_generate(p, 2 * cell_size, cell_size, "%cadd", prefix);
jvm_generate(p, 2 * cell_size, cell_size, "%cand", prefix);
break;
case OP_DIFFERENCE:
+ /* (a - b) == a & ~b */
jvm_generate_push_int_size(p, -1, t -> size);
jvm_generate(p, 2 * cell_size, cell_size, "%cxor", prefix);
jvm_generate(p, 2 * cell_size, cell_size, "%cand", prefix);
@@ -1684,15 +1581,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, "ifeq %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);
@@ -1703,15 +1598,13 @@ 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, "ifeq %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);
char prefix;
int cell_size;
- oberon_type_t * t;
+ oberon_type_t * type;
gen_var_t * ra;
gen_var_t * rb;
int label_else;
int label_end;
- bool wide;
- t = a -> result;
- cell_size = jvm_cell_size_for_type(t);
- prefix = jvm_get_prefix(t);
+ 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, t -> size);
+ jvm_generate_push_int_size(p, 1, type -> size);
push_expr(p, a);
jvm_generate(p, 2 * cell_size, cell_size, "%cshl", prefix);
}
else
{
- wide = jvm_is_wide_type(t);
- ra = oberon_generator_new_var();
- rb = oberon_generator_new_var();
- jvm_generate_and_init_local_var(ra, p, wide);
- jvm_generate_and_init_local_var(rb, p, wide);
+ 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, t, ra);
+ jvm_generate_store(p, ra);
push_expr(p, b);
- jvm_generate_store(p, t, rb);
+ jvm_generate_store(p, rb);
- jvm_generate_load(p, t, ra);
- jvm_generate_load(p, t, 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, t -> size);
- jvm_generate_load(p, t, rb);
+ 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, t -> size);
- jvm_generate_load(p, t, ra);
+ 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, t -> size);
+ jvm_generate_push_int_size(p, 0, type -> size);
jvm_generate_label(p, label_end);
}
int label_else = jvm_new_label_id(p);
int label_end = jvm_new_label_id(p);
+ /* (a IN b) == (1 << a) & b */
jvm_generate_push_int_size(p, 1, t -> size);
push_expr(p, a);
jvm_generate(p, 2 * cell_size, cell_size, "%cshl", prefix);
jvm_generate_label(p, label_end);
}
+static void
+jvm_generate_shift(gen_proc_t * p, int op, oberon_expr_t * a, oberon_expr_t * b)
+{
+ oberon_type_t * t = a -> result;
+ int cell_size = jvm_cell_size_for_type(t);
+ char prefix = jvm_get_prefix(t);
+ char dt = jvm_get_type_of_prefix(prefix);
+
+ push_expr(p, a);
+ jvm_generate_cast_type(p, a -> result, t);
+ push_expr(p, b);
+ jvm_generate_cast_type(p, b -> result, t);
+
+ char * opname;
+ switch(op)
+ {
+ case OP_ASH:
+ opname = "ASH";
+ break;
+ case OP_LSH:
+ opname = "LSH";
+ break;
+ case OP_ROT:
+ opname = "ROT";
+ break;
+ default:
+ gen_error("jvm_generate_shift: invalid op %i", op);
+ }
+
+ jvm_generate(p, 2 * cell_size, cell_size, "invokestatic SYSTEM/%s(%c%c)%c", opname, dt, dt, dt);
+}
+
+static void
+jvm_generate_entier(gen_proc_t * p, oberon_expr_t * x, oberon_type_t * res)
+{
+ char prefix = jvm_get_prefix(x -> result);
+ char postfix = jvm_get_postfix(res);
+
+ push_expr(p, x);
+ jvm_generate_cast_prefix(p, prefix, 'd');
+ jvm_generate(p, 2, 2, "invokestatic java/lang/Math/floor(D)D");
+ jvm_generate_cast_prefix(p, 'd', postfix);
+}
+
static void
push_operator(gen_proc_t * p, oberon_oper_t * oper)
{
push_expr(p, oper -> left);
jvm_generate_cast_type(p, oper -> left -> result, oper -> result);
break;
+ case OP_HARDCAST:
+ push_expr(p, oper -> left);
+ jvm_generate_hard_cast_type(p, oper -> left -> result, oper -> result);
+ break;
case OP_COMPLEMENTATION:
case OP_UNARY_MINUS:
case OP_LOGIC_NOT:
case OP_ABS:
+ case OP_CAP:
push_expr(p, oper -> left);
jvm_generate_operator(p, preq, op);
break;
+ case OP_ENTIER:
+ jvm_generate_entier(p, oper -> left, oper -> result);
+ break;
case OP_ADD:
case OP_SUB:
case OP_IN:
jvm_generate_in(p, oper -> left, oper -> right);
break;
+
+ case OP_ASH:
+ case OP_LSH:
+ case OP_ROT:
+ jvm_generate_shift(p, op, oper -> left, oper -> right);
+ break;
default:
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:
;
assert(item -> parent -> is_item);
push_item(p, (oberon_item_t *) item -> parent);
push_expr(p, item -> args);
+ check_index(p, item -> args -> result);
push_expr(p, src);
jvm_generate(p, 1 + 1 + cell_size, 0, "%castore", postfix);
break;
case MODE_FIELD:
assert(item -> parent -> is_item);
push_item(p, (oberon_item_t *) item -> parent);
+ jvm_generate_ldst_prepare(p, item -> var -> gen_var);
push_expr(p, src);
- jvm_generate_store(p, 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);
@@ -1946,27 +1901,108 @@ oberon_generate_assign(oberon_context_t * ctx, oberon_expr_t * src, oberon_expr_
}
void
-oberon_generate_code(oberon_context_t * ctx)
+oberon_generate_copy(oberon_context_t * ctx, oberon_expr_t * src, oberon_expr_t * dst)
+{
+ gen_module_t * m;
+ gen_proc_t * p;
+ char * desc;
+
+ m = ctx -> mod -> gen_mod;
+ p = m -> class -> p;
+
+ push_expr(p, src);
+ push_expr(p, dst);
+
+ desc = jvm_get_descriptor(dst -> result);
+
+ jvm_generate(p, 2, 0, "invokestatic SYSTEM/COPY(%s%s)V", desc, desc);
+}
+
+void
+oberon_generate_assert(oberon_context_t * ctx, oberon_expr_t * cond)
+{
+ gen_module_t * m;
+ gen_proc_t * p;
+
+ m = ctx -> mod -> gen_mod;
+ p = m -> class -> p;
+
+ push_expr(p, cond);
+ jvm_generate(p, 1, 0, "invokestatic SYSTEM/ASSERT(Z)V");
+}
+
+void
+oberon_generate_assert_n(oberon_context_t * ctx, oberon_expr_t * cond, int64_t n)
+{
+ gen_module_t * m;
+ gen_proc_t * p;
+
+ m = ctx -> mod -> gen_mod;
+ p = m -> class -> p;
+
+ push_expr(p, cond);
+ jvm_generate_push_int_size(p, n, 8);
+ jvm_generate(p, 1 + 2, 0, "invokestatic SYSTEM/ASSERT(ZJ)V");
+}
+
+void
+oberon_generate_trap(oberon_context_t * ctx, int64_t n)
+{
+ gen_module_t * m;
+ gen_proc_t * p;
+
+ m = ctx -> mod -> gen_mod;
+ p = m -> class -> p;
+
+ jvm_generate_push_int_size(p, n, 8);
+ jvm_generate(p, 2, 0, "invokestatic SYSTEM/TRAP(J)V");
+}
+
+void
+oberon_generate_halt(oberon_context_t * ctx, int64_t n)
{
- printf("generate code\n");
+ gen_module_t * m;
+ gen_proc_t * p;
+
+ m = ctx -> mod -> gen_mod;
+ p = m -> class -> p;
+
+ jvm_generate_push_int_size(p, n, 8);
+ jvm_generate(p, 2, 0, "invokestatic SYSTEM/HALT(J)V");
}
void
-oberon_generator_dump(oberon_context_t * ctx, char * path)
+oberon_set_out_directory(oberon_context_t * ctx, const char * path)
{
- printf("jit: dump code\n");
+ gen_context_t * c;
+
+ c = ctx -> gen_context;
+
+ c -> dir = new_string(path);
}
-void *
-oberon_generator_get_procedure(oberon_context_t * ctx, const char * name)
+void
+oberon_set_typecheck(oberon_object_t * var, bool enable)
{
- printf("jit: get pointer to procedure %s\n", name);
- return NULL;
+ var -> gen_var -> typecheck = enable;
+ var -> gen_var -> forcetype = (enable) ? (var -> type -> gen_type) : (NULL);
}
-void *
-oberon_generator_get_var(oberon_context_t * ctx, const char * name)
+void oberon_set_line(oberon_context_t * ctx, int line)
{
- printf("jit: get pointer to var %s\n", name);
- return NULL;
+ gen_module_t * m;
+ gen_proc_t * p;
+
+ m = ctx -> mod -> gen_mod;
+ if(m != NULL)
+ {
+ p = m -> class -> p;
+
+ if(p != NULL)
+ {
+ jvm_generate(p, 0, 0, ".line %i", line);
+ }
+
+ m -> line = line;
+ }
}