OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_timedrdlock.S 

(pthread_rwlock_timedrdlock): Copy futex retval to %esi rather than
	%ecx.
	* sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_timedwrlock.S
	(pthread_rwlock_timedwrlock): Likewise.
	* sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_unlock.S
	(__pthread_rwlock_unlock): Fix MUTEX != 0 args to __lll_*.
This commit is contained in:
Ulrich Drepper 2007-08-01 03:41:01 +00:00
parent 9506149a76
commit 6f59d56e61
4 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nptl/ChangeLog
View File

@ -1,3 +1,13 @@
2007-07-30 Jakub Jelinek <jakub@redhat.com>
* sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_timedrdlock.S
(pthread_rwlock_timedrdlock): Copy futex retval to %esi rather than
%ecx.
* sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_timedwrlock.S
(pthread_rwlock_timedwrlock): Likewise.
* sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_unlock.S
(__pthread_rwlock_unlock): Fix MUTEX != 0 args to __lll_*.
2007-07-31 Jakub Jelinek <jakub@redhat.com>
* sysdeps/sparc/tls.h (tcbhead_t): Add private_futex field.

6
nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_timedrdlock.S
View File

@ -124,7 +124,7 @@ pthread_rwlock_timedrdlock:
leal READERS_WAKEUP(%ebp), %ebx
movl $SYS_futex, %eax
ENTER_KERNEL
movl %eax, %ecx
movl %eax, %esi
17:
/* Reget the lock. */
@ -139,7 +139,7 @@ pthread_rwlock_timedrdlock:
jnz 12f
13: subl $1, READERS_QUEUED(%ebp)
cmpl $-ETIMEDOUT, %ecx
cmpl $-ETIMEDOUT, %esi
jne 2b
18: movl $ETIMEDOUT, %ecx
@ -217,7 +217,7 @@ pthread_rwlock_timedrdlock:
call __lll_mutex_lock_wait
jmp 13b
16: movl $-ETIMEDOUT, %ecx
16: movl $-ETIMEDOUT, %esi
jmp 17b
19: movl $EINVAL, %ecx

6
nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_timedwrlock.S
View File

@ -122,7 +122,7 @@ pthread_rwlock_timedwrlock:
leal WRITERS_WAKEUP(%ebp), %ebx
movl $SYS_futex, %eax
ENTER_KERNEL
movl %eax, %ecx
movl %eax, %esi
17:
/* Reget the lock. */
@ -137,7 +137,7 @@ pthread_rwlock_timedwrlock:
jnz 12f
13: subl $1, WRITERS_QUEUED(%ebp)
cmpl $-ETIMEDOUT, %ecx
cmpl $-ETIMEDOUT, %esi
jne 2b
18: movl $ETIMEDOUT, %ecx
@ -210,7 +210,7 @@ pthread_rwlock_timedwrlock:
call __lll_mutex_lock_wait
jmp 13b
16: movl $-ETIMEDOUT, %ecx
16: movl $-ETIMEDOUT, %esi
jmp 17b
19: movl $EINVAL, %ecx

6
nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_unlock.S
View File

@ -117,7 +117,7 @@ __pthread_rwlock_unlock:
#if MUTEX == 0
movl %edi, %ecx
#else
leal MUTEX(%edx), %ecx
leal MUTEX(%edi), %ecx
#endif
call __lll_mutex_lock_wait
jmp 2b
@ -126,7 +126,7 @@ __pthread_rwlock_unlock:
#if MUTEX == 0
movl %edi, %eax
#else
leal MUTEX(%edx), %eax
leal MUTEX(%edi), %eax
#endif
call __lll_mutex_unlock_wake
jmp 4b
@ -135,7 +135,7 @@ __pthread_rwlock_unlock:
#if MUTEX == 0
movl %edi, %eax
#else
leal MUTEX(%edx), %eax
leal MUTEX(%edi), %eax
#endif
call __lll_mutex_unlock_wake
jmp 8b