diff options
| -rw-r--r-- | nptl/ChangeLog | 23 | ||||
| -rw-r--r-- | nptl/sysdeps/i386/tcb-offsets.sym | 1 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S | 2 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_timedrdlock.S | 2 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_timedwrlock.S | 4 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S | 4 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S | 2 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S | 206 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S | 198 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S | 4 | ||||
| -rw-r--r-- | nptl/sysdeps/x86_64/Makefile | 21 | ||||
| -rw-r--r-- | nptl/sysdeps/x86_64/tcb-offsets.sym | 6 | ||||
| -rw-r--r-- | nptl/sysdeps/x86_64/tls.h | 2 |
13 files changed, 466 insertions, 9 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 952f2737aa..4313df0fc4 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,18 @@ +2003-03-12 Ulrich Drepper <drepper@redhat.com> + + * sysdeps/x86_64/tls.h [__ASSEMBLER__]: Include tcb-offsets.h. + * sysdeps/x86_64/tcb-offsets.sym: New file. + * sysdeps/x86_64/Makefile: New file. + + * sysdeps/i386/tcb-offsets.sym: Add SELF. + * sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S: Use SELF + to access own pthread_t in TCB. + * sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_timedrdlock.S: + Likewise. + * sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_timedwrlock.S: + Likewise. + * sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S: Likewise. + 2003-03-12 Roland McGrath <roland@redhat.com> * pthread-errnos.sym: New file. @@ -45,6 +60,14 @@ 2003-03-12 Ulrich Drepper <drepper@redhat.com> + * sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S: New + file. + * sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S: New + file. + + * sysdeps/unix/sysv/linux/x86_64/bits/pthreadtypes.h + (pthread_cond_t): Add padding. + * sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S: New file. * sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S: New file. * sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_unlock.S: New file. diff --git a/nptl/sysdeps/i386/tcb-offsets.sym b/nptl/sysdeps/i386/tcb-offsets.sym index 5395235506..6a5c16c0ee 100644 --- a/nptl/sysdeps/i386/tcb-offsets.sym +++ b/nptl/sysdeps/i386/tcb-offsets.sym @@ -1,6 +1,7 @@ #include <sysdep.h> #include <tls.h> +SELF offsetof (tcbhead_t, self) MULTIPLE_THREADS_OFFSET offsetof (tcbhead_t, multiple_threads) SYSINFO_OFFSET offsetof (tcbhead_t, sysinfo) CLEANUP offsetof (struct pthread, cleanup) diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S index 064d30dc34..30a2e2c092 100644 --- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S +++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S @@ -124,7 +124,7 @@ __pthread_rwlock_rdlock: call __lll_mutex_lock_wait jmp 2b -14: cmpl %gs:8, %eax +14: cmpl %gs:SELF, %eax jne 3b /* Deadlock detected. */ movl $EDEADLK, %ecx diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_timedrdlock.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_timedrdlock.S index 1fd04f815d..3ebe2a55f8 100644 --- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_timedrdlock.S +++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_timedrdlock.S @@ -165,7 +165,7 @@ pthread_rwlock_timedrdlock: call __lll_mutex_lock_wait jmp 2b -14: cmpl %gs:8, %eax +14: cmpl %gs:SELF, %eax jne 3b movl $EDEADLK, %ecx jmp 9b diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_timedwrlock.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_timedwrlock.S index ee9e6fa00e..9614f24cb2 100644 --- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_timedwrlock.S +++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_timedwrlock.S @@ -135,7 +135,7 @@ pthread_rwlock_timedwrlock: 5: xorl %ecx, %ecx - movl %gs:8, %eax + movl %gs:SELF, %eax movl %eax, WRITER(%ebp) 9: LOCK #if MUTEX == 0 @@ -163,7 +163,7 @@ pthread_rwlock_timedwrlock: call __lll_mutex_lock_wait jmp 2b -14: cmpl %gs:8, %eax +14: cmpl %gs:SELF, %eax jne 3b 20: movl $EDEADLK, %ecx jmp 9b diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S index 6c8b9e6d56..10b176edce 100644 --- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S +++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S @@ -97,7 +97,7 @@ __pthread_rwlock_wrlock: jmp 2b 5: xorl %ecx, %ecx - movl %gs:8, %eax + movl %gs:SELF, %eax movl %eax, WRITER(%ebx) 9: LOCK #if MUTEX == 0 @@ -122,7 +122,7 @@ __pthread_rwlock_wrlock: call __lll_mutex_lock_wait jmp 2b -14: cmpl %gs:8, %eax +14: cmpl %gs:SELF, %eax jne 3b movl $EDEADLK, %ecx jmp 9b diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S index 2e8e2979a3..03897e3690 100644 --- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S +++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S @@ -119,7 +119,7 @@ __pthread_rwlock_rdlock: #endif jmp 2b -14: cmpq %gs:16, %rax +14: cmpq %fs:SELF, %rax jne 3b /* Deadlock detected. */ movq $EDEADLK, %rcx diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S new file mode 100644 index 0000000000..4df136f939 --- /dev/null +++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S @@ -0,0 +1,206 @@ +/* Copyright (C) 2002, 2003 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include <sysdep.h> +#include <lowlevelrwlock.h> +#include <pthread-errnos.h> + + +#define SYS_gettimeofday __NR_gettimeofday +#define SYS_futex 202 +#define FUTEX_WAIT 0 +#define FUTEX_WAKE 1 + +#ifndef UP +# define LOCK lock +#else +# define LOCK +#endif + + + .text + + .globl pthread_rwlock_timedrdlock + .type pthread_rwlock_timedrdlock,@function + .align 16 +pthread_rwlock_timedrdlock: + subq $16, %rsp + + movq %rdi, %r8 + movq %rsi, %r9 + xorq %r10, %r10 + + /* Get the lock. */ + movl $1, %esi + LOCK +#if MUTEX == 0 + xaddl %esi, (%rdi) +#else + xaddl %esi, MUTEX(%rdi) +#endif + testl %esi, %esi + jne 1f + +2: movq WRITER(%r8), %rax + testq %rax, %rax + jne 14f + cmpl $0, WRITERS_QUEUED(%r8) + je 5f + cmpl $0, FLAGS(%r8) + je 5f + + /* Check the value of the timeout parameter. */ +3: cmpl $1000000000, 8(%r9) + jae 19f + + incl READERS_QUEUED(%r8) + je 4f + + movl READERS_WAKEUP(%r8), %edx + + /* Unlock. */ + LOCK +#if MUTEX == 0 + subl $1, (%r8) +#else + subl $1, MUTEX(%r8) +#endif + jne 10f + + /* Get current time. */ +11: movq %rsp, %rdi + xorq %rsi, %rsi + movq $SYS_gettimeofday, %rax + syscall + + /* Compute relative timeout. */ + movq 8(%rsp), %rax + movq $1000, %rdi + mul %rdi /* Milli seconds to nano seconds. */ + movq (%r9), %rcx + movq 8(%r9), %rdi + subq (%rsp), %rcx + subq %rax, %rdi + jns 15f + addq $1000000000, %rdi + decq %rcx +15: testq %rcx, %rcx + js 16f /* Time is already up. */ + + /* Futex call. */ + movq %rcx, (%rsp) /* Store relative timeout. */ + movq %rdi, 8(%rsp) + + xorq %rsi, %rsi /* movq $FUTEX_WAIT, %rsi */ + leaq READERS_WAKEUP(%r8), %rdi + movq $SYS_futex, %rax + syscall + movq %rax, %rdx +17: + + /* Reget the lock. */ + movl $1, %esi + LOCK +#if MUTEX == 0 + xaddl %esi, (%r8) +#else + xaddl %esi, MUTEX(%r8) +#endif + testl %esi, %esi + jne 12f + +13: decl READERS_QUEUED(%r8) + cmpq $-ETIMEDOUT, %rdx + jne 2b + +18: movq $ETIMEDOUT, %rcx + jmp 9f + + +5: xorq %rcx, %rcx + incl NR_READERS(%r8) + je 8f +9: LOCK +#if MUTEX == 0 + decl (%r8) +#else + decl MUTEX(%r8) +#endif + jne 6f + +7: movq %rcx, %rax + + addq $16, %rsp + retq + +1: +#if MUTEX != 0 + addq $MUTEX, %rdi +#endif + callq __lll_mutex_lock_wait + jmp 2b + +14: cmpq %fs:SELF, %rax + jne 3b + movq $EDEADLK, %rcx + jmp 9b + +6: +#if MUTEX == 0 + movq %r8, %rdi +#else + leal MUTEX(%r8), %rdi +#endif + callq __lll_mutex_unlock_wake + jmp 7b + + /* Overflow. */ +8: decl NR_READERS(%r8) + movq $EAGAIN, %rcx + jmp 9b + + /* Overflow. */ +4: decl READERS_QUEUED(%r8) + movq $EAGAIN, %rcx + jmp 9b + +10: +#if MUTEX == 0 + movq %r8, %rdi +#else + leaq MUTEX(%r8), %rdi +#endif + callq __lll_mutex_unlock_wake + jmp 11b + +12: +#if MUTEX == 0 + movq %r8, %rdi +#else + leaq MUTEX(%r8), %rdi +#endif + call __lll_mutex_lock_wait + jmp 13b + +16: movq $-ETIMEDOUT, %rdx + jmp 17b + +19: movq $EINVAL, %rcx + jmp 9b + .size pthread_rwlock_timedrdlock,.-pthread_rwlock_timedrdlock diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S new file mode 100644 index 0000000000..a6a02a98a5 --- /dev/null +++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S @@ -0,0 +1,198 @@ +/* Copyright (C) 2002, 2003 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include <sysdep.h> +#include <lowlevelrwlock.h> +#include <pthread-errnos.h> + + +#define SYS_gettimeofday __NR_gettimeofday +#define SYS_futex 202 +#define FUTEX_WAIT 0 +#define FUTEX_WAKE 1 + +#ifndef UP +# define LOCK lock +#else +# define LOCK +#endif + + + .text + + .globl pthread_rwlock_timedwrlock + .type pthread_rwlock_timedwrlock,@function + .align 16 +pthread_rwlock_timedwrlock: + subq $16, %rsp + + movq %rdi, %r8 + movq %rsi, %r9 + + /* Get the lock. */ + movl $1, %esi + LOCK +#if MUTEX == 0 + xaddl %esi, (%rdi) +#else + xaddl %esi, MUTEX(%rdi) +#endif + testl %esi, %esi + jne 1f + +2: movq WRITER(%r8), %rax + testq %rax, %rax + jne 14f + cmpl $0, NR_READERS(%r8) + je 5f + + /* Check the value of the timeout parameter. */ +3: cmpq $1000000000, 8(%r9) + jae 19f + + incl WRITERS_QUEUED(%r8) + je 4f + + movl WRITERS_WAKEUP(%r8), %edx + + LOCK +#if MUTEX == 0 + decl (%r8) +#else + decl MUTEX(%r8) +#endif + jne 10f + + /* Get current time. */ +11: movq %rsp, %rdi + xorq %rsi, %rsi + movq $SYS_gettimeofday, %rax + syscall + + /* Compute relative timeout. */ + movq 8(%rsp), %rax + movq $1000, %rdi + mul %rdi /* Milli seconds to nano seconds. */ + movq (%r9), %rcx + movq 8(%r9), %rdi + subq (%rsp), %rcx + subq %rax, %rdi + jns 15f + addq $1000000000, %rdi + decq %rcx +15: testq %rcx, %rcx + js 16f /* Time is already up. */ + + /* Futex call. */ + movq %rcx, (%rsp) /* Store relative timeout. */ + movq %rdi, 8(%rsp) + + xorq %rsi, %rsi /* movq $FUTEX_WAIT, %rsi */ + movq %rsp, %r10 + leaq WRITERS_WAKEUP(%r8), %rdi + movq $SYS_futex, %rax + syscall + movq %rax, %rdx +17: + + /* Reget the lock. */ + movl $1, %esi + LOCK +#if MUTEX == 0 + xaddl %esi, (%r8) +#else + xaddl %esi, MUTEX(%r8) +#endif + testl %esi, %esi + jne 12f + +13: decl WRITERS_QUEUED(%r8) + cmpq $-ETIMEDOUT, %rdx + jne 2b + +18: movq $ETIMEDOUT, %rcx + jmp 9f + + +5: xorq %rcx, %rcx + movq %fs:SELF, %rax + movq %rax, WRITER(%r8) +9: LOCK +#if MUTEX == 0 + decl (%r8) +#else + decl MUTEX(%r8) +#endif + jne 6f + +7: movq %rcx, %rax + + addq $16, %rsp + retq + +1: +#if MUTEX != 0 + addq $MUTEX, %rdi +#endif + callq __lll_mutex_lock_wait + jmp 2b + +14: cmpq %fs:SELF, %rax + jne 3b +20: movq $EDEADLK, %rcx + jmp 9b + +6: +#if MUTEX == 0 + movq %r8, %rdi +#else + leal MUTEX(%r8), %rdi +#endif + callq __lll_mutex_unlock_wake + jmp 7b + + /* Overflow. */ +4: decl WRITERS_QUEUED(%r8) + movq $EAGAIN, %rcx + jmp 9b + +10: +#if MUTEX == 0 + movq %r8, %rdi +#else + leaq MUTEX(%r8), %rdi +#endif + callq __lll_mutex_unlock_wake + jmp 11b + +12: +#if MUTEX == 0 + movq %r8, %rdi +#else + leaq MUTEX(%r8), %rdi +#endif + callq __lll_mutex_lock_wait + jmp 13b + +16: movq $-ETIMEDOUT, %rdx + jmp 17b + +19: movq $EINVAL, %rcx + jmp 9b + .size pthread_rwlock_timedwrlock,.-pthread_rwlock_timedwrlock diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S index 585c186917..5d63df8e84 100644 --- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S +++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S @@ -93,7 +93,7 @@ __pthread_rwlock_wrlock: jmp 2b 5: xorq %rcx, %rcx - movq %gs:16, %rax + movq %fs:SELF, %rax movq %rax, WRITER(%rdi) 9: LOCK #if MUTEX == 0 @@ -117,7 +117,7 @@ __pthread_rwlock_wrlock: #endif jmp 2b -14: cmpq %gs:16, %rax +14: cmpq %fs:SELF, %rax jne 3b movq $EDEADLK, %rcx jmp 9b diff --git a/nptl/sysdeps/x86_64/Makefile b/nptl/sysdeps/x86_64/Makefile new file mode 100644 index 0000000000..24990a2b7e --- /dev/null +++ b/nptl/sysdeps/x86_64/Makefile @@ -0,0 +1,21 @@ +# Copyright (C) 2002, 2003 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 +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. + +# The GNU C Library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. + +# You should have received a copy of the GNU Lesser General Public +# License along with the GNU C Library; if not, write to the Free +# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +ifeq ($(subdir),csu) +gen-as-const-headers += tcb-offsets.sym +endif diff --git a/nptl/sysdeps/x86_64/tcb-offsets.sym b/nptl/sysdeps/x86_64/tcb-offsets.sym new file mode 100644 index 0000000000..046ad5bee8 --- /dev/null +++ b/nptl/sysdeps/x86_64/tcb-offsets.sym @@ -0,0 +1,6 @@ +#include <sysdep.h> +#include <tls.h> + +SELF offsetof (tcbhead_t, self) +CLEANUP offsetof (struct pthread, cleanup) +CLEANUP_PREV offsetof (struct _pthread_cleanup_buffer, __prev) diff --git a/nptl/sysdeps/x86_64/tls.h b/nptl/sysdeps/x86_64/tls.h index 66ae0f3f07..69c8bc52e6 100644 --- a/nptl/sysdeps/x86_64/tls.h +++ b/nptl/sysdeps/x86_64/tls.h @@ -42,6 +42,8 @@ typedef struct dtv_t *dtv; void *self; /* Pointer to the thread descriptor. */ } tcbhead_t; +#else /* __ASSEMBLER__ */ +# include <tcb-offsets.h> #endif |