This is an automated email from the ASF dual-hosted git repository.

casaroli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git

commit 2ca5d1c142ce39c79dabe9e7651d931632ff70bb
Author: Bowen Wang <[email protected]>
AuthorDate: Thu Mar 12 20:18:06 2026 +0800

    include/atomic: add atomic_ptr_t type and operations
    
    Add atomic_ptr_t that maps to atomic_t on 32-bit platforms and
    atomic64_t on 64-bit platforms based on UINTPTR_MAX. All atomic_ptr_xx
    operations (set, read, add, sub, and, or, xor, xchg, cmpxchg,
    try_cmpxchg with memory order variants) are mapped to the corresponding
    atomic_xx or atomic64_xx macros accordingly.
    
    Signed-off-by: Bowen Wang <[email protected]>
---
 include/nuttx/atomic.h | 103 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 103 insertions(+)

diff --git a/include/nuttx/atomic.h b/include/nuttx/atomic.h
index 8b8e28f9ec2..f7843ee435d 100644
--- a/include/nuttx/atomic.h
+++ b/include/nuttx/atomic.h
@@ -28,6 +28,7 @@
  ****************************************************************************/
 
 #include <stdbool.h>
+#include <stdint.h>
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -155,6 +156,102 @@
 #define atomic64_try_cmpxchg_relaxed(obj, expected, desired) \
   atomic_compare_exchange_8(obj, (FAR int64_t *)expected, desired, true, 
__ATOMIC_RELAXED, __ATOMIC_RELAXED)
 
+#if UINTPTR_MAX > UINT32_MAX
+
+#define atomic_ptr_set(obj, val)            atomic64_set(obj, val)
+#define atomic_ptr_set_release(obj, val)    atomic64_set_release(obj, val)
+#define atomic_ptr_read(obj)                atomic64_read(obj)
+#define atomic_ptr_read_acquire(obj)        atomic64_read_acquire(obj)
+#define atomic_ptr_add(obj, val)            atomic64_add(obj, val)
+#define atomic_ptr_add_acquire(obj, val)    atomic64_add_acquire(obj, val)
+#define atomic_ptr_add_release(obj, val)    atomic64_add_release(obj, val)
+#define atomic_ptr_add_relaxed(obj, val)    atomic64_add_relaxed(obj, val)
+#define atomic_ptr_sub(obj, val)            atomic64_sub(obj, val)
+#define atomic_ptr_sub_acquire(obj, val)    atomic64_sub_acquire(obj, val)
+#define atomic_ptr_sub_release(obj, val)    atomic64_sub_release(obj, val)
+#define atomic_ptr_sub_relaxed(obj, val)    atomic64_sub_relaxed(obj, val)
+#define atomic_ptr_and(obj, val)            atomic64_and(obj, val)
+#define atomic_ptr_and_acquire(obj, val)    atomic64_and_acquire(obj, val)
+#define atomic_ptr_and_release(obj, val)    atomic64_and_release(obj, val)
+#define atomic_ptr_and_relaxed(obj, val)    atomic64_and_relaxed(obj, val)
+#define atomic_ptr_or(obj, val)             atomic64_or(obj, val)
+#define atomic_ptr_or_acquire(obj, val)     atomic64_or_acquire(obj, val)
+#define atomic_ptr_or_release(obj, val)     atomic64_or_release(obj, val)
+#define atomic_ptr_or_relaxed(obj, val)     atomic64_or_relaxed(obj, val)
+#define atomic_ptr_xor(obj, val)            atomic64_xor(obj, val)
+#define atomic_ptr_xor_acquire(obj, val)    atomic64_xor_acquire(obj, val)
+#define atomic_ptr_xor_release(obj, val)    atomic64_xor_release(obj, val)
+#define atomic_ptr_xor_relaxed(obj, val)    atomic64_xor_relaxed(obj, val)
+#define atomic_ptr_xchg(obj, val)           atomic64_xchg(obj, val)
+#define atomic_ptr_xchg_acquire(obj, val)   atomic64_xchg_acquire(obj, val)
+#define atomic_ptr_xchg_release(obj, val)   atomic64_xchg_release(obj, val)
+#define atomic_ptr_xchg_relaxed(obj, val)   atomic64_xchg_relaxed(obj, val)
+#define atomic_ptr_cmpxchg(obj, expected, desired) \
+  atomic64_cmpxchg(obj, expected, desired)
+#define atomic_ptr_cmpxchg_acquire(obj, expected, desired) \
+  atomic64_cmpxchg_acquire(obj, expected, desired)
+#define atomic_ptr_cmpxchg_release(obj, expected, desired) \
+  atomic64_cmpxchg_release(obj, expected, desired)
+#define atomic_ptr_cmpxchg_relaxed(obj, expected, desired) \
+  atomic64_cmpxchg_relaxed(obj, expected, desired)
+#define atomic_ptr_try_cmpxchg(obj, expected, desired) \
+  atomic64_try_cmpxchg(obj, expected, desired)
+#define atomic_ptr_try_cmpxchg_acquire(obj, expected, desired) \
+  atomic64_try_cmpxchg_acquire(obj, expected, desired)
+#define atomic_ptr_try_cmpxchg_release(obj, expected, desired) \
+  atomic64_try_cmpxchg_release(obj, expected, desired)
+#define atomic_ptr_try_cmpxchg_relaxed(obj, expected, desired) \
+  atomic64_try_cmpxchg_relaxed(obj, expected, desired)
+
+#else /* UINTPTR_MAX <= UINT32_MAX */
+
+#define atomic_ptr_set(obj, val)            atomic_set(obj, val)
+#define atomic_ptr_set_release(obj, val)    atomic_set_release(obj, val)
+#define atomic_ptr_read(obj)                atomic_read(obj)
+#define atomic_ptr_read_acquire(obj)        atomic_read_acquire(obj)
+#define atomic_ptr_add(obj, val)            atomic_add(obj, val)
+#define atomic_ptr_add_acquire(obj, val)    atomic_add_acquire(obj, val)
+#define atomic_ptr_add_release(obj, val)    atomic_add_release(obj, val)
+#define atomic_ptr_add_relaxed(obj, val)    atomic_add_relaxed(obj, val)
+#define atomic_ptr_sub(obj, val)            atomic_sub(obj, val)
+#define atomic_ptr_sub_acquire(obj, val)    atomic_sub_acquire(obj, val)
+#define atomic_ptr_sub_release(obj, val)    atomic_sub_release(obj, val)
+#define atomic_ptr_sub_relaxed(obj, val)    atomic_sub_relaxed(obj, val)
+#define atomic_ptr_and(obj, val)            atomic_and(obj, val)
+#define atomic_ptr_and_acquire(obj, val)    atomic_and_acquire(obj, val)
+#define atomic_ptr_and_release(obj, val)    atomic_and_release(obj, val)
+#define atomic_ptr_and_relaxed(obj, val)    atomic_and_relaxed(obj, val)
+#define atomic_ptr_or(obj, val)             atomic_or(obj, val)
+#define atomic_ptr_or_acquire(obj, val)     atomic_or_acquire(obj, val)
+#define atomic_ptr_or_release(obj, val)     atomic_or_release(obj, val)
+#define atomic_ptr_or_relaxed(obj, val)     atomic_or_relaxed(obj, val)
+#define atomic_ptr_xor(obj, val)            atomic_xor(obj, val)
+#define atomic_ptr_xor_acquire(obj, val)    atomic_xor_acquire(obj, val)
+#define atomic_ptr_xor_release(obj, val)    atomic_xor_release(obj, val)
+#define atomic_ptr_xor_relaxed(obj, val)    atomic_xor_relaxed(obj, val)
+#define atomic_ptr_xchg(obj, val)           atomic_xchg(obj, val)
+#define atomic_ptr_xchg_acquire(obj, val)   atomic_xchg_acquire(obj, val)
+#define atomic_ptr_xchg_release(obj, val)   atomic_xchg_release(obj, val)
+#define atomic_ptr_xchg_relaxed(obj, val)   atomic_xchg_relaxed(obj, val)
+#define atomic_ptr_cmpxchg(obj, expected, desired) \
+  atomic_cmpxchg(obj, expected, desired)
+#define atomic_ptr_cmpxchg_acquire(obj, expected, desired) \
+  atomic_cmpxchg_acquire(obj, expected, desired)
+#define atomic_ptr_cmpxchg_release(obj, expected, desired) \
+  atomic_cmpxchg_release(obj, expected, desired)
+#define atomic_ptr_cmpxchg_relaxed(obj, expected, desired) \
+  atomic_cmpxchg_relaxed(obj, expected, desired)
+#define atomic_ptr_try_cmpxchg(obj, expected, desired) \
+  atomic_try_cmpxchg(obj, expected, desired)
+#define atomic_ptr_try_cmpxchg_acquire(obj, expected, desired) \
+  atomic_try_cmpxchg_acquire(obj, expected, desired)
+#define atomic_ptr_try_cmpxchg_release(obj, expected, desired) \
+  atomic_try_cmpxchg_release(obj, expected, desired)
+#define atomic_ptr_try_cmpxchg_relaxed(obj, expected, desired) \
+  atomic_try_cmpxchg_relaxed(obj, expected, desired)
+
+#endif /* UINTPTR_MAX > UINT32_MAX */
+
 /****************************************************************************
  * Public Types
  ****************************************************************************/
@@ -162,6 +259,12 @@
 typedef __Atomic(int32_t) atomic_t;
 typedef __Atomic(int64_t) atomic64_t;
 
+#if UINTPTR_MAX > UINT32_MAX
+typedef atomic64_t atomic_ptr_t;
+#else
+typedef atomic_t atomic_ptr_t;
+#endif
+
 /****************************************************************************
  * Public Function Prototypes
  ****************************************************************************/

Reply via email to