diff options
| author | Thomas Schwinge <thomas@schwinge.name> | 2011-10-20 12:56:29 +0200 |
|---|---|---|
| committer | Thomas Schwinge <thomas@schwinge.name> | 2011-10-20 12:56:29 +0200 |
| commit | 127352671f6dca8572a8d310b162ccff32463ec5 (patch) | |
| tree | c9ac850d55e28344d98f551fadadf8d19ff84a49 /libthreads/i386 | |
| parent | 04db20c2fb450fc27300991eb029888487b580a0 (diff) | |
| parent | e24c161e9d16483a1d97402557f7756e26afb6cf (diff) | |
Merge branch 'tls/libthreads'
Conflicts:
libthreads/ChangeLog
Diffstat (limited to 'libthreads/i386')
| -rw-r--r-- | libthreads/i386/thread.c | 32 |
1 files changed, 29 insertions, 3 deletions
diff --git a/libthreads/i386/thread.c b/libthreads/i386/thread.c index c0195a8b..00537be5 100644 --- a/libthreads/i386/thread.c +++ b/libthreads/i386/thread.c @@ -61,6 +61,21 @@ char rcs_id[] = "$Header: cvs-sans-libpthread/hurd/libthreads/i386/thread.c,v 1. #include <cthreads.h> #include "cthread_internals.h" #include <mach.h> +#include <mach/i386/mach_i386.h> +#include <mach/mig_errors.h> + +#define HURD_TLS_DESC_DECL(desc, tcb) \ + struct descriptor desc = \ + { /* low word: */ \ + 0xffff /* limit 0..15 */ \ + | (((unsigned int) (tcb)) << 16) /* base 0..15 */ \ + , /* high word: */ \ + ((((unsigned int) (tcb)) >> 16) & 0xff) /* base 16..23 */ \ + | ((0x12 | 0x60 | 0x80) << 8) /* access = ACC_DATA_W|ACC_PL_U|ACC_P */ \ + | (0xf << 16) /* limit 16..19 */ \ + | ((4 | 8) << 20) /* granularity = SZ_32|SZ_G */ \ + | (((unsigned int) (tcb)) & 0xff000000) /* base 24..31 */ \ + } /* * Set up the initial state of a MACH thread @@ -68,7 +83,7 @@ char rcs_id[] = "$Header: cvs-sans-libpthread/hurd/libthreads/i386/thread.c,v 1. * when it is resumed. */ void -cproc_setup(register cproc_t child, thread_t thread, void (*routine)(cproc_t)) +cproc_setup(register cproc_t child, thread_t thread, tcbhead_t *tcb, void (*routine)(cproc_t)) { extern unsigned int __hurd_threadvar_max; /* GNU */ register int *top = (int *) @@ -81,13 +96,15 @@ cproc_setup(register cproc_t child, thread_t thread, void (*routine)(cproc_t)) register struct i386_thread_state *ts = &state; kern_return_t r; unsigned int count; + HURD_TLS_DESC_DECL(desc, tcb); + int sel; /* * Set up i386 call frame and registers. * Read registers first to get correct segment values. */ count = i386_THREAD_STATE_COUNT; - MACH_CALL(thread_get_state(thread,i386_THREAD_STATE,(thread_state_t) &state,&count),r); + MACH_CALL(thread_get_state(thread,i386_REGS_SEGS_STATE,(thread_state_t) &state,&count),r); ts->eip = (int) routine; *--top = (int) child; /* argument to function */ @@ -95,7 +112,16 @@ cproc_setup(register cproc_t child, thread_t thread, void (*routine)(cproc_t)) ts->uesp = (int) top; /* set stack pointer */ ts->ebp = 0; /* clear frame pointer */ - MACH_CALL(thread_set_state(thread,i386_THREAD_STATE,(thread_state_t) &state,i386_THREAD_STATE_COUNT),r); + asm ("mov %%gs, %w0" : "=q" (sel) : "0" (0)); + tcb->tcb = tcb; + tcb->self = thread; + if (__builtin_expect (sel, 0x48) & 4) /* LDT selector */ + __i386_set_ldt (thread, sel, &desc, 1); + else + __i386_set_gdt (thread, &sel, desc); + ts->gs = sel; + + MACH_CALL(thread_set_state(thread,i386_REGS_SEGS_STATE,(thread_state_t) &state,i386_THREAD_STATE_COUNT),r); } #if defined(cthread_sp) |