diff options
author | Ulrich Drepper <drepper@redhat.com> | 2003-06-08 05:28:14 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 2003-06-08 05:28:14 +0000 |
commit | 7726edc27354afe163f492c0e6a8d4354fddb494 (patch) | |
tree | 22a712872298767abf2b081d9f766a33cad8fa20 /nptl/sysdeps/unix/sysv/linux/x86_64/sem_wait.S | |
parent | ede0f73aeabe62589f6ca19a6987f48aa0d06184 (diff) | |
download | glibc-7726edc27354afe163f492c0e6a8d4354fddb494.tar.gz glibc-7726edc27354afe163f492c0e6a8d4354fddb494.tar.xz glibc-7726edc27354afe163f492c0e6a8d4354fddb494.zip |
Update.
2003-06-07 Ulrich Drepper <drepper@redhat.com> * cleanup_routine.c: New file. * Versions (libpthread) [GLIBC_2.3.3]: Add __pthread_cleanup_routine. * sysdeps/pthread/pthread.h: Add support for fully exception-based cleanup handling. * Makefile (libpthread-routines): Add cleanup_routine. Add more CFLAGS variables to compile with exceptions. Add comments why which file needs unwind tables. (tests) [have-forced-unwind==yes]: Add tst-cancelx* and tst-cleanupx* tests. * tst-cancelx1.c: New file. * tst-cancelx2.c: New file. * tst-cancelx3.c: New file. * tst-cancelx4.c: New file. * tst-cancelx5.c: New file. * tst-cancelx6.c: New file. * tst-cancelx7.c: New file. * tst-cancelx8.c: New file. * tst-cancelx9.c: New file. * tst-cancelx10.c: New file. * tst-cancelx11.c: New file. * tst-cancelx12.c: New file. * tst-cancelx13.c: New file. * tst-cancelx14.c: New file. * tst-cancelx15.c: New file. * tst-cleanupx0.c: New file. * tst-cleanupx0.expect: New file. * tst-cleanupx1.c: New file. * tst-cleanupx2.c: New file. * tst-cleanupx3.c: New file. * tst-cleanup0.c: Make standard compliant. * tst-cleanup1.c: Likewise. * sysdeps/unix/sysv/linux/sem_timedwait.c: Add cancellation support. * sysdeps/unix/sysv/linux/sem_wait.c: Likewise. * sysdeps/unix/sysv/linux/i386/i486/sem_timedwait.S: Likewise. * sysdeps/unix/sysv/linux/i386/i486/sem_wait.S: Likewise. * sysdeps/unix/sysv/linux/x86_64/sem_timedwait.S: Likewise. * sysdeps/unix/sysv/linux/x86_64/sem_wait.S: Likewise. * sysdeps/i386/tcb-offsets.sym: Add RESULT, CANCELHANDLING, and CLEANUP_JMP_BUF. * sysdeps/x86_64/tcb-offsets.sym: Likewise. * tst-cancel12.c: New file. * tst-cancel13.c: New file. * tst-cancel14.c: New file. * tst-cancel15.c: New file. * Makefile (tests): Add tst-cancel12, tst-cancel13, tst-cancel14, and tst-cancel15. * tst-cancel1.c: Add some comments. * sysdeps/unix/sysv/linux/x86_64/sem_timedwait.S: Compute relative timeout correctly.
Diffstat (limited to 'nptl/sysdeps/unix/sysv/linux/x86_64/sem_wait.S')
-rw-r--r-- | nptl/sysdeps/unix/sysv/linux/x86_64/sem_wait.S | 66 |
1 files changed, 57 insertions, 9 deletions
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/sem_wait.S b/nptl/sysdeps/unix/sysv/linux/x86_64/sem_wait.S index 877ee4c4dc..32742309fb 100644 --- a/nptl/sysdeps/unix/sysv/linux/x86_64/sem_wait.S +++ b/nptl/sysdeps/unix/sysv/linux/x86_64/sem_wait.S @@ -35,38 +35,86 @@ .globl sem_wait .type sem_wait,@function .align 16 + cfi_startproc sem_wait: -3: movl (%rdi), %eax + /* First check for cancellation. */ + movl %fs:CANCELHANDLING, %eax + andl $0xfffffff9, %eax + cmpl $8, %eax + je 4f + + pushq %r12 + cfi_adjust_cfa_offset(8) + cfi_offset(12, -16) + pushq %r13 + cfi_adjust_cfa_offset(8) + movq %rdi, %r13 + cfi_offset(13, -24) + +3: movl (%r13), %eax 2: testl %eax, %eax je 1f leaq -1(%rax), %rdx LOCK - cmpxchgl %edx, (%rdi) + cmpxchgl %edx, (%r13) jne 2b xorl %eax, %eax + popq %r13 + cfi_adjust_cfa_offset(-8) + cfi_restore(13) + popq %r12 + cfi_adjust_cfa_offset(-8) + cfi_restore(12) + retq -1: xorq %r10, %r10 + cfi_adjust_cfa_offset(16) + cfi_offset(12, -16) + cfi_offset(13, -24) +1: call __pthread_enable_asynccancel + movl %eax, %r8d + + xorq %r10, %r10 movq $SYS_futex, %rax + movq %r13, %rdi movq %r10, %rsi movq %r10, %rdx syscall + movq %rax, %r12 + + movl %r8d, %edi + call __pthread_disable_asynccancel - testq %rax, %rax + testq %r12, %r12 je 3b - cmpq $-EWOULDBLOCK, %rax + cmpq $-EWOULDBLOCK, %r12 je 3b - negq %rax + negq %r12 #if USE___THREAD movq errno@gottpoff(%rip), %rdx - movl %eax, %fs:(%rdx) + movl %r12d, %fs:(%rdx) #else - movl %eax, %edx callq __errno_location@plt - movl %edx, (%rax) + movl %r12d, (%rax) #endif orl $-1, %eax + + popq %r13 + cfi_adjust_cfa_offset(-8) + cfi_restore(13) + popq %r12 + cfi_adjust_cfa_offset(-8) + cfi_restore(12) + retq + +4: /* Canceled. */ + movq $0xffffffffffffffff, %fs:RESULT + LOCK + orl $0x10, %fs:CANCELHANDLING + movq %fs:CLEANUP_JMP_BUF, %rdi + jmp __pthread_unwind + cfi_endproc .size sem_wait,.-sem_wait |