diff --git a/generator.c b/generator.c
index f65b066d1fab3fe1f26df2430f6869126ee98390..4c3a984a6b226d5377ffb5fdcfa0ca5979ffd212 100644 (file)
--- a/generator.c
+++ b/generator.c
}
else if(type -> class == OBERON_TYPE_ARRAY)
{
- if(type -> dim != 1)
- {
- oberon_error(ctx, "multidimension and open arrays not supported");
- }
-
gen_type_t * gen_base = type -> base -> gen_type;
gcc_jit_type * gcc_base = gen_base -> gcc_type;
-
gcc_type = gcc_jit_context_new_array_type(gcc_context, NULL, gcc_base, type -> size);
}
else if(type -> class == OBERON_TYPE_RECORD)
{
- // TODO type exstension
-
- int num_fields = type -> num_decl;
- gcc_jit_field * fields[num_fields];
- oberon_object_t * o = type -> decl;
- for(int i = 0; i < num_fields; i++)
- {
- assert(o -> class == OBERON_CLASS_FIELD);
- gen_var_t * var = o -> gen_var;
- fields[i] = var -> gcc_field;
- o = o -> next;
- }
-
- gcc_struct = gcc_jit_context_new_struct_type(gcc_context, NULL, "", num_fields, fields);
+ gcc_struct = gcc_jit_context_new_opaque_struct(gcc_context, NULL, "");
gcc_type = gcc_jit_struct_as_type(gcc_struct);
}
else if(type -> class == OBERON_TYPE_POINTER)
gen_type -> gcc_struct = gcc_struct;
}
+void
+oberon_generator_init_record(oberon_context_t * ctx, oberon_type_t * type)
+{
+ assert(type -> class == OBERON_TYPE_RECORD);
+
+ gen_type_t * gen_type = type -> gen_type;
+ gcc_jit_struct * gcc_struct = gen_type -> gcc_struct;
+
+ // TODO type exstension
+
+ int num_fields = type -> num_decl;
+ gcc_jit_field * fields[num_fields];
+ oberon_object_t * o = type -> decl;
+ for(int i = 0; i < num_fields; i++)
+ {
+ assert(o -> class == OBERON_CLASS_FIELD);
+ gen_var_t * var = o -> gen_var;
+ fields[i] = var -> gcc_field;
+ o = o -> next;
+ }
+
+ gcc_jit_struct_set_fields (gcc_struct, NULL, num_fields, fields);
+
+ //gcc_struct = gcc_jit_context_new_struct_type(gcc_context, NULL, "", num_fields, fields);
+}
+
void
oberon_generator_init_var(oberon_context_t * ctx, oberon_object_t * var)
{
gcc_jit_type * gcc_type = gen_type -> gcc_type;
const char * name = var -> name;
- // TODO var param
gcc_jit_lvalue * gcc_lvalue = NULL;
gcc_jit_param * gcc_param = NULL;
gcc_jit_field * gcc_field = NULL;
gcc_param = gcc_jit_context_new_param(gcc_context, NULL, gcc_type, name);
gcc_lvalue = gcc_jit_param_as_lvalue(gcc_param);
}
+ else if(var -> class == OBERON_CLASS_VAR_PARAM)
+ {
+ gcc_type = gcc_jit_type_get_pointer(gcc_type);
+ gcc_param = gcc_jit_context_new_param(gcc_context, NULL, gcc_type, name);
+ gcc_lvalue = gcc_jit_param_as_lvalue(gcc_param);
+ }
else if(var -> class == OBERON_CLASS_FIELD)
{
gcc_field = gcc_jit_context_new_field(gcc_context, NULL, gcc_type, name);
{
gen_var_t * gen_var = item -> var -> gen_var;
left = gen_var -> gcc_lvalue;
+ if(item -> var -> class == OBERON_CLASS_VAR_PARAM)
+ {
+ gcc_jit_rvalue * r = gcc_jit_lvalue_as_rvalue(left);
+ left = gcc_jit_rvalue_dereference(r, NULL);
+ }
}
else if(item -> mode == MODE_INDEX)
{
}
else if(item -> mode == MODE_FIELD)
{
+ printf("lvalue_from_item: %s\n", item -> var -> name);
gen_var_t * gen_var = item -> var -> gen_var;
gcc_jit_field * gcc_field = gen_var -> gcc_field;
gcc_jit_lvalue * parent = lvalue_from_item(ctx, item -> parent);
left = gcc_jit_lvalue_access_field(parent, NULL, gcc_field);
}
+ else if(item -> mode == MODE_DEREF)
+ {
+ gcc_jit_rvalue * parent = rvalue_from_item(ctx, item -> parent);
+ left = gcc_jit_rvalue_dereference(parent, NULL);
+ }
else
{
oberon_error(ctx, "invalid lvalue expression");
gcc_jit_rvalue * right;
if(item -> mode == MODE_VAR)
{
- assert(item -> var -> class == OBERON_CLASS_VAR
- || item -> var -> class == OBERON_CLASS_PARAM);
- gen_var_t * gen_var = item -> var -> gen_var;
- right = gcc_jit_lvalue_as_rvalue(gen_var -> gcc_lvalue);
+ gcc_jit_lvalue * left = lvalue_from_item(ctx, item);
+ right = gcc_jit_lvalue_as_rvalue(left);
}
else if(item -> mode == MODE_INTEGER)
{
{
assert(item -> var -> class == OBERON_CLASS_PROC);
+ oberon_type_t * signature = item -> var -> type;
gen_proc_t * gen_proc = item -> var -> gen_proc;
int num_args = item -> num_args;
gcc_jit_rvalue *args[num_args];
oberon_expr_t * expr = item -> args;
+ oberon_object_t * arg_param = signature -> decl;
for(int i = 0; i < num_args; i++)
{
- args[i] = rvalue_from_expr(ctx, expr);
+ if(arg_param -> class == OBERON_CLASS_VAR_PARAM)
+ {
+ gcc_jit_lvalue * left = lvalue_from_expr(ctx, expr);
+ args[i] = gcc_jit_lvalue_get_address(left, NULL);
+ }
+ else
+ {
+ args[i] = rvalue_from_expr(ctx, expr);
+ }
expr = expr -> next;
+ arg_param = arg_param -> next;
}
gcc_jit_function * func = gen_proc -> gcc_func;
gcc_jit_rvalue * parent = rvalue_from_item(ctx, item -> parent);
right = gcc_jit_rvalue_access_field(parent, NULL, gcc_field);
}
+ else if(item -> mode == MODE_DEREF)
+ {
+ gcc_jit_lvalue * left = lvalue_from_item(ctx, item);
+ right = gcc_jit_lvalue_as_rvalue(left);
+ }
+ else if(item -> mode == MODE_NIL)
+ {
+ gcc_jit_type * type = gcc_jit_context_get_type(gcc_context, GCC_JIT_TYPE_VOID_PTR);
+ right = gcc_jit_context_null(gcc_context, type);
+ }
else
{
oberon_error(ctx, "rvalue_from_item: invalid mode %i", item -> mode);
@@ -529,6 +571,18 @@ oberon_generate_assign(oberon_context_t * ctx, oberon_expr_t * src, oberon_expr_
gcc_jit_rvalue * right;
right = rvalue_from_expr(ctx, src);
+ if(src -> is_item)
+ {
+ if(src -> item.mode == MODE_NIL)
+ {
+ gen_context_t * gen_context = ctx -> gen_context;
+ gcc_jit_context * gcc_context = gen_context -> gcc_context;
+ gen_type_t * gen_type = dst -> result -> gen_type;
+ gcc_jit_type * cast_to_type = gen_type -> gcc_type;
+ right = gcc_jit_context_new_cast(gcc_context, NULL, right, cast_to_type);
+ }
+ }
+
gen_context_t * gen_context = ctx -> gen_context;
gcc_jit_block * gcc_block = gen_context -> gcc_block;
gcc_jit_block_add_assignment(gcc_block, NULL, left, right);