X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fbackends%2Fjvm%2Fgenerator-jvm.c;h=bf3b07b52aee0c728cf194e2fbb521b635500557;hb=6a3dfd4bef9a28863a7645070f0067f4a09d143a;hp=c063e2fc7fcc03ddd8c2150e03cca24c2220a96a;hpb=789adb9354da345b13aa284f3f4f8f1046cadbc4;p=dsw-obn.git

diff --git a/src/backends/jvm/generator-jvm.c b/src/backends/jvm/generator-jvm.c
index c063e2f..bf3b07b 100644
--- a/src/backends/jvm/generator-jvm.c
+++ b/src/backends/jvm/generator-jvm.c
@@ -8,8 +8,8 @@
 
 #include <gc.h>
 
-#include "../../../include/oberon.h"
 #include "../../oberon-internals.h"
+#include "../../generator.h"
 #include "generator-jvm.h"
 #include "generator-jvm-abi.h"
 #include "generator-jvm-asm.h"
@@ -632,6 +632,13 @@ oberon_generator_init_var(oberon_context_t * ctx, oberon_object_t * var)
 	struct gen_class * c;
 	char * name = var -> name;
 	gen_type_t * t = var -> type -> gen_type;
+
+	assert(name);
+	if(t == NULL)
+	{
+		gen_error("uninitialized type class %i", var -> type -> class);
+	}
+
 	switch(var -> class)
 	{
 		case OBERON_CLASS_VAR_PARAM:
@@ -725,6 +732,18 @@ oberon_generator_fini_module(oberon_module_t * mod)
 static void
 push_expr(gen_proc_t * p, oberon_expr_t * expr);
 
+static void
+oberon_generate_static_initialization(gen_proc_t * p, oberon_object_t * x)
+{
+	if(x -> type -> class == OBERON_TYPE_ARRAY
+		|| x -> type -> class == OBERON_TYPE_RECORD)
+	{
+		jvm_generate_ldst_prepare(p, x -> gen_var);
+		jvm_generate_new(p, x -> type, 0);
+		jvm_generate_store(p, x -> gen_var);
+	}
+}
+
 void
 oberon_generate_begin_module(oberon_context_t * ctx)
 {
@@ -760,13 +779,7 @@ oberon_generate_begin_module(oberon_context_t * ctx)
 		else if(x -> class == OBERON_CLASS_VAR)
 		{
 			jvm_generate_var_initialization(p, x -> gen_var);
-			if(x -> type -> class == OBERON_TYPE_ARRAY
-				|| x -> type -> class == OBERON_TYPE_RECORD)
-			{
-				jvm_generate_ldst_prepare(p, x -> gen_var);
-				jvm_generate_new(p, x -> type, 0);
-				jvm_generate_store(p, x -> gen_var);
-			}
+			oberon_generate_static_initialization(p, x);
 		}
 
 		x = x -> next;
@@ -865,10 +878,12 @@ jvm_generate_local_object(gen_proc_t * p, oberon_object_t * x)
 		case OBERON_CLASS_VAR:
 			jvm_generate_var(v);
 			break;
+		case OBERON_CLASS_CONST:
+		case OBERON_CLASS_TYPE:
 		case OBERON_CLASS_PROC:
 			break;
 		default:
-			gen_error("jvm_generate_local_initialization: wat");
+			gen_error("jvm_generate_local_initialization: wat class %i", x -> class);
 			break;
 	}
 }
@@ -889,28 +904,31 @@ jvm_generate_local_initialization(gen_proc_t * p, oberon_object_t * x)
 	switch(x -> class)
 	{
 		case OBERON_CLASS_VAR_PARAM:
+			jvm_generate_var_initialization(p, v);
+			break;
 		case OBERON_CLASS_PARAM:
+			jvm_generate_var_initialization(p, v);
+			if(x -> type -> class == OBERON_TYPE_ARRAY)
+			{
+				jvm_generate_array_duplicate_and_replace(p, v, x -> type);
+			}
+			else if(x -> type -> class == OBERON_TYPE_RECORD)
+			{				
+				jvm_generate_record_duplicate_and_replace(p, v, x -> type);
+			}
+			break;
 		case OBERON_CLASS_VAR:
 			jvm_generate_var_initialization(p, v);
+			oberon_generate_static_initialization(p, x);
 			break;
+		case OBERON_CLASS_CONST:
+		case OBERON_CLASS_TYPE:
 		case OBERON_CLASS_PROC:
 			break;
 		default:
-			gen_error("jvm_generate_local_initialization: wat");
+			gen_error("jvm_generate_local_initialization: wat class %i", x -> class);
 			break;
 	}
-
-	if(x -> class == OBERON_CLASS_PARAM)
-	{
-		if(x -> type -> class == OBERON_TYPE_ARRAY)
-		{
-			jvm_generate_array_duplicate_and_replace(p, v, x -> type);
-		}
-		else if(x -> type -> class == OBERON_TYPE_RECORD)
-		{				
-			jvm_generate_record_duplicate_and_replace(p, v, x -> type);
-		}
-	}
 }
 
 void
@@ -971,6 +989,7 @@ oberon_generate_end_proc(oberon_context_t * ctx)
 	m = ctx -> mod -> gen_mod;
 	p = m -> class -> p;
 
+	oberon_generate_trap(ctx, -4);
 	jvm_generate_function_end(p);
 }
 
@@ -1207,6 +1226,45 @@ jvm_generate_cast_type(gen_proc_t * p, oberon_type_t * from, oberon_type_t * to)
 	}
 }
 
+static void
+jvm_generate_hard_cast_type(gen_proc_t * p, oberon_type_t * from, oberon_type_t * to)
+{
+	if(from -> class == OBERON_TYPE_REAL
+		&& (to -> class == OBERON_TYPE_INTEGER || to -> class == OBERON_TYPE_SYSTEM_BYTE))
+	{
+		char postfix = jvm_get_postfix(to);
+		if(from -> size <= 4)
+		{
+			jvm_generate(p, 1, 1, "invokestatic java/lang/Float/floatToIntBits(F)I");
+			jvm_generate_cast_prefix(p, 'i', postfix);
+		}
+		else
+		{
+			jvm_generate(p, 2, 2, "invokestatic java/lang/Double/doubleToIntBits(D)J");
+			jvm_generate_cast_prefix(p, 'l', postfix);
+		}
+	}
+	else if((from -> class == OBERON_TYPE_INTEGER || from -> class == OBERON_TYPE_SYSTEM_BYTE)
+		&& to -> class == OBERON_TYPE_REAL)
+	{
+		char prefix = jvm_get_prefix(from);
+		if(to -> size <= 4)
+		{
+			jvm_generate_cast_prefix(p, prefix, 'i');
+			jvm_generate(p, 1, 1, "invokestatic java/lang/Float/intBitsToFloat(I)F");
+		}
+		else
+		{
+			jvm_generate_cast_prefix(p, prefix, 'l');
+			jvm_generate(p, 2, 2, "invokestatic java/lang/Double/longBitsToDouble(J)D");
+		}
+	}
+	else
+	{
+		jvm_generate_cast_type(p, from, to);
+	}
+}
+
 static void
 push_item(gen_proc_t * p, oberon_item_t * item)
 {
@@ -1624,6 +1682,10 @@ push_operator(gen_proc_t * p, oberon_oper_t * oper)
 			push_expr(p, oper -> left);
 			jvm_generate_cast_type(p, oper -> left -> result, oper -> result);
 			break;
+		case OP_HARDCAST:
+			push_expr(p, oper -> left);
+			jvm_generate_hard_cast_type(p, oper -> left -> result, oper -> result);
+			break;
 		case OP_COMPLEMENTATION:
 		case OP_UNARY_MINUS:
 		case OP_LOGIC_NOT: