diff options
| author | ivmai <ivmai> | 2011-06-07 09:48:44 +0000 |
|---|---|---|
| committer | Ivan Maidanski <ivmai@mail.ru> | 2011-07-25 16:03:27 +0400 |
| commit | cda8cde323792a47ad6239e00801f9496a928f43 (patch) | |
| tree | 98763dd560f5a4c8388d96520ef316f6d3e16945 | |
| parent | 28f11cc87457c812ff43ec827b11bf3af13feeab (diff) | |
| download | libatomic_ops-cda8cde323792a47ad6239e00801f9496a928f43.tar.gz | |
2011-06-07 Ivan Maidanski <ivmai@mail.ru>
* src/atomic_ops/generalize.h: Reformat code.
* src/atomic_ops/generalize.h (AO_test_and_set_acquire): Fix
return type.
* src/atomic_ops/sysdeps/armcc/arm_v6.h (AO_test_and_set): Ditto.
* src/atomic_ops/sysdeps/gcc/arm.h (AO_test_and_set): Ditto.
* src/atomic_ops/sysdeps/gcc/arm.h (AO_test_and_set): Add
a comment (about SWP instruction).
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | src/atomic_ops/generalize.h | 1590 | ||||
| -rw-r--r-- | src/atomic_ops/sysdeps/armcc/arm_v6.h | 16 | ||||
| -rw-r--r-- | src/atomic_ops/sysdeps/gcc/arm.h | 5 |
4 files changed, 764 insertions, 857 deletions
@@ -1,3 +1,13 @@ +2011-06-07 Ivan Maidanski <ivmai@mail.ru> + + * src/atomic_ops/generalize.h: Reformat code. + * src/atomic_ops/generalize.h (AO_test_and_set_acquire): Fix + return type. + * src/atomic_ops/sysdeps/armcc/arm_v6.h (AO_test_and_set): Ditto. + * src/atomic_ops/sysdeps/gcc/arm.h (AO_test_and_set): Ditto. + * src/atomic_ops/sysdeps/gcc/arm.h (AO_test_and_set): Add + a comment (about SWP instruction). + 2011-06-06 Ivan Maidanski <ivmai@mail.ru> * src/atomic_ops/sysdeps/gcc/arm.h (AO_THUMB_GO_ARM, diff --git a/src/atomic_ops/generalize.h b/src/atomic_ops/generalize.h index 800aaa4..d6c8e93 100644 --- a/src/atomic_ops/generalize.h +++ b/src/atomic_ops/generalize.h @@ -49,96 +49,91 @@ #if AO_CHAR_TS_T # define AO_TS_COMPARE_AND_SWAP_FULL(a,o,n) \ - AO_char_compare_and_swap_full(a,o,n) + AO_char_compare_and_swap_full(a,o,n) # define AO_TS_COMPARE_AND_SWAP_ACQUIRE(a,o,n) \ - AO_char_compare_and_swap_acquire(a,o,n) + AO_char_compare_and_swap_acquire(a,o,n) # define AO_TS_COMPARE_AND_SWAP_RELEASE(a,o,n) \ - AO_char_compare_and_swap_release(a,o,n) -# define AO_TS_COMPARE_AND_SWAP(a,o,n) \ - AO_char_compare_and_swap(a,o,n) + AO_char_compare_and_swap_release(a,o,n) +# define AO_TS_COMPARE_AND_SWAP(a,o,n) AO_char_compare_and_swap(a,o,n) #endif #if AO_AO_TS_T -# define AO_TS_COMPARE_AND_SWAP_FULL(a,o,n) \ - AO_compare_and_swap_full(a,o,n) +# define AO_TS_COMPARE_AND_SWAP_FULL(a,o,n) AO_compare_and_swap_full(a,o,n) # define AO_TS_COMPARE_AND_SWAP_ACQUIRE(a,o,n) \ - AO_compare_and_swap_acquire(a,o,n) + AO_compare_and_swap_acquire(a,o,n) # define AO_TS_COMPARE_AND_SWAP_RELEASE(a,o,n) \ - AO_compare_and_swap_release(a,o,n) -# define AO_TS_COMPARE_AND_SWAP(a,o,n) \ - AO_compare_and_swap(a,o,n) + AO_compare_and_swap_release(a,o,n) +# define AO_TS_COMPARE_AND_SWAP(a,o,n) AO_compare_and_swap(a,o,n) #endif /* Generate test_and_set_full, if necessary and possible. */ -#if !defined(AO_HAVE_test_and_set) && \ - !defined(AO_HAVE_test_and_set_release) && \ - !defined(AO_HAVE_test_and_set_acquire) && \ - !defined(AO_HAVE_test_and_set_read) && \ - !defined(AO_HAVE_test_and_set_full) -# if AO_AO_TS_T && defined(AO_HAVE_compare_and_swap_full) || \ - AO_CHAR_TS_T && defined(AO_HAVE_char_compare_and_swap_full) - AO_INLINE AO_TS_VAL_t - AO_test_and_set_full(volatile AO_TS_t *addr) - { - if (AO_TS_COMPARE_AND_SWAP_FULL(addr, AO_TS_CLEAR, AO_TS_SET)) - return AO_TS_CLEAR; - else - return AO_TS_SET; - } -# define AO_HAVE_test_and_set_full -# endif /* AO_HAVE_compare_and_swap_full */ - -# if AO_AO_TS_T && defined(AO_HAVE_compare_and_swap_acquire) || \ - AO_CHAR_TS_T && defined(AO_HAVE_char_compare_and_swap_acquire) - AO_INLINE AO_TS_VAL_t - AO_test_and_set_acquire(volatile AO_TS_t *addr) - { - if (AO_TS_COMPARE_AND_SWAP_ACQUIRE(addr, AO_TS_CLEAR, AO_TS_SET)) - return AO_TS_CLEAR; - else - return AO_TS_SET; - } -# define AO_HAVE_test_and_set_acquire -# endif /* AO_HAVE_compare_and_swap_acquire */ - -# if AO_AO_TS_T && defined(AO_HAVE_compare_and_swap_release) || \ - AO_CHAR_TS_T && defined(AO_HAVE_char_compare_and_swap_release) - AO_INLINE AO_TS_VAL_t - AO_test_and_set_release(volatile AO_TS_t *addr) - { - if (AO_TS_COMPARE_AND_SWAP_RELEASE(addr, AO_TS_CLEAR, AO_TS_SET)) - return AO_TS_CLEAR; - else - return AO_TS_SET; - } -# define AO_HAVE_test_and_set_release -# endif /* AO_HAVE_compare_and_swap_release */ - -# if AO_AO_TS_T && defined(AO_HAVE_compare_and_swap) || \ - AO_CHAR_TS_T && defined(AO_HAVE_char_compare_and_swap) - AO_INLINE AO_TS_VAL_t - AO_test_and_set(volatile AO_TS_t *addr) - { - if (AO_TS_COMPARE_AND_SWAP(addr, AO_TS_CLEAR, AO_TS_SET)) - return AO_TS_CLEAR; - else - return AO_TS_SET; - } -# define AO_HAVE_test_and_set -# endif /* AO_HAVE_compare_and_swap */ - -# if defined(AO_HAVE_test_and_set) && defined(AO_HAVE_nop_full) \ - && !defined(AO_HAVE_test_and_set_acquire) - AO_INLINE AO_TS_VAL_t - AO_test_and_set_acquire(volatile AO_TS_t *addr) - { - AO_TS_VAL_t result = AO_test_and_set(addr); - AO_nop_full(); - return result; - } -# define AO_HAVE_test_and_set_acquire -# endif - +#if !defined(AO_HAVE_test_and_set) && !defined(AO_HAVE_test_and_set_release) \ + && !defined(AO_HAVE_test_and_set_acquire) \ + && !defined(AO_HAVE_test_and_set_read) \ + && !defined(AO_HAVE_test_and_set_full) +# if (AO_AO_TS_T && defined(AO_HAVE_compare_and_swap_full)) \ + || (AO_CHAR_TS_T && defined(AO_HAVE_char_compare_and_swap_full)) + AO_INLINE AO_TS_VAL_t + AO_test_and_set_full(volatile AO_TS_t *addr) + { + if (AO_TS_COMPARE_AND_SWAP_FULL(addr, AO_TS_CLEAR, AO_TS_SET)) + return AO_TS_CLEAR; + else + return AO_TS_SET; + } +# define AO_HAVE_test_and_set_full +# endif /* AO_HAVE_compare_and_swap_full */ + +# if (AO_AO_TS_T && defined(AO_HAVE_compare_and_swap_acquire)) \ + || (AO_CHAR_TS_T && defined(AO_HAVE_char_compare_and_swap_acquire)) + AO_INLINE AO_TS_VAL_t + AO_test_and_set_acquire(volatile AO_TS_t *addr) + { + if (AO_TS_COMPARE_AND_SWAP_ACQUIRE(addr, AO_TS_CLEAR, AO_TS_SET)) + return AO_TS_CLEAR; + else + return AO_TS_SET; + } +# define AO_HAVE_test_and_set_acquire +# endif /* AO_HAVE_compare_and_swap_acquire */ + +# if (AO_AO_TS_T && defined(AO_HAVE_compare_and_swap_release)) \ + || (AO_CHAR_TS_T && defined(AO_HAVE_char_compare_and_swap_release)) + AO_INLINE AO_TS_VAL_t + AO_test_and_set_release(volatile AO_TS_t *addr) + { + if (AO_TS_COMPARE_AND_SWAP_RELEASE(addr, AO_TS_CLEAR, AO_TS_SET)) + return AO_TS_CLEAR; + else + return AO_TS_SET; + } +# define AO_HAVE_test_and_set_release +# endif /* AO_HAVE_compare_and_swap_release */ + +# if (AO_AO_TS_T && defined(AO_HAVE_compare_and_swap)) \ + || (AO_CHAR_TS_T && defined(AO_HAVE_char_compare_and_swap)) + AO_INLINE AO_TS_VAL_t + AO_test_and_set(volatile AO_TS_t *addr) + { + if (AO_TS_COMPARE_AND_SWAP(addr, AO_TS_CLEAR, AO_TS_SET)) + return AO_TS_CLEAR; + else + return AO_TS_SET; + } +# define AO_HAVE_test_and_set +# endif /* AO_HAVE_compare_and_swap */ + +# if defined(AO_HAVE_test_and_set) && defined(AO_HAVE_nop_full) \ + && !defined(AO_HAVE_test_and_set_acquire) + AO_INLINE AO_TS_VAL_t + AO_test_and_set_acquire(volatile AO_TS_t *addr) + { + AO_TS_VAL_t result = AO_test_and_set(addr); + AO_nop_full(); + return result; + } +# define AO_HAVE_test_and_set_acquire +# endif #endif /* No prior test and set */ /* Nop */ @@ -148,20 +143,20 @@ #endif #if defined(AO_HAVE_test_and_set_full) && !defined(AO_HAVE_nop_full) - AO_INLINE void - AO_nop_full(void) - { - AO_TS_t dummy = AO_TS_INITIALIZER; - AO_test_and_set_full(&dummy); - } -# define AO_HAVE_nop_full + AO_INLINE void + AO_nop_full(void) + { + AO_TS_t dummy = AO_TS_INITIALIZER; + AO_test_and_set_full(&dummy); + } +# define AO_HAVE_nop_full #endif #if defined(AO_HAVE_nop_acquire) -# error AO_nop_acquire is useless: dont define. +# error AO_nop_acquire is useless: dont define. #endif #if defined(AO_HAVE_nop_release) -# error AO_nop_release is useless: dont define. +# error AO_nop_release is useless: dont define. #endif #if defined(AO_HAVE_nop_full) && !defined(AO_HAVE_nop_read) @@ -195,36 +190,36 @@ # define AO_HAVE_load_acquire_read #endif -#if defined(AO_HAVE_load) && defined(AO_HAVE_nop_full) && \ - !defined(AO_HAVE_load_acquire) - AO_INLINE AO_t - AO_load_acquire(const volatile AO_t *addr) - { - AO_t result = AO_load(addr); - /* Acquire barrier would be useless, since the load could be delayed */ - /* beyond it. */ - AO_nop_full(); - return result; - } -# define AO_HAVE_load_acquire -#endif - -#if defined(AO_HAVE_load) && defined(AO_HAVE_nop_read) && \ - !defined(AO_HAVE_load_read) - AO_INLINE AO_t - AO_load_read(const volatile AO_t *addr) - { - AO_t result = AO_load(addr); - /* Acquire barrier would be useless, since the load could be delayed */ - /* beyond it. */ - AO_nop_read(); - return result; - } -# define AO_HAVE_load_read -#endif - -#if defined(AO_HAVE_load_acquire) && defined(AO_HAVE_nop_full) && \ - !defined(AO_HAVE_load_full) +#if defined(AO_HAVE_load) && defined(AO_HAVE_nop_full) \ + && !defined(AO_HAVE_load_acquire) + AO_INLINE AO_t + AO_load_acquire(const volatile AO_t *addr) + { + AO_t result = AO_load(addr); + /* Acquire barrier would be useless, since the load could be delayed */ + /* beyond it. */ + AO_nop_full(); + return result; + } +# define AO_HAVE_load_acquire +#endif + +#if defined(AO_HAVE_load) && defined(AO_HAVE_nop_read) \ + && !defined(AO_HAVE_load_read) + AO_INLINE AO_t + AO_load_read(const volatile AO_t *addr) + { + AO_t result = AO_load(addr); + /* Acquire barrier would be useless, since the load could be delayed */ + /* beyond it. */ + AO_nop_read(); + return result; + } +# define AO_HAVE_load_read +#endif + +#if defined(AO_HAVE_load_acquire) && defined(AO_HAVE_nop_full) \ + && !defined(AO_HAVE_load_full) # define AO_load_full(addr) (AO_nop_full(), AO_load_acquire(addr)) # define AO_HAVE_load_full #endif @@ -240,27 +235,25 @@ #endif #ifdef AO_NO_DD_ORDERING -# if defined(AO_HAVE_load_acquire_read) -# define AO_load_dd_acquire_read(addr) AO_load_acquire_read(addr) -# define AO_HAVE_load_dd_acquire_read -# endif +# if defined(AO_HAVE_load_acquire_read) +# define AO_load_dd_acquire_read(addr) AO_load_acquire_read(addr) +# define AO_HAVE_load_dd_acquire_read +# endif #else -# if defined(AO_HAVE_load) -# define AO_load_dd_acquire_read(addr) AO_load(addr) -# define AO_HAVE_load_dd_acquire_read -# endif +# if defined(AO_HAVE_load) +# define AO_load_dd_acquire_read(addr) AO_load(addr) +# define AO_HAVE_load_dd_acquire_read +# endif #endif - /* Store */ - #if defined(AO_HAVE_store_full) && !defined(AO_HAVE_store_release) # define AO_store_release(addr,val) AO_store_full(addr,val) # define AO_HAVE_store_release #endif #if defined(AO_HAVE_store_release) && !defined(AO_HAVE_store) -# define AO_store(addr, val) AO_store_release(addr,val) +# define AO_store(addr,val) AO_store_release(addr,val) # define AO_HAVE_store #endif @@ -270,815 +263,718 @@ #endif #if defined(AO_HAVE_store_release) && !defined(AO_HAVE_store_release_write) -# define AO_store_release_write(addr, val) AO_store_release(addr,val) +# define AO_store_release_write(addr,val) AO_store_release(addr,val) # define AO_HAVE_store_release_write #endif #if defined(AO_HAVE_store_write) && !defined(AO_HAVE_store) -# define AO_store(addr, val) AO_store_write(addr,val) +# define AO_store(addr,val) AO_store_write(addr,val) # define AO_HAVE_store #endif -#if defined(AO_HAVE_store) && defined(AO_HAVE_nop_full) && \ - !defined(AO_HAVE_store_release) +#if defined(AO_HAVE_store) && defined(AO_HAVE_nop_full) \ + && !defined(AO_HAVE_store_release) # define AO_store_release(addr,val) (AO_nop_full(), AO_store(addr,val)) # define AO_HAVE_store_release #endif -#if defined(AO_HAVE_nop_write) && defined(AO_HAVE_store) && \ - !defined(AO_HAVE_store_write) -# define AO_store_write(addr, val) (AO_nop_write(), AO_store(addr,val)) +#if defined(AO_HAVE_nop_write) && defined(AO_HAVE_store) \ + && !defined(AO_HAVE_store_write) +# define AO_store_write(addr,val) (AO_nop_write(), AO_store(addr,val)) # define AO_HAVE_store_write #endif #if defined(AO_HAVE_store_write) && !defined(AO_HAVE_store_release_write) -# define AO_store_release_write(addr, val) AO_store_write(addr,val) +# define AO_store_release_write(addr,val) AO_store_write(addr,val) # define AO_HAVE_store_release_write #endif -#if defined(AO_HAVE_store_release) && defined(AO_HAVE_nop_full) && \ - !defined(AO_HAVE_store_full) -# define AO_store_full(addr, val) (AO_store_release(addr, val), AO_nop_full()) +#if defined(AO_HAVE_store_release) && defined(AO_HAVE_nop_full) \ + && !defined(AO_HAVE_store_full) +# define AO_store_full(addr,val) (AO_store_release(addr,val), AO_nop_full()) # define AO_HAVE_store_full #endif /* NEC LE-IT: Test and set */ -#if defined(AO_HAVE_test_and_set) && \ - defined(AO_HAVE_nop_full) && \ - !defined(AO_HAVE_test_and_set_release) -# define AO_test_and_set_release(addr) \ - (AO_nop_full(), AO_test_and_set(addr)) +#if defined(AO_HAVE_test_and_set) && defined(AO_HAVE_nop_full) \ + && !defined(AO_HAVE_test_and_set_release) +# define AO_test_and_set_release(addr) (AO_nop_full(), AO_test_and_set(addr)) # define AO_HAVE_test_and_set_release #endif -#if defined(AO_HAVE_test_and_set) && \ - defined(AO_HAVE_nop_full) && \ - !defined(AO_HAVE_test_and_set_acquire) -AO_INLINE AO_TS_t -AO_test_and_set_acquire(volatile AO_TS_t *addr) -{ - AO_TS_t res = AO_test_and_set(addr); - AO_nop_full(); - return res; -} -# define AO_HAVE_test_and_set_acquire +#if defined(AO_HAVE_test_and_set) && defined(AO_HAVE_nop_full) \ + && !defined(AO_HAVE_test_and_set_acquire) + AO_INLINE AO_TS_VAL_t + AO_test_and_set_acquire(volatile AO_TS_t *addr) + { + AO_TS_VAL_t result = AO_test_and_set(addr); + AO_nop_full(); + return result; + } +# define AO_HAVE_test_and_set_acquire #endif - /* Fetch_and_add */ /* We first try to implement fetch_and_add variants in terms */ /* of the corresponding compare_and_swap variants to minimize */ /* adding barriers. */ -#if defined(AO_HAVE_compare_and_swap_full) && \ - !defined(AO_HAVE_fetch_and_add_full) - AO_INLINE AO_t - AO_fetch_and_add_full(volatile AO_t *addr, AO_t incr) - { - AO_t old; - do - { - old = *addr; - } - while (!AO_compare_and_swap_full(addr, old, old+incr)); - return old; - } -# define AO_HAVE_fetch_and_add_full -#endif - -#if defined(AO_HAVE_compare_and_swap_acquire) && \ - !defined(AO_HAVE_fetch_and_add_acquire) - AO_INLINE AO_t - AO_fetch_and_add_acquire(volatile AO_t *addr, AO_t incr) - { - AO_t old; - do - { - old = *addr; - } - while (!AO_compare_and_swap_acquire(addr, old, old+incr)); - return old; - } -# define AO_HAVE_fetch_and_add_acquire -#endif - -#if defined(AO_HAVE_compare_and_swap_release) && \ - !defined(AO_HAVE_fetch_and_add_release) - AO_INLINE AO_t - AO_fetch_and_add_release(volatile AO_t *addr, AO_t incr) - { - AO_t old; - do - { - old = *addr; - } - while (!AO_compare_and_swap_release(addr, old, old+incr)); - return old; - } -# define AO_HAVE_fetch_and_add_release -#endif - -#if defined(AO_HAVE_compare_and_swap) && \ - !defined(AO_HAVE_fetch_and_add) - AO_INLINE AO_t - AO_fetch_and_add(volatile AO_t *addr, AO_t incr) - { - AO_t old; - do - { - old = *addr; - } - while (!AO_compare_and_swap(addr, old, old+incr)); - return old; - } -# define AO_HAVE_fetch_and_add +#if defined(AO_HAVE_compare_and_swap_full) \ + && !defined(AO_HAVE_fetch_and_add_full) + AO_INLINE AO_t + AO_fetch_and_add_full(volatile AO_t *addr, AO_t incr) + { + AO_t old; + do + { + old = *addr; + } + while (!AO_compare_and_swap_full(addr, old, old+incr)); + return old; + } +# define AO_HAVE_fetch_and_add_full +#endif + +#if defined(AO_HAVE_compare_and_swap_acquire) \ + && !defined(AO_HAVE_fetch_and_add_acquire) + AO_INLINE AO_t + AO_fetch_and_add_acquire(volatile AO_t *addr, AO_t incr) + { + AO_t old; + do + { + old = *addr; + } + while (!AO_compare_and_swap_acquire(addr, old, old+incr)); + return old; + } +# define AO_HAVE_fetch_and_add_acquire +#endif + +#if defined(AO_HAVE_compare_and_swap_release) \ + && !defined(AO_HAVE_fetch_and_add_release) + AO_INLINE AO_t + AO_fetch_and_add_release(volatile AO_t *addr, AO_t incr) + { + AO_t old; + do + { + old = *addr; + } + while (!AO_compare_and_swap_release(addr, old, old+incr)); + return old; + } +# define AO_HAVE_fetch_and_add_release +#endif + +#if defined(AO_HAVE_compare_and_swap) && !defined(AO_HAVE_fetch_and_add) + AO_INLINE AO_t + AO_fetch_and_add(volatile AO_t *addr, AO_t incr) + { + AO_t old; + do + { + old = *addr; + } + while (!AO_compare_and_swap(addr, old, old+incr)); + return old; + } +# define AO_HAVE_fetch_and_add #endif #if defined(AO_HAVE_fetch_and_add_full) -# if !defined(AO_HAVE_fetch_and_add_release) -# define AO_fetch_and_add_release(addr, val) \ - AO_fetch_and_add_full(addr, val) -# define AO_HAVE_fetch_and_add_release -# endif -# if !defined(AO_HAVE_fetch_and_add_acquire) -# define AO_fetch_and_add_acquire(addr, val) \ - AO_fetch_and_add_full(addr, val) -# define AO_HAVE_fetch_and_add_acquire -# endif -# if !defined(AO_HAVE_fetch_and_add_write) -# define AO_fetch_and_add_write(addr, val) \ - AO_fetch_and_add_full(addr, val) -# define AO_HAVE_fetch_and_add_write -# endif -# if !defined(AO_HAVE_fetch_and_add_read) -# define AO_fetch_and_add_read(addr, val) \ - AO_fetch_and_add_full(addr, val) -# define AO_HAVE_fetch_and_add_read -# endif +# if !defined(AO_HAVE_fetch_and_add_release) +# define AO_fetch_and_add_release(addr,val) AO_fetch_and_add_full(addr,val) +# define AO_HAVE_fetch_and_add_release +# endif +# if !defined(AO_HAVE_fetch_and_add_acquire) +# define AO_fetch_and_add_acquire(addr,val) AO_fetch_and_add_full(addr,val) +# define AO_HAVE_fetch_and_add_acquire +# endif +# if !defined(AO_HAVE_fetch_and_add_write) +# define AO_fetch_and_add_write(addr,val) AO_fetch_and_add_full(addr,val) +# define AO_HAVE_fetch_and_add_write +# endif +# if !defined(AO_HAVE_fetch_and_add_read) +# define AO_fetch_and_add_read(addr,val) AO_fetch_and_add_full(addr,val) +# define AO_HAVE_fetch_and_add_read +# endif #endif /* AO_HAVE_fetch_and_add_full */ -#if !defined(AO_HAVE_fetch_and_add) && \ - defined(AO_HAVE_fetch_and_add_release) -# define AO_fetch_and_add(addr, val) \ - AO_fetch_and_add_release(addr, val) +#if !defined(AO_HAVE_fetch_and_add) && defined(AO_HAVE_fetch_and_add_release) +# define AO_fetch_and_add(addr,val) AO_fetch_and_add_release(addr,val) # define AO_HAVE_fetch_and_add #endif -#if !defined(AO_HAVE_fetch_and_add) && \ - defined(AO_HAVE_fetch_and_add_acquire) -# define AO_fetch_and_add(addr, val) \ - AO_fetch_and_add_acquire(addr, val) +#if !defined(AO_HAVE_fetch_and_add) && defined(AO_HAVE_fetch_and_add_acquire) +# define AO_fetch_and_add(addr,val) AO_fetch_and_add_acquire(addr,val) # define AO_HAVE_fetch_and_add #endif -#if !defined(AO_HAVE_fetch_and_add) && \ - defined(AO_HAVE_fetch_and_add_write) -# define AO_fetch_and_add(addr, val) \ - AO_fetch_and_add_write(addr, val) +#if !defined(AO_HAVE_fetch_and_add) && defined(AO_HAVE_fetch_and_add_write) +# define AO_fetch_and_add(addr,val) AO_fetch_and_add_write(addr,val) # define AO_HAVE_fetch_and_add #endif -#if !defined(AO_HAVE_fetch_and_add) && \ - defined(AO_HAVE_fetch_and_add_read) -# define AO_fetch_and_add(addr, val) \ - AO_fetch_and_add_read(addr, val) +#if !defined(AO_HAVE_fetch_and_add) && defined(AO_HAVE_fetch_and_add_read) +# define AO_fetch_and_add(addr,val) AO_fetch_and_add_read(addr,val) # define AO_HAVE_fetch_and_add #endif -#if defined(AO_HAVE_fetch_and_add_acquire) && \ - defined(AO_HAVE_nop_full) && \ - !defined(AO_HAVE_fetch_and_add_full) -# define AO_fetch_and_add_full(addr, val) \ - (AO_nop_full(), AO_fetch_and_add_acquire(addr, val)) +#if defined(AO_HAVE_fetch_and_add_acquire) && defined(AO_HAVE_nop_full) \ + && !defined(AO_HAVE_fetch_and_add_full) +# define AO_fetch_and_add_full(addr,val) \ + (AO_nop_full(), AO_fetch_and_add_acquire(addr,val)) # define AO_HAVE_fetch_and_add_full #endif -#if !defined(AO_HAVE_fetch_and_add_release_write) && \ - defined(AO_HAVE_fetch_and_add_write) -# define AO_fetch_and_add_release_write(addr, val) \ - AO_fetch_and_add_write(addr, val) +#if !defined(AO_HAVE_fetch_and_add_release_write) \ + && defined(AO_HAVE_fetch_and_add_write) +# define AO_fetch_and_add_release_write(addr,val) \ + AO_fetch_and_add_write(addr,val) # define AO_HAVE_fetch_and_add_release_write #endif -#if !defined(AO_HAVE_fetch_and_add_release_write) && \ - defined(AO_HAVE_fetch_and_add_release) -# define AO_fetch_and_add_release_write(addr, val) \ - AO_fetch_and_add_release(addr, val) +#if !defined(AO_HAVE_fetch_and_add_release_write) \ + && defined(AO_HAVE_fetch_and_add_release) +# define AO_fetch_and_add_release_write(addr,val) \ + AO_fetch_and_add_release(addr,val) # define AO_HAVE_fetch_and_add_release_write #endif -#if !defined(AO_HAVE_fetch_and_add_acquire_read) && \ - defined(AO_HAVE_fetch_and_add_read) -# define AO_fetch_and_add_acquire_read(addr, val) \ - AO_fetch_and_add_read(addr, val) +#if !defined(AO_HAVE_fetch_and_add_acquire_read) \ + && defined(AO_HAVE_fetch_and_add_read) +# define AO_fetch_and_add_acquire_read(addr,val) \ + AO_fetch_and_add_read(addr,val) # define AO_HAVE_fetch_and_add_acquire_read #endif -#if !defined(AO_HAVE_fetch_and_add_acquire_read) && \ - defined(AO_HAVE_fetch_and_add_acquire) -# define AO_fetch_and_add_acquire_read(addr, val) \ - AO_fetch_and_add_acquire(addr, val) +#if !defined(AO_HAVE_fetch_and_add_acquire_read) \ + && defined(AO_HAVE_fetch_and_add_acquire) +# define AO_fetch_and_add_acquire_read(addr,val) \ + AO_fetch_and_add_acquire(addr,val) # define AO_HAVE_fetch_and_add_acquire_read #endif #ifdef AO_NO_DD_ORDERING -# if defined(AO_HAVE_fetch_and_add_acquire_read) -# define AO_fetch_and_add_dd_acquire_read(addr, val) \ - AO_fetch_and_add_acquire_read(addr, val) -# define AO_HAVE_fetch_and_add_dd_acquire_read -# endif +# if defined(AO_HAVE_fetch_and_add_acquire_read) +# define AO_fetch_and_add_dd_acquire_read(addr,val) \ + AO_fetch_and_add_acquire_read(addr,val) +# define AO_HAVE_fetch_and_add_dd_acquire_read +# endif #else -# if defined(AO_HAVE_fetch_and_add) -# define AO_fetch_and_add_dd_acquire_read(addr, val) \ - AO_fetch_and_add(addr, val) -# define AO_HAVE_fetch_and_add_dd_acquire_read -# endif -#endif +# if defined(AO_HAVE_fetch_and_add) +# define AO_fetch_and_add_dd_acquire_read(addr,val) \ + AO_fetch_and_add(addr,val) +# define AO_HAVE_fetch_and_add_dd_acquire_read +# endif +#endif /* !AO_NO_DD_ORDERING */ /* Fetch_and_add1 */ -#if defined(AO_HAVE_fetch_and_add_full) && \ - !defined(AO_HAVE_fetch_and_add1_full) +#if defined(AO_HAVE_fetch_and_add_full) \ + && !defined(AO_HAVE_fetch_and_add1_full) # define AO_fetch_and_add1_full(addr) AO_fetch_and_add_full(addr,1) # define AO_HAVE_fetch_and_add1_full #endif -#if defined(AO_HAVE_fetch_and_add_release) && \ - !defined(AO_HAVE_fetch_and_add1_release) +#if defined(AO_HAVE_fetch_and_add_release) \ + && !defined(AO_HAVE_fetch_and_add1_release) # define AO_fetch_and_add1_release(addr) AO_fetch_and_add_release(addr,1) # define AO_HAVE_fetch_and_add1_release #endif -#if defined(AO_HAVE_fetch_and_add_acquire) && \ - !defined(AO_HAVE_fetch_and_add1_acquire) +#if defined(AO_HAVE_fetch_and_add_acquire) \ + && !defined(AO_HAVE_fetch_and_add1_acquire) # define AO_fetch_and_add1_acquire(addr) AO_fetch_and_add_acquire(addr,1) # define AO_HAVE_fetch_and_add1_acquire #endif -#if defined(AO_HAVE_fetch_and_add_write) && \ - !defined(AO_HAVE_fetch_and_add1_write) +#if defined(AO_HAVE_fetch_and_add_write) \ + && !defined(AO_HAVE_fetch_and_add1_write) # define AO_fetch_and_add1_write(addr) AO_fetch_and_add_write(addr,1) # define AO_HAVE_fetch_and_add1_write #endif -#if defined(AO_HAVE_fetch_and_add_read) && \ - !defined(AO_HAVE_fetch_and_add1_read) +#if defined(AO_HAVE_fetch_and_add_read) \ + && !defined(AO_HAVE_fetch_and_add1_read) # define AO_fetch_and_add1_read(addr) AO_fetch_and_add_read(addr,1) # define AO_HAVE_fetch_and_add1_read #endif -#if defined(AO_HAVE_fetch_and_add_release_write) && \ - !defined(AO_HAVE_fetch_and_add1_release_write) +#if defined(AO_HAVE_fetch_and_add_release_write) \ + && !defined(AO_HAVE_fetch_and_add1_release_write) # define AO_fetch_and_add1_release_write(addr) \ - AO_fetch_and_add_release_write(addr,1) + AO_fetch_and_add_release_write(addr,1) # define AO_HAVE_fetch_and_add1_release_write #endif -#if defined(AO_HAVE_fetch_and_add_acquire_read) && \ - !defined(AO_HAVE_fetch_and_add1_acquire_read) +#if defined(AO_HAVE_fetch_and_add_acquire_read) \ + && !defined(AO_HAVE_fetch_and_add1_acquire_read) # define AO_fetch_and_add1_acquire_read(addr) \ - AO_fetch_and_add_acquire_read(addr,1) + AO_fetch_and_add_acquire_read(addr,1) # define AO_HAVE_fetch_and_add1_acquire_read #endif -#if defined(AO_HAVE_fetch_and_add) && \ - !defined(AO_HAVE_fetch_and_add1) -# define AO_fetch_and_add1(addr) \ - AO_fetch_and_add(addr,1) +#if defined(AO_HAVE_fetch_and_add) && !defined(AO_HAVE_fetch_and_add1) +# define AO_fetch_and_add1(addr) AO_fetch_and_add(addr,1) # define AO_HAVE_fetch_and_add1 #endif #if defined(AO_HAVE_fetch_and_add1_full) -# if !defined(AO_HAVE_fetch_and_add1_release) -# define AO_fetch_and_add1_release(addr) \ - AO_fetch_and_add1_full(addr) -# define AO_HAVE_fetch_and_add1_release -# endif -# if !defined(AO_HAVE_fetch_and_add1_acquire) -# define AO_fetch_and_add1_acquire(addr) \ - AO_fetch_and_add1_full(addr) -# define AO_HAVE_fetch_and_add1_acquire -# endif -# if !defined(AO_HAVE_fetch_and_add1_write) -# define AO_fetch_and_add1_write(addr) \ - AO_fetch_and_add1_full(addr) -# define AO_HAVE_fetch_and_add1_write -# endif -# if !defined(AO_HAVE_fetch_and_add1_read) -# define AO_fetch_and_add1_read(addr) \ - AO_fetch_and_add1_full(addr) -# define AO_HAVE_fetch_and_add1_read -# endif +# if !defined(AO_HAVE_fetch_and_add1_release) +# define AO_fetch_and_add1_release(addr) AO_fetch_and_add1_full(addr) +# define AO_HAVE_fetch_and_add1_release +# endif +# if !defined(AO_HAVE_fetch_and_add1_acquire) +# define AO_fetch_and_add1_acquire(addr) AO_fetch_and_add1_full(addr) +# define AO_HAVE_fetch_and_add1_acquire +# endif +# if !defined(AO_HAVE_fetch_and_add1_write) +# define AO_fetch_and_add1_write(addr) AO_fetch_and_add1_full(addr) +# define AO_HAVE_fetch_and_add1_write +# endif +# if !defined(AO_HAVE_fetch_and_add1_read) +# define AO_fetch_and_add1_read(addr) AO_fetch_and_add1_full(addr) +# define AO_HAVE_fetch_and_add1_read +# endif #endif /* AO_HAVE_fetch_and_add1_full */ -#if !defined(AO_HAVE_fetch_and_add1) && \ - defined(AO_HAVE_fetch_and_add1_release) -# define AO_fetch_and_add1(addr) \ - AO_fetch_and_add1_release(addr) +#if !defined(AO_HAVE_fetch_and_add1) \ + && defined(AO_HAVE_fetch_and_add1_release) +# define AO_fetch_and_add1(addr) AO_fetch_and_add1_release(addr) # define AO_HAVE_fetch_and_add1 #endif -#if !defined(AO_HAVE_fetch_and_add1) && \ - defined(AO_HAVE_fetch_and_add1_acquire) -# define AO_fetch_and_add1(addr) \ - AO_fetch_and_add1_acquire(addr) +#if !defined(AO_HAVE_fetch_and_add1) \ + && defined(AO_HAVE_fetch_and_add1_acquire) +# define AO_fetch_and_add1(addr) AO_fetch_and_add1_acquire(addr) # define AO_HAVE_fetch_and_add1 #endif -#if !defined(AO_HAVE_fetch_and_add1) && \ - defined(AO_HAVE_fetch_and_add1_write) -# define AO_fetch_and_add1(addr) \ - AO_fetch_and_add1_write(addr) +#if !defined(AO_HAVE_fetch_and_add1) && defined(AO_HAVE_fetch_and_add1_write) +# define AO_fetch_and_add1(addr) AO_fetch_and_add1_write(addr) # define AO_HAVE_fetch_and_add1 #endif -#if !defined(AO_HAVE_fetch_and_add1) && \ - defined(AO_HAVE_fetch_and_add1_read) -# define AO_fetch_and_add1(addr) \ - AO_fetch_and_add1_read(addr) +#if !defined(AO_HAVE_fetch_and_add1) && defined(AO_HAVE_fetch_and_add1_read) +# define AO_fetch_and_add1(addr) AO_fetch_and_add1_read(addr) # define AO_HAVE_fetch_and_add1 #endif -#if defined(AO_HAVE_fetch_and_add1_acquire) && \ - defined(AO_HAVE_nop_full) && \ - !defined(AO_HAVE_fetch_and_add1_full) +#if defined(AO_HAVE_fetch_and_add1_acquire) && defined(AO_HAVE_nop_full) \ + && !defined(AO_HAVE_fetch_and_add1_full) # define AO_fetch_and_add1_full(addr) \ - (AO_nop_full(), AO_fetch_and_add1_acquire(addr)) + (AO_nop_full(), AO_fetch_and_add1_acquire(addr)) # define AO_HAVE_fetch_and_add1_full #endif -#if !defined(AO_HAVE_fetch_and_add1_release_write) && \ - defined(AO_HAVE_fetch_and_add1_write) -# define AO_fetch_and_add1_release_write(addr) \ - AO_fetch_and_add1_write(addr) +#if !defined(AO_HAVE_fetch_and_add1_release_write) \ + && defined(AO_HAVE_fetch_and_add1_write) +# define AO_fetch_and_add1_release_write(addr) AO_fetch_and_add1_write(addr) # define AO_HAVE_fetch_and_add1_release_write #endif -#if !defined(AO_HAVE_fetch_and_add1_release_write) && \ - defined(AO_HAVE_fetch_and_add1_release) -# define AO_fetch_and_add1_release_write(addr) \ - AO_fetch_and_add1_release(addr) +#if !defined(AO_HAVE_fetch_and_add1_release_write) \ + && defined(AO_HAVE_fetch_and_add1_release) +# define AO_fetch_and_add1_release_write(addr) AO_fetch_and_add1_release(addr) # define AO_HAVE_fetch_and_add1_release_write #endif -#if !defined(AO_HAVE_fetch_and_add1_acquire_read) && \ - defined(AO_HAVE_fetch_and_add1_read) -# define AO_fetch_and_add1_acquire_read(addr) \ - AO_fetch_and_add1_read(addr) +#if !defined(AO_HAVE_fetch_and_add1_acquire_read) \ + && defined(AO_HAVE_fetch_and_add1_read) +# define AO_fetch_and_add1_acquire_read(addr) AO_fetch_and_add1_read(addr) # define AO_HAVE_fetch_and_add1_acquire_read #endif -#if !defined(AO_HAVE_fetch_and_add1_acquire_read) && \ - defined(AO_HAVE_fetch_and_add1_acquire) -# define AO_fetch_and_add1_acquire_read(addr) \ - AO_fetch_and_add1_acquire(addr) +#if !defined(AO_HAVE_fetch_and_add1_acquire_read) \ + && defined(AO_HAVE_fetch_and_add1_acquire) +# define AO_fetch_and_add1_acquire_read(addr) AO_fetch_and_add1_acquire(addr) # define AO_HAVE_fetch_and_add1_acquire_read #endif #ifdef AO_NO_DD_ORDERING -# if defined(AO_HAVE_fetch_and_add1_acquire_read) -# define AO_fetch_and_add1_dd_acquire_read(addr) \ - AO_fetch_and_add1_acquire_read(addr) -# define AO_HAVE_fetch_and_add1_dd_acquire_read -# endif +# if defined(AO_HAVE_fetch_and_add1_acquire_read) +# define AO_fetch_and_add1_dd_acquire_read(addr) \ + AO_fetch_and_add1_acquire_read(addr) +# define AO_HAVE_fetch_and_add1_dd_acquire_read +# endif #else -# if defined(AO_HAVE_fetch_and_add1) -# define AO_fetch_and_add1_dd_acquire_read(addr) AO_fetch_and_add1(addr) -# define AO_HAVE_fetch_and_add1_dd_acquire_read -# endif -#endif +# if defined(AO_HAVE_fetch_and_add1) +# define AO_fetch_and_add1_dd_acquire_read(addr) AO_fetch_and_add1(addr) +# define AO_HAVE_fetch_and_add1_dd_acquire_read +# endif +#endif /* !AO_NO_DD_ORDERING */ /* Fetch_and_sub1 */ - -#if defined(AO_HAVE_fetch_and_add_full) && \ - !defined(AO_HAVE_fetch_and_sub1_full) +#if defined(AO_HAVE_fetch_and_add_full) \ + && !defined(AO_HAVE_fetch_and_sub1_full) # define AO_fetch_and_sub1_full(addr) AO_fetch_and_add_full(addr,(AO_t)(-1)) # define AO_HAVE_fetch_and_sub1_full #endif -#if defined(AO_HAVE_fetch_and_add_release) && \ - !defined(AO_HAVE_fetch_and_sub1_release) +#if defined(AO_HAVE_fetch_and_add_release) \ + && !defined(AO_HAVE_fetch_and_sub1_release) # define AO_fetch_and_sub1_release(addr) \ - AO_fetch_and_add_release(addr,(AO_t)(-1)) + AO_fetch_and_add_release(addr,(AO_t)(-1)) # define AO_HAVE_fetch_and_sub1_release #endif -#if defined(AO_HAVE_fetch_and_add_acquire) && \ - !defined(AO_HAVE_fetch_and_sub1_acquire) +#if defined(AO_HAVE_fetch_and_add_acquire) \ + && !defined(AO_HAVE_fetch_and_sub1_acquire) # define AO_fetch_and_sub1_acquire(addr) \ - AO_fetch_and_add_acquire(addr,(AO_t)(-1)) + AO_fetch_and_add_acquire(addr,(AO_t)(-1)) # define AO_HAVE_fetch_and_sub1_acquire #endif -#if defined(AO_HAVE_fetch_and_add_write) && \ - !defined(AO_HAVE_fetch_and_sub1_write) -# define AO_fetch_and_sub1_write(addr) \ - AO_fetch_and_add_write(addr,(AO_t)(-1)) +#if defined(AO_HAVE_fetch_and_add_write) \ + && !defined(AO_HAVE_fetch_and_sub1_write) +# define AO_fetch_and_sub1_write(addr) AO_fetch_and_add_write(addr,(AO_t)(-1)) # define AO_HAVE_fetch_and_sub1_write #endif -#if defined(AO_HAVE_fetch_and_add_read) && \ - !defined(AO_HAVE_fetch_and_sub1_read) -# define AO_fetch_and_sub1_read(addr) \ - AO_fetch_and_add_read(addr,(AO_t)(-1)) +#if defined(AO_HAVE_fetch_and_add_read) \ + && !defined(AO_HAVE_fetch_and_sub1_read) +# define AO_fetch_and_sub1_read(addr) AO_fetch_and_add_read(addr,(AO_t)(-1)) # define AO_HAVE_fetch_and_sub1_read #endif -#if defined(AO_HAVE_fetch_and_add_release_write) && \ - !defined(AO_HAVE_fetch_and_sub1_release_write) +#if defined(AO_HAVE_fetch_and_add_release_write) \ + && !defined(AO_HAVE_fetch_and_sub1_release_write) # define AO_fetch_and_sub1_release_write(addr) \ - AO_fetch_and_add_release_write(addr,(AO_t)(-1)) + AO_fetch_and_add_release_write(addr,(AO_t)(-1)) # define AO_HAVE_fetch_and_sub1_release_write #endif -#if defined(AO_HAVE_fetch_and_add_acquire_read) && \ - !defined(AO_HAVE_fetch_and_sub1_acquire_read) +#if defined(AO_HAVE_fetch_and_add_acquire_read) \ + && !defined(AO_HAVE_fetch_and_sub1_acquire_read) # define AO_fetch_and_sub1_acquire_read(addr) \ - AO_fetch_and_add_acquire_read(addr,(AO_t)(-1)) + AO_fetch_and_add_acquire_read(addr,(AO_t)(-1)) # define AO_HAVE_fetch_and_sub1_acquire_read #endif -#if defined(AO_HAVE_fetch_and_add) && \ - !defined(AO_HAVE_fetch_and_sub1) -# define AO_fetch_and_sub1(addr) \ - AO_fetch_and_add(addr,(AO_t)(-1)) +#if defined(AO_HAVE_fetch_and_add) && !defined(AO_HAVE_fetch_and_sub1) +# define AO_fetch_and_sub1(addr) AO_fetch_and_add(addr,(AO_t)(-1)) # define AO_HAVE_fetch_and_sub1 #endif #if defined(AO_HAVE_fetch_and_sub1_full) -# if !defined(AO_HAVE_fetch_and_sub1_release) -# define AO_fetch_and_sub1_release(addr) \ - AO_fetch_and_sub1_full(addr) -# define AO_HAVE_fetch_and_sub1_release -# endif -# if !defined(AO_HAVE_fetch_and_sub1_acquire) -# define AO_fetch_and_sub1_acquire(addr) \ - AO_fetch_and_sub1_full(addr) -# define AO_HAVE_fetch_and_sub1_acquire -# endif -# if !defined(AO_HAVE_fetch_and_sub1_write) -# define AO_fetch_and_sub1_write(addr) \ - AO_fetch_and_sub1_full(addr) -# define AO_HAVE_fetch_and_sub1_write -# endif -# if !defined(AO_HAVE_fetch_and_sub1_read) -# define AO_fetch_and_sub1_read(addr) \ - AO_fetch_and_sub1_full(addr) -# define AO_HAVE_fetch_and_sub1_read -# endif +# if !defined(AO_HAVE_fetch_and_sub1_release) +# define AO_fetch_and_sub1_release(addr) AO_fetch_and_sub1_full(addr) +# define AO_HAVE_fetch_and_sub1_release +# endif +# if !defined(AO_HAVE_fetch_and_sub1_acquire) +# define AO_fetch_and_sub1_acquire(addr) AO_fetch_and_sub1_full(addr) +# define AO_HAVE_fetch_and_sub1_acquire +# endif +# if !defined(AO_HAVE_fetch_and_sub1_write) +# define AO_fetch_and_sub1_write(addr) AO_fetch_and_sub1_full(addr) +# define AO_HAVE_fetch_and_sub1_write +# endif +# if !defined(AO_HAVE_fetch_and_sub1_read) +# define AO_fetch_and_sub1_read(addr) AO_fetch_and_sub1_full(addr) +# define AO_HAVE_fetch_and_sub1_read +# endif #endif /* AO_HAVE_fetch_and_sub1_full */ -#if !defined(AO_HAVE_fetch_and_sub1) && \ - defined(AO_HAVE_fetch_and_sub1_release) -# define AO_fetch_and_sub1(addr) \ - AO_fetch_and_sub1_release(addr) +#if !defined(AO_HAVE_fetch_and_sub1) \ + && defined(AO_HAVE_fetch_and_sub1_release) +# define AO_fetch_and_sub1(addr) AO_fetch_and_sub1_release(addr) # define AO_HAVE_fetch_and_sub1 #endif -#if !defined(AO_HAVE_fetch_and_sub1) && \ - defined(AO_HAVE_fetch_and_sub1_acquire) -# define AO_fetch_and_sub1(addr) \ - AO_fetch_and_sub1_acquire(addr) +#if !defined(AO_HAVE_fetch_and_sub1) \ + && defined(AO_HAVE_fetch_and_sub1_acquire) +# define AO_fetch_and_sub1(addr) AO_fetch_and_sub1_acquire(addr) # define AO_HAVE_fetch_and_sub1 #endif -#if !defined(AO_HAVE_fetch_and_sub1) && \ - defined(AO_HAVE_fetch_and_sub1_write) -# define AO_fetch_and_sub1(addr) \ - AO_fetch_and_sub1_write(addr) +#if !defined(AO_HAVE_fetch_and_sub1) && defined(AO_HAVE_fetch_and_sub1_write) +# define AO_fetch_and_sub1(addr) AO_fetch_and_sub1_write(addr) # define AO_HAVE_fetch_and_sub1 #endif -#if !defined(AO_HAVE_fetch_and_sub1) && \ - defined(AO_HAVE_fetch_and_sub1_read) -# define AO_fetch_and_sub1(addr) \ - AO_fetch_and_sub1_read(addr) +#if !defined(AO_HAVE_fetch_and_sub1) && defined(AO_HAVE_fetch_and_sub1_read) +# define AO_fetch_and_sub1(addr) AO_fetch_and_sub1_read(addr) # define AO_HAVE_fetch_and_sub1 #endif -#if defined(AO_HAVE_fetch_and_sub1_acquire) && \ - defined(AO_HAVE_nop_full) && \ - !defined(AO_HAVE_fetch_and_sub1_full) +#if defined(AO_HAVE_fetch_and_sub1_acquire) && defined(AO_HAVE_nop_full) \ + && !defined(AO_HAVE_fetch_and_sub1_full) # define AO_fetch_and_sub1_full(addr) \ - (AO_nop_full(), AO_fetch_and_sub1_acquire(addr)) + (AO_nop_full(), AO_fetch_and_sub1_acquire(addr)) # define AO_HAVE_fetch_and_sub1_full #endif -#if !defined(AO_HAVE_fetch_and_sub1_release_write) && \ - defined(AO_HAVE_fetch_and_sub1_write) -# define AO_fetch_and_sub1_release_write(addr) \ - AO_fetch_and_sub1_write(addr) +#if !defined(AO_HAVE_fetch_and_sub1_release_write) \ + && defined(AO_HAVE_fetch_and_sub1_write) +# define AO_fetch_and_sub1_release_write(addr) AO_fetch_and_sub1_write(addr) # define AO_HAVE_fetch_and_sub1_release_write #endif -#if !defined(AO_HAVE_fetch_and_sub1_release_write) && \ - defined(AO_HAVE_fetch_and_sub1_release) -# define AO_fetch_and_sub1_release_write(addr) \ - AO_fetch_and_sub1_release(addr) +#if !defined(AO_HAVE_fetch_and_sub1_release_write) \ + && defined(AO_HAVE_fetch_and_sub1_release) +# define AO_fetch_and_sub1_release_write(addr) AO_fetch_and_sub1_release(addr) # define AO_HAVE_fetch_and_sub1_release_write #endif -#if !defined(AO_HAVE_fetch_and_sub1_acquire_read) && \ - defined(AO_HAVE_fetch_and_sub1_read) -# define AO_fetch_and_sub1_acquire_read(addr) \ - AO_fetch_and_sub1_read(addr) +#if !defined(AO_HAVE_fetch_and_sub1_acquire_read) \ + && defined(AO_HAVE_fetch_and_sub1_read) +# define AO_fetch_and_sub1_acquire_read(addr) AO_fetch_and_sub1_read(addr) # define AO_HAVE_fetch_and_sub1_acquire_read #endif -#if !defined(AO_HAVE_fetch_and_sub1_acquire_read) && \ - defined(AO_HAVE_fetch_and_sub1_acquire) -# define AO_fetch_and_sub1_acquire_read(addr) \ - AO_fetch_and_sub1_acquire(addr) +#if !defined(AO_HAVE_fetch_and_sub1_acquire_read) \ + && defined(AO_HAVE_fetch_and_sub1_acquire) +# define AO_fetch_and_sub1_acquire_read(addr) AO_fetch_and_sub1_acquire(addr) # define AO_HAVE_fetch_and_sub1_acquire_read #endif #ifdef AO_NO_DD_ORDERING -# if defined(AO_HAVE_fetch_and_sub1_acquire_read) -# define AO_fetch_and_sub1_dd_acquire_read(addr) \ - AO_fetch_and_sub1_acquire_read(addr) -# define AO_HAVE_fetch_and_sub1_dd_acquire_read -# endif +# if defined(AO_HAVE_fetch_and_sub1_acquire_read) +# define AO_fetch_and_sub1_dd_acquire_read(addr) \ + AO_fetch_and_sub1_acquire_read(addr) +# define AO_HAVE_fetch_and_sub1_dd_acquire_read +# endif #else -# if defined(AO_HAVE_fetch_and_sub1) -# define AO_fetch_and_sub1_dd_acquire_read(addr) AO_fetch_and_sub1(addr) -# define AO_HAVE_fetch_and_sub1_dd_acquire_read -# endif -#endif +# if defined(AO_HAVE_fetch_and_sub1) +# define AO_fetch_and_sub1_dd_acquire_read(addr) AO_fetch_and_sub1(addr) +# define AO_HAVE_fetch_and_sub1_dd_acquire_read +# endif +#endif /* !AO_NO_DD_ORDERING */ /* Atomic or */ -#if defined(AO_HAVE_compare_and_swap_full) && \ - !defined(AO_HAVE_or_full) - AO_INLINE void - AO_or_full(volatile AO_t *addr, AO_t incr) - { - AO_t old; - do - { - old = *addr; - } - while (!AO_compare_and_swap_full(addr, old, (old | incr))); - } +#if defined(AO_HAVE_compare_and_swap_full) && !defined(AO_HAVE_or_full) + AO_INLINE void + AO_or_full(volatile AO_t *addr, AO_t incr) + { + AO_t old; + do + { + old = *addr; + } + while (!AO_compare_and_swap_full(addr, old, old | incr)); + } # define AO_HAVE_or_full #endif #if defined(AO_HAVE_or_full) -# if !defined(AO_HAVE_or_release) -# define AO_or_release(addr, val) \ - AO_or_full(addr, val) -# define AO_HAVE_or_release -# endif -# if !defined(AO_HAVE_or_acquire) -# define AO_or_acquire(addr, val) \ - AO_or_full(addr, val) -# define AO_HAVE_or_acquire -# endif -# if !defined(AO_HAVE_or_write) -# define AO_or_write(addr, val) \ - AO_or_full(addr, val) -# define AO_HAVE_or_write -# endif -# if !defined(AO_HAVE_or_read) -# define AO_or_read(addr, val) \ - AO_or_full(addr, val) -# define AO_HAVE_or_read -# endif +# if !defined(AO_HAVE_or_release) +# define AO_or_release(addr,val) AO_or_full(addr,val) +# define AO_HAVE_or_release +# endif +# if !defined(AO_HAVE_or_acquire) +# define AO_or_acquire(addr,val) AO_or_full(addr,val) +# define AO_HAVE_or_acquire +# endif +# if !defined(AO_HAVE_or_write) +# define AO_or_write(addr,val) AO_or_full(addr,val) +# define AO_HAVE_or_write +# endif +# if !defined(AO_HAVE_or_read) +# define AO_or_read(addr,val) AO_or_full(addr,val) +# define AO_HAVE_or_read +# endif #endif /* AO_HAVE_or_full */ -#if !defined(AO_HAVE_or) && \ - defined(AO_HAVE_or_release) -# define AO_or(addr, val) \ - AO_or_release(addr, val) +#if !defined(AO_HAVE_or) && defined(AO_HAVE_or_release) +# define AO_or(addr,val) AO_or_release(addr,val) # define AO_HAVE_or #endif -#if !defined(AO_HAVE_or) && \ - defined(AO_HAVE_or_acquire) -# define AO_or(addr, val) \ - AO_or_acquire(addr, val) +#if !defined(AO_HAVE_or) && defined(AO_HAVE_or_acquire) +# define AO_or(addr,val) AO_or_acquire(addr,val) # define AO_HAVE_or #endif -#if !defined(AO_HAVE_or) && \ - defined(AO_HAVE_or_write) -# define AO_or(addr, val) \ - AO_or_write(addr, val) +#if !defined(AO_HAVE_or) && defined(AO_HAVE_or_write) +# define AO_or(addr,val) AO_or_write(addr,val) # define AO_HAVE_or #endif -#if !defined(AO_HAVE_or) && \ - defined(AO_HAVE_or_read) -# define AO_or(addr, val) \ - AO_or_read(addr, val) +#if !defined(AO_HAVE_or) && defined(AO_HAVE_or_read) +# define AO_or(addr,val) AO_or_read(addr,val) # define AO_HAVE_or #endif -#if defined(AO_HAVE_or_acquire) && \ - defined(AO_HAVE_nop_full) && \ - !defined(AO_HAVE_or_full) -# define AO_or_full(addr, val) \ - (AO_nop_full(), AO_or_acquire(addr, val)) +#if defined(AO_HAVE_or_acquire) && defined(AO_HAVE_nop_full) \ + && !defined(AO_HAVE_or_full) +# define AO_or_full(addr,val) (AO_nop_full(), AO_or_acquire(addr,val)) # define AO_HAVE_or_full #endif -#if !defined(AO_HAVE_or_release_write) && \ - defined(AO_HAVE_or_write) -# define AO_or_release_write(addr, val) \ - AO_or_write(addr, val) +#if !defined(AO_HAVE_or_release_write) && defined(AO_HAVE_or_write) +# define AO_or_release_write(addr,val) AO_or_write(addr,val) # define AO_HAVE_or_release_write #endif -#if !defined(AO_HAVE_or_release_write) && \ - defined(AO_HAVE_or_release) -# define AO_or_release_write(addr, val) \ - AO_or_release(addr, val) +#if !defined(AO_HAVE_or_release_write) && defined(AO_HAVE_or_release) +# define AO_or_release_write(addr,val) AO_or_release(addr,val) # define AO_HAVE_or_release_write #endif -#if !defined(AO_HAVE_or_acquire_read) && \ - defined(AO_HAVE_or_read) -# define AO_or_acquire_read(addr, val) \ - AO_or_read(addr, val) +#if !defined(AO_HAVE_or_acquire_read) && defined(AO_HAVE_or_read) +# define AO_or_acquire_read(addr,val) AO_or_read(addr,val) # define AO_HAVE_or_acquire_read #endif -#if !defined(AO_HAVE_or_acquire_read) && \ - defined(AO_HAVE_or_acquire) -# define AO_or_acquire_read(addr, val) \ - AO_or_acquire(addr, val) +#if !defined(AO_HAVE_or_acquire_read) && defined(AO_HAVE_or_acquire) +# define AO_or_acquire_read(addr,val) AO_or_acquire(addr,val) # define AO_HAVE_or_acquire_read #endif /* dd_aquire_read is meaningless. */ /* Test_and_set */ - #if defined(AO_HAVE_test_and_set_full) -# if !defined(AO_HAVE_test_and_set_release) -# define AO_test_and_set_release(addr) \ - AO_test_and_set_full(addr) -# define AO_HAVE_test_and_set_release -# endif -# if !defined(AO_HAVE_test_and_set_acquire) -# define AO_test_and_set_acquire(addr) \ - AO_test_and_set_full(addr) -# define AO_HAVE_test_and_set_acquire -# endif -# if !defined(AO_HAVE_test_and_set_write) -# define AO_test_and_set_write(addr) \ - AO_test_and_set_full(addr) -# define AO_HAVE_test_and_set_write -# endif -# if !defined(AO_HAVE_test_and_set_read) -# define AO_test_and_set_read(addr) \ - AO_test_and_set_full(addr) -# define AO_HAVE_test_and_set_read -# endif +# if !defined(AO_HAVE_test_and_set_release) +# define AO_test_and_set_release(addr) AO_test_and_set_full(addr) +# define AO_HAVE_test_and_set_release +# endif +# if !defined(AO_HAVE_test_and_set_acquire) +# define AO_test_and_set_acquire(addr) AO_test_and_set_full(addr) +# define AO_HAVE_test_and_set_acquire +# endif +# if !defined(AO_HAVE_test_and_set_write) +# define AO_test_and_set_write(addr) AO_test_and_set_full(addr) +# define AO_HAVE_test_and_set_write +# endif +# if !defined(AO_HAVE_test_and_set_read) +# define AO_test_and_set_read(addr) AO_test_and_set_full(addr) +# define AO_HAVE_test_and_set_read +# endif #endif /* AO_HAVE_test_and_set_full */ -#if !defined(AO_HAVE_test_and_set) && \ - defined(AO_HAVE_test_and_set_release) -# define AO_test_and_set(addr) \ - AO_test_and_set_release(addr) +#if !defined(AO_HAVE_test_and_set) && defined(AO_HAVE_test_and_set_release) +# define AO_test_and_set(addr) AO_test_and_set_release(addr) # define AO_HAVE_test_and_set #endif -#if !defined(AO_HAVE_test_and_set) && \ - defined(AO_HAVE_test_and_set_acquire) -# define AO_test_and_set(addr) \ - AO_test_and_set_acquire(addr) +#if !defined(AO_HAVE_test_and_set) && defined(AO_HAVE_test_and_set_acquire) +# define AO_test_and_set(addr) AO_test_and_set_acquire(addr) # define AO_HAVE_test_and_set #endif -#if !defined(AO_HAVE_test_and_set) && \ - defined(AO_HAVE_test_and_set_write) -# define AO_test_and_set(addr) \ - AO_test_and_set_write(addr) +#if !defined(AO_HAVE_test_and_set) && defined(AO_HAVE_test_and_set_write) +# define AO_test_and_set(addr) AO_test_and_set_write(addr) # define AO_HAVE_test_and_set #endif -#if !defined(AO_HAVE_test_and_set) && \ - defined(AO_HAVE_test_and_set_read) -# define AO_test_and_set(addr) \ - AO_test_and_set_read(addr) +#if !defined(AO_HAVE_test_and_set) && defined(AO_HAVE_test_and_set_read) +# define AO_test_and_set(addr) AO_test_and_set_read(addr) # define AO_HAVE_test_and_set #endif -#if defined(AO_HAVE_test_and_set_acquire) && \ - defined(AO_HAVE_nop_full) && \ - !defined(AO_HAVE_test_and_set_full) +#if defined(AO_HAVE_test_and_set_acquire) && defined(AO_HAVE_nop_full) \ + && !defined(AO_HAVE_test_and_set_full) # define AO_test_and_set_full(addr) \ - (AO_nop_full(), AO_test_and_set_acquire(addr)) + (AO_nop_full(), AO_test_and_set_acquire(addr)) # define AO_HAVE_test_and_set_full #endif -#if !defined(AO_HAVE_test_and_set_release_write) && \ - defined(AO_HAVE_test_and_set_write) -# define AO_test_and_set_release_write(addr) \ - AO_test_and_set_write(addr) +#if !defined(AO_HAVE_test_and_set_release_write) \ + && defined(AO_HAVE_test_and_set_write) +# define AO_test_and_set_release_write(addr) AO_test_and_set_write(addr) # define AO_HAVE_test_and_set_release_write #endif -#if !defined(AO_HAVE_test_and_set_release_write) && \ - defined(AO_HAVE_test_and_set_release) -# define AO_test_and_set_release_write(addr) \ - AO_test_and_set_release(addr) +#if !defined(AO_HAVE_test_and_set_release_write) \ + && defined(AO_HAVE_test_and_set_release) +# define AO_test_and_set_release_write(addr) AO_test_and_set_release(addr) # define AO_HAVE_test_and_set_release_write #endif -#if !defined(AO_HAVE_test_and_set_acquire_read) && \ - defined(AO_HAVE_test_and_set_read) -# define AO_test_and_set_acquire_read(addr) \ - AO_test_and_set_read(addr) +#if !defined(AO_HAVE_test_and_set_acquire_read) \ + && defined(AO_HAVE_test_and_set_read) +# define AO_test_and_set_acquire_read(addr) AO_test_and_set_read(addr) # define AO_HAVE_test_and_set_acquire_read #endif -#if !defined(AO_HAVE_test_and_set_acquire_read) && \ - defined(AO_HAVE_test_and_set_acquire) -# define AO_test_and_set_acquire_read(addr) \ - AO_test_and_set_acquire(addr) +#if !defined(AO_HAVE_test_and_set_acquire_read) \ + && defined(AO_HAVE_test_and_set_acquire) +# define AO_test_and_set_acquire_read(addr) AO_test_and_set_acquire(addr) # define AO_HAVE_test_and_set_acquire_read #endif #ifdef AO_NO_DD_ORDERING -# if defined(AO_HAVE_test_and_set_acquire_read) -# define AO_test_and_set_dd_acquire_read(addr) \ - AO_test_and_set_acquire_read(addr) -# define AO_HAVE_test_and_set_dd_acquire_read -# endif +# if defined(AO_HAVE_test_and_set_acquire_read) +# define AO_test_and_set_dd_acquire_read(addr) \ + AO_test_and_set_acquire_read(addr) +# define AO_HAVE_test_and_set_dd_acquire_read +# endif #else -# if defined(AO_HAVE_test_and_set) -# define AO_test_and_set_dd_acquire_read(addr) AO_test_and_set(addr) -# define AO_HAVE_test_and_set_dd_acquire_read -# endif -#endif +# if defined(AO_HAVE_test_and_set) +# define AO_test_and_set_dd_acquire_read(addr) AO_test_and_set(addr) +# define AO_HAVE_test_and_set_dd_acquire_read +# endif +#endif /* !AO_NO_DD_ORDERING */ /* Compare_and_swap */ #if defined(AO_HAVE_compare_and_swap) && defined(AO_HAVE_nop_full) \ && !defined(AO_HAVE_compare_and_swap_acquire) - AO_INLINE int - AO_compare_and_swap_acquire(volatile AO_t *addr, AO_t old, AO_t new_val) - { - int result = AO_compare_and_swap(addr, old, new_val); - AO_nop_full(); - return result; - } -# define AO_HAVE_compare_and_swap_acquire + AO_INLINE int + AO_compare_and_swap_acquire(volatile AO_t *addr, AO_t old, AO_t new_val) + { + int result = AO_compare_and_swap(addr, old, new_val); + AO_nop_full(); + return result; + } +# define AO_HAVE_compare_and_swap_acquire #endif #if defined(AO_HAVE_compare_and_swap) && defined(AO_HAVE_nop_full) \ && !defined(AO_HAVE_compare_and_swap_release) -# define AO_compare_and_swap_release(addr, old, new_val) \ - (AO_nop_full(), AO_compare_and_swap(addr, old, new_val)) +# define AO_compare_and_swap_release(addr,old,new_val) \ + (AO_nop_full(), AO_compare_and_swap(addr,old,new_val)) # define AO_HAVE_compare_and_swap_release #endif #if defined(AO_HAVE_compare_and_swap_full) -# if !defined(AO_HAVE_compare_and_swap_release) -# define AO_compare_and_swap_release(addr, old, new_val) \ - AO_compare_and_swap_full(addr, old, new_val) -# define AO_HAVE_compare_and_swap_release -# endif -# if !defined(AO_HAVE_compare_and_swap_acquire) -# define AO_compare_and_swap_acquire(addr, old, new_val) \ - AO_compare_and_swap_full(addr, old, new_val) -# define AO_HAVE_compare_and_swap_acquire -# endif -# if !defined(AO_HAVE_compare_and_swap_write) -# define AO_compare_and_swap_write(addr, old, new_val) \ - AO_compare_and_swap_full(addr, old, new_val) -# define AO_HAVE_compare_and_swap_write -# endif -# if !defined(AO_HAVE_compare_and_swap_read) -# define AO_compare_and_swap_read(addr, old, new_val) \ - AO_compare_and_swap_full(addr, old, new_val) -# define AO_HAVE_compare_and_swap_read -# endif +# if !defined(AO_HAVE_compare_and_swap_release) +# define AO_compare_and_swap_release(addr,old,new_val) \ + AO_compare_and_swap_full(addr,old,new_val) +# define AO_HAVE_compare_and_swap_release +# endif +# if !defined(AO_HAVE_compare_and_swap_acquire) +# define AO_compare_and_swap_acquire(addr,old,new_val) \ + AO_compare_and_swap_full(addr,old,new_val) +# define AO_HAVE_compare_and_swap_acquire +# endif +# if !defined(AO_HAVE_compare_and_swap_write) +# define AO_compare_and_swap_write(addr,old,new_val) \ + AO_compare_and_swap_full(addr,old,new_val) +# define AO_HAVE_compare_and_swap_write +# endif +# if !defined(AO_HAVE_compare_and_swap_read) +# define AO_compare_and_swap_read(addr,old,new_val) \ + AO_compare_and_swap_full(addr,old,new_val) +# define AO_HAVE_compare_and_swap_read +# endif #endif /* AO_HAVE_compare_and_swap_full */ -#if !defined(AO_HAVE_compare_and_swap) && \ - defined(AO_HAVE_compare_and_swap_release) -# define AO_compare_and_swap(addr, old, new_val) \ - AO_compare_and_swap_release(addr, old, new_val) +#if !defined(AO_HAVE_compare_and_swap) \ + && defined(AO_HAVE_compare_and_swap_release) +# define AO_compare_and_swap(addr,old,new_val) \ + AO_compare_and_swap_release(addr,old,new_val) # define AO_HAVE_compare_and_swap #endif -#if !defined(AO_HAVE_compare_and_swap) && \ - defined(AO_HAVE_compare_and_swap_acquire) -# define AO_compare_and_swap(addr, old, new_val) \ - AO_compare_and_swap_acquire(addr, old, new_val) +#if !defined(AO_HAVE_compare_and_swap) \ + && defined(AO_HAVE_compare_and_swap_acquire) +# define AO_compare_and_swap(addr,old,new_val) \ + AO_compare_and_swap_acquire(addr,old,new_val) # define AO_HAVE_compare_and_swap #endif -#if !defined(AO_HAVE_compare_and_swap) && \ - defined(AO_HAVE_compare_and_swap_write) -# define AO_compare_and_swap(addr, old, new_val) \ - AO_compare_and_swap_write(addr, old, new_val) +#if !defined(AO_HAVE_compare_and_swap) \ + && defined(AO_HAVE_compare_and_swap_write) +# define AO_compare_and_swap(addr,old,new_val) \ + AO_compare_and_swap_write(addr,old,new_val) # define AO_HAVE_compare_and_swap #endif -#if !defined(AO_HAVE_compare_and_swap) && \ - defined(AO_HAVE_compare_and_swap_read) -# define AO_compare_and_swap(addr, old, new_val) \ - AO_compare_and_swap_read(addr, old, new_val) +#if !defined(AO_HAVE_compare_and_swap) \ + && defined(AO_HAVE_compare_and_swap_read) +# define AO_compare_and_swap(addr,old,new_val) \ + AO_compare_and_swap_read(addr,old,new_val) # define AO_HAVE_compare_and_swap #endif -#if defined(AO_HAVE_compare_and_swap_acquire) && \ - defined(AO_HAVE_nop_full) && \ - !defined(AO_HAVE_compare_and_swap_full) -# define AO_compare_and_swap_full(addr, old, new_val) \ - (AO_nop_full(), AO_compare_and_swap_acquire(addr, old, new_val)) +#if defined(AO_HAVE_compare_and_swap_acquire) \ + && defined(AO_HAVE_nop_full) && !defined(AO_HAVE_compare_and_swap_full) +# define AO_compare_and_swap_full(addr,old,new_val) \ + (AO_nop_full(), AO_compare_and_swap_acquire(addr,old,new_val)) # define AO_HAVE_compare_and_swap_full #endif -#if !defined(AO_HAVE_compare_and_swap_release_write) && \ - defined(AO_HAVE_compare_and_swap_write) -# define AO_compare_and_swap_release_write(addr, old, new_val) \ - AO_compare_and_swap_write(addr, old, new_val) +#if !defined(AO_HAVE_compare_and_swap_release_write) \ + && defined(AO_HAVE_compare_and_swap_write) +# define AO_compare_and_swap_release_write(addr,old,new_val) \ + AO_compare_and_swap_write(addr,old,new_val) # define AO_HAVE_compare_and_swap_release_write #endif -#if !defined(AO_HAVE_compare_and_swap_release_write) && \ - defined(AO_HAVE_compare_and_swap_release) -# define AO_compare_and_swap_release_write(addr, old, new_val) \ - AO_compare_and_swap_release(addr, old, new_val) +#if !defined(AO_HAVE_compare_and_swap_release_write) \ + && defined(AO_HAVE_compare_and_swap_release) +# define AO_compare_and_swap_release_write(addr,old,new_val) \ + AO_compare_and_swap_release(addr,old,new_val) # define AO_HAVE_compare_and_swap_release_write #endif -#if !defined(AO_HAVE_compare_and_swap_acquire_read) && \ - defined(AO_HAVE_compare_and_swap_read) -# define AO_compare_and_swap_acquire_read(addr, old, new_val) \ - AO_compare_and_swap_read(addr, old, new_val) +#if !defined(AO_HAVE_compare_and_swap_acquire_read) \ + && defined(AO_HAVE_compare_and_swap_read) +# define AO_compare_and_swap_acquire_read(addr,old,new_val) \ + AO_compare_and_swap_read(addr,old,new_val) # define AO_HAVE_compare_and_swap_acquire_read #endif -#if !defined(AO_HAVE_compare_and_swap_acquire_read) && \ - defined(AO_HAVE_compare_and_swap_acquire) -# define AO_compare_and_swap_acquire_read(addr, old, new_val) \ - AO_compare_and_swap_acquire(addr, old, new_val) +#if !defined(AO_HAVE_compare_and_swap_acquire_read) \ + && defined(AO_HAVE_compare_and_swap_acquire) +# define AO_compare_and_swap_acquire_read(addr,old,new_val) \ + AO_compare_and_swap_acquire(addr,old,new_val) # define AO_HAVE_compare_and_swap_acquire_read #endif #ifdef AO_NO_DD_ORDERING -# if defined(AO_HAVE_compare_and_swap_acquire_read) -# define AO_compare_and_swap_dd_acquire_read(addr, old, new_val) \ - AO_compare_and_swap_acquire_read(addr, old, new_val) -# define AO_HAVE_compare_and_swap_dd_acquire_read -# endif +# if defined(AO_HAVE_compare_and_swap_acquire_read) +# define AO_compare_and_swap_dd_acquire_read(addr,old,new_val) \ + AO_compare_and_swap_acquire_read(addr,old,new_val) +# define AO_HAVE_compare_and_swap_dd_acquire_read +# endif #else -# if defined(AO_HAVE_compare_and_swap) -# define AO_compare_and_swap_dd_acquire_read(addr, old, new_val) \ - AO_compare_and_swap(addr, old, new_val) -# define AO_HAVE_compare_and_swap_dd_acquire_read -# endif -#endif +# if defined(AO_HAVE_compare_and_swap) +# define AO_compare_and_swap_dd_acquire_read(addr,old,new_val) \ + AO_compare_and_swap(addr,old,new_val) +# define AO_HAVE_compare_and_swap_dd_acquire_read +# endif +#endif /* !AO_NO_DD_ORDERING */ #include "generalize-small.h" @@ -1086,240 +982,240 @@ AO_test_and_set_acquire(volatile AO_TS_t *addr) #if defined(AO_HAVE_compare_double_and_swap_double) \ && defined(AO_HAVE_nop_full) \ && !defined(AO_HAVE_compare_double_and_swap_double_acquire) - AO_INLINE int - AO_compare_double_and_swap_double_acquire(volatile AO_double_t *addr, - AO_t o1, AO_t o2, - AO_t n1, AO_t n2) - { - int result = AO_compare_double_and_swap_double(addr, o1, o2, n1, n2); - AO_nop_full(); - return result; - } -# define AO_HAVE_compare_double_and_swap_double_acquire + AO_INLINE int + AO_compare_double_and_swap_double_acquire(volatile AO_double_t *addr, + AO_t o1, AO_t o2, + AO_t n1, AO_t n2) + { + int result = AO_compare_double_and_swap_double(addr, o1, o2, n1, n2); + AO_nop_full(); + return result; + } +# define AO_HAVE_compare_double_and_swap_double_acquire #endif #if defined(AO_HAVE_compare_double_and_swap_double) \ && defined(AO_HAVE_nop_full) \ && !defined(AO_HAVE_compare_double_and_swap_double_release) -# define AO_compare_double_and_swap_double_release(addr, o1, o2, n1, n2) \ - (AO_nop_full(), AO_compare_double_and_swap_double(addr, o1, o2, n1, n2)) +# define AO_compare_double_and_swap_double_release(addr,o1,o2,n1,n2) \ + (AO_nop_full(), AO_compare_double_and_swap_double(addr,o1,o2,n1,n2)) # define AO_HAVE_compare_double_and_swap_double_release #endif #if defined(AO_HAVE_compare_double_and_swap_double_full) -# if !defined(AO_HAVE_compare_double_and_swap_double_release) -# define AO_compare_double_and_swap_double_release(addr, o1, o2, n1, n2) \ - AO_compare_double_and_swap_double_full(addr, o1, o2, n1, n2) -# define AO_HAVE_compare_double_and_swap_double_release -# endif -# if !defined(AO_HAVE_compare_double_and_swap_double_acquire) -# define AO_compare_double_and_swap_double_acquire(addr, o1, o2, n1, n2) \ - AO_compare_double_and_swap_double_full(addr, o1, o2, n1, n2) -# define AO_HAVE_compare_double_and_swap_double_acquire -# endif -# if !defined(AO_HAVE_compare_double_and_swap_double_write) -# define AO_compare_double_and_swap_double_write(addr, o1, o2, n1, n2) \ - AO_compare_double_and_swap_double_full(addr, o1, o2, n1, n2) -# define AO_HAVE_compare_double_and_swap_double_write -# endif -# if !defined(AO_HAVE_compare_double_and_swap_double_read) -# define AO_compare_double_and_swap_double_read(addr, o1, o2, n1, n2) \ - AO_compare_double_and_swap_double_full(addr, o1, o2, n1, n2) -# define AO_HAVE_compare_double_and_swap_double_read -# endif +# if !defined(AO_HAVE_compare_double_and_swap_double_release) +# define AO_compare_double_and_swap_double_release(addr,o1,o2,n1,n2) \ + AO_compare_double_and_swap_double_full(addr,o1,o2,n1,n2) +# define AO_HAVE_compare_double_and_swap_double_release +# endif +# if !defined(AO_HAVE_compare_double_and_swap_double_acquire) +# define AO_compare_double_and_swap_double_acquire(addr,o1,o2,n1,n2) \ + AO_compare_double_and_swap_double_full(addr,o1,o2,n1,n2) +# define AO_HAVE_compare_double_and_swap_double_acquire +# endif +# if !defined(AO_HAVE_compare_double_and_swap_double_write) +# define AO_compare_double_and_swap_double_write(addr,o1,o2,n1,n2) \ + AO_compare_double_and_swap_double_full(addr,o1,o2,n1,n2) +# define AO_HAVE_compare_double_and_swap_double_write +# endif +# if !defined(AO_HAVE_compare_double_and_swap_double_read) +# define AO_compare_double_and_swap_double_read(addr,o1,o2,n1,n2) \ + AO_compare_double_and_swap_double_full(addr,o1,o2,n1,n2) +# define AO_HAVE_compare_double_and_swap_double_read +# endif #endif /* AO_HAVE_compare_double_and_swap_double_full */ -#if !defined(AO_HAVE_compare_double_and_swap_double) && \ - defined(AO_HAVE_compare_double_and_swap_double_release) -# define AO_compare_double_and_swap_double(addr, o1, o2, n1, n2) \ - AO_compare_double_and_swap_double_release(addr, o1, o2, n1, n2) +#if !defined(AO_HAVE_compare_double_and_swap_double) \ + && defined(AO_HAVE_compare_double_and_swap_double_release) +# define AO_compare_double_and_swap_double(addr,o1,o2,n1,n2) \ + AO_compare_double_and_swap_double_release(addr,o1,o2,n1,n2) # define AO_HAVE_compare_double_and_swap_double #endif -#if !defined(AO_HAVE_compare_double_and_swap_double) && \ - defined(AO_HAVE_compare_double_and_swap_double_acquire) -# define AO_compare_double_and_swap_double(addr, o1, o2, n1, n2) \ - AO_compare_double_and_swap_double_acquire(addr, o1, o2, n1, n2) +#if !defined(AO_HAVE_compare_double_and_swap_double) \ + && defined(AO_HAVE_compare_double_and_swap_double_acquire) +# define AO_compare_double_and_swap_double(addr,o1,o2,n1,n2) \ + AO_compare_double_and_swap_double_acquire(addr,o1,o2,n1,n2) # define AO_HAVE_compare_double_and_swap_double #endif -#if !defined(AO_HAVE_compare_double_and_swap_double) && \ - defined(AO_HAVE_compare_double_and_swap_double_write) -# define AO_compare_double_and_swap_double(addr, o1, o2, n1, n2) \ - AO_compare_double_and_swap_double_write(addr, o1, o2, n1, n2) +#if !defined(AO_HAVE_compare_double_and_swap_double) \ + && defined(AO_HAVE_compare_double_and_swap_double_write) +# define AO_compare_double_and_swap_double(addr,o1,o2,n1,n2) \ + AO_compare_double_and_swap_double_write(addr,o1,o2,n1,n2) # define AO_HAVE_compare_double_and_swap_double #endif -#if !defined(AO_HAVE_compare_double_and_swap_double) && \ - defined(AO_HAVE_compare_double_and_swap_double_read) -# define AO_compare_double_and_swap_double(addr, o1, o2, n1, n2) \ - AO_compare_double_and_swap_double_read(addr, o1, o2, n1, n2) +#if !defined(AO_HAVE_compare_double_and_swap_double) \ + && defined(AO_HAVE_compare_double_and_swap_double_read) +# define AO_compare_double_and_swap_double(addr,o1,o2,n1,n2) \ + AO_compare_double_and_swap_double_read(addr,o1,o2,n1,n2) # define AO_HAVE_compare_double_and_swap_double #endif -#if defined(AO_HAVE_compare_double_and_swap_double_acquire) && \ - defined(AO_HAVE_nop_full) && \ - !defined(AO_HAVE_compare_double_and_swap_double_full) -# define AO_compare_double_and_swap_double_full(addr, o1, o2, n1, n2) \ - (AO_nop_full(), \ - AO_compare_double_and_swap_double_acquire(addr, o1, o2, n1, n2)) +#if defined(AO_HAVE_compare_double_and_swap_double_acquire) \ + && defined(AO_HAVE_nop_full) \ + && !defined(AO_HAVE_compare_double_and_swap_double_full) +# define AO_compare_double_and_swap_double_full(addr,o1,o2,n1,n2) \ + (AO_nop_full(), \ + AO_compare_double_and_swap_double_acquire(addr,o1,o2,n1,n2)) # define AO_HAVE_compare_double_and_swap_double_full #endif -#if !defined(AO_HAVE_compare_double_and_swap_double_release_write) && \ - defined(AO_HAVE_compare_double_and_swap_double_write) -# define AO_compare_double_and_swap_double_release_write(addr, o1, o2, n1, n2) \ - AO_compare_double_and_swap_double_write(addr, o1, o2, n1, n2) +#if !defined(AO_HAVE_compare_double_and_swap_double_release_write) \ + && defined(AO_HAVE_compare_double_and_swap_double_write) +# define AO_compare_double_and_swap_double_release_write(addr,o1,o2,n1,n2) \ + AO_compare_double_and_swap_double_write(addr,o1,o2,n1,n2) # define AO_HAVE_compare_double_and_swap_double_release_write #endif -#if !defined(AO_HAVE_compare_double_and_swap_double_release_write) && \ - defined(AO_HAVE_compare_double_and_swap_double_release) -# define AO_compare_double_and_swap_double_release_write(addr, o1, o2, n1, n2) \ - AO_compare_double_and_swap_double_release(addr, o1, o2, n1, n2) +#if !defined(AO_HAVE_compare_double_and_swap_double_release_write) \ + && defined(AO_HAVE_compare_double_and_swap_double_release) +# define AO_compare_double_and_swap_double_release_write(addr,o1,o2,n1,n2) \ + AO_compare_double_and_swap_double_release(addr,o1,o2,n1,n2) # define AO_HAVE_compare_double_and_swap_double_release_write #endif -#if !defined(AO_HAVE_compare_double_and_swap_double_acquire_read) && \ - defined(AO_HAVE_compare_double_and_swap_double_read) -# define AO_compare_double_and_swap_double_acquire_read(addr, o1, o2, n1, n2) \ - AO_compare_double_and_swap_double_read(addr, o1, o2, n1, n2) +#if !defined(AO_HAVE_compare_double_and_swap_double_acquire_read) \ + && defined(AO_HAVE_compare_double_and_swap_double_read) +# define AO_compare_double_and_swap_double_acquire_read(addr,o1,o2,n1,n2) \ + AO_compare_double_and_swap_double_read(addr,o1,o2,n1,n2) # define AO_HAVE_compare_double_and_swap_double_acquire_read #endif -#if !defined(AO_HAVE_compare_double_and_swap_double_acquire_read) && \ - defined(AO_HAVE_compare_double_and_swap_double_acquire) -# define AO_compare_double_and_swap_double_acquire_read(addr, o1, o2, n1, n2) \ - AO_compare_double_and_swap_double_acquire(addr, o1, o2, n1, n2) +#if !defined(AO_HAVE_compare_double_and_swap_double_acquire_read) \ + && defined(AO_HAVE_compare_double_and_swap_double_acquire) +# define AO_compare_double_and_swap_double_acquire_read(addr,o1,o2,n1,n2) \ + AO_compare_double_and_swap_double_acquire(addr,o1,o2,n1,n2) # define AO_HAVE_compare_double_and_swap_double_acquire_read #endif #ifdef AO_NO_DD_ORDERING -# if defined(AO_HAVE_compare_double_and_swap_double_acquire_read) -# define AO_compare_double_and_swap_double_dd_acquire_read(addr, o1, o2, n1, n2) \ - AO_compare_double_and_swap_double_acquire_read(addr, o1, o2, n1, n2) -# define AO_HAVE_compare_double_and_swap_double_dd_acquire_read -# endif +# if defined(AO_HAVE_compare_double_and_swap_double_acquire_read) +# define AO_compare_double_and_swap_double_dd_acquire_read(addr,o1,o2,n1,n2) \ + AO_compare_double_and_swap_double_acquire_read(addr,o1,o2,n1,n2) +# define AO_HAVE_compare_double_and_swap_double_dd_acquire_read +# endif #else -# if defined(AO_HAVE_compare_double_and_swap_double) -# define AO_compare_double_and_swap_double_dd_acquire_read(addr, o1, o2, n1, n2) \ - AO_compare_double_and_swap_double(addr, o1, o2, n1, n2) -# define AO_HAVE_compare_double_and_swap_double_dd_acquire_read -# endif -#endif +# if defined(AO_HAVE_compare_double_and_swap_double) +# define AO_compare_double_and_swap_double_dd_acquire_read(addr,o1,o2,n1,n2) \ + AO_compare_double_and_swap_double(addr,o1,o2,n1,n2) +# define AO_HAVE_compare_double_and_swap_double_dd_acquire_read +# endif +#endif /* !AO_NO_DD_ORDERING */ /* Compare_and_swap_double */ #if defined(AO_HAVE_compare_and_swap_double) && defined(AO_HAVE_nop_full) \ && !defined(AO_HAVE_compare_and_swap_double_acquire) - AO_INLINE int - AO_compare_and_swap_double_acquire(volatile AO_double_t *addr, - AO_t o1, - AO_t n1, AO_t n2) - { - int result = AO_compare_and_swap_double(addr, o1, n1, n2); - AO_nop_full(); - return result; - } -# define AO_HAVE_compare_and_swap_double_acquire + AO_INLINE int + AO_compare_and_swap_double_acquire(volatile AO_double_t *addr, + AO_t o1, + AO_t n1, AO_t n2) + { + int result = AO_compare_and_swap_double(addr, o1, n1, n2); + AO_nop_full(); + return result; + } +# define AO_HAVE_compare_and_swap_double_acquire #endif #if defined(AO_HAVE_compare_and_swap_double) \ && defined(AO_HAVE_nop_full) \ && !defined(AO_HAVE_compare_and_swap_double_release) -# define AO_compare_and_swap_double_release(addr, o1, n1, n2) \ - (AO_nop_full(), AO_compare_and_swap_double(addr, o1, n1, n2)) +# define AO_compare_and_swap_double_release(addr,o1,n1,n2) \ + (AO_nop_full(), AO_compare_and_swap_double(addr,o1,n1,n2)) # define AO_HAVE_compare_and_swap_double_release #endif #if defined(AO_HAVE_compare_and_swap_double_full) -# if !defined(AO_HAVE_compare_and_swap_double_release) -# define AO_compare_and_swap_double_release(addr, o1, n1, n2) \ - AO_compare_and_swap_double_full(addr, o1, n1, n2) -# define AO_HAVE_compare_and_swap_double_release -# endif -# if !defined(AO_HAVE_compare_and_swap_double_acquire) -# define AO_compare_and_swap_double_acquire(addr, o1, n1, n2) \ - AO_compare_and_swap_double_full(addr, o1, n1, n2) -# define AO_HAVE_compare_and_swap_double_acquire -# endif -# if !defined(AO_HAVE_compare_and_swap_double_write) -# define AO_compare_and_swap_double_write(addr, o1, n1, n2) \ - AO_compare_and_swap_double_full(addr, o1, n1, n2) -# define AO_HAVE_compare_and_swap_double_write -# endif -# if !defined(AO_HAVE_compare_and_swap_double_read) -# define AO_compare_and_swap_double_read(addr, o1, n1, n2) \ - AO_compare_and_swap_double_full(addr, o1, n1, n2) -# define AO_HAVE_compare_and_swap_double_read -# endif +# if !defined(AO_HAVE_compare_and_swap_double_release) +# define AO_compare_and_swap_double_release(addr,o1,n1,n2) \ + AO_compare_and_swap_double_full(addr,o1,n1,n2) +# define AO_HAVE_compare_and_swap_double_release +# endif +# if !defined(AO_HAVE_compare_and_swap_double_acquire) +# define AO_compare_and_swap_double_acquire(addr,o1,n1,n2) \ + AO_compare_and_swap_double_full(addr,o1,n1,n2) +# define AO_HAVE_compare_and_swap_double_acquire +# endif +# if !defined(AO_HAVE_compare_and_swap_double_write) +# define AO_compare_and_swap_double_write(addr,o1,n1,n2) \ + AO_compare_and_swap_double_full(addr,o1,n1,n2) +# define AO_HAVE_compare_and_swap_double_write +# endif +# if !defined(AO_HAVE_compare_and_swap_double_read) +# define AO_compare_and_swap_double_read(addr,o1,n1,n2) \ + AO_compare_and_swap_double_full(addr,o1,n1,n2) +# define AO_HAVE_compare_and_swap_double_read +# endif #endif /* AO_HAVE_compare_and_swap_double_full */ -#if !defined(AO_HAVE_compare_and_swap_double) && \ - defined(AO_HAVE_compare_and_swap_double_release) -# define AO_compare_and_swap_double(addr, o1, n1, n2) \ - AO_compare_and_swap_double_release(addr, o1, n1, n2) +#if !defined(AO_HAVE_compare_and_swap_double) \ + && defined(AO_HAVE_compare_and_swap_double_release) +# define AO_compare_and_swap_double(addr,o1,n1,n2) \ + AO_compare_and_swap_double_release(addr,o1,n1,n2) # define AO_HAVE_compare_and_swap_double #endif -#if !defined(AO_HAVE_compare_and_swap_double) && \ - defined(AO_HAVE_compare_and_swap_double_acquire) -# define AO_compare_and_swap_double(addr, o1, n1, n2) \ - AO_compare_and_swap_double_acquire(addr, o1, n1, n2) +#if !defined(AO_HAVE_compare_and_swap_double) \ + && defined(AO_HAVE_compare_and_swap_double_acquire) +# define AO_compare_and_swap_double(addr,o1,n1,n2) \ + AO_compare_and_swap_double_acquire(addr,o1,n1,n2) # define AO_HAVE_compare_and_swap_double #endif -#if !defined(AO_HAVE_compare_and_swap_double) && \ - defined(AO_HAVE_compare_and_swap_double_write) -# define AO_compare_and_swap_double(addr, o1, n1, n2) \ - AO_compare_and_swap_double_write(addr, o1, n1, n2) +#if !defined(AO_HAVE_compare_and_swap_double) \ + && defined(AO_HAVE_compare_and_swap_double_write) +# define AO_compare_and_swap_double(addr,o1,n1,n2) \ + AO_compare_and_swap_double_write(addr,o1,n1,n2) # define AO_HAVE_compare_and_swap_double #endif -#if !defined(AO_HAVE_compare_and_swap_double) && \ - defined(AO_HAVE_compare_and_swap_double_read) -# define AO_compare_and_swap_double(addr, o1, n1, n2) \ - AO_compare_and_swap_double_read(addr, o1, n1, n2) +#if !defined(AO_HAVE_compare_and_swap_double) \ + && defined(AO_HAVE_compare_and_swap_double_read) +# define AO_compare_and_swap_double(addr,o1,n1,n2) \ + AO_compare_and_swap_double_read(addr,o1,n1,n2) # define AO_HAVE_compare_and_swap_double #endif -#if defined(AO_HAVE_compare_and_swap_double_acquire) && \ - defined(AO_HAVE_nop_full) && \ - !defined(AO_HAVE_compare_and_swap_double_full) -# define AO_compare_and_swap_double_full(addr, o1, n1, n2) \ - (AO_nop_full(), AO_compare_and_swap_double_acquire(addr, o1, n1, n2)) +#if defined(AO_HAVE_compare_and_swap_double_acquire) \ + && defined(AO_HAVE_nop_full) \ + && !defined(AO_HAVE_compare_and_swap_double_full) +# define AO_compare_and_swap_double_full(addr,o1,n1,n2) \ + (AO_nop_full(), AO_compare_and_swap_double_acquire(addr,o1,n1,n2)) # define AO_HAVE_compare_and_swap_double_full #endif -#if !defined(AO_HAVE_compare_and_swap_double_release_write) && \ - defined(AO_HAVE_compare_and_swap_double_write) -# define AO_compare_and_swap_double_release_write(addr, o1, n1, n2) \ - AO_compare_and_swap_double_write(addr, o1, n1, n2) +#if !defined(AO_HAVE_compare_and_swap_double_release_write) \ + && defined(AO_HAVE_compare_and_swap_double_write) +# define AO_compare_and_swap_double_release_write(addr,o1,n1,n2) \ + AO_compare_and_swap_double_write(addr,o1,n1,n2) # define AO_HAVE_compare_and_swap_double_release_write #endif -#if !defined(AO_HAVE_compare_and_swap_double_release_write) && \ - defined(AO_HAVE_compare_and_swap_double_release) -# define AO_compare_and_swap_double_release_write(addr, o1, n1, n2) \ - AO_compare_and_swap_double_release(addr, o1, n1, n2) +#if !defined(AO_HAVE_compare_and_swap_double_release_write) \ + && defined(AO_HAVE_compare_and_swap_double_release) +# define AO_compare_and_swap_double_release_write(addr,o1,n1,n2) \ + AO_compare_and_swap_double_release(addr,o1,n1,n2) # define AO_HAVE_compare_and_swap_double_release_write #endif -#if !defined(AO_HAVE_compare_and_swap_double_acquire_read) && \ - defined(AO_HAVE_compare_and_swap_double_read) -# define AO_compare_and_swap_double_acquire_read(addr, o1, n1, n2) \ - AO_compare_and_swap_double_read(addr, o1, n1, n2) +#if !defined(AO_HAVE_compare_and_swap_double_acquire_read) \ + && defined(AO_HAVE_compare_and_swap_double_read) +# define AO_compare_and_swap_double_acquire_read(addr,o1,n1,n2) \ + AO_compare_and_swap_double_read(addr,o1,n1,n2) # define AO_HAVE_compare_and_swap_double_acquire_read #endif -#if !defined(AO_HAVE_compare_and_swap_double_acquire_read) && \ - defined(AO_HAVE_compare_and_swap_double_acquire) -# define AO_compare_and_swap_double_acquire_read(addr, o1, n1, n2) \ - AO_compare_and_swap_double_acquire(addr, o1, n1, n2) +#if !defined(AO_HAVE_compare_and_swap_double_acquire_read) \ + && defined(AO_HAVE_compare_and_swap_double_acquire) +# define AO_compare_and_swap_double_acquire_read(addr,o1,n1,n2) \ + AO_compare_and_swap_double_acquire(addr,o1,n1,n2) # define AO_HAVE_compare_and_swap_double_acquire_read #endif #ifdef AO_NO_DD_ORDERING -# if defined(AO_HAVE_compare_and_swap_double_acquire_read) -# define AO_compare_and_swap_double_dd_acquire_read(addr, o1, n1, n2) \ - AO_compare_and_swap_double_acquire_read(addr, o1, n1, n2) -# define AO_HAVE_compare_and_swap_double_dd_acquire_read -# endif +# if defined(AO_HAVE_compare_and_swap_double_acquire_read) +# define AO_compare_and_swap_double_dd_acquire_read(addr,o1,n1,n2) \ + AO_compare_and_swap_double_acquire_read(addr,o1,n1,n2) +# define AO_HAVE_compare_and_swap_double_dd_acquire_read +# endif #else -# if defined(AO_HAVE_compare_and_swap_double) -# define AO_compare_and_swap_double_dd_acquire_read(addr, o1, n1, n2) \ - AO_compare_and_swap_double(addr, o1, n1, n2) -# define AO_HAVE_compare_and_swap_double_dd_acquire_read -# endif +# if defined(AO_HAVE_compare_and_swap_double) +# define AO_compare_and_swap_double_dd_acquire_read(addr,o1,n1,n2) \ + AO_compare_and_swap_double(addr,o1,n1,n2) +# define AO_HAVE_compare_and_swap_double_dd_acquire_read +# endif #endif /* NEC LE-IT: Convenience functions for AO_double compare and swap which */ /* types and reads easier in code */ -#if defined(AO_HAVE_compare_double_and_swap_double_release) && \ - !defined(AO_HAVE_double_compare_and_swap_release) +#if defined(AO_HAVE_compare_double_and_swap_double_release) \ + && !defined(AO_HAVE_double_compare_and_swap_release) AO_INLINE int AO_double_compare_and_swap_release(volatile AO_double_t *addr, AO_double_t old_val, AO_double_t new_val) @@ -1331,8 +1227,8 @@ AO_test_and_set_acquire(volatile AO_TS_t *addr) # define AO_HAVE_double_compare_and_swap_release #endif -#if defined(AO_HAVE_compare_double_and_swap_double_acquire) && \ - !defined(AO_HAVE_double_compare_and_swap_acquire) +#if defined(AO_HAVE_compare_double_and_swap_double_acquire) \ + && !defined(AO_HAVE_double_compare_and_swap_acquire) AO_INLINE int AO_double_compare_and_swap_acquire(volatile AO_double_t *addr, AO_double_t old_val, AO_double_t new_val) @@ -1344,8 +1240,8 @@ AO_test_and_set_acquire(volatile AO_TS_t *addr) # define AO_HAVE_double_compare_and_swap_acquire #endif -#if defined(AO_HAVE_compare_double_and_swap_double_full) && \ - !defined(AO_HAVE_double_compare_and_swap_full) +#if defined(AO_HAVE_compare_double_and_swap_double_full) \ + && !defined(AO_HAVE_double_compare_and_swap_full) AO_INLINE int AO_double_compare_and_swap_full(volatile AO_double_t *addr, AO_double_t old_val, AO_double_t new_val) diff --git a/src/atomic_ops/sysdeps/armcc/arm_v6.h b/src/atomic_ops/sysdeps/armcc/arm_v6.h index 33c22ca..a239587 100644 --- a/src/atomic_ops/sysdeps/armcc/arm_v6.h +++ b/src/atomic_ops/sysdeps/armcc/arm_v6.h @@ -44,12 +44,12 @@ AO_INLINE void AO_nop_full(void) { # ifndef AO_UNIPROCESSOR - unsigned int dest=0; - /* issue an data memory barrier (keeps ordering of memory transactions */ - /* before and after this operation) */ - __asm { - mcr p15,0,dest,c7,c10,5 - }; + unsigned int dest=0; + /* issue an data memory barrier (keeps ordering of memory transactions */ + /* before and after this operation) */ + __asm { + mcr p15,0,dest,c7,c10,5 + }; # endif } #define AO_HAVE_nop_full @@ -96,10 +96,10 @@ __asm { more flexible, other instructions can be done between the LDREX and STREX accesses. " */ -AO_INLINE AO_TS_t +AO_INLINE AO_TS_VAL_t AO_test_and_set(volatile AO_TS_t *addr) { - AO_TS_t oldval; + AO_TS_VAL_t oldval; unsigned long tmp; unsigned long one = 1; retry: diff --git a/src/atomic_ops/sysdeps/gcc/arm.h b/src/atomic_ops/sysdeps/gcc/arm.h index 2d27920..0152670 100644 --- a/src/atomic_ops/sysdeps/gcc/arm.h +++ b/src/atomic_ops/sysdeps/gcc/arm.h @@ -143,10 +143,11 @@ AO_INLINE void AO_store(volatile AO_t *addr, AO_t value) interrupt latencies. LDREX, STREX are more flexible, other instructions can be done between the LDREX and STREX accesses." */ -AO_INLINE AO_TS_t +/* GCC warns SWP is deprecated for this architecture too. */ +AO_INLINE AO_TS_VAL_t AO_test_and_set(volatile AO_TS_t *addr) { - AO_TS_t oldval; + AO_TS_VAL_t oldval; unsigned long flag; __asm__ __volatile__("@AO_test_and_set\n" |