index cb8eeef564ba2925b7eb5701002253f79cdd47d4..681b4df71ddf6ea5f4c4c885016b2f1557002fea 100644 (file)
jvm_generate_var_initialization(p, copy_dst);
jvm_generate_var_initialization(p, 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++)
num = rec -> num_decl;
field = rec -> decl;
for(int i = 0; i < num; i++)
static void
push_expr(gen_proc_t * p, oberon_expr_t * expr);
static void
push_expr(gen_proc_t * p, oberon_expr_t * expr);
+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_generate_begin_module(oberon_context_t * ctx)
{
void
oberon_generate_begin_module(oberon_context_t * ctx)
{
else if(x -> class == OBERON_CLASS_VAR)
{
jvm_generate_var_initialization(p, x -> gen_var);
else 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 -> gen_var);
- }
+ oberon_generate_static_initialization(p, x);
}
x = x -> next;
}
x = x -> next;
switch(x -> class)
{
case OBERON_CLASS_VAR_PARAM:
switch(x -> class)
{
case OBERON_CLASS_VAR_PARAM:
+ jvm_generate_var_initialization(p, v);
+ break;
case OBERON_CLASS_PARAM:
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);
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:
break;
case OBERON_CLASS_CONST:
case OBERON_CLASS_TYPE:
gen_error("jvm_generate_local_initialization: wat class %i", x -> class);
break;
}
gen_error("jvm_generate_local_initialization: wat class %i", x -> class);
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
}
void
@@ -1190,11 +1204,22 @@ jvm_generate_expr_new_pointer(gen_proc_t * p, oberon_type_t * type, int num, obe
static void
jvm_generate_cast_prefix(gen_proc_t * p, char prefix, char postfix)
{
static void
jvm_generate_cast_prefix(gen_proc_t * p, char prefix, char postfix)
{
+ if((prefix == 'b' || prefix == 's') && (postfix = 'l' || postfix == 'd'))
+ {
+ prefix = 'i';
+ }
+
if(prefix == postfix)
{
return;
}
if(prefix == postfix)
{
return;
}
+ if((prefix == 'l' || prefix == 'd') && (postfix == 'b' || postfix == 's'))
+ {
+ 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);
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);