X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fbackends%2Fjvm%2Fgenerator-jvm.c;h=5b45cc166bca184d32d0640a24f9f90a016617ef;hb=b09b4829b70cf34a470003286ea100663d7fe442;hp=ee4bc67c17d31f33f25ba5047600658776953755;hpb=3d4021b9a2dd52aaf4b97859a8a58b74903ebac9;p=dsw-obn.git

diff --git a/src/backends/jvm/generator-jvm.c b/src/backends/jvm/generator-jvm.c
index ee4bc67..5b45cc1 100644
--- a/src/backends/jvm/generator-jvm.c
+++ b/src/backends/jvm/generator-jvm.c
@@ -1136,6 +1136,19 @@ jvm_generate_expr_new_pointer(gen_proc_t * p, oberon_type_t * type, int num, obe
 	jvm_generate_new(p, type -> base, num);
 }
 
+static void
+jvm_generate_cast_prefix(gen_proc_t * p, char prefix, char postfix)
+{
+	if(prefix == postfix)
+	{
+		return;
+	}
+
+	int from_cell_size = jvm_cell_size_for_postfix(prefix);
+	int to_cell_size = jvm_cell_size_for_postfix(postfix);
+	jvm_generate(p, from_cell_size, to_cell_size, "%c2%c", prefix, postfix);
+}
+
 static void
 jvm_generate_cast_type(gen_proc_t * p, oberon_type_t * from, oberon_type_t * to)
 {
@@ -1151,17 +1164,7 @@ jvm_generate_cast_type(gen_proc_t * p, oberon_type_t * from, oberon_type_t * to)
 	{
 		char prefix = jvm_get_prefix(from);
 		char postfix = jvm_get_postfix(to);
-		int from_cell_size = jvm_cell_size_for_type(from);
-		int to_cell_size = jvm_cell_size_for_type(to);
-
-		jvm_generate_comment(p, "cast type class from %i(%i) to %i(%i)", from -> class, from -> size, to -> class, to -> size);
-
-		if(prefix == postfix)
-		{
-			return;
-		}
-
-		jvm_generate(p, from_cell_size, to_cell_size, "%c2%c", prefix, postfix);
+		jvm_generate_cast_prefix(p, prefix, postfix);
 	}
 }
 
@@ -1217,6 +1220,11 @@ push_item(gen_proc_t * p, oberon_item_t * item)
 		case MODE_STRING:
 			jvm_generate_push_string(p, item -> string, item -> result -> size);
 			break;
+		case MODE_LEN:
+			push_item(p, item -> parent);
+			jvm_generate_array_len(p, item -> integer);
+			jvm_generate_cast_prefix(p, 'i', jvm_get_postfix(item -> result));
+			break;
 		default:
 			gen_error("push_item: unk mode %i", item -> mode);
 			break;
@@ -1349,6 +1357,9 @@ jvm_generate_operator(gen_proc_t * p, oberon_type_t * t, int op)
 		case OP_ABS:
 			jvm_generate_abs(p, prefix);
 			break;
+		case OP_CAP:
+			jvm_generate(p, cell_size, cell_size, "invokestatic java/lang/Character/toUpperCase(I)I");
+			break;
 
 		case OP_ADD:
 			jvm_generate(p, 2 * cell_size, cell_size, "%cadd", prefix);
@@ -1519,6 +1530,51 @@ jvm_generate_in(gen_proc_t * p, oberon_expr_t * a, oberon_expr_t * b)
 	jvm_generate_label(p, label_end);
 }
 
+static void
+jvm_generate_ash(gen_proc_t * p, oberon_expr_t * a, oberon_expr_t * b)
+{
+	oberon_type_t * t = a -> result;
+	int cell_size = jvm_cell_size_for_type(t);
+	char prefix = jvm_get_prefix(t);
+	int label_else = jvm_new_label_id(p);
+	int label_end = jvm_new_label_id(p);
+
+	/* if b < 0 then a << b else a >> b end */
+
+	push_expr(p, a);
+	push_expr(p, b);
+	if(cell_size == 1)
+	{
+		jvm_generate(p, cell_size, 2 * cell_size, "dup");
+	}
+	else
+	{
+		jvm_generate(p, cell_size, 2 * cell_size, "dup2");
+	}
+	jvm_generate_push_int_size(p, 0, t -> size);
+	jvm_generate_compare_op(p, t, OP_LSS);
+
+	jvm_generate(p, cell_size, 0, "ifne L%i", label_else);
+	jvm_generate(p, 2 * cell_size, cell_size, "%cshl", prefix);
+	jvm_generate(p, 0, 0, "goto L%i", label_end);
+	jvm_generate_label(p, label_else);
+	jvm_generate_abs(p, prefix);	
+	jvm_generate(p, 2 * cell_size, cell_size, "%cshr", prefix);
+	jvm_generate_label(p, label_end);
+}
+
+static void
+jvm_generate_entier(gen_proc_t * p, oberon_expr_t * x, oberon_type_t * res)
+{
+	char prefix = jvm_get_prefix(x -> result);
+	char postfix = jvm_get_postfix(res);
+
+	push_expr(p, x);
+	jvm_generate_cast_prefix(p, prefix, 'd');
+	jvm_generate(p, 2, 2, "invokestatic java/lang/Math/floor(D)D");
+	jvm_generate_cast_prefix(p, 'd', postfix);
+}
+
 static void
 push_operator(gen_proc_t * p, oberon_oper_t * oper)
 {
@@ -1534,9 +1590,13 @@ push_operator(gen_proc_t * p, oberon_oper_t * oper)
 		case OP_UNARY_MINUS:
 		case OP_LOGIC_NOT:
 		case OP_ABS:
+		case OP_CAP:
 			push_expr(p, oper -> left);
 			jvm_generate_operator(p, preq, op);
 			break;
+		case OP_ENTIER:
+			jvm_generate_entier(p, oper -> left, oper -> result);
+			break;
 
 		case OP_ADD:
 		case OP_SUB:
@@ -1579,6 +1639,10 @@ push_operator(gen_proc_t * p, oberon_oper_t * oper)
 		case OP_IN:
 			jvm_generate_in(p, oper -> left, oper -> right);
 			break;
+
+		case OP_ASH:
+			jvm_generate_ash(p, oper -> left, oper -> right);
+			break;
 		default:
 			gen_error("push_oper: unk op %i", op);
 			break;