From 468777e1d0dbd6cb8bcaee244a954824d5c84167 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 25 Apr 2003 22:28:13 +0000 Subject: Update. * pthread.c (__pthread_initialize_manager): Subtract TLS_PRE_TCB_SIZE bytes from tcbp to get to descr. * manager.c (pthread_handle_create): Subtract or add TLS_PRE_TCB_SIZE instead of sizeof (pthread_descr). (pthread_free): Add TLS_PRE_TCB_SIZE instead of sizeof (pthread_descr). * sysdeps/powerpc/tls.h (TLS_INIT_TCB_SIZE, TLS_TCB_SIZE): Define to 0. --- nptl/sysdeps/ia64/tcb-offsets.sym | 2 +- nptl/sysdeps/powerpc/tcb-offsets.sym | 11 ++++++++++- nptl/sysdeps/powerpc/tls.h | 4 +++- nptl/sysdeps/pthread/createthread.c | 8 -------- nptl/sysdeps/sh/tcb-offsets.sym | 2 +- nptl/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h | 2 +- .../sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h | 3 ++- .../sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h | 3 ++- nptl/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h | 3 ++- 9 files changed, 22 insertions(+), 16 deletions(-) (limited to 'nptl/sysdeps') diff --git a/nptl/sysdeps/ia64/tcb-offsets.sym b/nptl/sysdeps/ia64/tcb-offsets.sym index 9f92bb62cd..11cc06ab31 100644 --- a/nptl/sysdeps/ia64/tcb-offsets.sym +++ b/nptl/sysdeps/ia64/tcb-offsets.sym @@ -1,4 +1,4 @@ #include #include -MULTIPLE_THREADS_OFFSET -sizeof(int) +MULTIPLE_THREADS_OFFSET offsetof (struct pthread, header.multiple_threads) - sizeof (struct pthread) diff --git a/nptl/sysdeps/powerpc/tcb-offsets.sym b/nptl/sysdeps/powerpc/tcb-offsets.sym index 58ee03072e..d6b7560b8e 100644 --- a/nptl/sysdeps/powerpc/tcb-offsets.sym +++ b/nptl/sysdeps/powerpc/tcb-offsets.sym @@ -1,4 +1,13 @@ #include #include -MULTIPLE_THREADS_OFFSET ((void *) &p_multiple_threads ((struct pthread) ((void *) 0 - TLS_TCB_OFFSET - TLS_PRE_TCB_SIZE)) - (void *) 0) +-- + +-- Abuse tls.h macros to derive offsets relative to the thread register. +# undef __thread_register +# define __thread_register ((void *) 0) +# define thread_offsetof(mem) ((void *) &THREAD_SELF->mem - (void *) 0) + +#if TLS_MULTIPLE_THREADS_IN_TCB +MULTIPLE_THREADS_OFFSET thread_offsetof (header.multiple_threads) +#endif diff --git a/nptl/sysdeps/powerpc/tls.h b/nptl/sysdeps/powerpc/tls.h index e3e0424fe0..6573bb6b04 100644 --- a/nptl/sysdeps/powerpc/tls.h +++ b/nptl/sysdeps/powerpc/tls.h @@ -81,7 +81,9 @@ typedef struct # define TLS_TCB_ALIGN __alignof__ (struct pthread) /* This is the size we need before TCB. */ -# define TLS_PRE_TCB_SIZE (sizeof (struct pthread) + 32) +# define TLS_PRE_TCB_SIZE \ + (sizeof (struct pthread) \ + + ((sizeof (tcbhead_t) + TLS_TCB_ALIGN - 1) & ~(TLS_TCB_ALIGN - 1))) # ifndef __powerpc64__ /* Register r2 (tp) is reserved by the ABI as "thread pointer". */ diff --git a/nptl/sysdeps/pthread/createthread.c b/nptl/sysdeps/pthread/createthread.c index f5c640607a..9d00e4e135 100644 --- a/nptl/sysdeps/pthread/createthread.c +++ b/nptl/sysdeps/pthread/createthread.c @@ -87,11 +87,7 @@ create_thread (struct pthread *pd, STACK_VARIABLES_PARMS) thread might not yet have the flag set. No need to set the global variable again if this is what we use. */ #ifdef TLS_MULTIPLE_THREADS_IN_TCB -# if TLS_DTV_AT_TP - p_multiple_threads (THREAD_SELF) = 1; -# else THREAD_SETMEM (THREAD_SELF, header.multiple_threads, 1); -# endif #endif /* Now fill in the information about the new thread in @@ -163,11 +159,7 @@ create_thread (struct pthread *pd, STACK_VARIABLES_PARMS) not yet have the flag set. No need to set the global variable again if this is what we use. */ #ifdef TLS_MULTIPLE_THREADS_IN_TCB -# if TLS_DTV_AT_TP - p_multiple_threads (THREAD_SELF) = 1; -# else THREAD_SETMEM (THREAD_SELF, header.multiple_threads, 1); -# endif #endif return 0; diff --git a/nptl/sysdeps/sh/tcb-offsets.sym b/nptl/sysdeps/sh/tcb-offsets.sym index 940c933edf..3386f1d056 100644 --- a/nptl/sysdeps/sh/tcb-offsets.sym +++ b/nptl/sysdeps/sh/tcb-offsets.sym @@ -1,5 +1,5 @@ #include #include -MULTIPLE_THREADS_OFFSET ((char *) &p_multiple_threads ((struct pthread *)0) - (char *) 0) +MULTIPLE_THREADS_OFFSET offsetof (struct pthread, header.multiple_threads) TLS_PRE_TCB_SIZE sizeof (struct pthread) diff --git a/nptl/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h b/nptl/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h index 930cc14e45..667abce340 100644 --- a/nptl/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h +++ b/nptl/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h @@ -101,7 +101,7 @@ __syscall_error_##args: \ # ifndef __ASSEMBLER__ # define SINGLE_THREAD_P \ - __builtin_expect (p_multiple_threads (THREAD_SELF) == 0, 1) + __builtin_expect (THREAD_GETMEM (THREAD_SELF, header.multiple_threads) == 0, 1) # else # define SINGLE_THREAD_P \ adds r14 = MULTIPLE_THREADS_OFFSET, r13 ;; ld4 r14 = [r14] ;; cmp4.ne p6, p7 = 0, r14 diff --git a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h b/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h index f82addb3ad..d256f8d8b2 100644 --- a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h +++ b/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h @@ -86,7 +86,8 @@ # ifndef __ASSEMBLER__ # define SINGLE_THREAD_P \ - __builtin_expect (p_multiple_threads (THREAD_SELF) == 0, 1) + __builtin_expect (THREAD_GETMEM (THREAD_SELF, \ + header.multiple_threads) == 0, 1) # else # define SINGLE_THREAD_P \ lwz 10,MULTIPLE_THREADS_OFFSET(2); \ diff --git a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h b/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h index 00dc3a2a6a..5483586c7b 100644 --- a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h +++ b/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h @@ -86,7 +86,8 @@ # ifndef __ASSEMBLER__ # define SINGLE_THREAD_P \ - __builtin_expect (p_multiple_threads (THREAD_SELF) == 0, 1) + __builtin_expect (THREAD_GETMEM (THREAD_SELF, \ + header.multiple_threads) == 0, 1) # else # define SINGLE_THREAD_P \ lwz 10,MULTIPLE_THREADS_OFFSET(13); \ diff --git a/nptl/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h b/nptl/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h index 10189a49b5..16f8ad5e0f 100644 --- a/nptl/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h +++ b/nptl/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h @@ -117,7 +117,8 @@ # ifndef __ASSEMBLER__ # define SINGLE_THREAD_P \ - __builtin_expect (p_multiple_threads (THREAD_SELF) == 0, 1) + __builtin_expect (THREAD_GETMEM (THREAD_SELF, \ + header.multiple_threads) == 0, 1) # else # define SINGLE_THREAD_P \ stc gbr,r0; \ -- cgit 1.4.1