index 450105525a0aa9b290fd7e0c3f7c91e5904dfdd9..90b0e88f777caa2c3731b55241603b971d126af6 100644 (file)
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:
;
struct gen_class * class = proc -> module -> gen_mod -> class;
proc -> gen_proc = jvm_create_proc(class);
proc -> gen_proc -> full_name = jvm_get_field_full_name_safe(proc);
+ jvm_create_static_links(proc);
}
void
p = proc -> gen_proc;
- if(proc -> local == false)
+ if(proc -> local)
+ {
+ signature = jvm_get_local_procedure_signature(proc);
+ }
+ else
{
oberon_generate_procedure_pointer_class(proc);
+ signature = jvm_get_procedure_signature(proc -> type);
}
- 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);
+ }
+
+ jvm_generate_procedure_frame(proc);
+
/* Создание парамеров и переменных */
var = proc -> scope -> list -> next;
while(var)
var = var -> next;
}
- jvm_generate_procedure_frame(proc);
jvm_generate_frame_initialization(p);
/* Инициализация парамеров и переменных */
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");
@@ -1628,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;
-}