X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fbackends%2Fjvm%2Fgenerator-jvm-basic.c;h=2088559c7e7089b6609e4857179125f70cda025e;hb=ac2eb0e30e5c65480e72565b104ea9a602fe31e2;hp=9c8b78c598e73aaacc9644309c4e5a654146ad44;hpb=a0ff807fe0e69c50469e506836467da32f23f754;p=dsw-obn.git

diff --git a/src/backends/jvm/generator-jvm-basic.c b/src/backends/jvm/generator-jvm-basic.c
index 9c8b78c..2088559 100644
--- a/src/backends/jvm/generator-jvm-basic.c
+++ b/src/backends/jvm/generator-jvm-basic.c
@@ -7,7 +7,6 @@
 
 #include <gc.h>
 
-#include "../../../include/oberon.h"
 #include "../../oberon-internals.h"
 #include "generator-jvm.h"
 #include "generator-jvm-basic.h"
@@ -77,6 +76,9 @@ jvm_get_descriptor(oberon_type_t * type)
 					break;
 			}
 			break;
+		case OBERON_TYPE_SYSTEM_BYTE:
+			return new_string("B");
+			break;
 		case OBERON_TYPE_REAL:
 			switch(type -> size)
 			{
@@ -146,6 +148,9 @@ jvm_get_descriptor(oberon_type_t * type)
 					break;
 			}
 			break;
+		case OBERON_TYPE_SYSTEM_PTR:
+			return new_string("Ljava/lang/Object;");
+			break;
 		default:
 			gen_error("jvm_get_descriptor: unsupported type class %i", type -> class);
 			break;
@@ -169,6 +174,9 @@ jvm_get_descriptor_safe(oberon_type_t * type)
 		case OBERON_TYPE_ARRAY:
 			return new_string("A%s", jvm_get_descriptor_safe(type -> base));
 			break;
+		case OBERON_TYPE_SYSTEM_PTR:
+			return new_string("SYSPTR");
+			break;
 		default:
 			return jvm_get_descriptor(type);
 			break;
@@ -183,10 +191,14 @@ jvm_get_prefix(oberon_type_t * type)
 	int size = type -> size;
 	switch(type -> class)
 	{
+		case OBERON_TYPE_NOTYPE:
+			return ' ';
+			break;
 		case OBERON_TYPE_BOOLEAN:
 		case OBERON_TYPE_INTEGER:
 		case OBERON_TYPE_CHAR:
 		case OBERON_TYPE_SET:
+		case OBERON_TYPE_SYSTEM_BYTE:
 			return (size <= 4) ? ('i') : ('l');
 			break;
 		case OBERON_TYPE_PROCEDURE:
@@ -195,6 +207,7 @@ jvm_get_prefix(oberon_type_t * type)
 		case OBERON_TYPE_POINTER:
 		case OBERON_TYPE_STRING:
 		case OBERON_TYPE_NIL:
+		case OBERON_TYPE_SYSTEM_PTR:
 			return 'a';
 			break;
 		case OBERON_TYPE_REAL:
@@ -213,6 +226,9 @@ jvm_get_postfix(oberon_type_t * type)
 	int size = type -> size;
 	switch(type -> class)
 	{
+		case OBERON_TYPE_NOTYPE:
+			return ' ';
+			break;
 		case OBERON_TYPE_BOOLEAN:
 			return 'b';
 			break;
@@ -237,6 +253,9 @@ jvm_get_postfix(oberon_type_t * type)
 					break;
 			}
 			break;
+		case OBERON_TYPE_SYSTEM_BYTE:
+			return 'b';
+			break;
 		case OBERON_TYPE_CHAR:
 			switch(size)
 			{
@@ -263,6 +282,7 @@ jvm_get_postfix(oberon_type_t * type)
 		case OBERON_TYPE_POINTER:
 		case OBERON_TYPE_STRING:
 		case OBERON_TYPE_NIL:
+		case OBERON_TYPE_SYSTEM_PTR:
 			return 'a';
 			break;
 		case OBERON_TYPE_REAL:
@@ -310,13 +330,17 @@ jvm_get_field_full_name(oberon_object_t * x)
 	{
 		case OBERON_CLASS_VAR:
 			return new_string("%s/%s", x -> module -> name, jvm_get_name(x));
+			break;
 		case OBERON_CLASS_PROC:
 			return new_string("%s/%s", x -> module -> name, jvm_get_name(x));
+			break;
 		case OBERON_CLASS_FIELD:
 			parent = jvm_get_class_full_name(x -> parent_type);
 			return new_string("%s/%s", parent, jvm_get_name(x));
+			break;
 		case OBERON_CLASS_MODULE:
 			return new_string(x -> module -> name);
+			break;
 		default:
 			gen_error("jvm_get_field_full_name: wat");
 			break;
@@ -331,13 +355,18 @@ jvm_get_field_full_name_safe(oberon_object_t * x)
 	switch(x -> class)
 	{
 		case OBERON_CLASS_VAR:
-		case OBERON_CLASS_PROC:
 			return new_string("%s$%s", x -> module -> name, x -> name);
+			break;
+		case OBERON_CLASS_PROC:
+			return new_string("%s$%s", x -> module -> name, jvm_get_name(x));
+			break;
 		case OBERON_CLASS_FIELD:;
 			char * rec_name = jvm_get_class_full_name(x -> parent_type);
 			return new_string("%s$%s", rec_name, x -> name);
+			break;
 		case OBERON_CLASS_MODULE:
 			return new_string(x -> module -> name);
+			break;
 		default:
 			gen_error("jvm_get_field_full_name: wat");
 			break;
@@ -361,15 +390,22 @@ jvm_get_class_full_name(oberon_type_t * type)
 			name = new_string("SYSTEM$PROCEDURE");
 
 			char * desc;
+			char * spec;
 			desc = jvm_get_descriptor_safe(type -> base);
 			name = new_string("%s$%s", name, desc);
 
 			int num = type -> num_decl;
 			oberon_object_t * arg = type -> decl;
+
 			for(int i = 0; i < num; i++)
 			{
+				spec = "";
+				if(arg -> class == OBERON_CLASS_VAR_PARAM)
+				{
+					spec = "VAR";
+				}
 				desc = jvm_get_descriptor_safe(arg -> type);
-				name = new_string("%s%s", name, desc);
+				name = new_string("%s%s%s", name, spec, desc);
 				arg = arg -> next;
 			}
 
@@ -378,6 +414,9 @@ jvm_get_class_full_name(oberon_type_t * type)
 			rec_id = type -> gen_type -> rec_id;
 			name = new_string("%s$RECORD%i", type -> module -> name, rec_id);
 			break;
+		case OBERON_TYPE_SYSTEM_PTR:
+			name = new_string("java/lang/Object");
+			break;
 		default:
 			gen_error("jvm_get_class_full_name: unk type class %i", type -> class);
 			break;
@@ -412,6 +451,8 @@ jvm_cell_size_for_postfix(char postfix)
 {
 	switch(postfix)
 	{
+		case ' ':
+			return 0;
 		case 'a':
 		case 'b':
 		case 's':
@@ -422,7 +463,7 @@ jvm_cell_size_for_postfix(char postfix)
 		case 'd':
 			return 2;
 		default:
-			gen_error("jvm_cell_size_for_postfix: unk postfix %c", postfix);
+			gen_error("jvm_cell_size_for_postfix: unk postfix %c (%i)", postfix, postfix);
 	}
 
 	return -666;
@@ -499,6 +540,8 @@ jvm_get_type_of_prefix(char prefix)
 {
 	switch(prefix)
 	{
+		case ' ':
+			return 'V';
 		case 'b':
 			return 'B';
 		case 'c':