Implement proper TSD lookup for arm-darwin

diff --git a/mono/mini/mini-amd64.c b/mono/mini/mini-amd64.c
index 06bb66fa4f06564e0729f2d81d41b434d2fa68d7..10f9f0ff31377da9b0bffc55b74fd1ed1e1bb43a 100644 (file)
--- a/mono/mini/mini-amd64.c
+++ b/mono/mini/mini-amd64.c
@@ -3588,43 +3588,6 @@ emit_move_return_value (MonoCompile *cfg, MonoInst *ins, guint8 *code)
 
 #endif /* DISABLE_JIT */
 
-gboolean
-mono_amd64_have_tls_get (void)
-{
-#ifdef __APPLE__
-       static gboolean have_tls_get = FALSE;
-       static gboolean inited = FALSE;
-
-       if (inited)
-               return have_tls_get;
-
-       guint8 *ins = (guint8*)pthread_getspecific;
-
-       /*
-        * We're looking for these two instructions:
-        *
-        * mov    %gs:0x60(,%rdi,8),%rax
-        * retq
-        */
-       have_tls_get = ins [0] == 0x65 &&
-                      ins [1] == 0x48 &&
-                      ins [2] == 0x8b &&
-                      ins [3] == 0x04 &&
-                      ins [4] == 0xfd &&
-                      ins [5] == 0x60 &&
-                      ins [6] == 0x00 &&
-                      ins [7] == 0x00 &&
-                      ins [8] == 0x00 &&
-                      ins [9] == 0xc3;
-
-       inited = TRUE;
-
-       return have_tls_get;
-#else
-       return TRUE;
-#endif
-}
-
 /*
  * mono_amd64_emit_tls_get:
  * @code: buffer to store code to
@@ -3644,9 +3607,6 @@ mono_amd64_emit_tls_get (guint8* code, int dreg, int tls_offset)
        g_assert (tls_offset < 64);
        x86_prefix (code, X86_GS_PREFIX);
        amd64_mov_reg_mem (code, dreg, (tls_offset * 8) + 0x1480, 8);
-#elif defined(__APPLE__)
-       x86_prefix (code, X86_GS_PREFIX);
-       amd64_mov_reg_mem (code, dreg, 0x60 + tls_offset * 8, 8);
 #else
        if (optimize_for_xen) {
                x86_prefix (code, X86_FS_PREFIX);
@@ -7073,7 +7033,7 @@ mono_arch_emit_epilog (MonoCompile *cfg)
                        amd64_mov_reg_membase (code, X86_ECX, X86_ECX, G_STRUCT_OFFSET (MonoJitTlsData, restore_stack_prot), 8);
                        x86_alu_reg_imm (code, X86_CMP, X86_ECX, 0);
                        patch = code;
-                       x86_branch8 (code, X86_CC_Z, 0, FALSE);
+                       x86_branch8 (code, X86_CC_Z, 0, FALSE);
                        /* note that the call trampoline will preserve eax/edx */
                        x86_call_reg (code, X86_ECX);
                        x86_patch (patch, code);

diff --git a/mono/mini/mini-amd64.h b/mono/mini/mini-amd64.h
index 01285149edbfa0e7c2e2958e7927af611e81aa1a..effe00bcbb0b34d053f1c3eee26f3adad44bd87d 100644 (file)
--- a/mono/mini/mini-amd64.h
+++ b/mono/mini/mini-amd64.h
@@ -351,7 +351,7 @@ typedef struct {
 #define MONO_ARCH_HAVE_FULL_AOT_TRAMPOLINES 1
 #define MONO_ARCH_HAVE_FULL_AOT_TRAMPOLINES_2 1
 #define MONO_ARCH_HAVE_IMT 1
-#define MONO_ARCH_HAVE_TLS_GET (mono_amd64_have_tls_get ())
+#define MONO_ARCH_HAVE_TLS_GET 1
 #define MONO_ARCH_IMT_REG AMD64_R10
 #define MONO_ARCH_IMT_SCRATCH_REG AMD64_R11
 #define MONO_ARCH_VTABLE_REG MONO_AMD64_ARG_REG1
@@ -443,9 +443,6 @@ mono_amd64_get_original_ip (void) MONO_INTERNAL;
 guint8*
 mono_amd64_emit_tls_get (guint8* code, int dreg, int tls_offset) MONO_INTERNAL;
 
-gboolean
-mono_amd64_have_tls_get (void) MONO_INTERNAL;
-
 GSList*
 mono_amd64_get_exception_trampolines (gboolean aot) MONO_INTERNAL;
 

diff --git a/mono/mini/mini-x86.c b/mono/mini/mini-x86.c
index 675fd76045fd700169dbf4a01cccd0760323a6d3..75c09414fb15e4539d1c5597cd1b350b29f78d1e 100644 (file)
--- a/mono/mini/mini-x86.c
+++ b/mono/mini/mini-x86.c
@@ -2203,12 +2203,6 @@ gboolean
 mono_x86_have_tls_get (void)
 {
 #ifdef __APPLE__
-       static gboolean have_tls_get = FALSE;
-       static gboolean inited = FALSE;
-
-       if (inited)
-               return have_tls_get;
-
        guint32 *ins = (guint32*)pthread_getspecific;
        /*
         * We're looking for these two instructions:
@@ -2216,11 +2210,7 @@ mono_x86_have_tls_get (void)
         * mov    0x4(%esp),%eax
         * mov    %gs:0x48(,%eax,4),%eax
         */
-       have_tls_get = ins [0] == 0x0424448b && ins [1] == 0x85048b65 && ins [2] == 0x00000048;
-
-       inited = TRUE;
-
-       return have_tls_get;
+       return ins [0] == 0x0424448b && ins [1] == 0x85048b65 && ins [2] == 0x00000048;
 #else
        return TRUE;
 #endif

diff --git a/mono/utils/mach-support-arm.c b/mono/utils/mach-support-arm.c
index 4ce821d73136897759589d0038d9c889f6db3af1..a5d27d46871b0d99403ecaa86e1cdb65e1412a81 100644 (file)
--- a/mono/utils/mach-support-arm.c
+++ b/mono/utils/mach-support-arm.c
@@ -74,8 +74,8 @@ mono_mach_arch_get_tls_value_from_thread (thread_port_t thread, guint32 key)
         * is baked into their pthread_getspecific implementation
         */
        intptr_t *p = (intptr_t *) pthread_from_mach_thread_np (thread);
-       intptr_t **tsd = (intptr_t **) (p + 0x48);
+       intptr_t **tsd = (intptr_t **) (p + 0x48 + (key << 2));
 
-       return (void *) tsd [key];
+       return (void *) *tsd;
 }
 #endif