From ab3dac04c2478a484b0e063b04fd0f19cc0f368d Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 30 Dec 2020 21:36:41 +0100 Subject: [PATCH 1/3] Use tpidrro_el0 for thread local storage in macOS-arm64 Fixes #343 --- include/mimalloc-internal.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/mimalloc-internal.h b/include/mimalloc-internal.h index e3e78e40..df700d39 100644 --- a/include/mimalloc-internal.h +++ b/include/mimalloc-internal.h @@ -707,7 +707,11 @@ static inline void* mi_tls_slot(size_t slot) mi_attr_noexcept { res = tcb[slot]; #elif defined(__aarch64__) void** tcb; UNUSED(ofs); +#if defined(__MACH__) + __asm__ volatile ("mrs %0, tpidrro_el0" : "=r" (tcb)); +#else __asm__ volatile ("mrs %0, tpidr_el0" : "=r" (tcb)); +#endif res = tcb[slot]; #endif return res; @@ -730,7 +734,11 @@ static inline void mi_tls_slot_set(size_t slot, void* value) mi_attr_noexcept { tcb[slot] = value; #elif defined(__aarch64__) void** tcb; UNUSED(ofs); +#if defined(__MACH__) + __asm__ volatile ("mrs %0, tpidrro_el0" : "=r" (tcb)); +#else __asm__ volatile ("mrs %0, tpidr_el0" : "=r" (tcb)); +#endif tcb[slot] = value; #endif } From 88330cfc9fdd4ec5aaa7988efdd209a593bb0026 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 22 Jan 2021 17:06:43 +0100 Subject: [PATCH 2/3] Use __APPLE__ instead of __MACH__ --- include/mimalloc-internal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/mimalloc-internal.h b/include/mimalloc-internal.h index df700d39..dca21bb9 100644 --- a/include/mimalloc-internal.h +++ b/include/mimalloc-internal.h @@ -707,7 +707,7 @@ static inline void* mi_tls_slot(size_t slot) mi_attr_noexcept { res = tcb[slot]; #elif defined(__aarch64__) void** tcb; UNUSED(ofs); -#if defined(__MACH__) +#if defined(__APPLE__) __asm__ volatile ("mrs %0, tpidrro_el0" : "=r" (tcb)); #else __asm__ volatile ("mrs %0, tpidr_el0" : "=r" (tcb)); From a753084f748d59dcd18fdc4f10c3e36ccfc107f5 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 28 Jan 2021 11:38:38 +0100 Subject: [PATCH 3/3] Use APPLE instead of MACH --- include/mimalloc-internal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/mimalloc-internal.h b/include/mimalloc-internal.h index dca21bb9..e1190c7e 100644 --- a/include/mimalloc-internal.h +++ b/include/mimalloc-internal.h @@ -734,7 +734,7 @@ static inline void mi_tls_slot_set(size_t slot, void* value) mi_attr_noexcept { tcb[slot] = value; #elif defined(__aarch64__) void** tcb; UNUSED(ofs); -#if defined(__MACH__) +#if defined(__APPLE__) __asm__ volatile ("mrs %0, tpidrro_el0" : "=r" (tcb)); #else __asm__ volatile ("mrs %0, tpidr_el0" : "=r" (tcb));