diff options
| -rw-r--r-- | nptl/ChangeLog | 7 | ||||
| -rw-r--r-- | nptl/sysdeps/i386/pthread_spin_lock.S (renamed from nptl/sysdeps/i386/pthread_spin_lock.c) | 53 | ||||
| -rw-r--r-- | nptl/sysdeps/x86_64/pthread_spin_lock.S | 36 | ||||
| -rw-r--r-- | nptl/sysdeps/x86_64/pthread_spin_lock.c | 1 |
4 files changed, 64 insertions, 33 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog index def7f2c3ac..e3075ab892 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,10 @@ +2012-05-02 Paul Pluzhnikov <ppluzhnikov@google.com> + + * sysdeps/i386/pthread_spin_lock.S: New. + * sysdeps/i386/pthread_spin_lock.c: Delete. + * sysdeps/x86_64/pthread_spin_lock.S: New. + * sysdeps/x86_64/pthread_spin_lock.c: Delete. + 2012-04-28 Andreas Schwab <schwab@linux-m68k.org> * Makefile ($(objpfx)tst-stack3-mem, $(objpfx)tst-tls6.out): Don't diff --git a/nptl/sysdeps/i386/pthread_spin_lock.c b/nptl/sysdeps/i386/pthread_spin_lock.S index c059e0123a..ba9b18e492 100644 --- a/nptl/sysdeps/i386/pthread_spin_lock.c +++ b/nptl/sysdeps/i386/pthread_spin_lock.S @@ -1,6 +1,5 @@ -/* Copyright (C) 2002,2003,2004 Free Software Foundation, Inc. +/* Copyright (C) 2012 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 @@ -16,33 +15,23 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#include "pthreadP.h" - -#ifndef LOCK_PREFIX -# ifdef UP -# define LOCK_PREFIX /* nothing */ -# else -# define LOCK_PREFIX "lock;" -# endif -#endif - - -int -pthread_spin_lock (lock) - pthread_spinlock_t *lock; -{ - asm ("\n" - "1:\t" LOCK_PREFIX "decl %0\n\t" - "jne 2f\n\t" - ".subsection 1\n\t" - ".align 16\n" - "2:\trep; nop\n\t" - "cmpl $0, %0\n\t" - "jg 1b\n\t" - "jmp 2b\n\t" - ".previous" - : "=m" (*lock) - : "m" (*lock)); - - return 0; -} +#include <lowlevellock.h> + + .globl pthread_spin_lock + .type pthread_spin_lock,@function + .align 16 +pthread_spin_lock: + mov 4(%esp), %eax +1: LOCK + decl 0(%eax) + jne 2f + xor %eax, %eax + ret + + .align 16 +2: rep + nop + cmpl $0, 0(%eax) + jg 1b + jmp 2b + .size pthread_spin_lock,.-pthread_spin_lock diff --git a/nptl/sysdeps/x86_64/pthread_spin_lock.S b/nptl/sysdeps/x86_64/pthread_spin_lock.S new file mode 100644 index 0000000000..5e3431c903 --- /dev/null +++ b/nptl/sysdeps/x86_64/pthread_spin_lock.S @@ -0,0 +1,36 @@ +/* Copyright (C) 2012 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, see + <http://www.gnu.org/licenses/>. */ + +#include <lowlevellock.h> + + .globl pthread_spin_lock + .type pthread_spin_lock,@function + .align 16 +pthread_spin_lock: +1: LOCK + decl 0(%rdi) + jne 2f + xor %eax, %eax + ret + + .align 16 +2: rep + nop + cmpl $0, 0(%rdi) + jg 1b + jmp 2b + .size pthread_spin_lock,.-pthread_spin_lock diff --git a/nptl/sysdeps/x86_64/pthread_spin_lock.c b/nptl/sysdeps/x86_64/pthread_spin_lock.c deleted file mode 100644 index 7cf0e0ecce..0000000000 --- a/nptl/sysdeps/x86_64/pthread_spin_lock.c +++ /dev/null @@ -1 +0,0 @@ -#include "../i386/pthread_spin_lock.c" |