X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/5ba3f43ea354af8ad55bea84372a2bc834d8757c..refs/heads/master:/libsyscall/os/tsd.h

diff --git a/libsyscall/os/tsd.h b/libsyscall/os/tsd.h
index d49087f14..e4ab6d678 100644
--- a/libsyscall/os/tsd.h
+++ b/libsyscall/os/tsd.h
@@ -29,8 +29,6 @@
 #ifndef OS_TSD_H
 #define OS_TSD_H
 
-#include <stdint.h>
-
 /* The low nine slots of the TSD are reserved for libsyscall usage. */
 #define __TSD_RESERVED_BASE 0
 #define __TSD_RESERVED_MAX 9
@@ -42,17 +40,25 @@
 #define __TSD_THREAD_QOS_CLASS 4
 #define __TSD_RETURN_TO_KERNEL 5
 /* slot 6 is reserved for Windows/WINE compatibility reasons */
+#define __TSD_PTR_MUNGE 7
+#define __TSD_MACH_SPECIAL_REPLY 8
 #define __TSD_SEMAPHORE_CACHE 9
 
+#ifndef __ASSEMBLER__
+
+#include <stdint.h>
+
 #ifdef __arm__
 #include <arm/arch.h>
 #endif
 
+extern void _thread_set_tsd_base(void *tsd_base);
+
 __attribute__((always_inline))
 static __inline__ unsigned int
 _os_cpu_number(void)
 {
-#if defined(__arm__) && defined(_ARM_ARCH_6)
+#if defined(__arm__)
 	uintptr_t p;
 	__asm__("mrc	p15, 0, %[p], c13, c0, 3" : [p] "=&r" (p));
 	return (unsigned int)(p & 0x3ul);
@@ -110,16 +116,16 @@ __attribute__((always_inline, pure))
 static __inline__ void**
 _os_tsd_get_base(void)
 {
-#if defined(__arm__) && defined(_ARM_ARCH_6)
+#if defined(__arm__)
 	uintptr_t tsd;
-	__asm__("mrc p15, 0, %0, c13, c0, 3" : "=r" (tsd));
-	tsd &= ~0x3ul; /* lower 2-bits contain CPU number */
-#elif defined(__arm__) && defined(_ARM_ARCH_5)
-	register uintptr_t tsd asm ("r9");
+	__asm__("mrc p15, 0, %0, c13, c0, 3\n"
+                "bic %0, %0, #0x3\n" : "=r" (tsd));
+	/* lower 2-bits contain CPU number */
 #elif defined(__arm64__)
 	uint64_t tsd;
-	__asm__("mrs %0, TPIDRRO_EL0" : "=r" (tsd));
-	tsd &= ~0x7ull;
+	__asm__("mrs %0, TPIDRRO_EL0\n"
+                "bic %0, %0, #0x7\n" : "=r" (tsd));
+	/* lower 3-bits contain CPU number */
 #endif
 
 	return (void**)(uintptr_t)tsd;
@@ -147,6 +153,61 @@ _os_tsd_set_direct(unsigned long slot, void *val)
 }
 #endif
 
-extern void _thread_set_tsd_base(void *tsd_base);
+__attribute__((always_inline, pure))
+static __inline__ uintptr_t
+_os_ptr_munge_token(void)
+{
+	return (uintptr_t)_os_tsd_get_direct(__TSD_PTR_MUNGE);
+}
 
-#endif
+__attribute__((always_inline, pure))
+static __inline__ uintptr_t
+_os_ptr_munge(uintptr_t ptr)
+{
+	return ptr ^ _os_ptr_munge_token();
+}
+#define _OS_PTR_MUNGE(_ptr) _os_ptr_munge((uintptr_t)(_ptr))
+#define _OS_PTR_UNMUNGE(_ptr) _os_ptr_munge((uintptr_t)(_ptr))
+
+#else // __ASSEMBLER__
+
+#define _OS_TSD_OFFSET(_key) \
+	((__POINTER_WIDTH__/__CHAR_BIT__)*_key)
+
+#if defined(__i386__) || defined(__x86_64__)
+
+#define _OS_PTR_MUNGE(_reg) \
+	xor %gs:_OS_TSD_OFFSET(__TSD_PTR_MUNGE), _reg
+
+#define _OS_PTR_UNMUNGE(_reg) \
+	_OS_PTR_MUNGE(_reg)
+
+#elif defined(__arm__) || defined(__arm64__)
+
+#if defined(__arm__)
+
+#define _OS_PTR_MUNGE_TOKEN(_reg, _token) \
+	mrc p15, 0, _reg, c13, c0, 3; \
+	bic	_reg, _reg, #3; \
+	ldr	_token, [ _reg,  #_OS_TSD_OFFSET(__TSD_PTR_MUNGE) ]
+
+#elif defined(__arm64__)
+
+#define _OS_PTR_MUNGE_TOKEN(_reg, _token) \
+	mrs _reg, TPIDRRO_EL0 %% \
+	and	_reg, _reg, #~0x7 %% \
+	ldr	_token, [ _reg,  #_OS_TSD_OFFSET(__TSD_PTR_MUNGE) ]
+
+#endif // defined(__arm64__)
+
+#define _OS_PTR_MUNGE(_regdest, _regsrc, _token) \
+	eor _regdest, _regsrc, _token
+
+#define _OS_PTR_UNMUNGE(_regdest, _regsrc, _token) \
+	_OS_PTR_MUNGE(_regdest, _regsrc, _token)
+
+#endif // defined(__arm__) || defined(__arm64__)
+
+#endif // __ASSEMBLER__
+
+#endif // OS_TSD_H