X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=generator.c;h=a802a96f4e071c64496e5df09f6d28cbfad24a58;hb=3376c57aa304940b405940c6463df71c7c1c7f01;hp=e4970fd995b0e5af87d12cb93f5c6d36bfe24359;hpb=342c8f1a44765e744c64e14a3b8f1aa4031c5f62;p=dsw-obn.git

diff --git a/generator.c b/generator.c
index e4970fd..a802a96 100644
--- a/generator.c
+++ b/generator.c
@@ -79,25 +79,6 @@ oberon_generator_init_type(oberon_context_t * ctx, oberon_type_t * type)
 	{
 		gcc_type = gcc_jit_context_get_type(gcc_context, GCC_JIT_TYPE_BOOL);
 	}
-	else if(type -> class == OBERON_TYPE_PROCEDURE)
-	{
-		int num_params = type -> num_decl;
-		gcc_jit_type * params[num_params];
-		oberon_object_t * o = type -> decl;
-		for(int i = 0; i < num_params; i++)
-		{
-			gen_type_t * gen_type = o -> type -> gen_type;
-			params[i] = gen_type -> gcc_type;
-			o = o -> next;
-		}
-
-		gen_type_t * base = type -> base -> gen_type;
-		gcc_jit_type * result_type = base -> gcc_type;
-
-		gcc_type = gcc_jit_context_new_function_ptr_type(
-			gcc_context, NULL, result_type, num_params, params, 0
-		);
-	}
 	else if(type -> class == OBERON_TYPE_ARRAY)
 	{
 		if(type -> dim != 1)
@@ -112,31 +93,70 @@ oberon_generator_init_type(oberon_context_t * ctx, oberon_type_t * type)
 	}
 	else if(type -> class == OBERON_TYPE_RECORD)
 	{
-		// TODO type exstension
-
-		int num_fields = type -> num_decl;
-		gcc_jit_field * fields[num_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_t * gen_base = type -> base -> gen_type;
+		gcc_jit_type * gcc_base = gen_base -> gcc_type;
+		gcc_type = gcc_jit_type_get_pointer(gcc_base);
+	}
+	else if(type -> class == OBERON_TYPE_PROCEDURE)
+	{
+		int num_params = type -> num_decl;
+		gcc_jit_type * params[num_params];
 		oberon_object_t * o = type -> decl;
-		for(int i = 0; i < num_fields; i++)
+		for(int i = 0; i < num_params; i++)
 		{
-			assert(o -> class == OBERON_CLASS_FIELD);
-			gen_var_t * var = o -> gen_var;
-			fields[i] = var -> gcc_field;
+			gen_type_t * gen_type = o -> type -> gen_type;
+			params[i] = gen_type -> gcc_type;
 			o = o -> next;
 		}
 
-		gcc_struct = gcc_jit_context_new_struct_type(gcc_context, NULL, "", num_fields, fields);
-		gcc_type = gcc_jit_struct_as_type(gcc_struct);
+		gen_type_t * base = type -> base -> gen_type;
+		gcc_jit_type * result_type = base -> gcc_type;
+
+		gcc_type = gcc_jit_context_new_function_ptr_type(
+			gcc_context, NULL, result_type, num_params, params, 0
+		);
 	}
 	else
 	{
 		oberon_error(ctx, "oberon_generator_init_type: invalid type class %i", type -> class);
 	}
 
+	assert(gcc_type);
 	gen_type -> gcc_type = gcc_type;
 	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)
 {