2003-04-06 21:04:05 +00:00
|
|
|
/* Atomic operations used inside libc. Linux/SH version.
|
2020-01-01 00:14:33 +00:00
|
|
|
Copyright (C) 2003-2020 Free Software Foundation, Inc.
|
2003-02-10 09:24:12 +00:00
|
|
|
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
|
2012-02-09 23:18:22 +00:00
|
|
|
License along with the GNU C Library; if not, see
|
Prefer https to http for gnu.org and fsf.org URLs
Also, change sources.redhat.com to sourceware.org.
This patch was automatically generated by running the following shell
script, which uses GNU sed, and which avoids modifying files imported
from upstream:
sed -ri '
s,(http|ftp)(://(.*\.)?(gnu|fsf|sourceware)\.org($|[^.]|\.[^a-z])),https\2,g
s,(http|ftp)(://(.*\.)?)sources\.redhat\.com($|[^.]|\.[^a-z]),https\2sourceware.org\4,g
' \
$(find $(git ls-files) -prune -type f \
! -name '*.po' \
! -name 'ChangeLog*' \
! -path COPYING ! -path COPYING.LIB \
! -path manual/fdl-1.3.texi ! -path manual/lgpl-2.1.texi \
! -path manual/texinfo.tex ! -path scripts/config.guess \
! -path scripts/config.sub ! -path scripts/install-sh \
! -path scripts/mkinstalldirs ! -path scripts/move-if-change \
! -path INSTALL ! -path locale/programs/charmap-kw.h \
! -path po/libc.pot ! -path sysdeps/gnu/errlist.c \
! '(' -name configure \
-execdir test -f configure.ac -o -f configure.in ';' ')' \
! '(' -name preconfigure \
-execdir test -f preconfigure.ac ';' ')' \
-print)
and then by running 'make dist-prepare' to regenerate files built
from the altered files, and then executing the following to cleanup:
chmod a+x sysdeps/unix/sysv/linux/riscv/configure
# Omit irrelevant whitespace and comment-only changes,
# perhaps from a slightly-different Autoconf version.
git checkout -f \
sysdeps/csky/configure \
sysdeps/hppa/configure \
sysdeps/riscv/configure \
sysdeps/unix/sysv/linux/csky/configure
# Omit changes that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/powerpc/powerpc64/ppc-mcount.S: trailing lines
git checkout -f \
sysdeps/powerpc/powerpc64/ppc-mcount.S \
sysdeps/unix/sysv/linux/s390/s390-64/syscall.S
# Omit change that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S: last line does not end in newline
git checkout -f sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S
2019-09-07 05:40:42 +00:00
|
|
|
<https://www.gnu.org/licenses/>. */
|
2003-02-10 09:24:12 +00:00
|
|
|
|
|
|
|
#include <stdint.h>
|
|
|
|
|
|
|
|
|
|
|
|
typedef int8_t atomic8_t;
|
|
|
|
typedef uint8_t uatomic8_t;
|
|
|
|
typedef int_fast8_t atomic_fast8_t;
|
|
|
|
typedef uint_fast8_t uatomic_fast8_t;
|
|
|
|
|
|
|
|
typedef int16_t atomic16_t;
|
|
|
|
typedef uint16_t uatomic16_t;
|
|
|
|
typedef int_fast16_t atomic_fast16_t;
|
|
|
|
typedef uint_fast16_t uatomic_fast16_t;
|
|
|
|
|
|
|
|
typedef int32_t atomic32_t;
|
|
|
|
typedef uint32_t uatomic32_t;
|
|
|
|
typedef int_fast32_t atomic_fast32_t;
|
|
|
|
typedef uint_fast32_t uatomic_fast32_t;
|
|
|
|
|
|
|
|
typedef int64_t atomic64_t;
|
|
|
|
typedef uint64_t uatomic64_t;
|
|
|
|
typedef int_fast64_t atomic_fast64_t;
|
|
|
|
typedef uint_fast64_t uatomic_fast64_t;
|
|
|
|
|
|
|
|
typedef intptr_t atomicptr_t;
|
|
|
|
typedef uintptr_t uatomicptr_t;
|
|
|
|
typedef intmax_t atomic_max_t;
|
|
|
|
typedef uintmax_t uatomic_max_t;
|
|
|
|
|
2014-10-17 23:02:59 +00:00
|
|
|
#define __HAVE_64B_ATOMICS 0
|
|
|
|
#define USE_ATOMIC_COMPILER_BUILTINS 0
|
|
|
|
|
2017-06-06 07:41:56 +00:00
|
|
|
/* XXX Is this actually correct? */
|
|
|
|
#define ATOMIC_EXCHANGE_USES_CAS 1
|
|
|
|
|
2003-04-06 21:04:05 +00:00
|
|
|
/* SH kernel has implemented a gUSA ("g" User Space Atomicity) support
|
|
|
|
for the user space atomicity. The atomicity macros use this scheme.
|
|
|
|
|
|
|
|
Reference:
|
|
|
|
Niibe Yutaka, "gUSA: Simple and Efficient User Space Atomicity
|
|
|
|
Emulation with Little Kernel Modification", Linux Conference 2002,
|
|
|
|
Japan. http://lc.linux.or.jp/lc2002/papers/niibe0919h.pdf (in
|
|
|
|
Japanese).
|
|
|
|
|
|
|
|
B.N. Bershad, D. Redell, and J. Ellis, "Fast Mutual Exclusion for
|
|
|
|
Uniprocessors", Proceedings of the Fifth Architectural Support for
|
|
|
|
Programming Languages and Operating Systems (ASPLOS), pp. 223-233,
|
|
|
|
October 1992. http://www.cs.washington.edu/homes/bershad/Papers/Rcs.ps
|
|
|
|
|
|
|
|
SuperH ABI:
|
|
|
|
r15: -(size of atomic instruction sequence) < 0
|
|
|
|
r0: end point
|
|
|
|
r1: saved stack pointer
|
|
|
|
*/
|
2003-02-10 09:24:12 +00:00
|
|
|
|
2003-03-29 01:24:20 +00:00
|
|
|
#define __arch_compare_and_exchange_val_8_acq(mem, newval, oldval) \
|
2003-04-06 21:04:05 +00:00
|
|
|
({ __typeof (*(mem)) __result; \
|
2003-02-10 09:24:12 +00:00
|
|
|
__asm __volatile ("\
|
|
|
|
mova 1f,r0\n\
|
2012-06-22 22:29:05 +00:00
|
|
|
.align 2\n\
|
2003-02-10 09:24:12 +00:00
|
|
|
mov r15,r1\n\
|
2012-06-22 22:29:05 +00:00
|
|
|
mov #(0f-1f),r15\n\
|
2003-03-29 01:24:20 +00:00
|
|
|
0: mov.b @%1,%0\n\
|
|
|
|
cmp/eq %0,%3\n\
|
2003-02-10 09:24:12 +00:00
|
|
|
bf 1f\n\
|
|
|
|
mov.b %2,@%1\n\
|
2003-03-29 01:24:20 +00:00
|
|
|
1: mov r1,r15"\
|
Remove miscellaneous GCC >= 4.7 version conditionals.
This patch removes miscellaneous __GNUC_PREREQ (4, 7) conditionals
that are now dead.
Tested for x86_64 and x86 (testsuite, and that installed stripped
shared libraries are unchanged by the patch).
* sysdeps/arm/atomic-machine.h
[__GNUC_PREREQ (4, 7) && __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4]:
Change conditional to [__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4].
[__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 && !__GNUC_PREREQ (4, 7)]:
Remove conditional code.
[!__GNUC_PREREQ (4, 7) || !__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4]:
Change conditional to [!__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4].
* sysdeps/i386/sysdep.h [__ASSEMBLER__ && __GNUC_PREREQ (4, 7)]:
Change conditional to [__ASSEMBLER__].
[__ASSEMBLER__ && !__GNUC_PREREQ (4, 7)]: Remove conditional code.
[!__ASSEMBLER__ && __GNUC_PREREQ (4, 7)]: Change conditional to
[!__ASSEMBLER__].
[!__ASSEMBLER__ && !__GNUC_PREREQ (4, 7)]: Remove conditional
code.
* sysdeps/unix/sysv/linux/sh/atomic-machine.h (rNOSP): Remove
conditional macro definitions.
(__arch_compare_and_exchange_val_8_acq): Use "u" instead of rNOSP.
(__arch_compare_and_exchange_val_16_acq): Likewise.
(__arch_compare_and_exchange_val_32_acq): Likewise.
(atomic_exchange_and_add): Likewise.
(atomic_add): Likewise.
(atomic_add_negative): Likewise.
(atomic_add_zero): Likewise.
(atomic_bit_set): Likewise.
(atomic_bit_test_set): Likewise.
* sysdeps/x86_64/atomic-machine.h [__GNUC_PREREQ (4, 7)]: Make
code unconditional.
[!__GNUC_PREREQ (4, 7)]: Remove conditional code.
2015-11-04 21:34:36 +00:00
|
|
|
: "=&r" (__result) : "u" (mem), "u" (newval), "u" (oldval) \
|
2003-03-29 01:24:20 +00:00
|
|
|
: "r0", "r1", "t", "memory"); \
|
2003-02-10 09:24:12 +00:00
|
|
|
__result; })
|
|
|
|
|
2003-03-29 01:24:20 +00:00
|
|
|
#define __arch_compare_and_exchange_val_16_acq(mem, newval, oldval) \
|
2003-04-06 21:04:05 +00:00
|
|
|
({ __typeof (*(mem)) __result; \
|
2003-02-10 09:24:12 +00:00
|
|
|
__asm __volatile ("\
|
|
|
|
mova 1f,r0\n\
|
|
|
|
mov r15,r1\n\
|
2012-06-22 22:29:05 +00:00
|
|
|
.align 2\n\
|
|
|
|
mov #(0f-1f),r15\n\
|
2003-02-10 09:24:12 +00:00
|
|
|
mov #-8,r15\n\
|
2003-03-29 01:24:20 +00:00
|
|
|
0: mov.w @%1,%0\n\
|
|
|
|
cmp/eq %0,%3\n\
|
2003-02-10 09:24:12 +00:00
|
|
|
bf 1f\n\
|
|
|
|
mov.w %2,@%1\n\
|
2003-03-29 01:24:20 +00:00
|
|
|
1: mov r1,r15"\
|
Remove miscellaneous GCC >= 4.7 version conditionals.
This patch removes miscellaneous __GNUC_PREREQ (4, 7) conditionals
that are now dead.
Tested for x86_64 and x86 (testsuite, and that installed stripped
shared libraries are unchanged by the patch).
* sysdeps/arm/atomic-machine.h
[__GNUC_PREREQ (4, 7) && __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4]:
Change conditional to [__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4].
[__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 && !__GNUC_PREREQ (4, 7)]:
Remove conditional code.
[!__GNUC_PREREQ (4, 7) || !__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4]:
Change conditional to [!__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4].
* sysdeps/i386/sysdep.h [__ASSEMBLER__ && __GNUC_PREREQ (4, 7)]:
Change conditional to [__ASSEMBLER__].
[__ASSEMBLER__ && !__GNUC_PREREQ (4, 7)]: Remove conditional code.
[!__ASSEMBLER__ && __GNUC_PREREQ (4, 7)]: Change conditional to
[!__ASSEMBLER__].
[!__ASSEMBLER__ && !__GNUC_PREREQ (4, 7)]: Remove conditional
code.
* sysdeps/unix/sysv/linux/sh/atomic-machine.h (rNOSP): Remove
conditional macro definitions.
(__arch_compare_and_exchange_val_8_acq): Use "u" instead of rNOSP.
(__arch_compare_and_exchange_val_16_acq): Likewise.
(__arch_compare_and_exchange_val_32_acq): Likewise.
(atomic_exchange_and_add): Likewise.
(atomic_add): Likewise.
(atomic_add_negative): Likewise.
(atomic_add_zero): Likewise.
(atomic_bit_set): Likewise.
(atomic_bit_test_set): Likewise.
* sysdeps/x86_64/atomic-machine.h [__GNUC_PREREQ (4, 7)]: Make
code unconditional.
[!__GNUC_PREREQ (4, 7)]: Remove conditional code.
2015-11-04 21:34:36 +00:00
|
|
|
: "=&r" (__result) : "u" (mem), "u" (newval), "u" (oldval) \
|
2003-03-29 01:24:20 +00:00
|
|
|
: "r0", "r1", "t", "memory"); \
|
2003-02-10 09:24:12 +00:00
|
|
|
__result; })
|
|
|
|
|
2003-03-29 01:24:20 +00:00
|
|
|
#define __arch_compare_and_exchange_val_32_acq(mem, newval, oldval) \
|
2003-04-06 21:04:05 +00:00
|
|
|
({ __typeof (*(mem)) __result; \
|
2003-02-10 09:24:12 +00:00
|
|
|
__asm __volatile ("\
|
|
|
|
mova 1f,r0\n\
|
2012-06-22 22:29:05 +00:00
|
|
|
.align 2\n\
|
2003-02-10 09:24:12 +00:00
|
|
|
mov r15,r1\n\
|
2012-06-22 22:29:05 +00:00
|
|
|
mov #(0f-1f),r15\n\
|
2003-03-29 01:24:20 +00:00
|
|
|
0: mov.l @%1,%0\n\
|
|
|
|
cmp/eq %0,%3\n\
|
2003-02-10 09:24:12 +00:00
|
|
|
bf 1f\n\
|
|
|
|
mov.l %2,@%1\n\
|
2003-03-29 01:24:20 +00:00
|
|
|
1: mov r1,r15"\
|
Remove miscellaneous GCC >= 4.7 version conditionals.
This patch removes miscellaneous __GNUC_PREREQ (4, 7) conditionals
that are now dead.
Tested for x86_64 and x86 (testsuite, and that installed stripped
shared libraries are unchanged by the patch).
* sysdeps/arm/atomic-machine.h
[__GNUC_PREREQ (4, 7) && __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4]:
Change conditional to [__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4].
[__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 && !__GNUC_PREREQ (4, 7)]:
Remove conditional code.
[!__GNUC_PREREQ (4, 7) || !__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4]:
Change conditional to [!__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4].
* sysdeps/i386/sysdep.h [__ASSEMBLER__ && __GNUC_PREREQ (4, 7)]:
Change conditional to [__ASSEMBLER__].
[__ASSEMBLER__ && !__GNUC_PREREQ (4, 7)]: Remove conditional code.
[!__ASSEMBLER__ && __GNUC_PREREQ (4, 7)]: Change conditional to
[!__ASSEMBLER__].
[!__ASSEMBLER__ && !__GNUC_PREREQ (4, 7)]: Remove conditional
code.
* sysdeps/unix/sysv/linux/sh/atomic-machine.h (rNOSP): Remove
conditional macro definitions.
(__arch_compare_and_exchange_val_8_acq): Use "u" instead of rNOSP.
(__arch_compare_and_exchange_val_16_acq): Likewise.
(__arch_compare_and_exchange_val_32_acq): Likewise.
(atomic_exchange_and_add): Likewise.
(atomic_add): Likewise.
(atomic_add_negative): Likewise.
(atomic_add_zero): Likewise.
(atomic_bit_set): Likewise.
(atomic_bit_test_set): Likewise.
* sysdeps/x86_64/atomic-machine.h [__GNUC_PREREQ (4, 7)]: Make
code unconditional.
[!__GNUC_PREREQ (4, 7)]: Remove conditional code.
2015-11-04 21:34:36 +00:00
|
|
|
: "=&r" (__result) : "u" (mem), "u" (newval), "u" (oldval) \
|
2003-03-29 01:24:20 +00:00
|
|
|
: "r0", "r1", "t", "memory"); \
|
2003-02-10 09:24:12 +00:00
|
|
|
__result; })
|
|
|
|
|
|
|
|
/* XXX We do not really need 64-bit compare-and-exchange. At least
|
|
|
|
not in the moment. Using it would mean causing portability
|
|
|
|
problems since not many other 32-bit architectures have support for
|
|
|
|
such an operation. So don't define any code for now. */
|
|
|
|
|
2003-03-29 01:24:20 +00:00
|
|
|
# define __arch_compare_and_exchange_val_64_acq(mem, newval, oldval) \
|
2003-05-05 18:24:09 +00:00
|
|
|
(abort (), (__typeof (*mem)) 0)
|
2003-02-10 09:24:12 +00:00
|
|
|
|
|
|
|
#define atomic_exchange_and_add(mem, value) \
|
2003-04-06 21:04:05 +00:00
|
|
|
({ __typeof (*(mem)) __result, __tmp, __value = (value); \
|
|
|
|
if (sizeof (*(mem)) == 1) \
|
2003-02-10 09:24:12 +00:00
|
|
|
__asm __volatile ("\
|
|
|
|
mova 1f,r0\n\
|
2012-06-22 22:29:05 +00:00
|
|
|
.align 2\n\
|
2003-02-10 09:24:12 +00:00
|
|
|
mov r15,r1\n\
|
2012-06-22 22:29:05 +00:00
|
|
|
mov #(0f-1f),r15\n\
|
2003-02-10 09:24:12 +00:00
|
|
|
0: mov.b @%2,%0\n\
|
2012-06-22 22:29:05 +00:00
|
|
|
mov %1,r2\n\
|
|
|
|
add %0,r2\n\
|
|
|
|
mov.b r2,@%2\n\
|
2003-02-10 09:24:12 +00:00
|
|
|
1: mov r1,r15"\
|
Remove miscellaneous GCC >= 4.7 version conditionals.
This patch removes miscellaneous __GNUC_PREREQ (4, 7) conditionals
that are now dead.
Tested for x86_64 and x86 (testsuite, and that installed stripped
shared libraries are unchanged by the patch).
* sysdeps/arm/atomic-machine.h
[__GNUC_PREREQ (4, 7) && __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4]:
Change conditional to [__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4].
[__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 && !__GNUC_PREREQ (4, 7)]:
Remove conditional code.
[!__GNUC_PREREQ (4, 7) || !__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4]:
Change conditional to [!__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4].
* sysdeps/i386/sysdep.h [__ASSEMBLER__ && __GNUC_PREREQ (4, 7)]:
Change conditional to [__ASSEMBLER__].
[__ASSEMBLER__ && !__GNUC_PREREQ (4, 7)]: Remove conditional code.
[!__ASSEMBLER__ && __GNUC_PREREQ (4, 7)]: Change conditional to
[!__ASSEMBLER__].
[!__ASSEMBLER__ && !__GNUC_PREREQ (4, 7)]: Remove conditional
code.
* sysdeps/unix/sysv/linux/sh/atomic-machine.h (rNOSP): Remove
conditional macro definitions.
(__arch_compare_and_exchange_val_8_acq): Use "u" instead of rNOSP.
(__arch_compare_and_exchange_val_16_acq): Likewise.
(__arch_compare_and_exchange_val_32_acq): Likewise.
(atomic_exchange_and_add): Likewise.
(atomic_add): Likewise.
(atomic_add_negative): Likewise.
(atomic_add_zero): Likewise.
(atomic_bit_set): Likewise.
(atomic_bit_test_set): Likewise.
* sysdeps/x86_64/atomic-machine.h [__GNUC_PREREQ (4, 7)]: Make
code unconditional.
[!__GNUC_PREREQ (4, 7)]: Remove conditional code.
2015-11-04 21:34:36 +00:00
|
|
|
: "=&r" (__result), "=&r" (__tmp) : "u" (mem), "1" (__value) \
|
2012-06-22 22:29:05 +00:00
|
|
|
: "r0", "r1", "r2", "memory"); \
|
2003-04-06 21:04:05 +00:00
|
|
|
else if (sizeof (*(mem)) == 2) \
|
2003-02-10 09:24:12 +00:00
|
|
|
__asm __volatile ("\
|
|
|
|
mova 1f,r0\n\
|
2012-06-22 22:29:05 +00:00
|
|
|
.align 2\n\
|
2003-02-10 09:24:12 +00:00
|
|
|
mov r15,r1\n\
|
2012-06-22 22:29:05 +00:00
|
|
|
mov #(0f-1f),r15\n\
|
2003-02-10 09:24:12 +00:00
|
|
|
0: mov.w @%2,%0\n\
|
2012-06-22 22:29:05 +00:00
|
|
|
mov %1,r2\n\
|
|
|
|
add %0,r2\n\
|
|
|
|
mov.w r2,@%2\n\
|
2003-02-10 09:24:12 +00:00
|
|
|
1: mov r1,r15"\
|
Remove miscellaneous GCC >= 4.7 version conditionals.
This patch removes miscellaneous __GNUC_PREREQ (4, 7) conditionals
that are now dead.
Tested for x86_64 and x86 (testsuite, and that installed stripped
shared libraries are unchanged by the patch).
* sysdeps/arm/atomic-machine.h
[__GNUC_PREREQ (4, 7) && __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4]:
Change conditional to [__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4].
[__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 && !__GNUC_PREREQ (4, 7)]:
Remove conditional code.
[!__GNUC_PREREQ (4, 7) || !__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4]:
Change conditional to [!__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4].
* sysdeps/i386/sysdep.h [__ASSEMBLER__ && __GNUC_PREREQ (4, 7)]:
Change conditional to [__ASSEMBLER__].
[__ASSEMBLER__ && !__GNUC_PREREQ (4, 7)]: Remove conditional code.
[!__ASSEMBLER__ && __GNUC_PREREQ (4, 7)]: Change conditional to
[!__ASSEMBLER__].
[!__ASSEMBLER__ && !__GNUC_PREREQ (4, 7)]: Remove conditional
code.
* sysdeps/unix/sysv/linux/sh/atomic-machine.h (rNOSP): Remove
conditional macro definitions.
(__arch_compare_and_exchange_val_8_acq): Use "u" instead of rNOSP.
(__arch_compare_and_exchange_val_16_acq): Likewise.
(__arch_compare_and_exchange_val_32_acq): Likewise.
(atomic_exchange_and_add): Likewise.
(atomic_add): Likewise.
(atomic_add_negative): Likewise.
(atomic_add_zero): Likewise.
(atomic_bit_set): Likewise.
(atomic_bit_test_set): Likewise.
* sysdeps/x86_64/atomic-machine.h [__GNUC_PREREQ (4, 7)]: Make
code unconditional.
[!__GNUC_PREREQ (4, 7)]: Remove conditional code.
2015-11-04 21:34:36 +00:00
|
|
|
: "=&r" (__result), "=&r" (__tmp) : "u" (mem), "1" (__value) \
|
2012-06-22 22:29:05 +00:00
|
|
|
: "r0", "r1", "r2", "memory"); \
|
2003-04-06 21:04:05 +00:00
|
|
|
else if (sizeof (*(mem)) == 4) \
|
2003-02-10 09:24:12 +00:00
|
|
|
__asm __volatile ("\
|
|
|
|
mova 1f,r0\n\
|
2012-06-22 22:29:05 +00:00
|
|
|
.align 2\n\
|
2003-02-10 09:24:12 +00:00
|
|
|
mov r15,r1\n\
|
2012-06-22 22:29:05 +00:00
|
|
|
mov #(0f-1f),r15\n\
|
2003-02-10 09:24:12 +00:00
|
|
|
0: mov.l @%2,%0\n\
|
2012-06-22 22:29:05 +00:00
|
|
|
mov %1,r2\n\
|
|
|
|
add %0,r2\n\
|
|
|
|
mov.l r2,@%2\n\
|
2003-02-10 09:24:12 +00:00
|
|
|
1: mov r1,r15"\
|
Remove miscellaneous GCC >= 4.7 version conditionals.
This patch removes miscellaneous __GNUC_PREREQ (4, 7) conditionals
that are now dead.
Tested for x86_64 and x86 (testsuite, and that installed stripped
shared libraries are unchanged by the patch).
* sysdeps/arm/atomic-machine.h
[__GNUC_PREREQ (4, 7) && __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4]:
Change conditional to [__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4].
[__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 && !__GNUC_PREREQ (4, 7)]:
Remove conditional code.
[!__GNUC_PREREQ (4, 7) || !__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4]:
Change conditional to [!__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4].
* sysdeps/i386/sysdep.h [__ASSEMBLER__ && __GNUC_PREREQ (4, 7)]:
Change conditional to [__ASSEMBLER__].
[__ASSEMBLER__ && !__GNUC_PREREQ (4, 7)]: Remove conditional code.
[!__ASSEMBLER__ && __GNUC_PREREQ (4, 7)]: Change conditional to
[!__ASSEMBLER__].
[!__ASSEMBLER__ && !__GNUC_PREREQ (4, 7)]: Remove conditional
code.
* sysdeps/unix/sysv/linux/sh/atomic-machine.h (rNOSP): Remove
conditional macro definitions.
(__arch_compare_and_exchange_val_8_acq): Use "u" instead of rNOSP.
(__arch_compare_and_exchange_val_16_acq): Likewise.
(__arch_compare_and_exchange_val_32_acq): Likewise.
(atomic_exchange_and_add): Likewise.
(atomic_add): Likewise.
(atomic_add_negative): Likewise.
(atomic_add_zero): Likewise.
(atomic_bit_set): Likewise.
(atomic_bit_test_set): Likewise.
* sysdeps/x86_64/atomic-machine.h [__GNUC_PREREQ (4, 7)]: Make
code unconditional.
[!__GNUC_PREREQ (4, 7)]: Remove conditional code.
2015-11-04 21:34:36 +00:00
|
|
|
: "=&r" (__result), "=&r" (__tmp) : "u" (mem), "1" (__value) \
|
2012-06-22 22:29:05 +00:00
|
|
|
: "r0", "r1", "r2", "memory"); \
|
2003-02-10 09:24:12 +00:00
|
|
|
else \
|
|
|
|
{ \
|
|
|
|
__typeof (mem) memp = (mem); \
|
|
|
|
do \
|
2003-03-29 01:24:20 +00:00
|
|
|
__result = *memp; \
|
|
|
|
while (__arch_compare_and_exchange_val_64_acq \
|
2003-04-06 21:04:05 +00:00
|
|
|
(memp, __result + __value, __result) == __result); \
|
|
|
|
(void) __value; \
|
2003-02-10 09:24:12 +00:00
|
|
|
} \
|
|
|
|
__result; })
|
|
|
|
|
|
|
|
#define atomic_add(mem, value) \
|
2003-04-06 21:04:05 +00:00
|
|
|
(void) ({ __typeof (*(mem)) __tmp, __value = (value); \
|
|
|
|
if (sizeof (*(mem)) == 1) \
|
2003-02-10 09:24:12 +00:00
|
|
|
__asm __volatile ("\
|
|
|
|
mova 1f,r0\n\
|
|
|
|
mov r15,r1\n\
|
2012-06-22 22:29:05 +00:00
|
|
|
.align 2\n\
|
|
|
|
mov #(0f-1f),r15\n\
|
2003-02-10 09:24:12 +00:00
|
|
|
0: mov.b @%1,r2\n\
|
2012-06-22 22:29:05 +00:00
|
|
|
add %0,r2\n\
|
|
|
|
mov.b r2,@%1\n\
|
2003-02-10 09:24:12 +00:00
|
|
|
1: mov r1,r15"\
|
Remove miscellaneous GCC >= 4.7 version conditionals.
This patch removes miscellaneous __GNUC_PREREQ (4, 7) conditionals
that are now dead.
Tested for x86_64 and x86 (testsuite, and that installed stripped
shared libraries are unchanged by the patch).
* sysdeps/arm/atomic-machine.h
[__GNUC_PREREQ (4, 7) && __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4]:
Change conditional to [__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4].
[__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 && !__GNUC_PREREQ (4, 7)]:
Remove conditional code.
[!__GNUC_PREREQ (4, 7) || !__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4]:
Change conditional to [!__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4].
* sysdeps/i386/sysdep.h [__ASSEMBLER__ && __GNUC_PREREQ (4, 7)]:
Change conditional to [__ASSEMBLER__].
[__ASSEMBLER__ && !__GNUC_PREREQ (4, 7)]: Remove conditional code.
[!__ASSEMBLER__ && __GNUC_PREREQ (4, 7)]: Change conditional to
[!__ASSEMBLER__].
[!__ASSEMBLER__ && !__GNUC_PREREQ (4, 7)]: Remove conditional
code.
* sysdeps/unix/sysv/linux/sh/atomic-machine.h (rNOSP): Remove
conditional macro definitions.
(__arch_compare_and_exchange_val_8_acq): Use "u" instead of rNOSP.
(__arch_compare_and_exchange_val_16_acq): Likewise.
(__arch_compare_and_exchange_val_32_acq): Likewise.
(atomic_exchange_and_add): Likewise.
(atomic_add): Likewise.
(atomic_add_negative): Likewise.
(atomic_add_zero): Likewise.
(atomic_bit_set): Likewise.
(atomic_bit_test_set): Likewise.
* sysdeps/x86_64/atomic-machine.h [__GNUC_PREREQ (4, 7)]: Make
code unconditional.
[!__GNUC_PREREQ (4, 7)]: Remove conditional code.
2015-11-04 21:34:36 +00:00
|
|
|
: "=&r" (__tmp) : "u" (mem), "0" (__value) \
|
2003-02-10 09:24:12 +00:00
|
|
|
: "r0", "r1", "r2", "memory"); \
|
2003-04-06 21:04:05 +00:00
|
|
|
else if (sizeof (*(mem)) == 2) \
|
2003-02-10 09:24:12 +00:00
|
|
|
__asm __volatile ("\
|
|
|
|
mova 1f,r0\n\
|
|
|
|
mov r15,r1\n\
|
2012-06-22 22:29:05 +00:00
|
|
|
.align 2\n\
|
|
|
|
mov #(0f-1f),r15\n\
|
2003-02-10 09:24:12 +00:00
|
|
|
0: mov.w @%1,r2\n\
|
2012-06-22 22:29:05 +00:00
|
|
|
add %0,r2\n\
|
|
|
|
mov.w r2,@%1\n\
|
2003-02-10 09:24:12 +00:00
|
|
|
1: mov r1,r15"\
|
Remove miscellaneous GCC >= 4.7 version conditionals.
This patch removes miscellaneous __GNUC_PREREQ (4, 7) conditionals
that are now dead.
Tested for x86_64 and x86 (testsuite, and that installed stripped
shared libraries are unchanged by the patch).
* sysdeps/arm/atomic-machine.h
[__GNUC_PREREQ (4, 7) && __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4]:
Change conditional to [__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4].
[__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 && !__GNUC_PREREQ (4, 7)]:
Remove conditional code.
[!__GNUC_PREREQ (4, 7) || !__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4]:
Change conditional to [!__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4].
* sysdeps/i386/sysdep.h [__ASSEMBLER__ && __GNUC_PREREQ (4, 7)]:
Change conditional to [__ASSEMBLER__].
[__ASSEMBLER__ && !__GNUC_PREREQ (4, 7)]: Remove conditional code.
[!__ASSEMBLER__ && __GNUC_PREREQ (4, 7)]: Change conditional to
[!__ASSEMBLER__].
[!__ASSEMBLER__ && !__GNUC_PREREQ (4, 7)]: Remove conditional
code.
* sysdeps/unix/sysv/linux/sh/atomic-machine.h (rNOSP): Remove
conditional macro definitions.
(__arch_compare_and_exchange_val_8_acq): Use "u" instead of rNOSP.
(__arch_compare_and_exchange_val_16_acq): Likewise.
(__arch_compare_and_exchange_val_32_acq): Likewise.
(atomic_exchange_and_add): Likewise.
(atomic_add): Likewise.
(atomic_add_negative): Likewise.
(atomic_add_zero): Likewise.
(atomic_bit_set): Likewise.
(atomic_bit_test_set): Likewise.
* sysdeps/x86_64/atomic-machine.h [__GNUC_PREREQ (4, 7)]: Make
code unconditional.
[!__GNUC_PREREQ (4, 7)]: Remove conditional code.
2015-11-04 21:34:36 +00:00
|
|
|
: "=&r" (__tmp) : "u" (mem), "0" (__value) \
|
2003-02-10 09:24:12 +00:00
|
|
|
: "r0", "r1", "r2", "memory"); \
|
2003-04-06 21:04:05 +00:00
|
|
|
else if (sizeof (*(mem)) == 4) \
|
2003-02-10 09:24:12 +00:00
|
|
|
__asm __volatile ("\
|
|
|
|
mova 1f,r0\n\
|
|
|
|
mov r15,r1\n\
|
2012-06-22 22:29:05 +00:00
|
|
|
.align 2\n\
|
|
|
|
mov #(0f-1f),r15\n\
|
2003-02-10 09:24:12 +00:00
|
|
|
0: mov.l @%1,r2\n\
|
2012-06-22 22:29:05 +00:00
|
|
|
add %0,r2\n\
|
|
|
|
mov.l r2,@%1\n\
|
2003-02-10 09:24:12 +00:00
|
|
|
1: mov r1,r15"\
|
Remove miscellaneous GCC >= 4.7 version conditionals.
This patch removes miscellaneous __GNUC_PREREQ (4, 7) conditionals
that are now dead.
Tested for x86_64 and x86 (testsuite, and that installed stripped
shared libraries are unchanged by the patch).
* sysdeps/arm/atomic-machine.h
[__GNUC_PREREQ (4, 7) && __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4]:
Change conditional to [__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4].
[__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 && !__GNUC_PREREQ (4, 7)]:
Remove conditional code.
[!__GNUC_PREREQ (4, 7) || !__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4]:
Change conditional to [!__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4].
* sysdeps/i386/sysdep.h [__ASSEMBLER__ && __GNUC_PREREQ (4, 7)]:
Change conditional to [__ASSEMBLER__].
[__ASSEMBLER__ && !__GNUC_PREREQ (4, 7)]: Remove conditional code.
[!__ASSEMBLER__ && __GNUC_PREREQ (4, 7)]: Change conditional to
[!__ASSEMBLER__].
[!__ASSEMBLER__ && !__GNUC_PREREQ (4, 7)]: Remove conditional
code.
* sysdeps/unix/sysv/linux/sh/atomic-machine.h (rNOSP): Remove
conditional macro definitions.
(__arch_compare_and_exchange_val_8_acq): Use "u" instead of rNOSP.
(__arch_compare_and_exchange_val_16_acq): Likewise.
(__arch_compare_and_exchange_val_32_acq): Likewise.
(atomic_exchange_and_add): Likewise.
(atomic_add): Likewise.
(atomic_add_negative): Likewise.
(atomic_add_zero): Likewise.
(atomic_bit_set): Likewise.
(atomic_bit_test_set): Likewise.
* sysdeps/x86_64/atomic-machine.h [__GNUC_PREREQ (4, 7)]: Make
code unconditional.
[!__GNUC_PREREQ (4, 7)]: Remove conditional code.
2015-11-04 21:34:36 +00:00
|
|
|
: "=&r" (__tmp) : "u" (mem), "0" (__value) \
|
2003-02-10 09:24:12 +00:00
|
|
|
: "r0", "r1", "r2", "memory"); \
|
|
|
|
else \
|
|
|
|
{ \
|
2003-04-06 21:04:05 +00:00
|
|
|
__typeof (*(mem)) oldval; \
|
2003-02-10 09:24:12 +00:00
|
|
|
__typeof (mem) memp = (mem); \
|
|
|
|
do \
|
|
|
|
oldval = *memp; \
|
2003-03-29 01:24:20 +00:00
|
|
|
while (__arch_compare_and_exchange_val_64_acq \
|
2003-04-06 21:04:05 +00:00
|
|
|
(memp, oldval + __value, oldval) == oldval); \
|
|
|
|
(void) __value; \
|
2003-02-10 09:24:12 +00:00
|
|
|
} \
|
|
|
|
})
|
|
|
|
|
|
|
|
#define atomic_add_negative(mem, value) \
|
|
|
|
({ unsigned char __result; \
|
2003-04-06 21:04:05 +00:00
|
|
|
__typeof (*(mem)) __tmp, __value = (value); \
|
|
|
|
if (sizeof (*(mem)) == 1) \
|
2003-02-10 09:24:12 +00:00
|
|
|
__asm __volatile ("\
|
|
|
|
mova 1f,r0\n\
|
|
|
|
mov r15,r1\n\
|
2012-06-22 22:29:05 +00:00
|
|
|
.align 2\n\
|
|
|
|
mov #(0f-1f),r15\n\
|
2003-02-10 09:24:12 +00:00
|
|
|
0: mov.b @%2,r2\n\
|
2012-06-22 22:29:05 +00:00
|
|
|
add %1,r2\n\
|
|
|
|
mov.b r2,@%2\n\
|
2003-02-10 09:24:12 +00:00
|
|
|
1: mov r1,r15\n\
|
2012-06-22 22:29:05 +00:00
|
|
|
shal r2\n\
|
2003-02-10 09:24:12 +00:00
|
|
|
movt %0"\
|
Remove miscellaneous GCC >= 4.7 version conditionals.
This patch removes miscellaneous __GNUC_PREREQ (4, 7) conditionals
that are now dead.
Tested for x86_64 and x86 (testsuite, and that installed stripped
shared libraries are unchanged by the patch).
* sysdeps/arm/atomic-machine.h
[__GNUC_PREREQ (4, 7) && __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4]:
Change conditional to [__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4].
[__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 && !__GNUC_PREREQ (4, 7)]:
Remove conditional code.
[!__GNUC_PREREQ (4, 7) || !__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4]:
Change conditional to [!__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4].
* sysdeps/i386/sysdep.h [__ASSEMBLER__ && __GNUC_PREREQ (4, 7)]:
Change conditional to [__ASSEMBLER__].
[__ASSEMBLER__ && !__GNUC_PREREQ (4, 7)]: Remove conditional code.
[!__ASSEMBLER__ && __GNUC_PREREQ (4, 7)]: Change conditional to
[!__ASSEMBLER__].
[!__ASSEMBLER__ && !__GNUC_PREREQ (4, 7)]: Remove conditional
code.
* sysdeps/unix/sysv/linux/sh/atomic-machine.h (rNOSP): Remove
conditional macro definitions.
(__arch_compare_and_exchange_val_8_acq): Use "u" instead of rNOSP.
(__arch_compare_and_exchange_val_16_acq): Likewise.
(__arch_compare_and_exchange_val_32_acq): Likewise.
(atomic_exchange_and_add): Likewise.
(atomic_add): Likewise.
(atomic_add_negative): Likewise.
(atomic_add_zero): Likewise.
(atomic_bit_set): Likewise.
(atomic_bit_test_set): Likewise.
* sysdeps/x86_64/atomic-machine.h [__GNUC_PREREQ (4, 7)]: Make
code unconditional.
[!__GNUC_PREREQ (4, 7)]: Remove conditional code.
2015-11-04 21:34:36 +00:00
|
|
|
: "=r" (__result), "=&r" (__tmp) : "u" (mem), "1" (__value) \
|
2003-02-10 09:24:12 +00:00
|
|
|
: "r0", "r1", "r2", "t", "memory"); \
|
2003-04-06 21:04:05 +00:00
|
|
|
else if (sizeof (*(mem)) == 2) \
|
2003-02-10 09:24:12 +00:00
|
|
|
__asm __volatile ("\
|
|
|
|
mova 1f,r0\n\
|
|
|
|
mov r15,r1\n\
|
2012-06-22 22:29:05 +00:00
|
|
|
.align 2\n\
|
|
|
|
mov #(0f-1f),r15\n\
|
2003-02-10 09:24:12 +00:00
|
|
|
0: mov.w @%2,r2\n\
|
2012-06-22 22:29:05 +00:00
|
|
|
add %1,r2\n\
|
|
|
|
mov.w r2,@%2\n\
|
2003-02-10 09:24:12 +00:00
|
|
|
1: mov r1,r15\n\
|
2012-06-22 22:29:05 +00:00
|
|
|
shal r2\n\
|
2003-02-10 09:24:12 +00:00
|
|
|
movt %0"\
|
Remove miscellaneous GCC >= 4.7 version conditionals.
This patch removes miscellaneous __GNUC_PREREQ (4, 7) conditionals
that are now dead.
Tested for x86_64 and x86 (testsuite, and that installed stripped
shared libraries are unchanged by the patch).
* sysdeps/arm/atomic-machine.h
[__GNUC_PREREQ (4, 7) && __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4]:
Change conditional to [__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4].
[__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 && !__GNUC_PREREQ (4, 7)]:
Remove conditional code.
[!__GNUC_PREREQ (4, 7) || !__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4]:
Change conditional to [!__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4].
* sysdeps/i386/sysdep.h [__ASSEMBLER__ && __GNUC_PREREQ (4, 7)]:
Change conditional to [__ASSEMBLER__].
[__ASSEMBLER__ && !__GNUC_PREREQ (4, 7)]: Remove conditional code.
[!__ASSEMBLER__ && __GNUC_PREREQ (4, 7)]: Change conditional to
[!__ASSEMBLER__].
[!__ASSEMBLER__ && !__GNUC_PREREQ (4, 7)]: Remove conditional
code.
* sysdeps/unix/sysv/linux/sh/atomic-machine.h (rNOSP): Remove
conditional macro definitions.
(__arch_compare_and_exchange_val_8_acq): Use "u" instead of rNOSP.
(__arch_compare_and_exchange_val_16_acq): Likewise.
(__arch_compare_and_exchange_val_32_acq): Likewise.
(atomic_exchange_and_add): Likewise.
(atomic_add): Likewise.
(atomic_add_negative): Likewise.
(atomic_add_zero): Likewise.
(atomic_bit_set): Likewise.
(atomic_bit_test_set): Likewise.
* sysdeps/x86_64/atomic-machine.h [__GNUC_PREREQ (4, 7)]: Make
code unconditional.
[!__GNUC_PREREQ (4, 7)]: Remove conditional code.
2015-11-04 21:34:36 +00:00
|
|
|
: "=r" (__result), "=&r" (__tmp) : "u" (mem), "1" (__value) \
|
2003-02-10 09:24:12 +00:00
|
|
|
: "r0", "r1", "r2", "t", "memory"); \
|
2003-04-06 21:04:05 +00:00
|
|
|
else if (sizeof (*(mem)) == 4) \
|
2003-02-10 09:24:12 +00:00
|
|
|
__asm __volatile ("\
|
|
|
|
mova 1f,r0\n\
|
|
|
|
mov r15,r1\n\
|
2012-06-22 22:29:05 +00:00
|
|
|
.align 2\n\
|
|
|
|
mov #(0f-1f),r15\n\
|
2003-02-10 09:24:12 +00:00
|
|
|
0: mov.l @%2,r2\n\
|
2012-06-22 22:29:05 +00:00
|
|
|
add %1,r2\n\
|
|
|
|
mov.l r2,@%2\n\
|
2003-02-10 09:24:12 +00:00
|
|
|
1: mov r1,r15\n\
|
2012-06-22 22:29:05 +00:00
|
|
|
shal r2\n\
|
2003-02-10 09:24:12 +00:00
|
|
|
movt %0"\
|
Remove miscellaneous GCC >= 4.7 version conditionals.
This patch removes miscellaneous __GNUC_PREREQ (4, 7) conditionals
that are now dead.
Tested for x86_64 and x86 (testsuite, and that installed stripped
shared libraries are unchanged by the patch).
* sysdeps/arm/atomic-machine.h
[__GNUC_PREREQ (4, 7) && __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4]:
Change conditional to [__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4].
[__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 && !__GNUC_PREREQ (4, 7)]:
Remove conditional code.
[!__GNUC_PREREQ (4, 7) || !__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4]:
Change conditional to [!__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4].
* sysdeps/i386/sysdep.h [__ASSEMBLER__ && __GNUC_PREREQ (4, 7)]:
Change conditional to [__ASSEMBLER__].
[__ASSEMBLER__ && !__GNUC_PREREQ (4, 7)]: Remove conditional code.
[!__ASSEMBLER__ && __GNUC_PREREQ (4, 7)]: Change conditional to
[!__ASSEMBLER__].
[!__ASSEMBLER__ && !__GNUC_PREREQ (4, 7)]: Remove conditional
code.
* sysdeps/unix/sysv/linux/sh/atomic-machine.h (rNOSP): Remove
conditional macro definitions.
(__arch_compare_and_exchange_val_8_acq): Use "u" instead of rNOSP.
(__arch_compare_and_exchange_val_16_acq): Likewise.
(__arch_compare_and_exchange_val_32_acq): Likewise.
(atomic_exchange_and_add): Likewise.
(atomic_add): Likewise.
(atomic_add_negative): Likewise.
(atomic_add_zero): Likewise.
(atomic_bit_set): Likewise.
(atomic_bit_test_set): Likewise.
* sysdeps/x86_64/atomic-machine.h [__GNUC_PREREQ (4, 7)]: Make
code unconditional.
[!__GNUC_PREREQ (4, 7)]: Remove conditional code.
2015-11-04 21:34:36 +00:00
|
|
|
: "=r" (__result), "=&r" (__tmp) : "u" (mem), "1" (__value) \
|
2003-02-10 09:24:12 +00:00
|
|
|
: "r0", "r1", "r2", "t", "memory"); \
|
|
|
|
else \
|
|
|
|
abort (); \
|
|
|
|
__result; })
|
|
|
|
|
|
|
|
#define atomic_add_zero(mem, value) \
|
|
|
|
({ unsigned char __result; \
|
2003-04-06 21:04:05 +00:00
|
|
|
__typeof (*(mem)) __tmp, __value = (value); \
|
|
|
|
if (sizeof (*(mem)) == 1) \
|
2003-02-10 09:24:12 +00:00
|
|
|
__asm __volatile ("\
|
|
|
|
mova 1f,r0\n\
|
|
|
|
mov r15,r1\n\
|
2012-06-22 22:29:05 +00:00
|
|
|
.align 2\n\
|
|
|
|
mov #(0f-1f),r15\n\
|
2003-02-10 09:24:12 +00:00
|
|
|
0: mov.b @%2,r2\n\
|
2012-06-22 22:29:05 +00:00
|
|
|
add %1,r2\n\
|
|
|
|
mov.b r2,@%2\n\
|
2003-02-10 09:24:12 +00:00
|
|
|
1: mov r1,r15\n\
|
2012-06-22 22:29:05 +00:00
|
|
|
tst r2,r2\n\
|
2003-02-10 09:24:12 +00:00
|
|
|
movt %0"\
|
Remove miscellaneous GCC >= 4.7 version conditionals.
This patch removes miscellaneous __GNUC_PREREQ (4, 7) conditionals
that are now dead.
Tested for x86_64 and x86 (testsuite, and that installed stripped
shared libraries are unchanged by the patch).
* sysdeps/arm/atomic-machine.h
[__GNUC_PREREQ (4, 7) && __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4]:
Change conditional to [__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4].
[__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 && !__GNUC_PREREQ (4, 7)]:
Remove conditional code.
[!__GNUC_PREREQ (4, 7) || !__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4]:
Change conditional to [!__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4].
* sysdeps/i386/sysdep.h [__ASSEMBLER__ && __GNUC_PREREQ (4, 7)]:
Change conditional to [__ASSEMBLER__].
[__ASSEMBLER__ && !__GNUC_PREREQ (4, 7)]: Remove conditional code.
[!__ASSEMBLER__ && __GNUC_PREREQ (4, 7)]: Change conditional to
[!__ASSEMBLER__].
[!__ASSEMBLER__ && !__GNUC_PREREQ (4, 7)]: Remove conditional
code.
* sysdeps/unix/sysv/linux/sh/atomic-machine.h (rNOSP): Remove
conditional macro definitions.
(__arch_compare_and_exchange_val_8_acq): Use "u" instead of rNOSP.
(__arch_compare_and_exchange_val_16_acq): Likewise.
(__arch_compare_and_exchange_val_32_acq): Likewise.
(atomic_exchange_and_add): Likewise.
(atomic_add): Likewise.
(atomic_add_negative): Likewise.
(atomic_add_zero): Likewise.
(atomic_bit_set): Likewise.
(atomic_bit_test_set): Likewise.
* sysdeps/x86_64/atomic-machine.h [__GNUC_PREREQ (4, 7)]: Make
code unconditional.
[!__GNUC_PREREQ (4, 7)]: Remove conditional code.
2015-11-04 21:34:36 +00:00
|
|
|
: "=r" (__result), "=&r" (__tmp) : "u" (mem), "1" (__value) \
|
2003-02-10 09:24:12 +00:00
|
|
|
: "r0", "r1", "r2", "t", "memory"); \
|
2003-04-06 21:04:05 +00:00
|
|
|
else if (sizeof (*(mem)) == 2) \
|
2003-02-10 09:24:12 +00:00
|
|
|
__asm __volatile ("\
|
|
|
|
mova 1f,r0\n\
|
|
|
|
mov r15,r1\n\
|
2012-06-22 22:29:05 +00:00
|
|
|
.align 2\n\
|
|
|
|
mov #(0f-1f),r15\n\
|
2003-02-10 09:24:12 +00:00
|
|
|
0: mov.w @%2,r2\n\
|
2012-06-22 22:29:05 +00:00
|
|
|
add %1,r2\n\
|
|
|
|
mov.w r2,@%2\n\
|
2003-02-10 09:24:12 +00:00
|
|
|
1: mov r1,r15\n\
|
2012-06-22 22:29:05 +00:00
|
|
|
tst r2,r2\n\
|
2003-02-10 09:24:12 +00:00
|
|
|
movt %0"\
|
Remove miscellaneous GCC >= 4.7 version conditionals.
This patch removes miscellaneous __GNUC_PREREQ (4, 7) conditionals
that are now dead.
Tested for x86_64 and x86 (testsuite, and that installed stripped
shared libraries are unchanged by the patch).
* sysdeps/arm/atomic-machine.h
[__GNUC_PREREQ (4, 7) && __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4]:
Change conditional to [__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4].
[__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 && !__GNUC_PREREQ (4, 7)]:
Remove conditional code.
[!__GNUC_PREREQ (4, 7) || !__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4]:
Change conditional to [!__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4].
* sysdeps/i386/sysdep.h [__ASSEMBLER__ && __GNUC_PREREQ (4, 7)]:
Change conditional to [__ASSEMBLER__].
[__ASSEMBLER__ && !__GNUC_PREREQ (4, 7)]: Remove conditional code.
[!__ASSEMBLER__ && __GNUC_PREREQ (4, 7)]: Change conditional to
[!__ASSEMBLER__].
[!__ASSEMBLER__ && !__GNUC_PREREQ (4, 7)]: Remove conditional
code.
* sysdeps/unix/sysv/linux/sh/atomic-machine.h (rNOSP): Remove
conditional macro definitions.
(__arch_compare_and_exchange_val_8_acq): Use "u" instead of rNOSP.
(__arch_compare_and_exchange_val_16_acq): Likewise.
(__arch_compare_and_exchange_val_32_acq): Likewise.
(atomic_exchange_and_add): Likewise.
(atomic_add): Likewise.
(atomic_add_negative): Likewise.
(atomic_add_zero): Likewise.
(atomic_bit_set): Likewise.
(atomic_bit_test_set): Likewise.
* sysdeps/x86_64/atomic-machine.h [__GNUC_PREREQ (4, 7)]: Make
code unconditional.
[!__GNUC_PREREQ (4, 7)]: Remove conditional code.
2015-11-04 21:34:36 +00:00
|
|
|
: "=r" (__result), "=&r" (__tmp) : "u" (mem), "1" (__value) \
|
2003-02-10 09:24:12 +00:00
|
|
|
: "r0", "r1", "r2", "t", "memory"); \
|
2003-04-06 21:04:05 +00:00
|
|
|
else if (sizeof (*(mem)) == 4) \
|
2003-02-10 09:24:12 +00:00
|
|
|
__asm __volatile ("\
|
|
|
|
mova 1f,r0\n\
|
|
|
|
mov r15,r1\n\
|
2012-06-22 22:29:05 +00:00
|
|
|
.align 2\n\
|
|
|
|
mov #(0f-1f),r15\n\
|
2003-02-10 09:24:12 +00:00
|
|
|
0: mov.l @%2,r2\n\
|
2012-06-22 22:29:05 +00:00
|
|
|
add %1,r2\n\
|
|
|
|
mov.l r2,@%2\n\
|
2003-02-10 09:24:12 +00:00
|
|
|
1: mov r1,r15\n\
|
2012-06-22 22:29:05 +00:00
|
|
|
tst r2,r2\n\
|
2003-02-10 09:24:12 +00:00
|
|
|
movt %0"\
|
Remove miscellaneous GCC >= 4.7 version conditionals.
This patch removes miscellaneous __GNUC_PREREQ (4, 7) conditionals
that are now dead.
Tested for x86_64 and x86 (testsuite, and that installed stripped
shared libraries are unchanged by the patch).
* sysdeps/arm/atomic-machine.h
[__GNUC_PREREQ (4, 7) && __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4]:
Change conditional to [__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4].
[__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 && !__GNUC_PREREQ (4, 7)]:
Remove conditional code.
[!__GNUC_PREREQ (4, 7) || !__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4]:
Change conditional to [!__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4].
* sysdeps/i386/sysdep.h [__ASSEMBLER__ && __GNUC_PREREQ (4, 7)]:
Change conditional to [__ASSEMBLER__].
[__ASSEMBLER__ && !__GNUC_PREREQ (4, 7)]: Remove conditional code.
[!__ASSEMBLER__ && __GNUC_PREREQ (4, 7)]: Change conditional to
[!__ASSEMBLER__].
[!__ASSEMBLER__ && !__GNUC_PREREQ (4, 7)]: Remove conditional
code.
* sysdeps/unix/sysv/linux/sh/atomic-machine.h (rNOSP): Remove
conditional macro definitions.
(__arch_compare_and_exchange_val_8_acq): Use "u" instead of rNOSP.
(__arch_compare_and_exchange_val_16_acq): Likewise.
(__arch_compare_and_exchange_val_32_acq): Likewise.
(atomic_exchange_and_add): Likewise.
(atomic_add): Likewise.
(atomic_add_negative): Likewise.
(atomic_add_zero): Likewise.
(atomic_bit_set): Likewise.
(atomic_bit_test_set): Likewise.
* sysdeps/x86_64/atomic-machine.h [__GNUC_PREREQ (4, 7)]: Make
code unconditional.
[!__GNUC_PREREQ (4, 7)]: Remove conditional code.
2015-11-04 21:34:36 +00:00
|
|
|
: "=r" (__result), "=&r" (__tmp) : "u" (mem), "1" (__value) \
|
2003-02-10 09:24:12 +00:00
|
|
|
: "r0", "r1", "r2", "t", "memory"); \
|
|
|
|
else \
|
|
|
|
abort (); \
|
|
|
|
__result; })
|
|
|
|
|
|
|
|
#define atomic_increment_and_test(mem) atomic_add_zero((mem), 1)
|
|
|
|
#define atomic_decrement_and_test(mem) atomic_add_zero((mem), -1)
|
|
|
|
|
|
|
|
#define atomic_bit_set(mem, bit) \
|
|
|
|
(void) ({ unsigned int __mask = 1 << (bit); \
|
2003-04-06 21:04:05 +00:00
|
|
|
if (sizeof (*(mem)) == 1) \
|
2003-02-10 09:24:12 +00:00
|
|
|
__asm __volatile ("\
|
|
|
|
mova 1f,r0\n\
|
|
|
|
mov r15,r1\n\
|
2012-06-22 22:29:05 +00:00
|
|
|
.align 2\n\
|
|
|
|
mov #(0f-1f),r15\n\
|
2003-02-10 09:24:12 +00:00
|
|
|
0: mov.b @%0,r2\n\
|
|
|
|
or %1,r2\n\
|
|
|
|
mov.b r2,@%0\n\
|
|
|
|
1: mov r1,r15"\
|
Remove miscellaneous GCC >= 4.7 version conditionals.
This patch removes miscellaneous __GNUC_PREREQ (4, 7) conditionals
that are now dead.
Tested for x86_64 and x86 (testsuite, and that installed stripped
shared libraries are unchanged by the patch).
* sysdeps/arm/atomic-machine.h
[__GNUC_PREREQ (4, 7) && __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4]:
Change conditional to [__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4].
[__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 && !__GNUC_PREREQ (4, 7)]:
Remove conditional code.
[!__GNUC_PREREQ (4, 7) || !__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4]:
Change conditional to [!__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4].
* sysdeps/i386/sysdep.h [__ASSEMBLER__ && __GNUC_PREREQ (4, 7)]:
Change conditional to [__ASSEMBLER__].
[__ASSEMBLER__ && !__GNUC_PREREQ (4, 7)]: Remove conditional code.
[!__ASSEMBLER__ && __GNUC_PREREQ (4, 7)]: Change conditional to
[!__ASSEMBLER__].
[!__ASSEMBLER__ && !__GNUC_PREREQ (4, 7)]: Remove conditional
code.
* sysdeps/unix/sysv/linux/sh/atomic-machine.h (rNOSP): Remove
conditional macro definitions.
(__arch_compare_and_exchange_val_8_acq): Use "u" instead of rNOSP.
(__arch_compare_and_exchange_val_16_acq): Likewise.
(__arch_compare_and_exchange_val_32_acq): Likewise.
(atomic_exchange_and_add): Likewise.
(atomic_add): Likewise.
(atomic_add_negative): Likewise.
(atomic_add_zero): Likewise.
(atomic_bit_set): Likewise.
(atomic_bit_test_set): Likewise.
* sysdeps/x86_64/atomic-machine.h [__GNUC_PREREQ (4, 7)]: Make
code unconditional.
[!__GNUC_PREREQ (4, 7)]: Remove conditional code.
2015-11-04 21:34:36 +00:00
|
|
|
: : "u" (mem), "u" (__mask) \
|
2003-02-10 09:24:12 +00:00
|
|
|
: "r0", "r1", "r2", "memory"); \
|
2003-04-06 21:04:05 +00:00
|
|
|
else if (sizeof (*(mem)) == 2) \
|
2003-02-10 09:24:12 +00:00
|
|
|
__asm __volatile ("\
|
|
|
|
mova 1f,r0\n\
|
|
|
|
mov r15,r1\n\
|
2012-06-22 22:29:05 +00:00
|
|
|
.align 2\n\
|
|
|
|
mov #(0f-1f),r15\n\
|
2003-02-10 09:24:12 +00:00
|
|
|
0: mov.w @%0,r2\n\
|
|
|
|
or %1,r2\n\
|
|
|
|
mov.w r2,@%0\n\
|
|
|
|
1: mov r1,r15"\
|
Remove miscellaneous GCC >= 4.7 version conditionals.
This patch removes miscellaneous __GNUC_PREREQ (4, 7) conditionals
that are now dead.
Tested for x86_64 and x86 (testsuite, and that installed stripped
shared libraries are unchanged by the patch).
* sysdeps/arm/atomic-machine.h
[__GNUC_PREREQ (4, 7) && __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4]:
Change conditional to [__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4].
[__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 && !__GNUC_PREREQ (4, 7)]:
Remove conditional code.
[!__GNUC_PREREQ (4, 7) || !__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4]:
Change conditional to [!__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4].
* sysdeps/i386/sysdep.h [__ASSEMBLER__ && __GNUC_PREREQ (4, 7)]:
Change conditional to [__ASSEMBLER__].
[__ASSEMBLER__ && !__GNUC_PREREQ (4, 7)]: Remove conditional code.
[!__ASSEMBLER__ && __GNUC_PREREQ (4, 7)]: Change conditional to
[!__ASSEMBLER__].
[!__ASSEMBLER__ && !__GNUC_PREREQ (4, 7)]: Remove conditional
code.
* sysdeps/unix/sysv/linux/sh/atomic-machine.h (rNOSP): Remove
conditional macro definitions.
(__arch_compare_and_exchange_val_8_acq): Use "u" instead of rNOSP.
(__arch_compare_and_exchange_val_16_acq): Likewise.
(__arch_compare_and_exchange_val_32_acq): Likewise.
(atomic_exchange_and_add): Likewise.
(atomic_add): Likewise.
(atomic_add_negative): Likewise.
(atomic_add_zero): Likewise.
(atomic_bit_set): Likewise.
(atomic_bit_test_set): Likewise.
* sysdeps/x86_64/atomic-machine.h [__GNUC_PREREQ (4, 7)]: Make
code unconditional.
[!__GNUC_PREREQ (4, 7)]: Remove conditional code.
2015-11-04 21:34:36 +00:00
|
|
|
: : "u" (mem), "u" (__mask) \
|
2003-02-10 09:24:12 +00:00
|
|
|
: "r0", "r1", "r2", "memory"); \
|
2003-04-06 21:04:05 +00:00
|
|
|
else if (sizeof (*(mem)) == 4) \
|
2003-02-10 09:24:12 +00:00
|
|
|
__asm __volatile ("\
|
|
|
|
mova 1f,r0\n\
|
|
|
|
mov r15,r1\n\
|
2012-06-22 22:29:05 +00:00
|
|
|
.align 2\n\
|
|
|
|
mov #(0f-1f),r15\n\
|
2003-02-10 09:24:12 +00:00
|
|
|
0: mov.l @%0,r2\n\
|
|
|
|
or %1,r2\n\
|
|
|
|
mov.l r2,@%0\n\
|
|
|
|
1: mov r1,r15"\
|
Remove miscellaneous GCC >= 4.7 version conditionals.
This patch removes miscellaneous __GNUC_PREREQ (4, 7) conditionals
that are now dead.
Tested for x86_64 and x86 (testsuite, and that installed stripped
shared libraries are unchanged by the patch).
* sysdeps/arm/atomic-machine.h
[__GNUC_PREREQ (4, 7) && __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4]:
Change conditional to [__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4].
[__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 && !__GNUC_PREREQ (4, 7)]:
Remove conditional code.
[!__GNUC_PREREQ (4, 7) || !__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4]:
Change conditional to [!__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4].
* sysdeps/i386/sysdep.h [__ASSEMBLER__ && __GNUC_PREREQ (4, 7)]:
Change conditional to [__ASSEMBLER__].
[__ASSEMBLER__ && !__GNUC_PREREQ (4, 7)]: Remove conditional code.
[!__ASSEMBLER__ && __GNUC_PREREQ (4, 7)]: Change conditional to
[!__ASSEMBLER__].
[!__ASSEMBLER__ && !__GNUC_PREREQ (4, 7)]: Remove conditional
code.
* sysdeps/unix/sysv/linux/sh/atomic-machine.h (rNOSP): Remove
conditional macro definitions.
(__arch_compare_and_exchange_val_8_acq): Use "u" instead of rNOSP.
(__arch_compare_and_exchange_val_16_acq): Likewise.
(__arch_compare_and_exchange_val_32_acq): Likewise.
(atomic_exchange_and_add): Likewise.
(atomic_add): Likewise.
(atomic_add_negative): Likewise.
(atomic_add_zero): Likewise.
(atomic_bit_set): Likewise.
(atomic_bit_test_set): Likewise.
* sysdeps/x86_64/atomic-machine.h [__GNUC_PREREQ (4, 7)]: Make
code unconditional.
[!__GNUC_PREREQ (4, 7)]: Remove conditional code.
2015-11-04 21:34:36 +00:00
|
|
|
: : "u" (mem), "u" (__mask) \
|
2003-02-10 09:24:12 +00:00
|
|
|
: "r0", "r1", "r2", "memory"); \
|
|
|
|
else \
|
|
|
|
abort (); \
|
|
|
|
})
|
|
|
|
|
|
|
|
#define atomic_bit_test_set(mem, bit) \
|
|
|
|
({ unsigned int __mask = 1 << (bit); \
|
|
|
|
unsigned int __result = __mask; \
|
2003-04-06 21:04:05 +00:00
|
|
|
if (sizeof (*(mem)) == 1) \
|
2003-02-10 09:24:12 +00:00
|
|
|
__asm __volatile ("\
|
|
|
|
mova 1f,r0\n\
|
2012-06-22 22:29:05 +00:00
|
|
|
.align 2\n\
|
2003-02-10 09:24:12 +00:00
|
|
|
mov r15,r1\n\
|
2012-06-22 22:29:05 +00:00
|
|
|
mov #(0f-1f),r15\n\
|
2003-02-10 09:24:12 +00:00
|
|
|
0: mov.b @%2,r2\n\
|
2012-06-22 22:29:05 +00:00
|
|
|
mov r2,r3\n\
|
|
|
|
or %1,r2\n\
|
|
|
|
mov.b r2,@%2\n\
|
|
|
|
1: mov r1,r15\n\
|
|
|
|
and r3,%0"\
|
2003-02-10 09:24:12 +00:00
|
|
|
: "=&r" (__result), "=&r" (__mask) \
|
Remove miscellaneous GCC >= 4.7 version conditionals.
This patch removes miscellaneous __GNUC_PREREQ (4, 7) conditionals
that are now dead.
Tested for x86_64 and x86 (testsuite, and that installed stripped
shared libraries are unchanged by the patch).
* sysdeps/arm/atomic-machine.h
[__GNUC_PREREQ (4, 7) && __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4]:
Change conditional to [__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4].
[__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 && !__GNUC_PREREQ (4, 7)]:
Remove conditional code.
[!__GNUC_PREREQ (4, 7) || !__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4]:
Change conditional to [!__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4].
* sysdeps/i386/sysdep.h [__ASSEMBLER__ && __GNUC_PREREQ (4, 7)]:
Change conditional to [__ASSEMBLER__].
[__ASSEMBLER__ && !__GNUC_PREREQ (4, 7)]: Remove conditional code.
[!__ASSEMBLER__ && __GNUC_PREREQ (4, 7)]: Change conditional to
[!__ASSEMBLER__].
[!__ASSEMBLER__ && !__GNUC_PREREQ (4, 7)]: Remove conditional
code.
* sysdeps/unix/sysv/linux/sh/atomic-machine.h (rNOSP): Remove
conditional macro definitions.
(__arch_compare_and_exchange_val_8_acq): Use "u" instead of rNOSP.
(__arch_compare_and_exchange_val_16_acq): Likewise.
(__arch_compare_and_exchange_val_32_acq): Likewise.
(atomic_exchange_and_add): Likewise.
(atomic_add): Likewise.
(atomic_add_negative): Likewise.
(atomic_add_zero): Likewise.
(atomic_bit_set): Likewise.
(atomic_bit_test_set): Likewise.
* sysdeps/x86_64/atomic-machine.h [__GNUC_PREREQ (4, 7)]: Make
code unconditional.
[!__GNUC_PREREQ (4, 7)]: Remove conditional code.
2015-11-04 21:34:36 +00:00
|
|
|
: "u" (mem), "0" (__result), "1" (__mask) \
|
2012-06-22 22:29:05 +00:00
|
|
|
: "r0", "r1", "r2", "r3", "memory"); \
|
2003-04-06 21:04:05 +00:00
|
|
|
else if (sizeof (*(mem)) == 2) \
|
2003-02-10 09:24:12 +00:00
|
|
|
__asm __volatile ("\
|
|
|
|
mova 1f,r0\n\
|
2012-06-22 22:29:05 +00:00
|
|
|
.align 2\n\
|
2003-02-10 09:24:12 +00:00
|
|
|
mov r15,r1\n\
|
2012-06-22 22:29:05 +00:00
|
|
|
mov #(0f-1f),r15\n\
|
2003-02-10 09:24:12 +00:00
|
|
|
0: mov.w @%2,r2\n\
|
2012-06-22 22:29:05 +00:00
|
|
|
mov r2,r3\n\
|
|
|
|
or %1,r2\n\
|
2003-02-10 09:24:12 +00:00
|
|
|
mov.w %1,@%2\n\
|
2012-06-22 22:29:05 +00:00
|
|
|
1: mov r1,r15\n\
|
|
|
|
and r3,%0"\
|
2003-02-10 09:24:12 +00:00
|
|
|
: "=&r" (__result), "=&r" (__mask) \
|
Remove miscellaneous GCC >= 4.7 version conditionals.
This patch removes miscellaneous __GNUC_PREREQ (4, 7) conditionals
that are now dead.
Tested for x86_64 and x86 (testsuite, and that installed stripped
shared libraries are unchanged by the patch).
* sysdeps/arm/atomic-machine.h
[__GNUC_PREREQ (4, 7) && __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4]:
Change conditional to [__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4].
[__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 && !__GNUC_PREREQ (4, 7)]:
Remove conditional code.
[!__GNUC_PREREQ (4, 7) || !__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4]:
Change conditional to [!__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4].
* sysdeps/i386/sysdep.h [__ASSEMBLER__ && __GNUC_PREREQ (4, 7)]:
Change conditional to [__ASSEMBLER__].
[__ASSEMBLER__ && !__GNUC_PREREQ (4, 7)]: Remove conditional code.
[!__ASSEMBLER__ && __GNUC_PREREQ (4, 7)]: Change conditional to
[!__ASSEMBLER__].
[!__ASSEMBLER__ && !__GNUC_PREREQ (4, 7)]: Remove conditional
code.
* sysdeps/unix/sysv/linux/sh/atomic-machine.h (rNOSP): Remove
conditional macro definitions.
(__arch_compare_and_exchange_val_8_acq): Use "u" instead of rNOSP.
(__arch_compare_and_exchange_val_16_acq): Likewise.
(__arch_compare_and_exchange_val_32_acq): Likewise.
(atomic_exchange_and_add): Likewise.
(atomic_add): Likewise.
(atomic_add_negative): Likewise.
(atomic_add_zero): Likewise.
(atomic_bit_set): Likewise.
(atomic_bit_test_set): Likewise.
* sysdeps/x86_64/atomic-machine.h [__GNUC_PREREQ (4, 7)]: Make
code unconditional.
[!__GNUC_PREREQ (4, 7)]: Remove conditional code.
2015-11-04 21:34:36 +00:00
|
|
|
: "u" (mem), "0" (__result), "1" (__mask) \
|
2012-06-22 22:29:05 +00:00
|
|
|
: "r0", "r1", "r2", "r3", "memory"); \
|
2003-04-06 21:04:05 +00:00
|
|
|
else if (sizeof (*(mem)) == 4) \
|
2003-02-10 09:24:12 +00:00
|
|
|
__asm __volatile ("\
|
|
|
|
mova 1f,r0\n\
|
2012-06-22 22:29:05 +00:00
|
|
|
.align 2\n\
|
2003-02-10 09:24:12 +00:00
|
|
|
mov r15,r1\n\
|
2012-06-22 22:29:05 +00:00
|
|
|
mov #(0f-1f),r15\n\
|
2003-02-10 09:24:12 +00:00
|
|
|
0: mov.l @%2,r2\n\
|
2012-06-22 22:29:05 +00:00
|
|
|
mov r2,r3\n\
|
2003-02-10 09:24:12 +00:00
|
|
|
or r2,%1\n\
|
|
|
|
mov.l %1,@%2\n\
|
2012-06-22 22:29:05 +00:00
|
|
|
1: mov r1,r15\n\
|
|
|
|
and r3,%0"\
|
2003-02-10 09:24:12 +00:00
|
|
|
: "=&r" (__result), "=&r" (__mask) \
|
Remove miscellaneous GCC >= 4.7 version conditionals.
This patch removes miscellaneous __GNUC_PREREQ (4, 7) conditionals
that are now dead.
Tested for x86_64 and x86 (testsuite, and that installed stripped
shared libraries are unchanged by the patch).
* sysdeps/arm/atomic-machine.h
[__GNUC_PREREQ (4, 7) && __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4]:
Change conditional to [__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4].
[__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 && !__GNUC_PREREQ (4, 7)]:
Remove conditional code.
[!__GNUC_PREREQ (4, 7) || !__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4]:
Change conditional to [!__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4].
* sysdeps/i386/sysdep.h [__ASSEMBLER__ && __GNUC_PREREQ (4, 7)]:
Change conditional to [__ASSEMBLER__].
[__ASSEMBLER__ && !__GNUC_PREREQ (4, 7)]: Remove conditional code.
[!__ASSEMBLER__ && __GNUC_PREREQ (4, 7)]: Change conditional to
[!__ASSEMBLER__].
[!__ASSEMBLER__ && !__GNUC_PREREQ (4, 7)]: Remove conditional
code.
* sysdeps/unix/sysv/linux/sh/atomic-machine.h (rNOSP): Remove
conditional macro definitions.
(__arch_compare_and_exchange_val_8_acq): Use "u" instead of rNOSP.
(__arch_compare_and_exchange_val_16_acq): Likewise.
(__arch_compare_and_exchange_val_32_acq): Likewise.
(atomic_exchange_and_add): Likewise.
(atomic_add): Likewise.
(atomic_add_negative): Likewise.
(atomic_add_zero): Likewise.
(atomic_bit_set): Likewise.
(atomic_bit_test_set): Likewise.
* sysdeps/x86_64/atomic-machine.h [__GNUC_PREREQ (4, 7)]: Make
code unconditional.
[!__GNUC_PREREQ (4, 7)]: Remove conditional code.
2015-11-04 21:34:36 +00:00
|
|
|
: "u" (mem), "0" (__result), "1" (__mask) \
|
2012-06-22 22:29:05 +00:00
|
|
|
: "r0", "r1", "r2", "r3", "memory"); \
|
2003-02-10 09:24:12 +00:00
|
|
|
else \
|
|
|
|
abort (); \
|
|
|
|
__result; })
|