X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=generator.c;h=b7c24b3968cd780b14e47bc5a26c591179dc8f1a;hb=c15b86365824545bdee7d813ce0c796f1bdff592;hp=709e5a65cbfb513cd502e2bf7d70383b89468449;hpb=1bf625553dc35ac4a5c1afceb6950fd44776a424;p=dsw-obn.git

diff --git a/generator.c b/generator.c
index 709e5a6..b7c24b3 100644
--- a/generator.c
+++ b/generator.c
@@ -8,21 +8,6 @@
 #include "oberon.h"
 #include "generator.h"
 
-static void printcontext(oberon_context_t * ctx, char * s)
-{
-/*
-	gen_context_t * gen_context = ctx -> gen_context;
-	gcc_jit_context * gcc_context = gen_context -> gcc_context;
-	gcc_jit_block * gcc_block = gen_context -> gcc_block;
-
-	printf("%s:\n", s);
-	printf("  ctx     = %p:\n", ctx);
-	printf("  gctx    = %p:\n", gctx);
-	printf("  context = %p:\n", context);
-	printf("  block   = %p:\n", block);
-*/
-}
-
 // =======================================================================
 //   ALLOC
 // ======================================================================= 
@@ -56,15 +41,11 @@ oberon_generator_init_context(oberon_context_t * ctx)
 
 	ctx -> gen_context = gen_context;
 	gen_context -> gcc_context = gcc_context;
-
-	printcontext(ctx, "oberon_generator_init_context");
 }
 
 void
 oberon_generator_destroy_context(oberon_context_t * ctx)
 {
-	printcontext(ctx, "oberon_generator_destroy_context");
-
 	gen_context_t * gen_context = ctx -> gen_context;
 	gcc_jit_context * gcc_context = gen_context -> gcc_context;
 
@@ -171,6 +152,38 @@ oberon_generator_init_record(oberon_context_t * ctx, oberon_type_t * type)
 	//gcc_struct = gcc_jit_context_new_struct_type(gcc_context, NULL, "", num_fields, fields);
 }
 
+static void
+oberon_generator_get_full_name(char * name, int max_len, oberon_object_t * o)
+{
+	if(!o)
+	{
+		name[0] = 0;
+		return;
+	}
+
+	char parent[256];
+	oberon_generator_get_full_name(parent, 256, o -> parent);
+
+	char * xname;
+//	if(o -> class == OBERON_CLASS_MODULE)
+//	{
+//		xname = o -> module -> name;
+//	}
+//	else
+//	{
+		xname = o -> name;
+//	}
+
+	if(strlen(parent) > 0)
+	{
+		snprintf(name, max_len, "%s_%s", parent, xname);
+	}
+	else
+	{
+		snprintf(name, max_len, "%s", xname);
+	}
+}
+
 void
 oberon_generator_init_var(oberon_context_t * ctx, oberon_object_t * var)
 {
@@ -183,7 +196,9 @@ oberon_generator_init_var(oberon_context_t * ctx, oberon_object_t * var)
 
 	gcc_jit_context * gcc_context = gen_context -> gcc_context;
 	gcc_jit_type * gcc_type = gen_type -> gcc_type;
-	const char * name = var -> name;
+
+	char name[256];
+	oberon_generator_get_full_name(name, 256, var);
 
 	gcc_jit_lvalue * gcc_lvalue = NULL;
 	gcc_jit_param * gcc_param = NULL;
@@ -244,7 +259,9 @@ oberon_generator_init_proc(oberon_context_t * ctx, oberon_object_t * proc)
 	memset(gen_proc, 0, sizeof *gen_proc);
 	proc -> gen_proc = gen_proc;
 
-	const char * name = proc -> name;
+	char name[256];
+	oberon_generator_get_full_name(name, 256, proc);
+
 	gen_type_t * gen_result_type = proc -> type -> base -> gen_type;
 	gcc_jit_type * result_type = gen_result_type -> gcc_type;
 
@@ -277,14 +294,15 @@ static gcc_jit_rvalue * rvalue_from_expr(oberon_context_t * ctx, oberon_expr_t *
 void
 oberon_generate_begin_module(oberon_context_t * ctx)
 {
-	printcontext(ctx, "oberon_generate_begin_module");
-
 	gen_context_t * gen_context = ctx -> gen_context;
 	gcc_jit_context * gcc_context = gen_context -> gcc_context;
 
+	char name[256];
+	snprintf(name, 256, "%s_BEGIN", ctx -> mod -> name);
+
 	gcc_jit_type * void_type = gcc_jit_context_get_type(gcc_context, GCC_JIT_TYPE_VOID);
 	gcc_jit_function * func = gcc_jit_context_new_function(
-		gcc_context, NULL, GCC_JIT_FUNCTION_EXPORTED, void_type, "BEGIN", 0, NULL, 0
+		gcc_context, NULL, GCC_JIT_FUNCTION_EXPORTED, void_type, name, 0, NULL, 0
 	);
 	gcc_jit_block * gcc_block = gcc_jit_function_new_block(func, NULL);
 
@@ -294,8 +312,6 @@ oberon_generate_begin_module(oberon_context_t * ctx)
 void
 oberon_generate_end_module(oberon_context_t * ctx)
 {
-	printcontext(ctx, "oberon_generate_end_module");
-
 	gen_context_t * gen_context = ctx -> gen_context;
 	gcc_jit_block * gcc_block = gen_context -> block -> gcc_block;
 
@@ -363,6 +379,11 @@ lvalue_from_item(oberon_context_t * ctx, oberon_item_t * item)
 
 	if(item -> mode == MODE_VAR)
 	{
+		if(item -> var -> class == OBERON_CLASS_PROC)
+		{
+			oberon_error(ctx, "casting static procedure to pointer not supported by generator");
+		}
+
 		gen_var_t * gen_var = item -> var -> gen_var;
 		left = gen_var -> gcc_lvalue;
 		if(item -> var -> class == OBERON_CLASS_VAR_PARAM)
@@ -450,8 +471,6 @@ rvalue_from_item(oberon_context_t * ctx, oberon_item_t * item)
 	}
 	else if(item -> mode == MODE_CALL)
 	{
-		assert(item -> var -> class == OBERON_CLASS_PROC);
-
 		oberon_type_t * signature = item -> var -> type;
 		gen_proc_t * gen_proc = item -> var -> gen_proc;
 
@@ -475,10 +494,28 @@ rvalue_from_item(oberon_context_t * ctx, oberon_item_t * item)
 			arg_param = arg_param -> next;
 		}
 
-		gcc_jit_function * func = gen_proc -> gcc_func;
-		right = gcc_jit_context_new_call(
-	                gcc_context, NULL, func, num_args, args
-		);
+		gcc_jit_rvalue * fnptr;
+		gcc_jit_function * func;
+		switch(item -> var -> class)
+		{
+			case OBERON_CLASS_PROC:
+				func = gen_proc -> gcc_func;
+				right = gcc_jit_context_new_call(
+					gcc_context, NULL, func, num_args, args
+				);
+				break;
+			case OBERON_CLASS_VAR:
+			case OBERON_CLASS_VAR_PARAM:
+			case OBERON_CLASS_PARAM:
+				fnptr = gcc_jit_lvalue_as_rvalue(item -> var -> gen_var -> gcc_lvalue);
+				right = gcc_jit_context_new_call_through_ptr(
+					gcc_context, NULL, fnptr, num_args, args
+				);
+				break;
+			default:
+				assert(0);
+				break;
+		}
 	}
 	else if(item -> mode == MODE_INDEX)
 	{
@@ -622,6 +659,8 @@ oberon_generate_assign(oberon_context_t * ctx, oberon_expr_t * src, oberon_expr_
 		}
 	}
 
+	printf("oberon_generate_assign: class %i := class %i\n", dst -> result -> class, src -> result -> class);
+
 	gen_context_t * gen_context = ctx -> gen_context;
 	gen_block_t * gen_block = gen_context -> block;
 	gcc_jit_block * gcc_block = gen_block -> gcc_block;
@@ -638,7 +677,8 @@ oberon_generate_code(oberon_context_t * ctx)
 	gcc_result = gcc_jit_context_compile(gcc_context);
 
 	gen_context -> gcc_result = gcc_result;
-	ctx -> mod -> begin = gcc_jit_result_get_code(gcc_result, "BEGIN");
+
+//	ctx -> mod -> begin = gcc_jit_result_get_code(gcc_result, "BEGIN");
 }
 
 void
@@ -648,3 +688,21 @@ oberon_generator_dump(oberon_context_t * ctx, char * path)
 	gcc_jit_context * gcc_context = gen_context -> gcc_context;
 	gcc_jit_context_dump_to_file(gcc_context, path, 0);
 }
+
+void *
+oberon_generator_get_procedure(oberon_context_t * ctx, const char * name)
+{
+	gen_context_t * gen_context = ctx -> gen_context;
+	gcc_jit_result * gcc_result = gen_context -> gcc_result;
+
+	return gcc_jit_result_get_code(gcc_result, name);
+}
+
+void *
+oberon_generator_get_var(oberon_context_t * ctx, const char * name)
+{
+	gen_context_t * gen_context = ctx -> gen_context;
+	gcc_jit_result * gcc_result = gen_context -> gcc_result;
+
+	return gcc_jit_result_get_global(gcc_result, name);
+}