Реализованы VAR-параметры в генераторе

[dsw-obn.git] / generator.c

diff --git a/generator.c b/generator.c
index 24529e0e26add6f595560626773029ce65f903e6..4c3a984a6b226d5377ffb5fdcfa0ca5979ffd212 100644 (file)
--- a/generator.c
+++ b/generator.c
@@ -165,7 +165,6 @@ 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;
@@ -180,6 +179,12 @@ oberon_generator_init_var(oberon_context_t * ctx, oberon_object_t * var)
                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);
@@ -326,6 +331,11 @@ lvalue_from_item(oberon_context_t * ctx, oberon_item_t * item)
        {
                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)
        {
@@ -384,10 +394,8 @@ rvalue_from_item(oberon_context_t * ctx, oberon_item_t * item)
        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)
        {
@@ -410,16 +418,27 @@ rvalue_from_item(oberon_context_t * ctx, oberon_item_t * item)
        {
                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;