d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Switch to saving non-offseted pointer to TLS block in order too keep things simple

Browse Source
This commit is contained in:
Oleksandr Tymoshenko 2012-03-06 03:27:58 +00:00
parent 0a0f480835
commit 34e3f7e717
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/libthr/arch/mips/include/pthread_md.h
View File

@ -35,15 +35,11 @@
#include <sys/types.h> #include <sys/types.h>
#include <machine/sysarch.h> #include <machine/sysarch.h>
#include <machine/tls.h>
#include <stddef.h> #include <stddef.h>
#define CPU_SPINWAIT #define CPU_SPINWAIT
#define DTV_OFFSET offsetof(struct tcb, tcb_dtv) #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 * Variant I tcb. The structure layout is fixed, don't blindly
@ -65,7 +61,7 @@ static __inline void
_tcb_set(struct tcb *tcb) _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 * static __inline struct tcb *
_tcb_get(void) _tcb_get(void)
{ {
uint8_t *tcb; struct tcb *tcb;
sysarch(MIPS_GET_TLS, &tcb); sysarch(MIPS_GET_TLS, &tcb);
return ((struct tcb *)(tcb - TP_OFFSET)); return tcb;
} }
extern struct pthread *_thr_initial; extern struct pthread *_thr_initial;