From d15851ec24d31ccf3ee9a4a388104974d1f494dc Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Sat, 22 Mar 2003 23:01:01 +0000 Subject: * include/atomic.h (atomic_increment_and_test): Invert sense of test. Add comment. (atomic_decrement_and_test): Add comment. 2003-03-22 Jakub Jelinek * include/atomic.h (atomic_compare_and_exchange_val_acq): Add comment. Don't define if __arch_compare_and_exchange_val_32_acq is not defined. (atomic_compare_and_exchange_bool_acq): Add comment. Don't use __oldval variable in the macro, since it might be macro argument. (atomic_decrement_if_positive): Initialize __memp, remove setting of non-existent variable. (atomic_bit_test_set): Cast 1 to __typeof (*mem) before shifting. * sysdeps/ia64/bits/atomic.h (atomic_exchange_and_add): Implement using atomic_compare_and_exchange_val_acq. (atomic_decrement_if_positive, atomic_bit_test_set): Define. * sysdeps/s390/bits/atomic.h (__arch_compare_and_exchange_val_8_acq): Renamed from... (__arch_compare_and_exchange_bool_8_acq): ... this. (__arch_compare_and_exchange_val_16_acq): Renamed from... (__arch_compare_and_exchange_bool_16_acq): ... this. (__arch_compare_and_exchange_val_32_acq): Return old value. Renamed from... (__arch_compare_and_exchange_bool_32_acq): ... this. (__arch_compare_and_exchange_val_64_acq): Return old value. Renamed from... (__arch_compare_and_exchange_bool_64_acq): ... this. (__arch_compare_and_exchange_val_32_acq): Use __typeof for local variables types instead of assuming int. Change prefix of local variables to __arch. * sysdeps/generic/bits/atomic.h (arch_compare_and_exchange_acq): Remove. (atomic_compare_and_exchange_val_acq, atomic_compare_and_exchange_bool_acq): Define. * csu/tst-atomic.c: New test. * csu/tst-atomic-long.c: New test. * csu/Makefile (tests): Add tst-atomic and tst-atomic-long. * malloc/memusagestat.c (main): Kill warning if uint64_t is ulong. * sysdeps/s390/Versions: Add trailing newline. * sysdeps/unix/sysv/linux/sysconf.c (__sysconf): Kill warning if INTERNAL_SYSCALL_ERROR_P doesn't use its first argument. --- sysdeps/s390/bits/atomic.h | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) (limited to 'sysdeps/s390') diff --git a/sysdeps/s390/bits/atomic.h b/sysdeps/s390/bits/atomic.h index 74321b62ae..8504458cc7 100644 --- a/sysdeps/s390/bits/atomic.h +++ b/sysdeps/s390/bits/atomic.h @@ -45,34 +45,32 @@ typedef intmax_t atomic_max_t; typedef uintmax_t uatomic_max_t; -#define __arch_compare_and_exchange_bool_8_acq(mem, newval, oldval) \ +#define __arch_compare_and_exchange_val_8_acq(mem, newval, oldval) \ (abort (), 0) -#define __arch_compare_and_exchange_bool_16_acq(mem, newval, oldval) \ +#define __arch_compare_and_exchange_val_16_acq(mem, newval, oldval) \ (abort (), 0) -#define __arch_compare_and_exchange_bool_32_acq(mem, newval, oldval) \ - ({ unsigned int *__mem = (unsigned int *) (mem); \ - unsigned int __old = (unsigned int) (oldval); \ - unsigned int __cmp = __old; \ +#define __arch_compare_and_exchange_val_32_acq(mem, newval, oldval) \ + ({ __typeof (mem) __archmem = (mem); \ + __typeof (*mem) __archold = (oldval); \ __asm __volatile ("cs %0,%2,%1" \ - : "+d" (__old), "=Q" (*__mem) \ - : "d" (newval), "m" (*__mem) : "cc" ); \ - __cmp != __old; }) + : "+d" (__archold), "=Q" (*__archmem) \ + : "d" (newval), "m" (*__archmem) : "cc" ); \ + __archold; }) #ifdef __s390x__ -# define __arch_compare_and_exchange_bool_64_acq(mem, newval, oldval) \ - ({ unsigned long int *__mem = (unsigned long int *) (mem); \ - unsigned long int __old = (unsigned long int) (oldval); \ - unsigned long int __cmp = __old; \ +# define __arch_compare_and_exchange_val_64_acq(mem, newval, oldval) \ + ({ __typeof (mem) __archmem = (mem); \ + __typeof (*mem) __archold = (oldval); \ __asm __volatile ("csg %0,%2,%1" \ - : "+d" (__old), "=Q" (*__mem) \ - : "d" (newval), "m" (*__mem) : "cc" ); \ - __cmp != __old; }) + : "+d" (__archold), "=Q" (*__archmem) \ + : "d" (newval), "m" (*__archmem) : "cc" ); \ + __archold; }) #else /* For 31 bit we do not really need 64-bit compare-and-exchange. We can implement them by use of the csd instruction. The straightforward implementation causes warnings so we skip the definition for now. */ -# define __arch_compare_and_exchange_bool_64_acq(mem, newval, oldval) \ +# define __arch_compare_and_exchange_val_64_acq(mem, newval, oldval) \ (abort (), 0) #endif -- cgit 1.4.1