index da8b06b29f5142a7ea9b25cdd2e6c8ed18a00bb8..90b0e88f777caa2c3731b55241603b971d126af6 100644 (file)
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");
oberon_object_t * param = proc -> type -> decl;
for(int i = 0; i < num; i++)
{
- gen_var_t * v = oberon_generator_new_var();
gen_type_t * t = param -> type -> gen_type;
- use_size += t -> cell_size;
if(param -> class == OBERON_CLASS_VAR_PARAM)
{
- jvm_generate_and_init_var_param(p, v, param -> name, t);
- jvm_generate_ldst_prepare(p, v);
+ 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
{
- jvm_generate_and_init_named_local_var(p, v, param -> name, t);
- jvm_generate_load(p, v);
+ 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");
}
memset(t, 0, sizeof *t);
type -> gen_type = t;
- if(type -> class != OBERON_TYPE_VOID)
+ 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);
}
+
t -> cell_size = jvm_cell_size_for_type(type);
- t -> desc = jvm_get_descriptor(type);
+
+ if(type -> class != OBERON_TYPE_NIL)
+ {
+ t -> desc = jvm_get_descriptor(type);
+ }
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_CHAR:
case OBERON_TYPE_STRING:
case OBERON_TYPE_SET:
+ case OBERON_TYPE_NIL:
break;
case OBERON_TYPE_RECORD:
;
oberon_object_t * field = rec -> decl;
for(int i = 0; i < num; i++)
{
- char * name = field -> name;
- gen_var_t * v = field -> gen_var;
- gen_type_t * t = field -> type -> gen_type;
- jvm_generate_and_init_field(class, v, name, t);
+ jvm_generate_var(field -> gen_var);
field = field -> next;
}
for(int i = 0; i < num; i++)
{
jvm_generate(p, 0, 1, "aload_0");
- jvm_generate_variable_initialization(p, field -> gen_var);
+ jvm_generate_var_initialization(p, field -> gen_var);
if(field -> type -> class == OBERON_TYPE_RECORD
|| field -> type -> class == OBERON_TYPE_ARRAY)
/* Метод для копирования полей класса */
/* reg0 == src -> reg1 == dst */
p = jvm_create_proc(class);
- gen_var_t * copy_dst = oberon_generator_new_var();
- gen_var_t * copy_src = oberon_generator_new_var();
char * signature = new_string("(%s%s)V", rec -> gen_type -> desc, rec -> gen_type -> desc);
jvm_generate_function_header(p, "public static", "$COPY$", signature);
- jvm_generate_and_init_named_local_var(p, copy_dst, "dst", rec -> gen_type);
- jvm_generate_and_init_named_local_var(p, copy_src, "src", rec -> gen_type);
+
+ 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++)
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;
+ 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:
+ 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 == false)
+ if(var -> local)
+ {
+ p = var -> parent -> gen_proc;
+ var -> gen_var = jvm_create_function_var(p, JVM_STORAGE_FRAME_VAR, name, t);
+ }
+ else
{
- jvm_generate_and_init_global_var(class, v, var -> name, var -> type -> gen_type);
+ var -> gen_var = jvm_create_class_var(class, JVM_STORAGE_STATIC_VAR, name, t);
+ jvm_generate_var(var -> gen_var);
}
break;
default:
{
assert(var -> class == OBERON_CLASS_VAR);
- gen_var_t * v = oberon_generator_new_var();
- var -> gen_var = v;
-
gen_module_t * m;
m = ctx -> mod -> gen_mod;
gen_proc_t * p;
p = m -> class -> p;
- jvm_generate_and_init_local_var(p, v, var -> type -> gen_type);
+ 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
{
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");
- }
- else
- {
- 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_variable_initialization(p, x -> gen_var);
+ jvm_generate_var_initialization(p, x -> gen_var);
if(x -> type -> class == OBERON_TYPE_ARRAY
|| x -> type -> class == OBERON_TYPE_RECORD)
{
@@ -802,7 +811,7 @@ jvm_generate_record_duplicate_and_replace(gen_proc_t * p, gen_var_t * v, oberon_
}
static void
-jvm_init_local_object(gen_proc_t * p, oberon_object_t * x)
+jvm_generate_local_object(gen_proc_t * p, oberon_object_t * x)
{
gen_var_t * v;
struct gen_class * class;
switch(x -> class)
{
case OBERON_CLASS_VAR_PARAM:
- jvm_generate_and_init_var_param(p, v, x -> name, x -> type -> gen_type);
- break;
- case OBERON_CLASS_VAR:
case OBERON_CLASS_PARAM:
- jvm_generate_and_init_named_local_var(p, v, x -> name, x -> type -> gen_type);
+ case OBERON_CLASS_VAR:
+ jvm_generate_var(v);
+ break;
+ case OBERON_CLASS_PROC:
break;
default:
- gen_error("jvm_init_local_object: wat");
+ gen_error("jvm_generate_local_initialization: wat");
break;
}
}
switch(x -> class)
{
case OBERON_CLASS_VAR_PARAM:
- break;
+ case OBERON_CLASS_PARAM:
case OBERON_CLASS_VAR:
- jvm_generate_variable_initialization(p, v);
+ jvm_generate_var_initialization(p, v);
break;
- case OBERON_CLASS_PARAM:
- jvm_generate_param_initialization(p, v);
+ 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);
+ }
- /* Выделение регистров под параметры и переменные */
- oberon_object_t * var = proc -> scope -> list -> next;
- while(var)
+ name = jvm_get_name(proc);
+ jvm_generate_function_header(p, "public static", name, signature);
+
+ if(proc -> local)
{
- jvm_init_local_object(p, var);
- var = var -> next;
+ jvm_generate_staticlinks(proc);
}
- /* Инициализация */
+ jvm_generate_procedure_frame(proc);
+
+ /* Создание парамеров и переменных */
var = proc -> scope -> list -> next;
while(var)
{
- jvm_generate_local_initialization(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
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);
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);
}
}
}
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);
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);
+ 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");
}
else
{
- ra = oberon_generator_new_var();
- rb = oberon_generator_new_var();
- jvm_generate_and_init_local_var(p, ra, type -> gen_type);
- jvm_generate_and_init_local_var(p, rb, type -> gen_type);
+ 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);
@@ -1620,29 +1642,3 @@ oberon_generate_assign(oberon_context_t * ctx, oberon_expr_t * src, oberon_expr_
store_expr(p, dst, src);
}
-
-void
-oberon_generate_code(oberon_context_t * ctx)
-{
- printf("generate code\n");
-}
-
-void
-oberon_generator_dump(oberon_context_t * ctx, char * path)
-{
- printf("jit: dump code\n");
-}
-
-void *
-oberon_generator_get_procedure(oberon_context_t * ctx, const char * name)
-{
- printf("jit: get pointer to procedure %s\n", name);
- return NULL;
-}
-
-void *
-oberon_generator_get_var(oberon_context_t * ctx, const char * name)
-{
- printf("jit: get pointer to var %s\n", name);
- return NULL;
-}