index 5b45cc166bca184d32d0640a24f9f90a016617ef..1ba25c9afe28ee69e957cb10b6c9572814f06176 100644 (file)
memset(gen_context, 0, sizeof *gen_context);
ctx -> gen_context = gen_context;
+ gen_context -> dir = ".";
}
void
}
static void
-oberon_generate_procedure_class(oberon_type_t * proc)
+oberon_generate_procedure_class(const char * dir, oberon_type_t * proc)
{
FILE * fp;
char * cname;
struct gen_class * class;
cname = jvm_get_class_full_name(proc);
- class = jvm_create_class(cname);
+ class = jvm_create_class(dir, cname);
fp = class -> fp;
fprintf(fp, ".source SYSTEM\n");
}
static void
-oberon_generate_procedure_pointer_class(oberon_object_t * proc)
+oberon_generate_procedure_pointer_class(const char * dir, oberon_object_t * proc)
{
FILE * fp;
char * cname;
struct gen_class * class;
cname = jvm_get_field_full_name_safe(proc);
- class = jvm_create_class(cname);
+ class = jvm_create_class(dir, cname);
abscname = jvm_get_class_full_name(proc -> type);
absdesc = jvm_get_descriptor(proc -> type);
fp = class -> fp;
}
static void
-oberon_generate_record_class(gen_module_t * m, oberon_type_t * rec)
+oberon_generate_record_class(const char * dir, gen_module_t * m, oberon_type_t * rec)
{
char * cname;
struct gen_class * class;
m -> rec_id += 1;
cname = jvm_get_class_full_name(rec);
- class = jvm_create_class(cname);
+ class = jvm_create_class(dir, cname);
fprintf(class -> fp, ".source %s\n", rec -> module -> name);
fprintf(class -> fp, ".class public %s\n", cname);
memset(t, 0, sizeof *t);
type -> gen_type = t;
+ gen_context_t * c;
+ c = ctx -> gen_context;
+
gen_module_t * m;
switch(type -> class)
{
case OBERON_TYPE_STRING:
case OBERON_TYPE_SET:
case OBERON_TYPE_NIL:
+ case OBERON_TYPE_SYSTEM_BYTE:
break;
case OBERON_TYPE_RECORD:
m = type -> module -> gen_mod;
- oberon_generate_record_class(m, type);
+ oberon_generate_record_class(c -> dir, m, type);
break;
case OBERON_TYPE_PROCEDURE:
- oberon_generate_procedure_class(type);
+ oberon_generate_procedure_class(c -> dir, type);
break;
default:
gen_error("oberon_generator_init_type: unk calss %i", type -> class);
memset(m, 0, sizeof *m);
mod -> gen_mod = m;
+ gen_context_t * c;
+ c = ctx -> gen_context;
+
struct gen_class * class;
- class = jvm_create_class(mod -> name);
+ class = jvm_create_class(c -> dir, mod -> name);
fprintf(class -> fp, ".source %s\n", mod -> name);
fprintf(class -> fp, ".class %s\n", mod -> name);
fprintf(class -> fp, ".super java/lang/Object\n\n");
+ fprintf(class -> fp, ".field private static $INITIALIZED$ Z\n\n");
+
m -> class = class;
- ctx -> gen_context -> current_m = m;
+ c -> current_m = m;
}
void
void
oberon_generate_begin_module(oberon_context_t * ctx)
{
- struct gen_class * class = ctx -> mod -> gen_mod -> class;
- gen_proc_t * p = jvm_create_proc(class);
+ gen_proc_t * p;
+ int label_cont;
+ struct gen_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");
+ class = ctx -> mod -> gen_mod -> class;
+
+ p = jvm_create_proc(class);
+ jvm_generate_function_header(p, "public static", "BEGIN", "()V");
+
+ label_cont = jvm_new_label_id(p);
+ jvm_generate(p, 0, 1, "getstatic %s/$INITIALIZED$ Z", class -> full_name);
+ jvm_generate(p, 1, 0, "ifeq L%i", label_cont);
+ jvm_generate(p, 0, 0, "return");
+ jvm_generate_label(p, label_cont);
+
+ jvm_generate(p, 0, 1, "iconst_1");
+ jvm_generate(p, 1, 0, "putstatic %s/$INITIALIZED$ Z", class -> full_name);
/* Инициализация переменных объявленных в модуле */
oberon_object_t * x = ctx -> mod -> decl -> list -> next;
while(x != NULL)
{
- if(x -> class == OBERON_CLASS_VAR)
+ if(x -> class == OBERON_CLASS_MODULE)
+ {
+ if(!x -> module -> intrinsic)
+ {
+ jvm_generate(p, 0, 0, "invokestatic %s/BEGIN()V", x -> module -> gen_mod -> class -> full_name);
+ }
+ }
+ else if(x -> class == OBERON_CLASS_VAR)
{
jvm_generate_var_initialization(p, x -> gen_var);
if(x -> type -> class == OBERON_TYPE_ARRAY
jvm_generate(p, 0, 0, "return");
jvm_generate_function_end(class -> p);
+
+ p = jvm_create_proc(class);
+ jvm_generate_function_header(p, "private", "<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");
+ jvm_generate(p, 0, 0, "return");
+ jvm_generate_function_end(class -> p);
}
/*
}
else
{
- oberon_generate_procedure_pointer_class(proc);
+ oberon_generate_procedure_pointer_class(p -> class -> dir, proc);
signature = jvm_get_procedure_signature(proc -> type);
}
jvm_generate_procedure_frame(proc);
- /* Создание парамеров и переменных */
+ /* Создание паÑ\80амеÑ\82Ñ\80ов и пеÑ\80еменнÑ\8bÑ\85 */
var = proc -> scope -> list -> next;
while(var)
{
jvm_generate_ldst_prepare(p, expr -> item.var -> gen_var);
break;
case MODE_INDEX:
- push_item(p, (oberon_item_t *) expr -> item.parent);
+ push_item(p, expr -> item.parent);
push_expr(p, expr -> item.args);
break;
case MODE_FIELD:
- push_item(p, (oberon_item_t *) expr -> item.parent);
+ push_item(p, expr -> item.parent);
jvm_generate_ldst_prepare(p, expr -> item.var -> gen_var);
break;
+ case MODE_DEREF:
+ push_varptr(p, (oberon_expr_t *) expr -> item.parent);
+ break;
default:
gen_error("push_varptr: wat %i", expr -> item.mode);
break;
jvm_generate(p, 2, 0, "invokestatic SYSTEM/HALT(J)V");
}
+void
+oberon_set_out_directory(oberon_context_t * ctx, const char * path)
+{
+ gen_context_t * c;
+
+ c = ctx -> gen_context;
+
+ c -> dir = new_string(path);
+}