diff options
Diffstat (limited to 'src/corelib/arch')
-rw-r--r-- | src/corelib/arch/qatomic_ia64.h | 34 | ||||
-rw-r--r-- | src/corelib/arch/sparc/arch.pri | 2 | ||||
-rw-r--r-- | src/corelib/arch/sparc/qatomic_sparc.cpp | 2 |
3 files changed, 19 insertions, 19 deletions
diff --git a/src/corelib/arch/qatomic_ia64.h b/src/corelib/arch/qatomic_ia64.h index d4b187ffea..ed72036076 100644 --- a/src/corelib/arch/qatomic_ia64.h +++ b/src/corelib/arch/qatomic_ia64.h @@ -219,28 +219,28 @@ inline int QBasicAtomicInt::fetchAndStoreAcquire(int newValue) inline bool QBasicAtomicInt::testAndSetRelaxed(int expectedValue, int newValue) { register int expectedValueCopy = expectedValue; - return (static_cast<int>(_InterlockedCompareExchange(&_q_value, - newValue, - expectedValueCopy)) - == expectedValue); + return (static_cast<int>(_InterlockedCompareExchange(&_q_value, + newValue, + expectedValueCopy)) + == expectedValue); } inline bool QBasicAtomicInt::testAndSetAcquire(int expectedValue, int newValue) { register int expectedValueCopy = expectedValue; - return (static_cast<int>(_InterlockedCompareExchange_acq(reinterpret_cast<volatile uint *>(&_q_value), - newValue, - expectedValueCopy)) - == expectedValue); + return (static_cast<int>(_InterlockedCompareExchange_acq(reinterpret_cast<volatile uint *>(&_q_value), + newValue, + expectedValueCopy)) + == expectedValue); } inline bool QBasicAtomicInt::testAndSetRelease(int expectedValue, int newValue) { register int expectedValueCopy = expectedValue; - return (static_cast<int>(_InterlockedCompareExchange_rel(reinterpret_cast<volatile uint *>(&_q_value), - newValue, - expectedValueCopy)) - == expectedValue); + return (static_cast<int>(_InterlockedCompareExchange_rel(reinterpret_cast<volatile uint *>(&_q_value), + newValue, + expectedValueCopy)) + == expectedValue); } inline int QBasicAtomicInt::fetchAndAddAcquire(int valueToAdd) @@ -286,10 +286,10 @@ template <typename T> Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetRelaxed(T *expectedValue, T *newValue) { register T *expectedValueCopy = expectedValue; - return (_InterlockedCompareExchangePointer(reinterpret_cast<void * volatile*>(&_q_value), - newValue, - expectedValueCopy) - == expectedValue); + return (_InterlockedCompareExchangePointer(reinterpret_cast<void * volatile*>(&_q_value), + newValue, + expectedValueCopy) + == expectedValue); } template <typename T> @@ -301,7 +301,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetAcquire(T *expectedValu }; x = &_q_value; register T *expectedValueCopy = expectedValue; - return (_InterlockedCompareExchange64_acq(p, quintptr(newValue), quintptr(expectedValueCopy)) + return (_InterlockedCompareExchange64_acq(p, quintptr(newValue), quintptr(expectedValueCopy)) == quintptr(expectedValue)); } diff --git a/src/corelib/arch/sparc/arch.pri b/src/corelib/arch/sparc/arch.pri index b3ca399640..a201c83c6a 100644 --- a/src/corelib/arch/sparc/arch.pri +++ b/src/corelib/arch/sparc/arch.pri @@ -3,7 +3,7 @@ # *-64* { SOURCES += $$PWD/qatomic64.s -} +} else { SOURCES += $$PWD/qatomic32.s \ $$PWD/qatomic_sparc.cpp diff --git a/src/corelib/arch/sparc/qatomic_sparc.cpp b/src/corelib/arch/sparc/qatomic_sparc.cpp index d0a9eb8d29..8ea270e90a 100644 --- a/src/corelib/arch/sparc/qatomic_sparc.cpp +++ b/src/corelib/arch/sparc/qatomic_sparc.cpp @@ -60,7 +60,7 @@ Q_CORE_EXPORT int q_atomic_lock_int(volatile int *addr) sched_yield(); returnValue = *addr; } while (returnValue == INT_MIN); - + // try again returnValue = q_atomic_trylock_int(addr); } while (returnValue == INT_MIN); |