Merge pull request #1150 from ludovic-henry/pr17c-delegate-trampoline
[mono.git] / mono / mini / decompose.c
index dd5542560a140c1d29c57a2e8a5ffec7fa648424..07242d86138e0ce371119ddffa80e7d85e9861fe 100644 (file)
@@ -13,6 +13,7 @@
 #include "jit-icalls.h"
 
 #include <mono/metadata/gc-internal.h>
+#include <mono/metadata/abi-details.h>
 
 #ifndef DISABLE_JIT
 
@@ -21,7 +22,10 @@ MONO_API MonoInst* mono_emit_native_call (MonoCompile *cfg, gconstpointer func,
 void mini_emit_stobj (MonoCompile *cfg, MonoInst *dest, MonoInst *src, MonoClass *klass, gboolean native);
 void mini_emit_initobj (MonoCompile *cfg, MonoInst *dest, const guchar *ip, MonoClass *klass);
 
-/* Decompose complex long opcodes on 64 bit machines or when using LLVM */
+/*
+ * Decompose complex long opcodes on 64 bit machines.
+ * This is also used on 32 bit machines when using LLVM, so it needs to handle I/U correctly.
+ */
 static gboolean
 decompose_long_opcode (MonoCompile *cfg, MonoInst *ins, MonoInst **repl_ins)
 {
@@ -34,10 +38,27 @@ decompose_long_opcode (MonoCompile *cfg, MonoInst *ins, MonoInst **repl_ins)
                ins->opcode = OP_SEXT_I4;
                break;
        case OP_LCONV_TO_I8:
-       case OP_LCONV_TO_I:
        case OP_LCONV_TO_U8:
+               if (SIZEOF_VOID_P == 4)
+                       ins->opcode = OP_LMOVE;
+               else
+                       ins->opcode = OP_MOVE;
+               break;
+       case OP_LCONV_TO_I:
+               if (SIZEOF_VOID_P == 4)
+                       /* OP_LCONV_TO_I4 */
+                       ins->opcode = OP_SEXT_I4;
+               else
+                       ins->opcode = OP_MOVE;
+               break;
        case OP_LCONV_TO_U:
-               ins->opcode = OP_MOVE;
+               if (SIZEOF_VOID_P == 4) {
+                       /* OP_LCONV_TO_U4 */
+                       MONO_EMIT_NEW_BIALU_IMM (cfg, OP_ISHR_UN_IMM, ins->dreg, ins->sreg1, 0);
+                       NULLIFY_INS (ins);
+               } else {
+                       ins->opcode = OP_MOVE;
+               }
                break;
        case OP_ICONV_TO_I8:
                ins->opcode = OP_SEXT_I4;
@@ -50,67 +71,63 @@ decompose_long_opcode (MonoCompile *cfg, MonoInst *ins, MonoInst **repl_ins)
                MONO_EMIT_NEW_BIALU_IMM (cfg, OP_ISHR_UN_IMM, ins->dreg, ins->sreg1, 0);
                NULLIFY_INS (ins);
                break;
-       case OP_LADD_OVF:
+       case OP_LADD_OVF: {
+               int opcode;
+
                if (COMPILE_LLVM (cfg))
                        break;
-               {
-                       int opcode;
-#if defined(__mono_ilp32__) && SIZEOF_REGISTER == 8
+               if (MONO_IS_ILP32 && SIZEOF_REGISTER == 8)
                        opcode = OP_LADDCC;
-#else
+               else
                        opcode = OP_ADDCC;
-#endif
-                       EMIT_NEW_BIALU (cfg, repl, opcode, ins->dreg, ins->sreg1, ins->sreg2);
-               }
+               EMIT_NEW_BIALU (cfg, repl, opcode, ins->dreg, ins->sreg1, ins->sreg2);
                MONO_EMIT_NEW_COND_EXC (cfg, OV, "OverflowException");
                NULLIFY_INS (ins);
                break;
-       case OP_LADD_OVF_UN:
+       }
+       case OP_LADD_OVF_UN: {
+               int opcode;
+
                if (COMPILE_LLVM (cfg))
                        break;
-               {
-                       int opcode;
-#if defined(__mono_ilp32__) && SIZEOF_REGISTER == 8
+               if (MONO_IS_ILP32 && SIZEOF_REGISTER == 8)
                        opcode = OP_LADDCC;
-#else
+               else
                        opcode = OP_ADDCC;
-#endif
-                       EMIT_NEW_BIALU (cfg, repl, opcode, ins->dreg, ins->sreg1, ins->sreg2);
-               }
+               EMIT_NEW_BIALU (cfg, repl, opcode, ins->dreg, ins->sreg1, ins->sreg2);
                MONO_EMIT_NEW_COND_EXC (cfg, C, "OverflowException");
                NULLIFY_INS (ins);
                break;
+       }
 #ifndef __mono_ppc64__
-       case OP_LSUB_OVF:
+       case OP_LSUB_OVF: {
+               int opcode;
+
                if (COMPILE_LLVM (cfg))
                        break;
-               {
-                       int opcode;
-#if defined(__mono_ilp32__) && SIZEOF_REGISTER == 8
+               if (MONO_IS_ILP32 && SIZEOF_REGISTER == 8)
                        opcode = OP_LSUBCC;
-#else
+               else
                        opcode = OP_SUBCC;
-#endif
-                       EMIT_NEW_BIALU (cfg, repl, opcode, ins->dreg, ins->sreg1, ins->sreg2);
-               }
+               EMIT_NEW_BIALU (cfg, repl, opcode, ins->dreg, ins->sreg1, ins->sreg2);
                MONO_EMIT_NEW_COND_EXC (cfg, OV, "OverflowException");
                NULLIFY_INS (ins);
                break;
-       case OP_LSUB_OVF_UN:
+       }
+       case OP_LSUB_OVF_UN: {
+               int opcode;
+
                if (COMPILE_LLVM (cfg))
                        break;
-               {
-                       int opcode;
-#if defined(__mono_ilp32__) && SIZEOF_REGISTER == 8
+               if (MONO_IS_ILP32 && SIZEOF_REGISTER == 8)
                        opcode = OP_LSUBCC;
-#else
+               else
                        opcode = OP_SUBCC;
-#endif
-                       EMIT_NEW_BIALU (cfg, repl, opcode, ins->dreg, ins->sreg1, ins->sreg2);
-               }
+               EMIT_NEW_BIALU (cfg, repl, opcode, ins->dreg, ins->sreg1, ins->sreg2);
                MONO_EMIT_NEW_COND_EXC (cfg, C, "OverflowException");
                NULLIFY_INS (ins);
                break;
+       }
 #endif
                
        case OP_ICONV_TO_OVF_I8:
@@ -192,6 +209,9 @@ decompose_long_opcode (MonoCompile *cfg, MonoInst *ins, MonoInst **repl_ins)
                NULLIFY_INS (ins);
                break;
        case OP_LCONV_TO_OVF_I4:
+#if SIZEOF_VOID_P == 4
+       case OP_LCONV_TO_OVF_I:
+#endif
                MONO_EMIT_NEW_LCOMPARE_IMM (cfg, ins->sreg1, 0x7fffffff);
                MONO_EMIT_NEW_COND_EXC (cfg, GT, "OverflowException");
                /* The int cast is needed for the VS compiler.  See Compiler Warning (level 2) C4146. */
@@ -206,12 +226,18 @@ decompose_long_opcode (MonoCompile *cfg, MonoInst *ins, MonoInst **repl_ins)
                NULLIFY_INS (ins);
                break;
        case OP_LCONV_TO_OVF_I4_UN:
+#if SIZEOF_VOID_P == 4
+       case OP_LCONV_TO_OVF_I_UN:
+#endif
                MONO_EMIT_NEW_LCOMPARE_IMM (cfg, ins->sreg1, 0x7fffffff);
                MONO_EMIT_NEW_COND_EXC (cfg, GT_UN, "OverflowException");
                MONO_EMIT_NEW_UNALU (cfg, OP_MOVE, ins->dreg, ins->sreg1);
                NULLIFY_INS (ins);
                break;
        case OP_LCONV_TO_OVF_U4:
+#if SIZEOF_VOID_P == 4
+       case OP_LCONV_TO_OVF_U:
+#endif
                MONO_EMIT_NEW_LCOMPARE_IMM (cfg, ins->sreg1, 0xffffffffUL);
                MONO_EMIT_NEW_COND_EXC (cfg, GT, "OverflowException");
                MONO_EMIT_NEW_LCOMPARE_IMM (cfg, ins->sreg1, 0);
@@ -220,18 +246,25 @@ decompose_long_opcode (MonoCompile *cfg, MonoInst *ins, MonoInst **repl_ins)
                NULLIFY_INS (ins);
                break;
        case OP_LCONV_TO_OVF_U4_UN:
+#if SIZEOF_VOID_P == 4
+       case OP_LCONV_TO_OVF_U_UN:
+#endif
                MONO_EMIT_NEW_LCOMPARE_IMM (cfg, ins->sreg1, 0xffffffff);
                MONO_EMIT_NEW_COND_EXC (cfg, GT_UN, "OverflowException");
                MONO_EMIT_NEW_UNALU (cfg, OP_MOVE, ins->dreg, ins->sreg1);
                NULLIFY_INS (ins);
                break;
+#if SIZEOF_VOID_P == 8
        case OP_LCONV_TO_OVF_I:
        case OP_LCONV_TO_OVF_U_UN:
+#endif
        case OP_LCONV_TO_OVF_U8_UN:
        case OP_LCONV_TO_OVF_I8:
                ins->opcode = OP_MOVE;
                break;
+#if SIZEOF_VOID_P == 8
        case OP_LCONV_TO_OVF_I_UN:
+#endif
        case OP_LCONV_TO_OVF_I8_UN:
                MONO_EMIT_NEW_LCOMPARE_IMM (cfg, ins->sreg1, 0);
                MONO_EMIT_NEW_COND_EXC (cfg, LT, "OverflowException");
@@ -239,7 +272,9 @@ decompose_long_opcode (MonoCompile *cfg, MonoInst *ins, MonoInst **repl_ins)
                NULLIFY_INS (ins);
                break;
        case OP_LCONV_TO_OVF_U8:
+#if SIZEOF_VOID_P == 8
        case OP_LCONV_TO_OVF_U:
+#endif
                MONO_EMIT_NEW_LCOMPARE_IMM (cfg, ins->sreg1, 0);
                MONO_EMIT_NEW_COND_EXC (cfg, LT, "OverflowException");
                MONO_EMIT_NEW_UNALU (cfg, OP_MOVE, ins->dreg, ins->sreg1);
@@ -442,6 +477,43 @@ mono_decompose_opcode (MonoCompile *cfg, MonoInst *ins)
                break;
 #endif
 
+#if SIZEOF_REGISTER == 8
+       case OP_LREM_IMM:
+#endif
+       case OP_IREM_IMM: {
+               int power = mono_is_power_of_two (ins->inst_imm);
+               if (ins->inst_imm == 1) {
+                       ins->opcode = OP_ICONST;
+                       MONO_INST_NULLIFY_SREGS (ins);
+                       ins->inst_c0 = 0;
+               } else if ((ins->inst_imm > 0) && (ins->inst_imm < (1LL << 32)) && (power != -1)) {
+                       gboolean is_long = ins->opcode == OP_LREM_IMM;
+                       int compensator_reg = alloc_ireg (cfg);
+                       int intermediate_reg;
+
+                       /* Based on gcc code */
+
+                       /* Add compensation for negative numerators */
+
+                       if (power > 1) {
+                               intermediate_reg = compensator_reg;
+                               MONO_EMIT_NEW_BIALU_IMM (cfg, is_long ? OP_LSHR_IMM : OP_SHR_IMM, intermediate_reg, ins->sreg1, is_long ? 63 : 31);
+                       } else {
+                               intermediate_reg = ins->sreg1;
+                       }
+
+                       MONO_EMIT_NEW_BIALU_IMM (cfg, is_long ? OP_LSHR_UN_IMM : OP_SHR_UN_IMM, compensator_reg, intermediate_reg, (is_long ? 64 : 32) - power);
+                       MONO_EMIT_NEW_BIALU (cfg, is_long ? OP_LADD : OP_IADD, ins->dreg, ins->sreg1, compensator_reg);
+                       /* Compute remainder */
+                       MONO_EMIT_NEW_BIALU_IMM (cfg, is_long ? OP_LAND_IMM : OP_AND_IMM, ins->dreg, ins->dreg, (1 << power) - 1);
+                       /* Remove compensation */
+                       MONO_EMIT_NEW_BIALU (cfg, is_long ? OP_LSUB : OP_ISUB, ins->dreg, ins->dreg, compensator_reg);
+
+                       NULLIFY_INS (ins);
+               }
+               break;
+       }
+
        default:
                emulate = TRUE;
                break;
@@ -1485,7 +1557,7 @@ mono_decompose_array_access_opts (MonoCompile *cfg)
                                switch (ins->opcode) {
                                case OP_LDLEN:
                                        NEW_LOAD_MEMBASE_FLAGS (cfg, dest, OP_LOADI4_MEMBASE, ins->dreg, ins->sreg1,
-                                                                                       G_STRUCT_OFFSET (MonoArray, max_length), ins->flags | MONO_INST_INVARIANT_LOAD);
+                                                                                       MONO_STRUCT_OFFSET (MonoArray, max_length), ins->flags | MONO_INST_INVARIANT_LOAD);
                                        MONO_ADD_INS (cfg->cbb, dest);
                                        break;
                                case OP_BOUNDS_CHECK:
@@ -1524,7 +1596,7 @@ mono_decompose_array_access_opts (MonoCompile *cfg)
                                        break;
                                case OP_STRLEN:
                                        MONO_EMIT_NEW_LOAD_MEMBASE_OP_FLAGS (cfg, OP_LOADI4_MEMBASE, ins->dreg,
-                                                                                                                ins->sreg1, G_STRUCT_OFFSET (MonoString, length), ins->flags | MONO_INST_INVARIANT_LOAD);
+                                                                                                                ins->sreg1, MONO_STRUCT_OFFSET (MonoString, length), ins->flags | MONO_INST_INVARIANT_LOAD);
                                        break;
                                default:
                                        break;