From 6bf4e448fee554153eab09c755ba6fdca012bd52 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Mon, 6 Aug 2012 17:48:42 +0200 Subject: Mark all atomic functions as Q_DECL_NOTHROW Actually, only the "new" atomics are marked. The old implementation, based on qoldbasicatomic.h is unchanged, but should still work without a problem. The following configurations were tested and do work: - x86 64-bit - x86 32-bit - generic GCC - generic C++11 std::atomic - bootstrap - ARMv6 and 7 - MIPS - MSVC 2010 32-bit - MSVC 2010 64-bit The only two configurations untested are IA-64 and ARMv5. Except for MSVC, all configurations were tested with GCC 4.6 (MIPS and ARM) and 4.7 (x86 and generics). Change-Id: Iecbfeacd9d20b535453e91335165e9a221e0b47e Reviewed-by: Marc Mutz Reviewed-by: Lars Knoll --- src/corelib/arch/qatomic_armv5.h | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'src/corelib/arch/qatomic_armv5.h') diff --git a/src/corelib/arch/qatomic_armv5.h b/src/corelib/arch/qatomic_armv5.h index 210fbc1931..c43b4de6da 100644 --- a/src/corelib/arch/qatomic_armv5.h +++ b/src/corelib/arch/qatomic_armv5.h @@ -82,13 +82,13 @@ template struct QBasicAtomicOps: QGenericAtomicOps - static int _q_cmpxchg(T oldval, T newval, volatile T *ptr) + static int _q_cmpxchg(T oldval, T newval, volatile T *ptr) Q_DECL_NOTHROW { typedef int (* kernel_cmpxchg_t)(T oldval, T newval, volatile T *ptr); kernel_cmpxchg_t kernel_cmpxchg = *reinterpret_cast(0xffff0fc0); return kernel_cmpxchg(oldval, newval, ptr); } - static void _q_dmb() + static void _q_dmb() Q_DECL_NOTHROW { typedef void (* kernel_dmb_t)(); kernel_dmb_t kernel_dmb = *reinterpret_cast(0xffff0fa0); @@ -96,17 +96,17 @@ template struct QBasicAtomicOps: QGenericAtomicOps - static void orderedMemoryFence(const T &) { _q_dmb(); } + static void orderedMemoryFence(const T &) Q_DECL_NOTHROW { _q_dmb(); } - template static bool ref(T &_q_value); - template static bool deref(T &_q_value); + template static bool ref(T &_q_value) Q_DECL_NOTHROW; + template static bool deref(T &_q_value) Q_DECL_NOTHROW; - static bool isTestAndSetNative() { return false; } - static bool isTestAndSetWaitFree() { return false; } - template static bool testAndSetRelaxed(T &_q_value, T expectedValue, T newValue); - template static T fetchAndStoreRelaxed(T &_q_value, T newValue); + static bool isTestAndSetNative() Q_DECL_NOTHROW { return false; } + static bool isTestAndSetWaitFree() Q_DECL_NOTHROW { return false; } + template static bool testAndSetRelaxed(T &_q_value, T expectedValue, T newValue) Q_DECL_NOTHROW; + template static T fetchAndStoreRelaxed(T &_q_value, T newValue) Q_DECL_NOTHROW; template static - T fetchAndAddRelaxed(T &_q_value, typename QAtomicAdditiveType::AdditiveT valueToAdd); + T fetchAndAddRelaxed(T &_q_value, typename QAtomicAdditiveType::AdditiveT valueToAdd) Q_DECL_NOTHROW; }; template struct QAtomicOps : QBasicAtomicOps @@ -115,7 +115,7 @@ template struct QAtomicOps : QBasicAtomicOps }; template<> template inline -bool QBasicAtomicOps<4>::ref(T &_q_value) +bool QBasicAtomicOps<4>::ref(T &_q_value) Q_DECL_NOTHROW { register T originalValue; register T newValue; @@ -127,7 +127,7 @@ bool QBasicAtomicOps<4>::ref(T &_q_value) } template<> template inline -bool QBasicAtomicOps<4>::deref(T &_q_value) +bool QBasicAtomicOps<4>::deref(T &_q_value) Q_DECL_NOTHROW { register T originalValue; register T newValue; @@ -139,7 +139,7 @@ bool QBasicAtomicOps<4>::deref(T &_q_value) } template<> template inline -bool QBasicAtomicOps<4>::testAndSetRelaxed(T &_q_value, T expectedValue, T newValue) +bool QBasicAtomicOps<4>::testAndSetRelaxed(T &_q_value, T expectedValue, T newValue) Q_DECL_NOTHROW { register T originalValue; do { @@ -153,7 +153,7 @@ bool QBasicAtomicOps<4>::testAndSetRelaxed(T &_q_value, T expectedValue, T newVa // Fetch and store for integers #ifdef Q_CC_RVCT template<> template inline -__asm T QBasicAtomicOps<4>::fetchAndStoreRelaxed(T &_q_value, T newValue) +__asm T QBasicAtomicOps<4>::fetchAndStoreRelaxed(T &_q_value, T newValue) Q_DECL_NOTHROW { add r2, pc, #0 bx r2 @@ -165,7 +165,7 @@ __asm T QBasicAtomicOps<4>::fetchAndStoreRelaxed(T &_q_value, T newValue) } #else template<> template inline -T QBasicAtomicOps<4>::fetchAndStoreRelaxed(T &_q_value, T newValue) +T QBasicAtomicOps<4>::fetchAndStoreRelaxed(T &_q_value, T newValue) Q_DECL_NOTHROW { T originalValue; asm volatile("swp %0,%2,[%3]" @@ -177,7 +177,7 @@ T QBasicAtomicOps<4>::fetchAndStoreRelaxed(T &_q_value, T newValue) #endif // Q_CC_RVCT template<> template inline -T QBasicAtomicOps<4>::fetchAndAddRelaxed(T &_q_value, typename QAtomicAdditiveType::AdditiveT valueToAdd) +T QBasicAtomicOps<4>::fetchAndAddRelaxed(T &_q_value, typename QAtomicAdditiveType::AdditiveT valueToAdd) Q_DECL_NOTHROW { register T originalValue; register T newValue; -- cgit v1.2.3