index 5e74d18a0acfdf31d609959415e0d7a92ecdfc5a..c2fd9abd4662bef894b32ae159650e7cdcb4baa2 100644 (file)
@@ -1141,8 +1141,11 @@ jvm_generate_cast_type(gen_proc_t * p, oberon_type_t * from, oberon_type_t * to)
{
if(to -> class == OBERON_TYPE_RECORD || to -> class == OBERON_TYPE_POINTER)
{
- char * full_name = jvm_get_class_full_name(to);
- jvm_generate(p, 1, 1, "checkcast %s", full_name);
+ if(to -> class == OBERON_TYPE_POINTER && to -> base -> class == OBERON_TYPE_RECORD)
+ {
+ char * full_name = jvm_get_class_full_name(to);
+ jvm_generate(p, 1, 1, "checkcast %s", full_name);
+ }
}
else
{
jvm_generate(p, 2 * cell_size, 1, "%ccmp%c", prefix, fop);
jvm_generate(p, 1, 1, "if%s L%i", cmpop, label_true);
}
+ else if(prefix == 'a')
+ {
+ if(t -> class == OBERON_TYPE_STRING
+ || (t -> class == OBERON_TYPE_POINTER && t -> base -> class == OBERON_TYPE_CHAR))
+ {
+ jvm_generate(p, 2, 1, "invokestatic SYSTEM/STRCMP([B[B)I");
+ jvm_generate(p, 1, 0, "if%s L%i", cmpop, label_true);
+ }
+ else
+ {
+ jvm_generate(p, 1, 0, "if_acmp%s L%i", cmpop, label_true);
+ }
+ }
else
{
jvm_generate(p, 2 * cell_size, 0, "if_%ccmp%s L%i", prefix, cmpop, label_true);
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);
jvm_generate(p, 2 * cell_size, cell_size, "%cand", prefix);
break;
case OP_DIFFERENCE:
+ /* (a - b) == a & ~b */
jvm_generate_push_int_size(p, -1, t -> size);
jvm_generate(p, 2 * cell_size, cell_size, "%cxor", prefix);
jvm_generate(p, 2 * cell_size, cell_size, "%cand", prefix);
int label_else = jvm_new_label_id(p);
int label_end = jvm_new_label_id(p);
+ /* (a IN b) == (1 << a) & b */
jvm_generate_push_int_size(p, 1, t -> size);
push_expr(p, a);
jvm_generate(p, 2 * cell_size, cell_size, "%cshl", prefix);
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
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_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;
@@ -1641,3 +1700,75 @@ oberon_generate_assign(oberon_context_t * ctx, oberon_expr_t * src, oberon_expr_
store_expr(p, dst, src);
}
+
+void
+oberon_generate_copy(oberon_context_t * ctx, oberon_expr_t * src, oberon_expr_t * dst)
+{
+ gen_module_t * m;
+ gen_proc_t * p;
+ char * desc;
+
+ m = ctx -> mod -> gen_mod;
+ p = m -> class -> p;
+
+ push_expr(p, src);
+ push_expr(p, dst);
+
+ desc = jvm_get_descriptor(dst -> result);
+
+ jvm_generate(p, 2, 0, "invokestatic SYSTEM/COPY(%s%s)V", desc, desc);
+}
+
+void
+oberon_generate_assert(oberon_context_t * ctx, oberon_expr_t * cond)
+{
+ gen_module_t * m;
+ gen_proc_t * p;
+
+ m = ctx -> mod -> gen_mod;
+ p = m -> class -> p;
+
+ push_expr(p, cond);
+ jvm_generate(p, 1, 0, "invokestatic SYSTEM/ASSERT(Z)V");
+}
+
+void
+oberon_generate_assert_n(oberon_context_t * ctx, oberon_expr_t * cond, int64_t n)
+{
+ gen_module_t * m;
+ gen_proc_t * p;
+
+ m = ctx -> mod -> gen_mod;
+ p = m -> class -> p;
+
+ push_expr(p, cond);
+ jvm_generate_push_int_size(p, n, 8);
+ jvm_generate(p, 1 + 2, 0, "invokestatic SYSTEM/ASSERT(ZJ)V");
+}
+
+void
+oberon_generate_trap(oberon_context_t * ctx, int64_t n)
+{
+ gen_module_t * m;
+ gen_proc_t * p;
+
+ m = ctx -> mod -> gen_mod;
+ p = m -> class -> p;
+
+ jvm_generate_push_int_size(p, n, 8);
+ jvm_generate(p, 2, 0, "invokestatic SYSTEM/TRAP(J)V");
+}
+
+void
+oberon_generate_halt(oberon_context_t * ctx, int64_t n)
+{
+ gen_module_t * m;
+ gen_proc_t * p;
+
+ m = ctx -> mod -> gen_mod;
+ p = m -> class -> p;
+
+ jvm_generate_push_int_size(p, n, 8);
+ jvm_generate(p, 2, 0, "invokestatic SYSTEM/HALT(J)V");
+}
+