diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2011-10-30 20:14:18 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2011-10-30 20:14:18 +0100 |
| commit | d88d71c54992e93c812ad33bb2b9962c71a78fd7 (patch) | |
| tree | e478d8999e5a87dff31653c8d4a7ff6e828bfc64 /libpthread/sysdeps/mach/hurd/ia32/pt-machdep.c | |
| parent | 62e8551e80d71082c6e2ae74cca0b1a157beedce (diff) | |
| parent | 10c4673df9e51862737285c87270245e025c8c1f (diff) | |
Merge branch 'upstream-merged'
Diffstat (limited to 'libpthread/sysdeps/mach/hurd/ia32/pt-machdep.c')
| -rw-r--r-- | libpthread/sysdeps/mach/hurd/ia32/pt-machdep.c | 39 |
1 files changed, 34 insertions, 5 deletions
diff --git a/libpthread/sysdeps/mach/hurd/ia32/pt-machdep.c b/libpthread/sysdeps/mach/hurd/ia32/pt-machdep.c index face46c5..f3c8cf50 100644 --- a/libpthread/sysdeps/mach/hurd/ia32/pt-machdep.c +++ b/libpthread/sysdeps/mach/hurd/ia32/pt-machdep.c @@ -1,5 +1,5 @@ /* Machine dependent pthreads code. Hurd/i386 version. - Copyright (C) 2000,02 Free Software Foundation, Inc. + Copyright (C) 2000, 2002, 2007 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -21,12 +21,28 @@ #include <mach.h> #include <mach/i386/thread_status.h> +#include <mach/i386/mach_i386.h> +#include <mach/mig_errors.h> #include <mach/thread_status.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 */ \ + } + int -__thread_set_pcsp (thread_t thread, +__thread_set_pcsptp (thread_t thread, int set_ip, void *ip, - int set_sp, void *sp) + int set_sp, void *sp, + int set_tp, void *tp) { error_t err; struct i386_thread_state state; @@ -34,7 +50,7 @@ __thread_set_pcsp (thread_t thread, state_count = i386_THREAD_STATE_COUNT; - err = __thread_get_state (thread, i386_THREAD_STATE, + err = __thread_get_state (thread, i386_REGS_SEGS_STATE, (thread_state_t) &state, &state_count); if (err) return err; @@ -43,8 +59,21 @@ __thread_set_pcsp (thread_t thread, state.uesp = (unsigned int) sp; if (set_ip) state.eip = (unsigned int) ip; + if (set_tp) { + HURD_TLS_DESC_DECL(desc, tp); + int sel; + + asm ("mov %%gs, %w0" : "=q" (sel) : "0" (0)); + if (__builtin_expect (sel, 0x48) & 4) /* LDT selector */ + err = __i386_set_ldt (thread, sel, &desc, 1); + else + err = __i386_set_gdt (thread, &sel, desc); + if (err) + return err; + state.gs = sel; + } - err = __thread_set_state (thread, i386_THREAD_STATE, + err = __thread_set_state (thread, i386_REGS_SEGS_STATE, (thread_state_t) &state, i386_THREAD_STATE_COUNT); if (err) |