Добавлена процедура NEW для аллокации обычных массивов

[dsw-obn.git] / generator.c

diff --git a/generator.c b/generator.c
index bad063d57adcac9ee2c45d5f1442febdf5839055..94bc1696a8f54f281e8868cfa02d7a51f1800cb0 100644 (file)
--- a/generator.c
+++ b/generator.c
@@ -5,9 +5,23 @@
 #include <string.h>
 #include <assert.h>
 
+#include <gc.h>
+
 #include "oberon.h"
 #include "generator.h"
 
+// =======================================================================
+//   INTERNAL FUNCTIONS
+// ======================================================================= 
+
+static void *
+__OBERON_ALLOC__ (size_t bytes)
+{
+       void * p = GC_MALLOC(bytes);
+       memset(p, 0, bytes);
+       return p;
+}
+
 // =======================================================================
 //   ALLOC
 // ======================================================================= 
@@ -41,6 +55,15 @@ oberon_generator_init_context(oberon_context_t * ctx)
 
        ctx -> gen_context = gen_context;
        gen_context -> gcc_context = gcc_context;
+
+       gcc_jit_type * void_ptr_type = gcc_jit_context_get_type(gcc_context, GCC_JIT_TYPE_VOID_PTR);
+       gcc_jit_type * size_type = gcc_jit_context_get_type(gcc_context, GCC_JIT_TYPE_SIZE_T);
+       gcc_jit_type * alloc_ptr_type = gcc_jit_context_new_function_ptr_type(
+               gcc_context, NULL, void_ptr_type, 1, &size_type, 0
+       );
+       gen_context -> gcc_alloc = gcc_jit_context_new_global(
+               gcc_context, NULL, GCC_JIT_GLOBAL_EXPORTED, alloc_ptr_type, "__OBERON_ALLOC__"
+       );
 }
 
 void
@@ -299,6 +322,13 @@ oberon_generator_init_proc(oberon_context_t * ctx, oberon_object_t * proc)
 static gcc_jit_rvalue * rvalue_from_item(oberon_context_t * ctx, oberon_item_t * item);
 static gcc_jit_rvalue * rvalue_from_expr(oberon_context_t * ctx, oberon_expr_t * expr);
 
+static int
+oberon_generator_get_type_size(oberon_type_t * type)
+{
+       printf("TODO: oberon_generator_get_type_size\n");
+       return 128;
+}
+
 void
 oberon_generate_begin_module(oberon_context_t * ctx)
 {
@@ -423,7 +453,7 @@ lvalue_from_item(oberon_context_t * ctx, oberon_item_t * item)
        }
        else
        {
-               oberon_error(ctx, "invalid lvalue expression");
+               oberon_error(ctx, "lvalue_from_item: invalid mode %i", item -> mode);
        }
 
        return left;
@@ -548,6 +578,30 @@ rvalue_from_item(oberon_context_t * ctx, oberon_item_t * item)
                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 if(item -> mode == MODE_NEWARR)
+       {
+               int type_size = oberon_generator_get_type_size(item -> type);
+               int array_size = type_size;
+
+               int num = item -> num_args;
+               oberon_expr_t * arg = item -> args;
+               for(int i = 0; i < num; i++)
+               {
+                       array_size *= arg -> item.integer;
+                       arg = arg -> next;
+               }
+
+               gcc_jit_type * size_type;
+               size_type = gcc_jit_context_get_type(gcc_context, GCC_JIT_TYPE_SIZE_T);
+
+               gcc_jit_rvalue * fnarg;
+               fnarg = gcc_jit_context_new_rvalue_from_int(gcc_context, size_type, array_size);
+
+               gcc_jit_type * result_type = item -> result -> gen_type -> gcc_type;
+               gcc_jit_rvalue * gcc_alloc = gcc_jit_lvalue_as_rvalue(gen_context -> gcc_alloc);
+               right = gcc_jit_context_new_call_through_ptr(gcc_context, NULL, gcc_alloc, 1, &fnarg);
+               right = gcc_jit_context_new_cast(gcc_context, NULL, right, result_type);
+       }
        else
        {
                oberon_error(ctx, "rvalue_from_item: invalid mode %i", item -> mode);
@@ -686,6 +740,10 @@ oberon_generate_code(oberon_context_t * ctx)
 
        gen_context -> gcc_result = gcc_result;
 
+       typedef void * (*TOberonAlloc)(size_t);
+       TOberonAlloc * fn_alloc_ptr = gcc_jit_result_get_global(gcc_result, "__OBERON_ALLOC__");
+       *fn_alloc_ptr = __OBERON_ALLOC__;
+
 //     ctx -> mod -> begin = gcc_jit_result_get_code(gcc_result, "BEGIN");
 }