reorder to end of pyatomic.h

Author: tom-pytel

Include/cpython/pyatomic.h

@@ -612,3 +612,56 @@ static inline void _Py_atomic_fence_release(void);
 #else
 # error "long must be 4 or 8 bytes in size"
 #endif  // SIZEOF_LONG
+
+
+// --- _Py_atomic_memcpy / _Py_atomic_memmove ------------
+
+static inline void *
+_Py_atomic_memcpy_ptr_store_relaxed(void *dest, void *src, size_t n)
+{
+    assert(_Py_IS_ALIGNED(dest, sizeof(void *)));
+    assert(_Py_IS_ALIGNED(src, sizeof(void *)));
+    assert(n % sizeof(void *) == 0);
+
+    if (dest != src) {
+        void **dest_ = (void **)dest;
+        void **src_ = (void **)src;
+        void **end = dest_ + n / sizeof(void *);
+
+        for (; dest_ != end; dest_++, src_++) {
+            _Py_atomic_store_ptr_relaxed(dest_, *src_);
+        }
+    }
+
+    return dest;
+}
+
+static inline void *
+_Py_atomic_memmove_ptr_store_relaxed(void *dest, void *src, size_t n)
+{
+    assert(_Py_IS_ALIGNED(dest, sizeof(void *)));
+    assert(_Py_IS_ALIGNED(src, sizeof(void *)));
+    assert(n % sizeof(void *) == 0);
+
+    if (dest < src || dest >= (void *)((char *)src + n)) {
+        void **dest_ = (void **)dest;
+        void **src_ = (void **)src;
+        void **end = dest_ + n / sizeof(void *);
+
+        for (; dest_ != end; dest_++, src_++) {
+            _Py_atomic_store_ptr_relaxed(dest_, *src_);
+        }
+    }
+    else if (dest > src) {
+        n = n / sizeof(void *) - 1;
+        void **dest_ = (void **)dest + n;
+        void **src_ = (void **)src + n;
+        void **end = (void **)dest - 1;
+
+        for (; dest_ != end; dest_--, src_--) {
+            _Py_atomic_store_ptr_relaxed(dest_, *src_);
+        }
+    }
+
+    return dest;
+}

Include/internal/pycore_pyatomic_ft_wrappers.h

@@ -115,23 +115,9 @@ extern "C" {
 #define FT_MUTEX_UNLOCK(lock) PyMutex_Unlock(lock)
 
 #define FT_ATOMIC_MEMCPY_PTR_STORE_RELAXED(dest, src, n) \
-{ \
-    void *_dest = (dest); \
-    void *_src = (src); \
- \
-    if (dest != src) { \
-        void **dest_ = (void **)_dest; \
-        void **src_ = (void **)_src; \
-        void **end = dest_ + (Py_ssize_t)(n) / sizeof(void *); \
- \
-        for (; dest_ != end; dest_++, src_++) { \
-            _Py_atomic_store_ptr_relaxed(dest_, *src_); \
-        } \
-    } \
-}
-
+    _Py_atomic_memcpy_ptr_store_relaxed(dest, src, (size_t)(n))
 #define FT_ATOMIC_MEMMOVE_PTR_STORE_RELAXED(dest, src, n) \
-    memmove(dest, src, (size_t)(n))
+    _Py_atomic_memmove_ptr_store_relaxed(dest, src, (size_t)(n))
 
 
 #else

Modules/_testcapi/pyatomic.c

@@ -5,7 +5,7 @@
  */
 
 #include "parts.h"
-#include "pyconfig.h"  // SIZEOF_VOID_P
+// #include "pyconfig.h"  // SIZEOF_VOID_P
 
 // We define atomic bitwise operations on these types
 #define FOR_BITWISE_TYPES(V)    \