Test case for bug#325444.

[mono.git] / mono / mini / tramp-amd64.c

diff --git a/mono/mini/tramp-amd64.c b/mono/mini/tramp-amd64.c
index fbafebe1489113d17e0efa9c6a7f24ffba3a78b0..0d606cc5f8dfb2190706ec05554b6ca150e2f7a1 100644 (file)
--- a/mono/mini/tramp-amd64.c
+++ b/mono/mini/tramp-amd64.c
@@ -124,8 +124,9 @@ mono_arch_nullify_class_init_trampoline (guint8 *code, gssize *regs)
                buf [2] = 0x90;
                buf [3] = 0x66;
                buf [4] = 0x90;
-       } else if ((code [0] == 0x49) && (code [1] == 0xff)) {
+       } else if ((code [0] == 0x41) && (code [1] == 0xff)) {
                /* call <REG> */
+               /* happens on machines without MAP_32BIT like freebsd */
                /* amd64_set_reg_template is 10 bytes long */
                guint8* buf = code - 10;
 
@@ -160,38 +161,6 @@ mono_arch_nullify_plt_entry (guint8 *code)
        mono_arch_patch_plt_entry (code, nullified_class_init_trampoline);
 }
 
-void
-mono_arch_patch_delegate_trampoline (guint8 *code, guint8 *tramp, gssize *regs, guint8 *addr)
-{
-       guint8 rex = 0;
-       guint32 reg;
-       guint32 disp;
-
-       if ((code [-3] == 0xff) && (amd64_modrm_reg (code [-2]) == 0x2) && (amd64_modrm_mod (code [-2]) == 0x1)) {
-               /* call *[reg+disp8] */
-               if (IS_REX (code [-4]))
-                       rex = code [-4];
-               reg = amd64_modrm_rm (code [-2]);
-               disp = *(guint8*)(code - 1);
-               //printf ("B: [%%r%d+0x%x]\n", reg, disp);
-       }
-       else {
-               int i;
-
-               for (i = -16; i < 0; ++i)
-                       printf ("%d ", code [i]);
-               printf ("\n");
-               g_assert_not_reached ();
-       }
-
-       reg += amd64_rex_b (rex);
-
-       /* R11 is clobbered by the trampoline code */
-       g_assert (reg != AMD64_R11);
-
-       *(gpointer*)(((guint64)(regs [reg])) + disp) = addr;
-}
-
 guchar*
 mono_arch_create_trampoline_code (MonoTrampolineType tramp_type)
 {