summaryrefslogtreecommitdiffstats
path: root/cpukit/score/include/rtems/score/cpustdatomic.h
diff options
context:
space:
mode:
Diffstat (limited to 'cpukit/score/include/rtems/score/cpustdatomic.h')
-rw-r--r--cpukit/score/include/rtems/score/cpustdatomic.h100
1 files changed, 49 insertions, 51 deletions
diff --git a/cpukit/score/include/rtems/score/cpustdatomic.h b/cpukit/score/include/rtems/score/cpustdatomic.h
index c66dd7eb34..fb7ba2d89c 100644
--- a/cpukit/score/include/rtems/score/cpustdatomic.h
+++ b/cpukit/score/include/rtems/score/cpustdatomic.h
@@ -45,7 +45,7 @@ typedef std::atomic_uint CPU_atomic_Uint;
typedef std::atomic_ulong CPU_atomic_Ulong;
-typedef std::atomic_uintptr_t CPU_atomic_Pointer;
+typedef std::atomic_uintptr_t CPU_atomic_Uintptr;
typedef std::atomic_flag CPU_atomic_Flag;
@@ -65,8 +65,7 @@ typedef std::memory_order CPU_atomic_Order;
#define CPU_ATOMIC_INITIALIZER_ULONG( value ) ATOMIC_VAR_INIT( value )
-#define CPU_ATOMIC_INITIALIZER_PTR( value ) \
- ATOMIC_VAR_INIT( (uintptr_t) (value) )
+#define CPU_ATOMIC_INITIALIZER_UINTPTR( value ) ATOMIC_VAR_INIT( value )
#define CPU_ATOMIC_INITIALIZER_FLAG ATOMIC_FLAG_INIT
@@ -76,7 +75,7 @@ typedef atomic_uint CPU_atomic_Uint;
typedef atomic_ulong CPU_atomic_Ulong;
-typedef atomic_uintptr_t CPU_atomic_Pointer;
+typedef atomic_uintptr_t CPU_atomic_Uintptr;
typedef atomic_flag CPU_atomic_Flag;
@@ -96,8 +95,7 @@ typedef memory_order CPU_atomic_Order;
#define CPU_ATOMIC_INITIALIZER_ULONG( value ) ATOMIC_VAR_INIT( value )
-#define CPU_ATOMIC_INITIALIZER_PTR( value ) \
- ATOMIC_VAR_INIT( (uintptr_t) (value) )
+#define CPU_ATOMIC_INITIALIZER_UINTPTR( value ) ATOMIC_VAR_INIT( value )
#define CPU_ATOMIC_INITIALIZER_FLAG ATOMIC_FLAG_INIT
@@ -107,7 +105,7 @@ typedef unsigned int CPU_atomic_Uint;
typedef unsigned long CPU_atomic_Ulong;
-typedef uintptr_t CPU_atomic_Pointer;
+typedef uintptr_t CPU_atomic_Uintptr;
typedef bool CPU_atomic_Flag;
@@ -127,7 +125,7 @@ typedef int CPU_atomic_Order;
#define CPU_ATOMIC_INITIALIZER_ULONG( value ) ( value )
-#define CPU_ATOMIC_INITIALIZER_PTR( value ) ( (uintptr_t) (value) )
+#define CPU_ATOMIC_INITIALIZER_UINTPTR( value ) ( value )
#define CPU_ATOMIC_INITIALIZER_FLAG false
@@ -167,14 +165,14 @@ static inline void _CPU_atomic_Init_ulong( CPU_atomic_Ulong *obj, unsigned long
#endif
}
-static inline void _CPU_atomic_Init_ptr( CPU_atomic_Pointer *obj, void *desired )
+static inline void _CPU_atomic_Init_uintptr( CPU_atomic_Uintptr *obj, uintptr_t desired )
{
#if defined(_RTEMS_SCORE_CPUSTDATOMIC_USE_ATOMIC)
- obj->store( (uintptr_t) desired );
+ obj->store( desired );
#elif defined(_RTEMS_SCORE_CPUSTDATOMIC_USE_STDATOMIC)
- atomic_init( obj, (uintptr_t) desired );
+ atomic_init( obj, desired );
#else
- *obj = (uintptr_t) desired;
+ *obj = desired;
#endif
}
@@ -212,12 +210,12 @@ static inline unsigned long _CPU_atomic_Load_ulong( const CPU_atomic_Ulong *obj,
#endif
}
-static inline void *_CPU_atomic_Load_ptr( const CPU_atomic_Pointer *obj, CPU_atomic_Order order )
+static inline uintptr_t _CPU_atomic_Load_uintptr( const CPU_atomic_Uintptr *obj, CPU_atomic_Order order )
{
#if defined(_RTEMS_SCORE_CPUSTDATOMIC_USE_ATOMIC)
- return (void *) obj->load( order );
+ return obj->load( order );
#elif defined(_RTEMS_SCORE_CPUSTDATOMIC_USE_STDATOMIC)
- return (void *) atomic_load_explicit( obj, order );
+ return atomic_load_explicit( obj, order );
#else
uintptr_t val;
@@ -225,7 +223,7 @@ static inline void *_CPU_atomic_Load_ptr( const CPU_atomic_Pointer *obj, CPU_ato
val = *obj;
RTEMS_COMPILER_MEMORY_BARRIER();
- return (void *) val;
+ return val;
#endif
}
@@ -255,16 +253,16 @@ static inline void _CPU_atomic_Store_ulong( CPU_atomic_Ulong *obj, unsigned long
#endif
}
-static inline void _CPU_atomic_Store_ptr( CPU_atomic_Pointer *obj, void *desired, CPU_atomic_Order order )
+static inline void _CPU_atomic_Store_uintptr( CPU_atomic_Uintptr *obj, uintptr_t desired, CPU_atomic_Order order )
{
#if defined(_RTEMS_SCORE_CPUSTDATOMIC_USE_ATOMIC)
- obj->store( (uintptr_t) desired );
+ obj->store( desired );
#elif defined(_RTEMS_SCORE_CPUSTDATOMIC_USE_STDATOMIC)
- atomic_store_explicit( obj, (uintptr_t) desired, order );
+ atomic_store_explicit( obj, desired, order );
#else
(void) order;
RTEMS_COMPILER_MEMORY_BARRIER();
- *obj = (uintptr_t) desired;
+ *obj = desired;
#endif
}
@@ -308,12 +306,12 @@ static inline unsigned long _CPU_atomic_Fetch_add_ulong( CPU_atomic_Ulong *obj,
#endif
}
-static inline void *_CPU_atomic_Fetch_add_ptr( CPU_atomic_Pointer *obj, void *arg, CPU_atomic_Order order )
+static inline uintptr_t _CPU_atomic_Fetch_add_uintptr( CPU_atomic_Uintptr *obj, uintptr_t arg, CPU_atomic_Order order )
{
#if defined(_RTEMS_SCORE_CPUSTDATOMIC_USE_ATOMIC)
- return (void *) obj->fetch_add( (uintptr_t) arg, order );
+ return obj->fetch_add( arg, order );
#elif defined(_RTEMS_SCORE_CPUSTDATOMIC_USE_STDATOMIC)
- return (void *) atomic_fetch_add_explicit( obj, (uintptr_t) arg, order );
+ return atomic_fetch_add_explicit( obj, arg, order );
#else
uintptr_t val;
ISR_Level level;
@@ -321,10 +319,10 @@ static inline void *_CPU_atomic_Fetch_add_ptr( CPU_atomic_Pointer *obj, void *ar
(void) order;
_ISR_Disable( level );
val = *obj;
- *obj = val + (uintptr_t) arg;
+ *obj = val + arg;
_ISR_Enable( level );
- return (void *) val;
+ return val;
#endif
}
@@ -368,12 +366,12 @@ static inline unsigned long _CPU_atomic_Fetch_sub_ulong( CPU_atomic_Ulong *obj,
#endif
}
-static inline void *_CPU_atomic_Fetch_sub_ptr( CPU_atomic_Pointer *obj, void *arg, CPU_atomic_Order order )
+static inline uintptr_t _CPU_atomic_Fetch_sub_uintptr( CPU_atomic_Uintptr *obj, uintptr_t arg, CPU_atomic_Order order )
{
#if defined(_RTEMS_SCORE_CPUSTDATOMIC_USE_ATOMIC)
- return (void *) obj->fetch_sub( (uintptr_t) arg, order );
+ return obj->fetch_sub( arg, order );
#elif defined(_RTEMS_SCORE_CPUSTDATOMIC_USE_STDATOMIC)
- return (void *) atomic_fetch_sub_explicit( obj, (uintptr_t) arg, order );
+ return atomic_fetch_sub_explicit( obj, arg, order );
#else
uintptr_t val;
ISR_Level level;
@@ -381,10 +379,10 @@ static inline void *_CPU_atomic_Fetch_sub_ptr( CPU_atomic_Pointer *obj, void *ar
(void) order;
_ISR_Disable( level );
val = *obj;
- *obj = val - (uintptr_t) arg;
+ *obj = val - arg;
_ISR_Enable( level );
- return (void *) val;
+ return val;
#endif
}
@@ -428,12 +426,12 @@ static inline unsigned long _CPU_atomic_Fetch_or_ulong( CPU_atomic_Ulong *obj, u
#endif
}
-static inline void *_CPU_atomic_Fetch_or_ptr( CPU_atomic_Pointer *obj, void *arg, CPU_atomic_Order order )
+static inline uintptr_t _CPU_atomic_Fetch_or_uintptr( CPU_atomic_Uintptr *obj, uintptr_t arg, CPU_atomic_Order order )
{
#if defined(_RTEMS_SCORE_CPUSTDATOMIC_USE_ATOMIC)
- return (void *) obj->fetch_or( (uintptr_t) arg, order );
+ return obj->fetch_or( arg, order );
#elif defined(_RTEMS_SCORE_CPUSTDATOMIC_USE_STDATOMIC)
- return (void *) atomic_fetch_or_explicit( obj, (uintptr_t) arg, order );
+ return atomic_fetch_or_explicit( obj, arg, order );
#else
uintptr_t val;
ISR_Level level;
@@ -441,10 +439,10 @@ static inline void *_CPU_atomic_Fetch_or_ptr( CPU_atomic_Pointer *obj, void *arg
(void) order;
_ISR_Disable( level );
val = *obj;
- *obj = val | (uintptr_t) arg;
+ *obj = val | arg;
_ISR_Enable( level );
- return (void *) val;
+ return val;
#endif
}
@@ -488,12 +486,12 @@ static inline unsigned long _CPU_atomic_Fetch_and_ulong( CPU_atomic_Ulong *obj,
#endif
}
-static inline void *_CPU_atomic_Fetch_and_ptr( CPU_atomic_Pointer *obj, void *arg, CPU_atomic_Order order )
+static inline uintptr_t _CPU_atomic_Fetch_and_uintptr( CPU_atomic_Uintptr *obj, uintptr_t arg, CPU_atomic_Order order )
{
#if defined(_RTEMS_SCORE_CPUSTDATOMIC_USE_ATOMIC)
- return (void *) obj->fetch_and( (uintptr_t) arg, order );
+ return obj->fetch_and( arg, order );
#elif defined(_RTEMS_SCORE_CPUSTDATOMIC_USE_STDATOMIC)
- return (void *) atomic_fetch_and_explicit( obj, (uintptr_t) arg, order );
+ return atomic_fetch_and_explicit( obj, arg, order );
#else
uintptr_t val;
ISR_Level level;
@@ -501,10 +499,10 @@ static inline void *_CPU_atomic_Fetch_and_ptr( CPU_atomic_Pointer *obj, void *ar
(void) order;
_ISR_Disable( level );
val = *obj;
- *obj = val & (uintptr_t) arg;
+ *obj = val & arg;
_ISR_Enable( level );
- return (void *) val;
+ return val;
#endif
}
@@ -548,12 +546,12 @@ static inline unsigned long _CPU_atomic_Exchange_ulong( CPU_atomic_Ulong *obj, u
#endif
}
-static inline void *_CPU_atomic_Exchange_ptr( CPU_atomic_Pointer *obj, void *desired, CPU_atomic_Order order )
+static inline uintptr_t _CPU_atomic_Exchange_uintptr( CPU_atomic_Uintptr *obj, uintptr_t desired, CPU_atomic_Order order )
{
#if defined(_RTEMS_SCORE_CPUSTDATOMIC_USE_ATOMIC)
- return (void *) obj->exchange( (uintptr_t) desired, order );
+ return obj->exchange( desired, order );
#elif defined(_RTEMS_SCORE_CPUSTDATOMIC_USE_STDATOMIC)
- return (void *) atomic_exchange_explicit( obj, (uintptr_t) desired, order );
+ return atomic_exchange_explicit( obj, desired, order );
#else
uintptr_t val;
ISR_Level level;
@@ -561,10 +559,10 @@ static inline void *_CPU_atomic_Exchange_ptr( CPU_atomic_Pointer *obj, void *des
(void) order;
_ISR_Disable( level );
val = *obj;
- *obj = (uintptr_t) desired;
+ *obj = desired;
_ISR_Enable( level );
- return (void *) val;
+ return val;
#endif
}
@@ -622,12 +620,12 @@ static inline bool _CPU_atomic_Compare_exchange_ulong( CPU_atomic_Ulong *obj, un
#endif
}
-static inline bool _CPU_atomic_Compare_exchange_ptr( CPU_atomic_Pointer *obj, void **expected, void *desired, CPU_atomic_Order succ, CPU_atomic_Order fail )
+static inline bool _CPU_atomic_Compare_exchange_uintptr( CPU_atomic_Uintptr *obj, uintptr_t *expected, uintptr_t desired, CPU_atomic_Order succ, CPU_atomic_Order fail )
{
#if defined(_RTEMS_SCORE_CPUSTDATOMIC_USE_ATOMIC)
- return obj->compare_exchange_strong( *(uintptr_t *) expected, (uintptr_t) desired, succ, fail );
+ return obj->compare_exchange_strong( *expected, desired, succ, fail );
#elif defined(_RTEMS_SCORE_CPUSTDATOMIC_USE_STDATOMIC)
- return atomic_compare_exchange_strong_explicit( obj, (uintptr_t *) expected, (uintptr_t) desired, succ, fail );
+ return atomic_compare_exchange_strong_explicit( obj, expected, desired, succ, fail );
#else
bool success;
ISR_Level level;
@@ -637,11 +635,11 @@ static inline bool _CPU_atomic_Compare_exchange_ptr( CPU_atomic_Pointer *obj, vo
(void) fail;
_ISR_Disable( level );
actual = *obj;
- success = ( actual == (uintptr_t) *expected );
+ success = ( actual == *expected );
if ( success ) {
- *obj = (uintptr_t) desired;
+ *obj = desired;
} else {
- *expected = (void *) actual;
+ *expected = actual;
}
_ISR_Enable( level );
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 03:41:08 +0000