index 4f49cfb86ca94df0b220be27f0d5fad68ac99a3b..f26c9513e000ca18cc3203fc0e67155b3111398c 100644 (file)
#include <gc.h>
#include "../../oberon-internals.h"
#include <gc.h>
#include "../../oberon-internals.h"
+#include "../../oberon-type-compat.h"
#include "../../generator.h"
#include "generator-jvm.h"
#include "generator-jvm-abi.h"
#include "../../generator.h"
#include "generator-jvm.h"
#include "generator-jvm-abi.h"
}
else
{
}
else
{
- jvm_generate(p, 2, 2, "invokestatic java/lang/Double/doubleToRawIntBits(D)J");
+ jvm_generate(p, 2, 2, "invokestatic java/lang/Double/doubleToRawLongBits(D)J");
jvm_generate_cast_prefix(p, 'l', postfix);
}
}
jvm_generate_cast_prefix(p, 'l', postfix);
}
}
@@ -103,6 +104,14 @@ jvm_generate_hard_cast_type(gen_proc_t * p, oberon_type_t * from, oberon_type_t
}
}
}
}
+static void
+check_index(gen_proc_t * p, oberon_type_t * index_type)
+{
+ // TODO проверка валидности границ
+ char prefix = jvm_get_prefix(index_type);
+ jvm_generate_cast_prefix(p, prefix, 'i');
+}
+
/*
* Генерирует код для инициализации массива со статическим базовым типом
* ( aref -- )
/*
* Генерирует код для инициализации массива со статическим базовым типом
* ( aref -- )
break;
case OBERON_TYPE_RECORD:
m = type -> module -> gen_mod;
break;
case OBERON_TYPE_RECORD:
m = type -> module -> gen_mod;
+ t -> full_name = jvm_get_class_full_name(type);
oberon_generate_record_class(c -> dir, m, type);
break;
case OBERON_TYPE_PROCEDURE:
oberon_generate_record_class(c -> dir, m, type);
break;
case OBERON_TYPE_PROCEDURE:
t -> postfix = jvm_get_postfix(type);
}
t -> postfix = jvm_get_postfix(type);
}
+ if((type -> class == OBERON_TYPE_POINTER && type -> base -> class == OBERON_TYPE_RECORD) ||
+ type -> class == OBERON_TYPE_PROCEDURE ||
+ type -> class == OBERON_TYPE_RECORD ||
+ type -> class == OBERON_TYPE_SYSTEM_PTR)
+ {
+ t -> full_name = jvm_get_class_full_name(type);
+ }
+
t -> cell_size = jvm_cell_size_for_type(type);
if(type -> class != OBERON_TYPE_NIL)
t -> cell_size = jvm_cell_size_for_type(type);
if(type -> class != OBERON_TYPE_NIL)
}
}
}
}
+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_generator_init_temp_var(oberon_context_t * ctx, oberon_object_t * var)
{
void
oberon_generator_init_temp_var(oberon_context_t * ctx, oberon_object_t * var)
{
var -> gen_var = jvm_create_function_temp_var(p, t);
jvm_generate_var(var -> gen_var);
jvm_generate_var_initialization(p, var -> gen_var);
var -> gen_var = jvm_create_function_temp_var(p, t);
jvm_generate_var(var -> gen_var);
jvm_generate_var_initialization(p, var -> gen_var);
+ oberon_generate_static_initialization(p, var);
}
void
}
void
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)
{
}
name = jvm_get_name(proc);
}
name = jvm_get_name(proc);
+ p -> ret_prefix = jvm_get_prefix(proc -> type -> base);
jvm_generate_function_header(p, "public static", name, signature);
if(proc -> local)
jvm_generate_function_header(p, "public static", name, signature);
if(proc -> local)
p = m -> class -> p;
oberon_generate_trap(ctx, -4);
p = m -> class -> p;
oberon_generate_trap(ctx, -4);
+
+ if(p -> ret_prefix == ' ')
+ {
+ jvm_generate(p, 0, 0, "return");
+ }
+ else
+ {
+ int sz = jvm_cell_size_for_postfix(p -> ret_prefix);
+ switch(p -> ret_prefix)
+ {
+ case 'a':
+ jvm_generate(p, 0, 1, "aconst_null");
+ break;
+ case 'l':
+ jvm_generate_push_int_size(p, 0, 8);
+ break;
+ case 'f':
+ jvm_generate_push_float(p, 0, 4);
+ break;
+ case 'd':
+ jvm_generate_push_float(p, 0, 8);
+ break;
+ default:
+ jvm_generate_push_int(p, 0);
+ break;
+ }
+ jvm_generate(p, sz, 0, "%creturn", p -> ret_prefix);
+ }
+
jvm_generate_function_end(p);
}
jvm_generate_function_end(p);
}
@@ -1146,14 +1195,6 @@ oberon_generate_branch(oberon_context_t * ctx, oberon_expr_t * cond, bool gotoif
}
}
}
}
-static void
-check_index(gen_proc_t * p, oberon_type_t * index_type)
-{
- // TODO проверка валидности границ
- char prefix = jvm_get_prefix(index_type);
- jvm_generate_cast_prefix(p, prefix, 'i');
-}
-
static void
push_varptr(gen_proc_t * p, oberon_expr_t * expr)
{
static void
push_varptr(gen_proc_t * p, oberon_expr_t * expr)
{
@@ -1286,6 +1327,7 @@ jvm_generate_expr_new_pointer(gen_proc_t * p, oberon_type_t * type, int num, obe
for(int i = 0; i < num; i++)
{
push_expr(p, arg);
for(int i = 0; i < num; i++)
{
push_expr(p, arg);
+ check_index(p, arg -> result);
arg = arg -> next;
}
arg = arg -> next;
}
jvm_generate_array_len(p, item -> integer);
jvm_generate_cast_prefix(p, 'i', jvm_get_postfix(item -> result));
break;
jvm_generate_array_len(p, item -> integer);
jvm_generate_cast_prefix(p, 'i', jvm_get_postfix(item -> result));
break;
+ case MODE_AS:
+ push_item(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;
default:
gen_error("push_item: unk mode %i", item -> mode);
break;
}
else if(prefix == 'a')
{
}
else if(prefix == 'a')
{
- if(t -> class == OBERON_TYPE_STRING
- || (t -> class == OBERON_TYPE_POINTER && t -> base -> class == OBERON_TYPE_CHAR))
+ if(oberon_is_array_of_char_type(t) || oberon_is_string_type(t))
{
jvm_generate(p, 2, 1, "invokestatic SYSTEM/STRCMP([B[B)I");
jvm_generate(p, 1, 0, "if%s L%i", cmpop, label_true);
{
jvm_generate(p, 2, 1, "invokestatic SYSTEM/STRCMP([B[B)I");
jvm_generate(p, 1, 0, "if%s L%i", cmpop, label_true);
c -> dir = new_string(path);
}
c -> dir = new_string(path);
}
+
+void
+oberon_set_typecheck(oberon_object_t * var, bool enable)
+{
+ var -> gen_var -> typecheck = enable;
+ var -> gen_var -> forcetype = (enable) ? (var -> type -> gen_type) : (NULL);
+}
+
+void oberon_set_line(oberon_context_t * ctx, int line)
+{
+ gen_module_t * m;
+ gen_proc_t * p;
+
+ m = ctx -> mod -> gen_mod;
+ if(m != NULL)
+ {
+ p = m -> class -> p;
+
+ if(p != NULL)
+ {
+ jvm_generate(p, 0, 0, ".line %i", line);
+ }
+
+ m -> line = line;
+ }
+}