Tue Jul 10 17:33:12 CEST 2007 Paolo Molaro <lupus@ximian.com>

[mono.git] / mono / mini / inssel.brg

diff --git a/mono/mini/inssel.brg b/mono/mini/inssel.brg
index 14aba785383247331e3a7f0c6a68ed0f028618fc..3ec201ed3a810f095cdda9d6ae0981327afa3090 100644 (file)
--- a/mono/mini/inssel.brg
+++ b/mono/mini/inssel.brg
@@ -319,6 +319,13 @@
        } while (0)
 #endif
 
+#ifndef MONO_EMIT_NEW_COMPARE_BRANCH_LABEL_CHAINED
+#define MONO_EMIT_NEW_COMPARE_BRANCH_LABEL_CHAINED(cfg, cmp_op, sreg1, sreg2, label) \
+        do { \
+                MONO_EMIT_NEW_BRANCH_LABEL (s, (cmp_op), (label)); \
+} while (0)
+#endif
+
 #ifndef MONO_EMIT_NEW_COMPARE_IMM_BRANCH_LABEL
 #define MONO_EMIT_NEW_COMPARE_IMM_BRANCH_LABEL(cfg, cmp_op, sreg1, imm, label) \
        do { \
@@ -327,6 +334,13 @@
        } while (0)
 #endif
 
+#ifndef MONO_EMIT_NEW_COMPARE_IMM_BRANCH_LABEL_CHAINED
+#define MONO_EMIT_NEW_COMPARE_IMM_BRANCH_LABEL_CHAINED(cfg, cmp_op, sreg1, imm, label) \
+        do { \
+                MONO_EMIT_NEW_BRANCH_LABEL (s, (cmp_op), (label)); \
+} while (0)
+#endif
+
 #ifndef MONO_EMIT_NEW_COMPARE_BRANCH_BLOCK
 #define MONO_EMIT_NEW_COMPARE_BRANCH_BLOCK(cfg, cmp_op, sreg1, sreg2, block) \
        do { \
@@ -335,6 +349,13 @@
        } while (0)
 #endif
 
+#ifndef MONO_EMIT_NEW_COMPARE_BRANCH_BLOCK_CHAINED
+#define MONO_EMIT_NEW_COMPARE_BRANCH_BLOCK_CHAINED(cfg, cmp_op, sreg1, sreg2, block) \
+        do { \
+                MONO_EMIT_NEW_BRANCH_BLOCK (s, (cmp_op), (block)); \
+} while (0)
+#endif
+
 #ifndef MONO_EMIT_NEW_COMPARE_IMM_BRANCH_BLOCK
 #define MONO_EMIT_NEW_COMPARE_IMM_BRANCH_BLOCK(cfg, cmp_op, sreg1, imm, block) \
        do { \
@@ -343,6 +364,13 @@
        } while (0)
 #endif
 
+#ifndef MONO_EMIT_NEW_COMPARE_IMM_BRANCH_BLOCK_CHAINED
+#define MONO_EMIT_NEW_COMPARE_IMM_BRANCH_BLOCK_CHAINED(cfg, cmp_op, sreg1, imm, block) \
+        do { \
+                MONO_EMIT_NEW_BRANCH_BLOCK (s, (cmp_op), (block)); \
+} while (0)
+#endif
+
 %%
 
 %termprefix OP_ CEE_
@@ -752,7 +780,7 @@ reg: OP_CEQ (cflags),
 reg: OP_CLT (cflags),
 reg: OP_CLT_UN (cflags),
 reg: OP_CGT (cflags),
-reg: OP_CGT_UN (cflags) {      
+reg: OP_CGT_UN (cflags) "2" {  
        tree->dreg = state->reg1;
        mono_bblock_add_inst (s->cbb, tree);
 }
@@ -1534,6 +1562,28 @@ stmt: CEE_MKREFANY (OP_GROUP (reg, OP_I8CONST), reg) {
        MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STOREP_MEMBASE_REG, state->right->reg1, G_STRUCT_OFFSET (MonoTypedRef, value), state->left->left->reg1);
 }
 
+reg: OP_MIN (reg, reg) "2" {
+       /* min (x,y) = y + (((x-y)>>31)&(x-y)); */
+       int diff = mono_regstate_next_int (s->rs);
+       int shifted = mono_regstate_next_int (s->rs);
+       int anded = mono_regstate_next_int (s->rs);
+       MONO_EMIT_NEW_BIALU (s, CEE_SUB, diff, state->left->reg1, state->right->reg1);
+       MONO_EMIT_NEW_BIALU_IMM (s, OP_SHR_IMM, shifted, diff, (sizeof(void*)*8-1));
+       MONO_EMIT_NEW_BIALU (s, CEE_AND, anded, shifted, diff);
+       MONO_EMIT_NEW_BIALU (s, CEE_ADD, state->reg1, anded, state->right->reg1);
+}
+
+reg: OP_MAX (reg, reg) "2" {
+       /* max (x,y) = x - (((x-y)>>31)&(x-y)); */
+       int diff = mono_regstate_next_int (s->rs);
+       int shifted = mono_regstate_next_int (s->rs);
+       int anded = mono_regstate_next_int (s->rs);
+       MONO_EMIT_NEW_BIALU (s, CEE_SUB, diff, state->left->reg1, state->right->reg1);
+       MONO_EMIT_NEW_BIALU_IMM (s, OP_SHR_IMM, shifted, diff, (sizeof(void*)*8-1));
+       MONO_EMIT_NEW_BIALU (s, CEE_AND, anded, shifted, diff);
+       MONO_EMIT_NEW_BIALU (s, CEE_SUB, state->reg1, state->left->reg1, anded);
+}
+
 %%
 
 #ifdef MONO_ARCH_NEED_GOT_VAR
@@ -1669,6 +1719,23 @@ mini_emit_load_intf_bit_reg_vtable (MonoCompile *s, int intf_bit_reg, int vtable
        }
 }
 
+#ifdef MONO_ARCH_HAVE_IMT
+static void
+emit_imt_argument (MonoCompile *cfg, MonoCallInst *call) {
+#ifdef MONO_ARCH_IMT_REG
+       MonoInst *inst;
+       MONO_INST_NEW (cfg, inst, OP_PCONST);
+       inst->inst_p0 = call->method;
+       inst->dreg = mono_regstate_next_int (cfg->rs);
+       mono_bblock_add_inst (cfg->cbb, inst);
+
+       mono_call_inst_add_outarg_reg (cfg, call, inst->dreg, MONO_ARCH_IMT_REG, FALSE);
+#else
+       mono_arch_emit_imt_argument (cfg, call);
+#endif
+}
+#endif
+
 static void 
 mini_emit_virtual_call (MonoCompile *cfg, void *st, MonoInst *tree, int novirtop, int virtop)
 {
@@ -1733,9 +1800,16 @@ mini_emit_virtual_call (MonoCompile *cfg, void *st, MonoInst *tree, int novirtop
        vtable_reg = mono_regstate_next_int (cfg->rs);
        MONO_EMIT_NEW_LOAD_MEMBASE (cfg, vtable_reg, this_reg, G_STRUCT_OFFSET (MonoObject, vtable));
        if (method->klass->flags & TYPE_ATTRIBUTE_INTERFACE) {
+#ifdef MONO_ARCH_HAVE_IMT
+               guint32 imt_slot = mono_method_get_imt_slot (method);
+               emit_imt_argument (cfg, (MonoCallInst*)tree);
+               slot_reg = vtable_reg;
+               tree->inst_offset = (imt_slot - MONO_IMT_SIZE) * SIZEOF_VOID_P;
+#else
                slot_reg = mono_regstate_next_int (cfg->rs);
                mini_emit_load_intf_reg_vtable (cfg, slot_reg, vtable_reg, method->klass);
                tree->inst_offset = method->slot * SIZEOF_VOID_P;
+#endif
        } else {
                slot_reg = vtable_reg;
                tree->inst_offset = G_STRUCT_OFFSET (MonoVTable, vtable) + (method->slot * SIZEOF_VOID_P);