From e2dbf201abdfa13fc4035a1a8888ecec91bef44c Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Wed, 2 May 2012 19:04:54 -0700 Subject: Mirror i386 change on sparc: 'Avoid "anonymous" code in pthread_spin_lock' nptl/ * sysdeps/sparc/sparc64/pthread_spin_lock.S: New. * sysdeps/sparc/sparc64/pthread_spin_lock.c: Delete. * sysdeps/sparc/sparc64/pthread_spin_unlock.S: New. * sysdeps/sparc/sparc64/pthread_spin_unlock.c: Delete. * sysdeps/sparc/sparc64/pthread_spin_trylock.S: New. * sysdeps/sparc/sparc64/pthread_spin_trylock.c: Delete. * sysdeps/sparc/sparc64/pthread_spin_init.c: New. * sysdeps/sparc/sparc32/pthread_spin_lock.S: New. * sysdeps/sparc/sparc32/pthread_spin_lock.c: Delete. * sysdeps/sparc/sparc32/pthread_spin_trylock.S: New. * sysdeps/sparc/sparc32/pthread_spin_trylock.c: Delete. * sysdeps/sparc/sparc32/sparcv9/pthread_spin_lock.S: New. * sysdeps/sparc/sparc32/sparcv9/pthread_spin_lock.c: Delete. * sysdeps/sparc/sparc32/sparcv9/pthread_spin_trylock.S: New. * sysdeps/sparc/sparc32/sparcv9/pthread_spin_trylock.c: Delete. * sysdeps/sparc/sparc32/sparcv9/pthread_spin_unlock.S: New. * sysdeps/sparc/sparc32/sparcv9/pthread_spin_unlock.c: Delete. * sysdeps/sparc/sparc32/sparcv9/pthread_spin_init.c: New. --- nptl/sysdeps/sparc/sparc64/pthread_spin_init.c | 1 + nptl/sysdeps/sparc/sparc64/pthread_spin_lock.S | 31 ++++++++++++++++++ nptl/sysdeps/sparc/sparc64/pthread_spin_lock.c | 38 ----------------------- nptl/sysdeps/sparc/sparc64/pthread_spin_trylock.S | 27 ++++++++++++++++ nptl/sysdeps/sparc/sparc64/pthread_spin_trylock.c | 33 -------------------- nptl/sysdeps/sparc/sparc64/pthread_spin_unlock.S | 27 ++++++++++++++++ nptl/sysdeps/sparc/sparc64/pthread_spin_unlock.c | 29 ----------------- 7 files changed, 86 insertions(+), 100 deletions(-) create mode 100644 nptl/sysdeps/sparc/sparc64/pthread_spin_init.c create mode 100644 nptl/sysdeps/sparc/sparc64/pthread_spin_lock.S delete mode 100644 nptl/sysdeps/sparc/sparc64/pthread_spin_lock.c create mode 100644 nptl/sysdeps/sparc/sparc64/pthread_spin_trylock.S delete mode 100644 nptl/sysdeps/sparc/sparc64/pthread_spin_trylock.c create mode 100644 nptl/sysdeps/sparc/sparc64/pthread_spin_unlock.S delete mode 100644 nptl/sysdeps/sparc/sparc64/pthread_spin_unlock.c (limited to 'nptl/sysdeps/sparc/sparc64') diff --git a/nptl/sysdeps/sparc/sparc64/pthread_spin_init.c b/nptl/sysdeps/sparc/sparc64/pthread_spin_init.c new file mode 100644 index 0000000000..58319ab62d --- /dev/null +++ b/nptl/sysdeps/sparc/sparc64/pthread_spin_init.c @@ -0,0 +1 @@ +/* pthread_spin_init is in pthread_spin_unlock.S */ diff --git a/nptl/sysdeps/sparc/sparc64/pthread_spin_lock.S b/nptl/sysdeps/sparc/sparc64/pthread_spin_lock.S new file mode 100644 index 0000000000..5e7b0fade9 --- /dev/null +++ b/nptl/sysdeps/sparc/sparc64/pthread_spin_lock.S @@ -0,0 +1,31 @@ +/* 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 + . */ + +#include + + .text +ENTRY(pthread_spin_lock) + ldstub [%o0], %g1 + brnz,pn %g1, 2f + membar #StoreLoad | #StoreStore +1: retl + mov 0, %o0 +2: ldub [%o0], %g1 + brnz,pt %g1, 2b + membar #LoadLoad + ba,a,pt %xcc, 1b +END(pthread_spin_lock) \ No newline at end of file diff --git a/nptl/sysdeps/sparc/sparc64/pthread_spin_lock.c b/nptl/sysdeps/sparc/sparc64/pthread_spin_lock.c deleted file mode 100644 index e82053a534..0000000000 --- a/nptl/sysdeps/sparc/sparc64/pthread_spin_lock.c +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright (C) 2003 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Jakub Jelinek , 2003. - - 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 - . */ - -#include "pthreadP.h" - -int -pthread_spin_lock (pthread_spinlock_t *lock) -{ - __asm __volatile - ("1: ldstub [%0], %%g5\n" - " brnz,pn %%g5, 2f\n" - " membar #StoreLoad | #StoreStore\n" - ".subsection 2\n" - "2: ldub [%0], %%g5\n" - " brnz,pt %%g5, 2b\n" - " membar #LoadLoad\n" - " b,a,pt %%xcc, 1b\n" - ".previous" - : /* no outputs */ - : "r" (lock) - : "g5", "memory"); - return 0; -} diff --git a/nptl/sysdeps/sparc/sparc64/pthread_spin_trylock.S b/nptl/sysdeps/sparc/sparc64/pthread_spin_trylock.S new file mode 100644 index 0000000000..867b8b5024 --- /dev/null +++ b/nptl/sysdeps/sparc/sparc64/pthread_spin_trylock.S @@ -0,0 +1,27 @@ +/* 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 + . */ + +#include +#include + + .text +ENTRY(pthread_spin_trylock) + ldstub [%o0], %o0 + membar #StoreLoad | #StoreStore + retl + movrnz %o0, EBUSY, %o0 +END(pthread_spin_trylock) diff --git a/nptl/sysdeps/sparc/sparc64/pthread_spin_trylock.c b/nptl/sysdeps/sparc/sparc64/pthread_spin_trylock.c deleted file mode 100644 index 7bbfef6ace..0000000000 --- a/nptl/sysdeps/sparc/sparc64/pthread_spin_trylock.c +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright (C) 2003 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Jakub Jelinek , 2003. - - 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 - . */ - -#include -#include "pthreadP.h" - -int -pthread_spin_trylock (pthread_spinlock_t *lock) -{ - int res; - __asm __volatile - ("ldstub [%1], %0\n" - "membar #StoreLoad | #StoreStore" - : "=r" (res) - : "r" (lock) - : "memory"); - return res == 0 ? 0 : EBUSY; -} diff --git a/nptl/sysdeps/sparc/sparc64/pthread_spin_unlock.S b/nptl/sysdeps/sparc/sparc64/pthread_spin_unlock.S new file mode 100644 index 0000000000..e668c395c5 --- /dev/null +++ b/nptl/sysdeps/sparc/sparc64/pthread_spin_unlock.S @@ -0,0 +1,27 @@ +/* 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 + . */ + +#include + + .text +ENTRY(pthread_spin_unlock) + membar #StoreStore | #LoadStore + retl + stb %g0, [%o0] +END(pthread_spin_unlock) + +strong_alias (pthread_spin_unlock, pthread_spin_init) diff --git a/nptl/sysdeps/sparc/sparc64/pthread_spin_unlock.c b/nptl/sysdeps/sparc/sparc64/pthread_spin_unlock.c deleted file mode 100644 index cda16f91ca..0000000000 --- a/nptl/sysdeps/sparc/sparc64/pthread_spin_unlock.c +++ /dev/null @@ -1,29 +0,0 @@ -/* pthread_spin_unlock -- unlock a spin lock. Generic version. - Copyright (C) 2003 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Paul Mackerras , 2003. - - 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 - . */ - -#include "pthreadP.h" -#include - -int -pthread_spin_unlock (pthread_spinlock_t *lock) -{ - __asm __volatile ("membar #StoreStore | #LoadStore"); - *lock = 0; - return 0; -} -- cgit 1.4.1