X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fbackends%2Fjvm%2Fgenerator-jvm.c;h=d609ed8de96c216a30ac4ec9bceda90ec230583e;hb=ee7fd939ac99201466900fb3983aa90b980da5c3;hp=581faf92c302bab84ce601e5087eeb39e480d4ef;hpb=d11b76dfc015306841ed4befae800ba1ed7c765b;p=dsw-obn.git diff --git a/src/backends/jvm/generator-jvm.c b/src/backends/jvm/generator-jvm.c index 581faf9..d609ed8 100644 --- a/src/backends/jvm/generator-jvm.c +++ b/src/backends/jvm/generator-jvm.c @@ -166,7 +166,7 @@ jvm_generate_push_int(gen_proc_t * p, int64_t i) } else { - jvm_generate(p, 0, 2, "ldc2 %li", i); + jvm_generate(p, 0, 2, "ldc2_w %li", i); } } @@ -198,7 +198,7 @@ jvm_generate_push_int_size(gen_proc_t * p, int64_t i, int size) else { pushed_cell = 2; - jvm_generate(p, 0, 2, "ldc2 %li", i); + jvm_generate(p, 0, 2, "ldc2_w %li", i); } assert(size <= 8); @@ -258,7 +258,7 @@ jvm_generate_push_float(gen_proc_t * p, double f, int size) } else { - jvm_generate(p, 0, 2, "ldc2 %lf", f); + jvm_generate(p, 0, 2, "ldc2_w %lf", f); } } } @@ -689,6 +689,9 @@ jvm_generate_push_procedure_pointer(gen_proc_t * p, oberon_object_t * proc) // ========================================== // ========================================== +static void +push_item(gen_proc_t * p, oberon_item_t * item); + void oberon_generator_init_context(oberon_context_t * ctx) { @@ -758,7 +761,14 @@ oberon_generate_procedure_pointer_class(oberon_object_t * proc) fprintf(fp, ".method ()V\n"); fprintf(fp, " aload_0\n"); fprintf(fp, " invokespecial %s/()V\n", abscname); - fprintf(fp, " aload_0\n"); + fprintf(fp, " return\n"); + fprintf(fp, ".end method\n\n"); + + fprintf(fp, ".method static ()V\n"); + fprintf(fp, " .limit stack 2\n"); + fprintf(fp, " new %s\n", cname); + fprintf(fp, " dup\n"); + fprintf(fp, " invokespecial %s/()V\n", cname); fprintf(fp, " putstatic %s/pointer %s\n", cname, absdesc); fprintf(fp, " return\n"); fprintf(fp, ".end method\n\n"); @@ -827,7 +837,16 @@ oberon_generate_record_class(gen_module_t * m, oberon_type_t * rec) fprintf(class -> fp, ".source %s\n", rec -> module -> name); fprintf(class -> fp, ".class public %s\n", cname); - fprintf(class -> fp, ".super java/lang/Object\n\n"); + + if(rec -> base == NULL) + { + fprintf(class -> fp, ".super java/lang/Object\n\n"); + } + else + { + class -> base = rec -> base -> gen_type -> class; + fprintf(class -> fp, ".super %s\n\n", class -> base -> full_name); + } rec -> gen_type -> class = class; } @@ -846,6 +865,7 @@ oberon_generator_init_type(oberon_context_t * ctx, oberon_type_t * type) case OBERON_TYPE_BOOLEAN: case OBERON_TYPE_ARRAY: case OBERON_TYPE_REAL: + case OBERON_TYPE_CHAR: break; case OBERON_TYPE_RECORD: ; @@ -887,7 +907,14 @@ oberon_generator_init_record(oberon_context_t * ctx, oberon_type_t * rec) jvm_generate_function_header(p, "public", "", "()V"); jvm_alloc_register_untyped(p -> rf, false); jvm_generate(p, 0, 1, "aload_0"); - jvm_generate(p, 1, 0, "invokespecial java/lang/Object/()V"); + if(class -> base) + { + jvm_generate(p, 1, 0, "invokespecial %s/()V", class -> base -> full_name); + } + else + { + jvm_generate(p, 1, 0, "invokespecial java/lang/Object/()V"); + } num = rec -> num_decl; field = rec -> decl; for(int i = 0; i < num; i++) @@ -1056,12 +1083,6 @@ oberon_generate_begin_module(oberon_context_t * ctx) jvm_generate_store(p, x -> type, x -> gen_var); } } - else if(x -> class == OBERON_CLASS_PROC) - { - char * cname = jvm_get_field_full_name_safe(x); - jvm_generate(p, 0, 1, "new %s", cname); - jvm_generate(p, 1, 0, "invokespecial %s/()V", cname); - } x = x -> next; } @@ -1208,30 +1229,39 @@ oberon_generate_end_proc(oberon_context_t * ctx) } static void -jvm_generate_call_proc(gen_proc_t * p, oberon_expr_t * desig) +jvm_generate_call_proc(gen_proc_t * p, oberon_item_t * desig) { - assert(desig -> is_item); - assert(desig -> item.mode == MODE_CALL); - - oberon_object_t * proc; - char * fullname; - char * signature; + assert(desig -> var == NULL); + assert(desig -> mode == MODE_CALL); - proc = desig -> item.var; - fullname = jvm_get_field_full_name(proc); - signature = jvm_get_procedure_signature(proc -> type); + char * signature = NULL; + + bool direct_call = false; + if(desig -> parent -> mode == MODE_VAR) + { + if(desig -> parent -> var -> class == OBERON_CLASS_PROC) + { + direct_call = true; + } + } + + printf("direct_call == %i\n", direct_call); + + oberon_type_t * procsig; + procsig = desig -> parent -> result; + signature = jvm_get_procedure_signature(procsig); - if(proc -> class != OBERON_CLASS_PROC) + if(direct_call == false) { /* Загружаем указатель на процедуру */ - jvm_generate_load(p, proc -> type, proc -> gen_var); + push_item(p, desig -> parent); } int args_cells = 0; - int result_cells = jvm_cell_size_for_type(proc -> type -> base); + int result_cells = jvm_cell_size_for_type(procsig -> base); - int num = desig -> item.num_args; - oberon_expr_t * arg = desig -> item.args; + int num = desig -> num_args; + oberon_expr_t * arg = desig -> args; for(int i = 0; i < num; i++) { args_cells += jvm_cell_size_for_type(arg -> result); @@ -1239,23 +1269,23 @@ jvm_generate_call_proc(gen_proc_t * p, oberon_expr_t * desig) arg = arg -> next; } - if(proc -> class == OBERON_CLASS_PROC) + if(direct_call) { - /* Обычная статическая процедура */ - jvm_generate(p, args_cells, result_cells, "invokestatic %s%s", fullname, signature); + char * full_name = jvm_get_field_full_name(desig -> parent -> var); + jvm_generate(p, args_cells, result_cells, "invokestatic %s%s", full_name, signature); } else { - /* Процедура-переменная */ - char * class = jvm_get_class_full_name(proc -> type); - jvm_generate(p, 1 + args_cells, result_cells, "invokevirtual %s/invoke%s", class, signature); + char * cname = jvm_get_class_full_name(procsig); + jvm_generate(p, 1 + args_cells, result_cells, "invokevirtual %s/invoke%s", cname, signature); } } void oberon_generate_call_proc(oberon_context_t * ctx, oberon_expr_t * desig) { - jvm_generate_call_proc(ctx -> mod -> gen_mod -> class -> p, desig); + assert(desig -> is_item); + jvm_generate_call_proc(ctx -> mod -> gen_mod -> class -> p, (oberon_item_t *) desig); } void @@ -1299,19 +1329,27 @@ jvm_generate_expr_new_pointer(gen_proc_t * p, oberon_type_t * type, int num, obe static void jvm_generate_cast_type(gen_proc_t * p, oberon_type_t * from, oberon_type_t * to) { - 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) + if(to -> class == OBERON_TYPE_RECORD || to -> class == OBERON_TYPE_POINTER) { - return; + 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(p, from_cell_size, to_cell_size, "%c2%c", prefix, postfix); + 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 @@ -1330,13 +1368,14 @@ push_item(gen_proc_t * p, oberon_item_t * item) } break; case MODE_INTEGER: + case MODE_CHAR: 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, (oberon_expr_t *) item); + jvm_generate_call_proc(p, item); break; case MODE_INDEX: ; @@ -1366,10 +1405,6 @@ push_item(gen_proc_t * p, oberon_item_t * item) case MODE_REAL: jvm_generate_push_float(p, item -> real, item -> result -> size); break; - case MODE_CAST: - push_expr(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; @@ -1549,6 +1584,10 @@ push_operator(gen_proc_t * p, oberon_oper_t * oper) int op = oper -> op; switch(op) { + case OP_CAST: + push_expr(p, oper -> left); + jvm_generate_cast_type(p, oper -> left -> result, oper -> result); + break; case OP_UNARY_MINUS: case OP_BITWISE_NOT: case OP_LOGIC_NOT: