index da8b06b29f5142a7ea9b25cdd2e6c8ed18a00bb8..559325964d72498d3bfd7cfee1f1faf9e7e02012 100644 (file)
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;
}
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);
+ jvm_init_param(p, copy_dst, rec -> gen_type);
+ jvm_init_param(p, copy_src, rec -> gen_type);
+ jvm_generate_param_initialization(p, copy_dst, "dst");
+ jvm_generate_param_initialization(p, copy_src, "src");
num = rec -> num_decl;
field = rec -> decl;
for(int i = 0; i < num; i++)
struct gen_class * class;
class = m -> class;
+ gen_proc_t * p;
switch(var -> class)
{
case OBERON_CLASS_VAR_PARAM:
+ p = var -> parent -> gen_proc;
+ jvm_init_var_param(p, v, var -> type -> gen_type);
+ break;
case OBERON_CLASS_PARAM:
- /* Заполняется при генерации функции */
- /* смотри jvm_init_local_object() */
+ p = var -> parent -> gen_proc;
+ jvm_init_param(p, v, var -> type -> gen_type);
break;
case OBERON_CLASS_FIELD:
/* Заполняются при инициализации структуры */
/* смотри oberon_generator_init_record() */
break;
case OBERON_CLASS_VAR:
- /* Локальные заполняются при генерации функции */
- /* смотри jvm_init_local_object() */
- if(var -> local == false)
+ if(var -> local)
+ {
+ p = var -> parent -> gen_proc;
+ jvm_init_named_local_var(p, v, var -> type -> gen_type);
+ }
+ else
{
jvm_generate_and_init_global_var(class, v, var -> name, var -> type -> gen_type);
}
{
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);
- }
}
void
@@ -802,10 +802,11 @@ 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_initialization(gen_proc_t * p, oberon_object_t * x)
{
gen_var_t * v;
struct gen_class * class;
+ char * name;
v = x -> gen_var;
class = p -> class;
assert(class -> p);
assert(x -> local);
+ name = jvm_get_name(x);
switch(x -> class)
{
case OBERON_CLASS_VAR_PARAM:
- jvm_generate_and_init_var_param(p, v, x -> name, x -> type -> gen_type);
+ jvm_generate_var_param_initialization(p, v, name);
break;
- case OBERON_CLASS_VAR:
case OBERON_CLASS_PARAM:
- jvm_generate_and_init_named_local_var(p, v, x -> name, x -> type -> gen_type);
- break;
- default:
- gen_error("jvm_init_local_object: wat");
- break;
- }
-}
-
-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_param_initialization(p, v, name);
break;
case OBERON_CLASS_VAR:
- jvm_generate_variable_initialization(p, v);
+ jvm_generate_named_local_var_initialization(p, v, name);
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 || x -> class == OBERON_CLASS_VAR_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;
p = proc -> gen_proc;
- signature = jvm_get_procedure_signature(proc -> type);
- jvm_generate_function_header(p, "public static", proc -> name, signature);
-
- /* Выделение регистров под параметры и переменные */
- oberon_object_t * var = proc -> scope -> list -> next;
- while(var)
+ if(proc -> local == false)
{
- jvm_init_local_object(p, var);
- var = var -> next;
+ 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);
+
/* Инициализация */
- var = proc -> scope -> list -> next;
+ oberon_object_t * var = proc -> scope -> list -> next;
while(var)
{
jvm_generate_local_initialization(p, var);
var = var -> next;
}
-
- /* Копирование статических/открытых массивов и записей */
- var = proc -> type -> decl;
- while(var)
- {
- if(var -> class == OBERON_CLASS_PARAM || var -> class == OBERON_CLASS_VAR_PARAM)
- {
- if(var -> type -> class == OBERON_TYPE_ARRAY)
- {
- jvm_generate_array_duplicate_and_replace(p, var -> gen_var, var -> type);
- }
- else if(var -> type -> class == OBERON_TYPE_RECORD)
- {
- jvm_generate_record_duplicate_and_replace(p, var -> gen_var, var -> type);
- }
- }
- var = var -> next;
- }
}
void