X-Git-Url: http://deadsoftware.ru/gitweb?p=dsw-obn.git;a=blobdiff_plain;f=src%2Fbackends%2Fjvm%2Fgenerator-jvm.c;h=cb8eeef564ba2925b7eb5701002253f79cdd47d4;hp=1ba25c9afe28ee69e957cb10b6c9572814f06176;hb=35e75d29be18a7355aaaea9e146f3fda1d91857f;hpb=1233fb1d5d8f67a8f5e970386c1c4cbb6691ec04 diff --git a/src/backends/jvm/generator-jvm.c b/src/backends/jvm/generator-jvm.c index 1ba25c9..cb8eeef 100644 --- a/src/backends/jvm/generator-jvm.c +++ b/src/backends/jvm/generator-jvm.c @@ -8,8 +8,8 @@ #include -#include "../../../include/oberon.h" #include "../../oberon-internals.h" +#include "../../generator.h" #include "generator-jvm.h" #include "generator-jvm-abi.h" #include "generator-jvm-asm.h" @@ -493,6 +493,7 @@ oberon_generator_init_type(oberon_context_t * ctx, oberon_type_t * type) case OBERON_TYPE_SET: case OBERON_TYPE_NIL: case OBERON_TYPE_SYSTEM_BYTE: + case OBERON_TYPE_SYSTEM_PTR: break; case OBERON_TYPE_RECORD: m = type -> module -> gen_mod; @@ -631,6 +632,13 @@ oberon_generator_init_var(oberon_context_t * ctx, oberon_object_t * var) struct gen_class * c; char * name = var -> name; gen_type_t * t = var -> type -> gen_type; + + assert(name); + if(t == NULL) + { + gen_error("uninitialized type class %i", var -> type -> class); + } + switch(var -> class) { case OBERON_CLASS_VAR_PARAM: @@ -864,10 +872,12 @@ jvm_generate_local_object(gen_proc_t * p, oberon_object_t * x) case OBERON_CLASS_VAR: jvm_generate_var(v); break; + case OBERON_CLASS_CONST: + case OBERON_CLASS_TYPE: case OBERON_CLASS_PROC: break; default: - gen_error("jvm_generate_local_initialization: wat"); + gen_error("jvm_generate_local_initialization: wat class %i", x -> class); break; } } @@ -892,10 +902,12 @@ jvm_generate_local_initialization(gen_proc_t * p, oberon_object_t * x) case OBERON_CLASS_VAR: jvm_generate_var_initialization(p, v); break; + case OBERON_CLASS_CONST: + case OBERON_CLASS_TYPE: case OBERON_CLASS_PROC: break; default: - gen_error("jvm_generate_local_initialization: wat"); + gen_error("jvm_generate_local_initialization: wat class %i", x -> class); break; } @@ -970,6 +982,7 @@ oberon_generate_end_proc(oberon_context_t * ctx) m = ctx -> mod -> gen_mod; p = m -> class -> p; + oberon_generate_trap(ctx, -4); jvm_generate_function_end(p); } @@ -1206,6 +1219,45 @@ jvm_generate_cast_type(gen_proc_t * p, oberon_type_t * from, oberon_type_t * to) } } +static void +jvm_generate_hard_cast_type(gen_proc_t * p, oberon_type_t * from, oberon_type_t * to) +{ + if(from -> class == OBERON_TYPE_REAL + && (to -> class == OBERON_TYPE_INTEGER || to -> class == OBERON_TYPE_SYSTEM_BYTE)) + { + char postfix = jvm_get_postfix(to); + if(from -> size <= 4) + { + jvm_generate(p, 1, 1, "invokestatic java/lang/Float/floatToIntBits(F)I"); + jvm_generate_cast_prefix(p, 'i', postfix); + } + else + { + jvm_generate(p, 2, 2, "invokestatic java/lang/Double/doubleToIntBits(D)J"); + jvm_generate_cast_prefix(p, 'l', postfix); + } + } + else if((from -> class == OBERON_TYPE_INTEGER || from -> class == OBERON_TYPE_SYSTEM_BYTE) + && to -> class == OBERON_TYPE_REAL) + { + char prefix = jvm_get_prefix(from); + if(to -> size <= 4) + { + jvm_generate_cast_prefix(p, prefix, 'i'); + jvm_generate(p, 1, 1, "invokestatic java/lang/Float/intBitsToFloat(I)F"); + } + else + { + jvm_generate_cast_prefix(p, prefix, 'l'); + jvm_generate(p, 2, 2, "invokestatic java/lang/Double/longBitsToDouble(J)D"); + } + } + else + { + jvm_generate_cast_type(p, from, to); + } +} + static void push_item(gen_proc_t * p, oberon_item_t * item) { @@ -1569,36 +1621,35 @@ jvm_generate_in(gen_proc_t * p, oberon_expr_t * a, oberon_expr_t * b) } static void -jvm_generate_ash(gen_proc_t * p, oberon_expr_t * a, oberon_expr_t * b) +jvm_generate_shift(gen_proc_t * p, int op, oberon_expr_t * a, oberon_expr_t * b) { oberon_type_t * t = a -> result; int cell_size = jvm_cell_size_for_type(t); char prefix = jvm_get_prefix(t); - int label_else = jvm_new_label_id(p); - int label_end = jvm_new_label_id(p); - - /* if b < 0 then a << b else a >> b end */ + char dt = jvm_get_type_of_prefix(prefix); push_expr(p, a); + jvm_generate_cast_type(p, a -> result, t); push_expr(p, b); - if(cell_size == 1) - { - jvm_generate(p, cell_size, 2 * cell_size, "dup"); - } - else + jvm_generate_cast_type(p, b -> result, t); + + char * opname; + switch(op) { - jvm_generate(p, cell_size, 2 * cell_size, "dup2"); + case OP_ASH: + opname = "ASH"; + break; + case OP_LSH: + opname = "LSH"; + break; + case OP_ROT: + opname = "ROT"; + break; + default: + gen_error("jvm_generate_shift: invalid op %i", op); } - jvm_generate_push_int_size(p, 0, t -> size); - jvm_generate_compare_op(p, t, OP_LSS); - jvm_generate(p, cell_size, 0, "ifne L%i", label_else); - jvm_generate(p, 2 * cell_size, cell_size, "%cshl", prefix); - jvm_generate(p, 0, 0, "goto L%i", label_end); - jvm_generate_label(p, label_else); - jvm_generate_abs(p, prefix); - jvm_generate(p, 2 * cell_size, cell_size, "%cshr", prefix); - jvm_generate_label(p, label_end); + jvm_generate(p, 2 * cell_size, cell_size, "invokestatic SYSTEM/%s(%c%c)%c", opname, dt, dt, dt); } static void @@ -1624,6 +1675,10 @@ push_operator(gen_proc_t * p, oberon_oper_t * oper) push_expr(p, oper -> left); jvm_generate_cast_type(p, oper -> left -> result, oper -> result); break; + case OP_HARDCAST: + push_expr(p, oper -> left); + jvm_generate_hard_cast_type(p, oper -> left -> result, oper -> result); + break; case OP_COMPLEMENTATION: case OP_UNARY_MINUS: case OP_LOGIC_NOT: @@ -1679,7 +1734,9 @@ push_operator(gen_proc_t * p, oberon_oper_t * oper) break; case OP_ASH: - jvm_generate_ash(p, oper -> left, oper -> right); + case OP_LSH: + case OP_ROT: + jvm_generate_shift(p, op, oper -> left, oper -> right); break; default: gen_error("push_oper: unk op %i", op);