diff options
author | Oleksandr Tymoshenko <gonzo@FreeBSD.org> | 2012-03-06 03:27:58 +0000 |
---|---|---|
committer | Oleksandr Tymoshenko <gonzo@FreeBSD.org> | 2012-03-06 03:27:58 +0000 |
commit | 34e3f7e717d85e14cf87a1d7ab3fc143122a69a0 (patch) | |
tree | 7425c7e6ee42dfd1f457540804a0c88cc902427f /lib/libthr/arch | |
parent | 0a0f480835897ef7d079a391e15598fdf338aae7 (diff) | |
download | src-34e3f7e717d85e14cf87a1d7ab3fc143122a69a0.tar.gz src-34e3f7e717d85e14cf87a1d7ab3fc143122a69a0.zip |
- Switch to saving non-offseted pointer to TLS block in order too keep things simple
Notes
Notes:
svn path=/head/; revision=232579
Diffstat (limited to 'lib/libthr/arch')
-rw-r--r-- | lib/libthr/arch/mips/include/pthread_md.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/lib/libthr/arch/mips/include/pthread_md.h b/lib/libthr/arch/mips/include/pthread_md.h index f7c286a322ce..19c9f38193dc 100644 --- a/lib/libthr/arch/mips/include/pthread_md.h +++ b/lib/libthr/arch/mips/include/pthread_md.h @@ -35,15 +35,11 @@ #include <sys/types.h> #include <machine/sysarch.h> +#include <machine/tls.h> #include <stddef.h> #define CPU_SPINWAIT #define DTV_OFFSET offsetof(struct tcb, tcb_dtv) -#ifdef __mips_n64 -#define TP_OFFSET 0x7010 -#else -#define TP_OFFSET 0x7008 -#endif /* * Variant I tcb. The structure layout is fixed, don't blindly @@ -65,7 +61,7 @@ static __inline void _tcb_set(struct tcb *tcb) { - sysarch(MIPS_SET_TLS, ((uint8_t*)tcb + TP_OFFSET)); + sysarch(MIPS_SET_TLS, tcb); } /* @@ -74,10 +70,10 @@ _tcb_set(struct tcb *tcb) static __inline struct tcb * _tcb_get(void) { - uint8_t *tcb; + struct tcb *tcb; sysarch(MIPS_GET_TLS, &tcb); - return ((struct tcb *)(tcb - TP_OFFSET)); + return tcb; } extern struct pthread *_thr_initial; |