2010-07-15 Zoltan Varga <vargaz@gmail.com>

	* mini-ia64.c: Change the calling convention to pass this as first as on other
	architectures. Remove some dead code from the get_vcall_slot() and the implementation
	of the CALL_MEMBASE opcodes as a result.

svn path=/trunk/mono/; revision=160458

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index 801090bfd2da5ab727228b1763889e9a7293d781..abba6b078b477ca549cb494ff8371046188230ae 100755 (executable)
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,8 +1,14 @@
+2010-07-15  Zoltan Varga  <vargaz@gmail.com>
+
+       * mini-ia64.c: Change the calling convention to pass this as first as on other
+       architectures. Remove some dead code from the get_vcall_slot() and the implementation
+       of the CALL_MEMBASE opcodes as a result.
+
 2010-07-13  Miguel de Icaza  <miguel@novell.com>
 
        * mini.c: LLVM is disabled by default on LLVM builds.  You can use
        the MONO_ENV_OPTIONS to set the --llvm flag.
-       
+
 2010-07-13  Atsushi Enomoto  <atsushi@ximian.com>
 
        * driver.c : windows build fix for --with-moonlight.

diff --git a/mono/mini/mini-ia64.c b/mono/mini/mini-ia64.c
index 83e9d9eecd35da68e2264ec60a1b5816cd9f1d79..8a62f88147dbc47bc0bf5f8bb17b7ea9e793c7f9 100644 (file)
--- a/mono/mini/mini-ia64.c
+++ b/mono/mini/mini-ia64.c
@@ -432,6 +432,12 @@ get_call_info (MonoCompile *cfg, MonoMemPool *mp, MonoMethodSignature *sig, gboo
                }
        }
 
+       /*
+        * IA64 has MONO_ARCH_THIS_AS_FIRST_ARG defined, but we don't need to really pass
+        * this as first, because this is stored in a non-stacked register by the calling
+        * sequence.
+        */
+
        /* this */
        if (sig->hasthis)
                add_general (&gr, &stack_size, cinfo->args + 0);
@@ -2686,7 +2692,8 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                /* Calls */
                case OP_CHECK_THIS:
                        /* ensure ins->sreg1 is not NULL */
-                       ia64_ld8 (code, GP_SCRATCH_REG, ins->sreg1);
+                       /* Can't use ld8 as this could be a vtype address */
+                       ia64_ld1 (code, GP_SCRATCH_REG, ins->sreg1);
                        break;
                case OP_ARGLIST:
                        ia64_adds_imm (code, GP_SCRATCH_REG, cfg->sig_cookie, cfg->frame_reg);
@@ -2748,12 +2755,6 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                        CallInfo *cinfo;
                        int out_reg;
 
-                       /* 
-                        * There are no membase instructions on ia64, but we can't 
-                        * lower this since get_vcall_slot_addr () needs to decode it.
-                        */
-
-                       /* Keep this in synch with get_vcall_slot_addr */
                        ia64_mov (code, IA64_R11, ins->sreg1);
                        if (ia64_is_imm14 (ins->inst_offset))
                                ia64_adds_imm (code, IA64_R8, ins->inst_offset, ins->sreg1);
@@ -2781,23 +2782,12 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                                out_reg ++;
                        ia64_mov (code, IA64_R10, out_reg);
 
-                       ia64_begin_bundle (code);
-                       ia64_codegen_set_one_ins_per_bundle (code, TRUE);
-
                        ia64_ld8 (code, GP_SCRATCH_REG, IA64_R8);
 
                        ia64_mov_to_br (code, IA64_B6, GP_SCRATCH_REG);
 
-                       /*
-                        * This nop will tell get_vcall_slot_addr that this is a virtual 
-                        * call.
-                        */
-                       ia64_nop_i (code, 0x12345);
-
                        ia64_br_call_reg (code, IA64_B0, IA64_B6);
 
-                       ia64_codegen_set_one_ins_per_bundle (code, FALSE);
-
                        code = emit_move_return_value (cfg, ins, code);
                        break;
                }
@@ -4510,58 +4500,8 @@ mono_arch_get_patch_offset (guint8 *code)
 gpointer
 mono_arch_get_vcall_slot (guint8* code, mgreg_t *regs, int *displacement)
 {
-       guint8 *bundle2 = code - 48;
-       guint8 *bundle3 = code - 32;
-       guint8 *bundle4 = code - 16;
-       guint64 ins21 = ia64_bundle_ins1 (bundle2);
-       guint64 ins22 = ia64_bundle_ins2 (bundle2);
-       guint64 ins23 = ia64_bundle_ins3 (bundle2);
-       guint64 ins31 = ia64_bundle_ins1 (bundle3);
-       guint64 ins32 = ia64_bundle_ins2 (bundle3);
-       guint64 ins33 = ia64_bundle_ins3 (bundle3);
-       guint64 ins41 = ia64_bundle_ins1 (bundle4);
-       guint64 ins42 = ia64_bundle_ins2 (bundle4);
-       guint64 ins43 = ia64_bundle_ins3 (bundle4);
-
-       /* 
-        * Virtual calls are made with:
-        *
-        * [MII]       ld8 r31=[r8]
-        *             nop.i 0x0
-        *             nop.i 0x0;;
-        * [MII]       nop.m 0x0
-        *             mov.sptk b6=r31,0x2000000000f32a80
-        *             nop.i 0x0
-        * [MII]       nop.m 0x0
-        *             nop.i 0x123456
-        *             nop.i 0x0
-        * [MIB]       nop.m 0x0
-        *             nop.i 0x0
-        *             br.call.sptk.few b0=b6;;
-        */
-
-       if (((ia64_bundle_template (bundle3) == IA64_TEMPLATE_MII) ||
-                (ia64_bundle_template (bundle3) == IA64_TEMPLATE_MIIS)) &&
-               (ia64_bundle_template (bundle4) == IA64_TEMPLATE_MIBS) &&
-               (ins31 == IA64_NOP_M) && 
-               (ia64_ins_opcode (ins32) == 0) && (ia64_ins_x3 (ins32) == 0) && (ia64_ins_x6 (ins32) == 0x1) && (ia64_ins_y (ins32) == 0) &&
-               (ins33 == IA64_NOP_I) &&
-               (ins41 == IA64_NOP_M) &&
-               (ins42 == IA64_NOP_I) &&
-               (ia64_ins_opcode (ins43) == 1) && (ia64_ins_b1 (ins43) == 0) && (ia64_ins_b2 (ins43) == 6) &&
-               ((ins32 >> 6) & 0xfffff) == 0x12345) {
-               g_assert (ins21 == IA64_NOP_M);
-               g_assert (ins23 == IA64_NOP_I);
-               g_assert (ia64_ins_opcode (ins22) == 0);
-               g_assert (ia64_ins_x3 (ins22) == 7);
-               g_assert (ia64_ins_x (ins22) == 0);
-               g_assert (ia64_ins_b1 (ins22) == IA64_B6);
-
-               *displacement = (gssize)regs [IA64_R8] - (gssize)regs [IA64_R11];
-
-               return (gpointer)regs [IA64_R11];
-       }
-
+       /* Not used on IA64 */
+       g_assert_not_reached ();
        return NULL;
 }
 

diff --git a/mono/mini/mini-ia64.h b/mono/mini/mini-ia64.h
index 56d142d4bbe877ab9ed40d8d844b2a77ee6be4c6..4ec5c01c0d0558a1e9312b0d54371a8f73b31f99 100644 (file)
--- a/mono/mini/mini-ia64.h
+++ b/mono/mini/mini-ia64.h
@@ -189,5 +189,6 @@ unw_dyn_region_info_t* mono_ia64_create_unwind_region (Ia64CodegenState *code);
 #define MONO_ARCH_HAVE_ATOMIC_EXCHANGE 1
 #define MONO_ARCH_HAVE_IMT 1
 #define MONO_ARCH_HAVE_GENERALIZED_IMT_THUNK 1
+#define MONO_ARCH_THIS_AS_FIRST_ARG 1
 
 #endif /* __MONO_MINI_IA64_H__ */