summaryrefslogtreecommitdiff
path: root/arch/mips/pthread_arch.h
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2020-08-24 22:23:08 -0400
committerRich Felker <dalias@aerifal.cx>2020-08-27 18:36:45 -0400
commit3a5b9ae7cf656648c80fe155a5239d9b4fb4c485 (patch)
treefaef753db71ebd66802f84034478dd5c982bdd92 /arch/mips/pthread_arch.h
parentea71a9004e08030a15d45186e263fd2b0c51cc25 (diff)
downloadmusl-3a5b9ae7cf656648c80fe155a5239d9b4fb4c485.tar.gz
deduplicate __pthread_self thread pointer adjustment out of each arch
the adjustment made is entirely a function of TLS_ABOVE_TP and TP_OFFSET. aside from avoiding repetition of the TP_OFFSET value and arithmetic, this change makes pthread_arch.h independent of the definition of struct __pthread from pthread_impl.h. this in turn will allow inclusion of pthread_arch.h to be moved to the top of pthread_impl.h so that it can influence the definition of the structure. previously, arch files were very inconsistent about the type used for the thread pointer. this change unifies the new __get_tp interface to always use uintptr_t, which is the most correct when performing arithmetic that may involve addresses outside the actual pointed-to object (due to TP_OFFSET).
Diffstat (limited to 'arch/mips/pthread_arch.h')
-rw-r--r--arch/mips/pthread_arch.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/mips/pthread_arch.h b/arch/mips/pthread_arch.h
index c22eb34d..c45347ab 100644
--- a/arch/mips/pthread_arch.h
+++ b/arch/mips/pthread_arch.h
@@ -1,13 +1,13 @@
-static inline struct pthread *__pthread_self()
+static inline uintptr_t __get_tp()
{
#if __mips_isa_rev < 2
- register char *tp __asm__("$3");
+ register uintptr_t tp __asm__("$3");
__asm__ (".word 0x7c03e83b" : "=r" (tp) );
#else
- char *tp;
+ uintptr_t tp;
__asm__ ("rdhwr %0, $29" : "=r" (tp) );
#endif
- return (pthread_t)(tp - 0x7000 - sizeof(struct pthread));
+ return tp;
}
#define TLS_ABOVE_TP