X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fbackends%2Fjvm%2Fgenerator-jvm.c;h=a107efc119eca8a22afc620cbc912e8e284f86fa;hb=2c43a7d73a91f64b1318306fa259a9337951a3a3;hp=fe8bc003d149bb4640fef9bad7792572aa500c11;hpb=9bcd389a97869b2ab6b1c6fdc35c0f09beab66c5;p=dsw-obn.git

diff --git a/src/backends/jvm/generator-jvm.c b/src/backends/jvm/generator-jvm.c
index fe8bc00..a107efc 100644
--- a/src/backends/jvm/generator-jvm.c
+++ b/src/backends/jvm/generator-jvm.c
@@ -1690,7 +1690,7 @@ jvm_generate_logical_or(gen_proc_t * p, oberon_expr_t * a, oberon_expr_t * b)
 	/* a OR b -- если a, то TRUE, иначе b */
 
 	push_expr(p, a);
-	jvm_generate(p, 1, 0, "ifne %s", label_name_calc_b);
+	jvm_generate(p, 1, 0, "ifeq %s", label_name_calc_b);
 	jvm_generate(p, 0, 1, "iconst_1");
 	jvm_generate(p, 0, 0, "goto %s", label_name_done);
 	jvm_generate_label(p, label_calc_b);
@@ -1709,7 +1709,7 @@ jvm_generate_logical_and(gen_proc_t * p, oberon_expr_t * a, oberon_expr_t * b)
 	/* a AND b -- если a, то b, иначе FALSE */
 
 	push_expr(p, a);
-	jvm_generate(p, 1, 0, "ifne %s", label_name_false);
+	jvm_generate(p, 1, 0, "ifeq %s", label_name_false);
 	push_expr(p, b);
 	jvm_generate(p, 0, 0, "goto %s", label_name_done);
 	jvm_generate_label(p, label_false);
@@ -1778,6 +1778,34 @@ jvm_generate_range(gen_proc_t * p, oberon_expr_t * a, oberon_expr_t * b)
 	/* TODO free registers */
 }
 
+static void
+jvm_generate_in(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);
+
+	jvm_generate_push_int_size(p, 1, t -> size);
+	push_expr(p, a);
+	jvm_generate(p, 2 * cell_size, cell_size, "%cshl", prefix);
+	push_expr(p, b);	
+	jvm_generate(p, 2 * cell_size, cell_size, "%cand", prefix);
+
+	if(cell_size > 1)
+	{
+		jvm_generate(p, cell_size, 0, "lcmp");
+	}
+
+	jvm_generate(p, 1, 0, "ifeq L%i", label_else);
+	jvm_generate(p, 0, 1, "iconst_1");
+	jvm_generate(p, 0, 0, "goto L%i", label_end);
+	jvm_generate_label(p, label_else);
+	jvm_generate(p, 0, 1, "iconst_0");	
+	jvm_generate_label(p, label_end);
+}
+
 static void
 push_operator(gen_proc_t * p, oberon_oper_t * oper)
 {
@@ -1835,6 +1863,9 @@ push_operator(gen_proc_t * p, oberon_oper_t * oper)
 		case OP_RANGE:
 			jvm_generate_range(p, oper -> left, oper -> right);
 			break;
+		case OP_IN:
+			jvm_generate_in(p, oper -> left, oper -> right);
+			break;
 		default:
 			gen_error("push_oper: unk op %i", op);
 			break;