index 497b99ed278453c093a55685c29b1ceae6b523e4..8c9d69f61258fb91af3a443771b682692fb7d1ee 100644 (file)
va_end(ptr);
}
+static void
+jvm_generate_comment(gen_proc_t * p, char * format, ...)
+{
+ va_list ptr;
+ va_start(ptr, format);
+
+ fprintf(p -> class -> fp, " ;;;; ");
+ vfprintf(p -> class -> fp, format, ptr);
+ fprintf(p -> class -> fp, "\n");
+
+ va_end(ptr);
+}
+
static void
jvm_generate_push_int(gen_proc_t * p, int64_t i)
{
}
}
+static void
+jvm_generate_push_int_size(gen_proc_t * p, int64_t i, int size)
+{
+ int pushed_cell = 1;
+
+ if(i == -1)
+ {
+ jvm_generate(p, 0, 1, "iconst_m1");
+ }
+ else if(i >= 0 && i <= 5)
+ {
+ jvm_generate(p, 0, 1, "iconst_%li", i);
+ }
+ else if(i >= -128 && i <= 127)
+ {
+ jvm_generate(p, 0, 1, "bipush %li", i);
+ }
+ else if(i >= -32768 && i <= 32767)
+ {
+ jvm_generate(p, 0, 1, "sipush %li", i);
+ }
+ else if(i >= -2147483648 && i <= 2147483647)
+ {
+ jvm_generate(p, 0, 1, "ldc %li", i);
+ }
+ else
+ {
+ pushed_cell = 2;
+ jvm_generate(p, 0, 2, "ldc2 %li", i);
+ }
+
+ assert(size <= 8);
+ if(size > 4 && pushed_cell == 1)
+ {
+ jvm_generate(p, pushed_cell, 2, "i2l");
+ }
+ else if(size <= 4)
+ {
+ if(pushed_cell > 1)
+ {
+ jvm_generate(p, 2, 1, "l2i");
+ }
+
+ if(size == 2)
+ {
+ jvm_generate(p, 1, 1, "i2s");
+ }
+ else if(size == 1)
+ {
+ jvm_generate(p, 1, 1, "i2b");
+ }
+ }
+}
+
static void
jvm_generate_push_float(gen_proc_t * p, double f, int size)
{
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;
}
jvm_generate_function_header(p, "public", "<init>", "()V");
jvm_alloc_register_untyped(p -> rf, false);
jvm_generate(p, 0, 1, "aload_0");
- jvm_generate(p, 1, 0, "invokespecial java/lang/Object/<init>()V");
+ if(class -> base)
+ {
+ jvm_generate(p, 1, 0, "invokespecial %s/<init>()V", class -> base -> full_name);
+ }
+ else
+ {
+ jvm_generate(p, 1, 0, "invokespecial java/lang/Object/<init>()V");
+ }
num = rec -> num_decl;
field = rec -> decl;
for(int i = 0; i < num; i++)
@@ -1229,6 +1312,32 @@ jvm_generate_expr_new_pointer(gen_proc_t * p, oberon_type_t * type, int num, obe
jvm_generate_new(p, type -> base, num);
}
+static void
+jvm_generate_cast_type(gen_proc_t * p, oberon_type_t * from, oberon_type_t * to)
+{
+ if(to -> class == OBERON_TYPE_RECORD || to -> class == OBERON_TYPE_POINTER)
+ {
+ 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_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
push_item(gen_proc_t * p, oberon_item_t * item)
{
}
break;
case MODE_INTEGER:
- jvm_generate_push_int(p, item -> integer);
+ jvm_generate_push_int_size(p, item -> integer, item -> result -> size);
break;
case MODE_BOOLEAN:
- jvm_generate_push_int(p, item -> 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);
;
char postfix = jvm_get_postfix(item -> result);
int cell_size = jvm_cell_size_for_postfix(postfix);
- push_item(p, item -> parent);
+ assert(item -> parent -> is_item);
+ push_item(p, (oberon_item_t *) item -> parent);
push_expr(p, item -> args);
jvm_generate(p, 1 + 1, cell_size, "%caload", postfix);
break;
case MODE_FIELD:
- push_item(p, item -> parent);
+ assert(item -> parent -> is_item);
+ push_item(p, (oberon_item_t *) item -> parent);
jvm_generate_load(p, item -> result, item -> var -> gen_var);
break;
case MODE_DEREF:
/* Все объекты в jvm представляются как указатели */
- push_item(p, item -> parent);
+ assert(item -> parent -> is_item);
+ push_item(p, (oberon_item_t *) item -> parent);
break;
case MODE_NIL:
jvm_generate(p, 0, 1, "aconst_null");
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;
;
char postfix = jvm_get_postfix(src -> result);
int cell_size = jvm_cell_size_for_postfix(postfix);
- push_item(p, item -> parent);
+ assert(item -> parent -> is_item);
+ push_item(p, (oberon_item_t *) item -> parent);
push_expr(p, item -> args);
push_expr(p, src);
jvm_generate(p, 1 + 1 + cell_size, 0, "%castore", postfix);
break;
case MODE_FIELD:
- push_item(p, item -> parent);
+ assert(item -> parent -> is_item);
+ push_item(p, (oberon_item_t *) item -> parent);
push_expr(p, src);
jvm_generate_store(p, src -> result, item -> var -> gen_var);
break;