summaryrefslogtreecommitdiff
path: root/sysdeps/mach
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps/mach')
-rw-r--r--sysdeps/mach/hurd/i386/pt-machdep.c39
-rw-r--r--sysdeps/mach/hurd/i386/pt-setup.c9
-rw-r--r--sysdeps/mach/hurd/pt-docancel.c6
-rw-r--r--sysdeps/mach/hurd/pt-sysdep.h12
4 files changed, 50 insertions, 16 deletions
diff --git a/sysdeps/mach/hurd/i386/pt-machdep.c b/sysdeps/mach/hurd/i386/pt-machdep.c
index face46c5..f3c8cf50 100644
--- a/sysdeps/mach/hurd/i386/pt-machdep.c
+++ b/sysdeps/mach/hurd/i386/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)
diff --git a/sysdeps/mach/hurd/i386/pt-setup.c b/sysdeps/mach/hurd/i386/pt-setup.c
index 32ace6ad..020f677a 100644
--- a/sysdeps/mach/hurd/i386/pt-setup.c
+++ b/sysdeps/mach/hurd/i386/pt-setup.c
@@ -1,5 +1,5 @@
/* Setup thread stack. Hurd/i386 version.
- Copyright (C) 2000, 2002, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2000, 2002, 2005, 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
@@ -89,12 +89,15 @@ __pthread_setup (struct __pthread *thread,
thread->mcontext.pc = entry_point;
thread->mcontext.sp = stack_setup (thread, start_routine, arg);
+ thread->tcb->self = thread->kernel_thread;
+
ktid = __mach_thread_self ();
if (thread->kernel_thread != ktid)
{
- err = __thread_set_pcsp (thread->kernel_thread,
+ err = __thread_set_pcsptp (thread->kernel_thread,
1, thread->mcontext.pc,
- 1, thread->mcontext.sp);
+ 1, thread->mcontext.sp,
+ 1, thread->tcb);
assert_perror (err);
}
__mach_port_deallocate (__mach_task_self (), ktid);
diff --git a/sysdeps/mach/hurd/pt-docancel.c b/sysdeps/mach/hurd/pt-docancel.c
index bac62a71..84f04c0c 100644
--- a/sysdeps/mach/hurd/pt-docancel.c
+++ b/sysdeps/mach/hurd/pt-docancel.c
@@ -1,5 +1,5 @@
/* Cancel a thread.
- Copyright (C) 2002 Free Software Foundation, Inc.
+ Copyright (C) 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
@@ -52,8 +52,8 @@ __pthread_do_cancel (struct __pthread *p)
err = __thread_abort (p->kernel_thread);
assert_perror (err);
- err = __thread_set_pcsp (p->kernel_thread,
- 1, (void *) call_exit, 0, 0);
+ err = __thread_set_pcsptp (p->kernel_thread,
+ 1, (void *) call_exit, 0, 0, 0, 0);
assert_perror (err);
err = __thread_resume (p->kernel_thread);
diff --git a/sysdeps/mach/hurd/pt-sysdep.h b/sysdeps/mach/hurd/pt-sysdep.h
index 83bad963..f652b687 100644
--- a/sysdeps/mach/hurd/pt-sysdep.h
+++ b/sysdeps/mach/hurd/pt-sysdep.h
@@ -1,5 +1,5 @@
/* Internal defenitions for pthreads library.
- Copyright (C) 2000, 2002 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
@@ -59,11 +59,13 @@ __pthread_stack_dealloc (void *stackaddr, size_t stacksize)
__vm_deallocate (__mach_task_self (), (vm_offset_t) stackaddr, stacksize);
}
-/* Change thread THREAD's program counter to PC if SET_PC is true and
- its stack pointer to SP if SET_IP is true. */
-extern int __thread_set_pcsp (thread_t thread,
+/* Change thread THREAD's program counter to PC if SET_PC is true,
+ its stack pointer to SP if SET_IP is true, and its thread pointer
+ to TP if SET_TP is true. */
+extern int __thread_set_pcsptp (thread_t thread,
int set_pc, void *pc,
- int set_sp, void *sp);
+ int set_sp, void *sp,
+ int set_tp, void *tp);
#endif /* pt-sysdep.h */
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-18 00:29:42 +0000