diff options
Diffstat (limited to 'libstdc++-v3/config/cpu/m68k/atomicity.h')
| -rw-r--r-- | libstdc++-v3/config/cpu/m68k/atomicity.h | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/libstdc++-v3/config/cpu/m68k/atomicity.h b/libstdc++-v3/config/cpu/m68k/atomicity.h index c4ce17dac67..eb801dec50c 100644 --- a/libstdc++-v3/config/cpu/m68k/atomicity.h +++ b/libstdc++-v3/config/cpu/m68k/atomicity.h @@ -39,7 +39,7 @@ typedef int _Atomic_word; static inline _Atomic_word __attribute__ ((__unused__)) -__exchange_and_add (volatile _Atomic_word *__mem, int __val) +__exchange_and_add(volatile _Atomic_word* __mem, int __val) { register _Atomic_word __result = *__mem; register _Atomic_word __temp; @@ -47,9 +47,8 @@ __exchange_and_add (volatile _Atomic_word *__mem, int __val) "add%.l %3,%1\n\t" "cas%.l %0,%1,%2\n\t" "jne 1b" - : "=d" (__result), "=&d" (__temp), "+m" (*__mem) - : "d" (__val), "0" (__result) - : "memory"); + : "=d" (__result), "=&d" (__temp), "=m" (*__mem) + : "d" (__val), "0" (__result), "m" (*__mem)); return __result; } @@ -60,7 +59,7 @@ __exchange_and_add (volatile _Atomic_word *__mem, int __val) */ static inline _Atomic_word __attribute__ ((__unused__)) -__exchange_and_add (volatile _Atomic_word *__mem, int __val) +__exchange_and_add(volatile _Atomic_word* __mem, int __val) { _Atomic_word __result; short __level, __tmpsr; @@ -77,20 +76,20 @@ __exchange_and_add (volatile _Atomic_word *__mem, int __val) #else -template <int __inst> -struct __Atomicity_lock -{ - static volatile unsigned char _S_atomicity_lock; -}; +template<int __inst> + struct __Atomicity_lock + { + static volatile unsigned char _S_atomicity_lock; + }; -template <int __inst> +template<int __inst> volatile unsigned char __Atomicity_lock<__inst>::_S_atomicity_lock = 0; template volatile unsigned char __Atomicity_lock<0>::_S_atomicity_lock; static inline _Atomic_word __attribute__ ((__unused__)) -__exchange_and_add (volatile _Atomic_word *__mem, int __val) +__exchange_and_add(volatile _Atomic_word* __mem, int __val) { _Atomic_word __result; @@ -130,11 +129,11 @@ __exchange_and_add (volatile _Atomic_word *__mem, int __val) static inline void __attribute__ ((__unused__)) -__atomic_add (volatile _Atomic_word* __mem, int __val) +__atomic_add(volatile _Atomic_word* __mem, int __val) { // Careful: using add.l with a memory destination is not // architecturally guaranteed to be atomic. - (void) __exchange_and_add (__mem, __val); + (void) __exchange_and_add(__mem, __val); } #endif /* !_GLIBCXX_ATOMICITY_H */ |