From a8fd5a02d94dcbe9a75252a66d2d73b41b9a2c83 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sun, 22 Feb 2004 19:37:31 +0000 Subject: Update. 2004-02-22 Ulrich Drepper * sysdeps/unix/sysv/linux/i386/posix_fadvise64.S: Pop register content also in case of an overflow in the parameter. Reported by Momchil Velikov . --- nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'nptl/sysdeps/unix/sysv/linux/x86_64') diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S b/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S index a56c714aeb..3c56daecf5 100644 --- a/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S +++ b/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2003 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 2002. @@ -50,24 +50,25 @@ __lll_mutex_lock_wait: movl $2, %edx movq %r10, %rsi /* movq $FUTEX_WAIT, %rsi */ -1: - movl $1, %eax - LOCK - cmpxchgl %edx, (%rdi) + cmpl %edx, %eax /* NB: %edx == 2 */ + je 1f + + movl %edx, %eax + xchgl %eax, (%rdi) /* NB: lock is implied */ testl %eax, %eax je 2f - movq $SYS_futex, %rax +1: movq $SYS_futex, %rax syscall - xorl %eax, %eax -2: LOCK - cmpxchgl %edx, (%rdi) + movl %edx, %eax + xchgl %eax, (%rdi) /* NB: lock is implied */ + testl %eax, %eax jnz 1b - popq %rdx +2: popq %rdx popq %r10 retq .size __lll_mutex_lock_wait,.-__lll_mutex_lock_wait -- cgit 1.4.1