mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-02-17 13:00:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Mirror i386 change on sparc: 'Avoid "anonymous" code in pthread_spin_lock'

Browse Source 
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.
This commit is contained in:
David S. Miller 2012-05-02 19:04:54 -07:00
parent d4c2917fc5
commit e2dbf201ab
15 changed files with 104 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
nptl/ChangeLog
View File

@ -1,3 +1,24 @@
2012-05-02 David S. Miller <davem@davemloft.net>
* 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.
2012-05-02 Allan McRae <allan@archlinux.org>
* Makefile: (LDFLAGS-tst-tls5): Use $(no-as-needed).

26
nptl/sysdeps/sparc/sparc32/pthread_spin_trylock.c → nptl/sysdeps/sparc/sparc32/pthread_spin_lock.S
View File

@ -1,6 +1,5 @@
/* Copyright (C) 2003 Free Software Foundation, Inc.
/* Copyright (C) 2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Jakub Jelinek <jakub@redhat.com>, 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
@ -16,13 +15,18 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
#include <errno.h>
#include "pthreadP.h"
#include <sysdep.h>
int
pthread_spin_trylock (pthread_spinlock_t *lock)
{
int res;
__asm __volatile ("ldstub [%1], %0" : "=r" (res) : "r" (lock) : "memory");
return res == 0 ? 0 : EBUSY;
}
.text
ENTRY(pthread_spin_lock)
ldstub [%o0], %g1
orcc %g1, 0x0, %g0
bne,a 2f
ldub [%o0], %g1
1: retl
mov 0, %o0
2: orcc %g1, 0x0, %g0
bne,a 2b
ldub [%o0], %g1
ba,a,pt %xcc, 1b
END(pthread_spin_lock)

39
nptl/sysdeps/sparc/sparc32/pthread_spin_lock.c
View File

@ -1,39 +0,0 @@
/* Copyright (C) 2003 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Jakub Jelinek <jakub@redhat.com>, 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
<http://www.gnu.org/licenses/>. */
#include "pthreadP.h"
int
pthread_spin_lock (pthread_spinlock_t *lock)
{
__asm __volatile
("1: ldstub [%0], %%g2\n"
" orcc %%g2, 0x0, %%g0\n"
" bne,a 2f\n"
" ldub [%0], %%g2\n"
".subsection 2\n"
"2: orcc %%g2, 0x0, %%g0\n"
" bne,a 2b\n"
" ldub [%0], %%g2\n"
" b,a 1b\n"
".previous"
: /* no outputs */
: "r" (lock)
: "g2", "memory", "cc");
return 0;
}

24
nptl/sysdeps/sparc/sparc64/pthread_spin_unlock.c → nptl/sysdeps/sparc/sparc32/pthread_spin_trylock.S
View File

@ -1,7 +1,5 @@
/* pthread_spin_unlock -- unlock a spin lock. Generic version.
Copyright (C) 2003 Free Software Foundation, Inc.
/* Copyright (C) 2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Paul Mackerras <paulus@au.ibm.com>, 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
@ -17,13 +15,15 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
#include "pthreadP.h"
#include <atomic.h>
#include <sysdep.h>
#include <pthread-errnos.h>
int
pthread_spin_unlock (pthread_spinlock_t *lock)
{
__asm __volatile ("membar #StoreStore | #LoadStore");
*lock = 0;
return 0;
}
.text
ENTRY(pthread_spin_trylock)
ldstub [%o0], %o0
cmp %o0, 0
bne,a 1f
mov EBUSY, %o0
1: retl
nop
END(pthread_spin_trylock)

1
nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_init.c Normal file
View File

@ -0,0 +1 @@
#include <sparc64/pthread_spin_init.c>

1
nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_lock.S Normal file
View File

@ -0,0 +1 @@
#include <sparc64/pthread_spin_lock.S>

38
nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_lock.c
View File

@ -1,38 +0,0 @@
/* Copyright (C) 2003 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Jakub Jelinek <jakub@redhat.com>, 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
<http://www.gnu.org/licenses/>. */
#include "pthreadP.h"
int
pthread_spin_lock (pthread_spinlock_t *lock)
{
__asm __volatile
("1: ldstub [%0], %%g2\n"
" brnz,pn %%g2, 2f\n"
" membar #StoreLoad | #StoreStore\n"
".subsection 2\n"
"2: ldub [%0], %%g2\n"
" brnz,pt %%g2, 2b\n"
" membar #LoadLoad\n"
" b,a,pt %%xcc, 1b\n"
".previous"
: /* no outputs */
: "r" (lock)
: "g2", "memory");
return 0;
}

1
nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_trylock.S Normal file
View File

@ -0,0 +1 @@
#include <sparc64/pthread_spin_trylock.S>

1
nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_trylock.c
View File

@ -1 +0,0 @@
#include <sparc64/pthread_spin_trylock.c>

1
nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_unlock.S Normal file
View File

@ -0,0 +1 @@
#include <sparc64/pthread_spin_unlock.S>

1
nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_unlock.c
View File

@ -1 +0,0 @@
#include <sparc64/pthread_spin_unlock.c>

1
nptl/sysdeps/sparc/sparc64/pthread_spin_init.c Normal file
View File

@ -0,0 +1 @@
/* pthread_spin_init is in pthread_spin_unlock.S */

30
nptl/sysdeps/sparc/sparc64/pthread_spin_trylock.c → nptl/sysdeps/sparc/sparc64/pthread_spin_lock.S
View File

@ -1,6 +1,5 @@
/* Copyright (C) 2003 Free Software Foundation, Inc.
/* Copyright (C) 2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Jakub Jelinek <jakub@redhat.com>, 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
@ -16,18 +15,17 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
#include <errno.h>
#include "pthreadP.h"
#include <sysdep.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;
}
.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)

31
nptl/sysdeps/sparc/sparc64/pthread_spin_lock.c → nptl/sysdeps/sparc/sparc64/pthread_spin_trylock.S
View File

@ -1,6 +1,5 @@
/* Copyright (C) 2003 Free Software Foundation, Inc.
/* Copyright (C) 2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Jakub Jelinek <jakub@redhat.com>, 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
@ -16,23 +15,13 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
#include "pthreadP.h"
#include <sysdep.h>
#include <pthread-errnos.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;
}
.text
ENTRY(pthread_spin_trylock)
ldstub [%o0], %o0
membar #StoreLoad | #StoreStore
retl
movrnz %o0, EBUSY, %o0
END(pthread_spin_trylock)

27
nptl/sysdeps/sparc/sparc64/pthread_spin_unlock.S Normal file
View File

@ -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
<http://www.gnu.org/licenses/>. */
#include <sysdep.h>
.text
ENTRY(pthread_spin_unlock)
membar #StoreStore | #LoadStore
retl
stb %g0, [%o0]
END(pthread_spin_unlock)
strong_alias (pthread_spin_unlock, pthread_spin_init)