diff options
| author | Rich Felker <dalias@aerifal.cx> | 2020-08-24 22:23:08 -0400 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2020-08-27 18:36:45 -0400 |
| commit | 3a5b9ae7cf656648c80fe155a5239d9b4fb4c485 (patch) | |
| tree | faef753db71ebd66802f84034478dd5c982bdd92 /arch/sh/pthread_arch.h | |
| parent | ea71a9004e08030a15d45186e263fd2b0c51cc25 (diff) | |
| download | musl-3a5b9ae7cf656648c80fe155a5239d9b4fb4c485.zip musl-3a5b9ae7cf656648c80fe155a5239d9b4fb4c485.tar.gz musl-3a5b9ae7cf656648c80fe155a5239d9b4fb4c485.tar.bz2 | |
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/sh/pthread_arch.h')
| -rw-r--r-- | arch/sh/pthread_arch.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/sh/pthread_arch.h b/arch/sh/pthread_arch.h index c225290..0fcf70d 100644 --- a/arch/sh/pthread_arch.h +++ b/arch/sh/pthread_arch.h @@ -1,8 +1,8 @@ -static inline struct pthread *__pthread_self() +static inline uintptr_t __get_tp() { - char *self; - __asm__ ("stc gbr,%0" : "=r" (self) ); - return (struct pthread *) (self - sizeof(struct pthread)); + uintptr_t tp; + __asm__ ("stc gbr,%0" : "=r" (tp) ); + return tp; } #define TLS_ABOVE_TP |