Removing atomic_ops.h from atomic.h to reduce extra dependency on Windows

Author: ktakashi

.gitignore

@@ -10,6 +10,7 @@ gc-*/
 out/
 CMakeCache.txt
 CMakeSettings.json
+CTestTestfile.cmake
 cmake_install.cmake
 cmake_uninstall.cmake
 Makefile
@@ -29,6 +30,33 @@ sagittarius-config
 sagittarius-package
 
 /doc/*.html
+/doc/sections
+/ext/crypto/bytevector.c
+/ext/crypto/cipher.c
+/ext/crypto/digest.c
+/ext/crypto/ec-fields.c
+/ext/crypto/libtomcrypt/liblibtomcrypt.a
+/ext/crypto/mac.c
+/ext/crypto/modes/
+/ext/crypto/random.c
+/ext/crypto/salsa.c
+/ext/crypto/scrypt.stub
+/ext/crypto/stream.c
+/ext/ffi/ffi_stub.c
+/ext/filewatch/filewatch_stub.c
+/ext/odbc/odbc_stub.c
+/ext/perr
+/ext/pout
+/ext/process/process_stub.c
+/ext/socket/selector.c
+/ext/socket/socket_stub.c
+/ext/socket/tls_socket_stub.c
+/ext/termios/termios_stub.c
+/ext/threads/threads_stub.c
+/ext/time/date_stub.c
+/ext/time/time_stub.c
+/ext/watch
+/ext/zlib/zlib_stub.c
 /sagittarius/config.h
 /src/vminsn.c
 /src/sagittarius/private/instruction.h
@@ -51,6 +79,7 @@ sagittarius-package
 /src/lib_clos.c
 /src/lib_arith.c
 /src/lib_kernel.c
+/src/lib_atomic.c
 /src/compiler.c
 /src/compiler-aux.c
 /src/builtin-symbols.c

CMakeLists.txt

@@ -283,7 +283,6 @@ SET(SAGITTARIUS_INCLUDE_DIR ${SAGITTARIUS_INCLUDE_DIR}
 INCLUDE_DIRECTORIES(${SAGITTARIUS_INCLUDE_DIR})
 
 
-INCLUDE_DIRECTORIES("/opt/homebrew/include")
 IF(USE_BOEHM_GC)
   # SET(GC_DEPENDS_TARGET false)
   FIND_PACKAGE(Boehm_GC)

src/atomic.c

@@ -36,6 +36,8 @@
 
 #ifndef HAVE_STDATOMIC_H
 
+#include <atomic_ops.h>
+
 #define handle_memory_order(ret, proc, order, ...)		\
   do {								\
     switch (order) {						\
@@ -196,7 +198,7 @@ static SgAtomic * make_atomic(SgAtomicType type)
 SgObject Sg_MakeAtomic(SgObject obj)
 {
   SgAtomic *a = make_atomic(SG_ATOMIC_OBJECT);
-  SG_ATOMIC_REF_OBJECT(a) = (atomic_intptr_t)obj;
+  SG_ATOMIC_REF_OBJECT(a) = (object_t)obj;
   return SG_OBJ(a);
 }
 
@@ -214,7 +216,7 @@ SgObject Sg_AtomicLoad(volatile SgAtomic *o, SgMemoryOrder order)
     long v = atomic_load_explicit(&SG_ATOMIC_REF_FIXNUM(o), order);
     return SG_MAKE_INT(v);
   } else {
-    intptr_t v = atomic_load_explicit(&SG_ATOMIC_REF_OBJECT(o), order);
+    object_t v = atomic_load_explicit(&SG_ATOMIC_REF_OBJECT(o), order);
     return SG_OBJ(v);
   }
 }
@@ -227,7 +229,7 @@ void Sg_AtomicStore(volatile SgAtomic *o, SgObject v, SgMemoryOrder order)
     }
     atomic_store_explicit(&SG_ATOMIC_REF_FIXNUM(o), SG_INT_VALUE(v), order);
   } else {
-    atomic_store_explicit(&SG_ATOMIC_REF_OBJECT(o), (intptr_t)v, order);
+    atomic_store_explicit(&SG_ATOMIC_REF_OBJECT(o), (object_t)v, order);
   }
 }
 
@@ -241,8 +243,8 @@ SgObject Sg_AtomicExchange(volatile SgAtomic *o, SgObject v, SgMemoryOrder order
     long l = atomic_exchange_explicit(&SG_ATOMIC_REF_FIXNUM(o), vl, order);
     return SG_MAKE_INT(l);
   } else {
-    intptr_t r = atomic_exchange_explicit(&SG_ATOMIC_REF_OBJECT(o),
-					  (intptr_t)v, order);
+    object_t r = atomic_exchange_explicit(&SG_ATOMIC_REF_OBJECT(o),
+					  (object_t)v, order);
     return SG_OBJ(r);
   }  
 }
@@ -319,9 +321,9 @@ int Sg_AtomicCompareAndSwap(volatile SgAtomic *o, SgObject e, SgObject v,
     }
   default:
     {
-      intptr_t ev = (intptr_t)e;
+      object_t ev = (object_t)e;
       return atomic_compare_exchange_strong_explicit(&(o->reference.object),
-						     &ev, (intptr_t)v,
+						     &ev, (object_t)v,
 						     success, failure);
     }
   }

src/sagittarius/private/atomic.h

@@ -35,13 +35,19 @@
 
 #ifdef HAVE_STDATOMIC_H
 # include <stdatomic.h>
+# ifdef HAVE_ATOMIC_INTPTR_T
+typedef atomic_intptr_t atomic_object_t;
+typedef intptr_t object_t;
+# else
+typedef atomic_size_t atomic_object_t;
+typedef size_t object_t;
+# endif
 #else
-#include <atomic_ops.h>
+
 /* We define only what we need here */
-typedef AO_t atomic_long;
-typedef AO_t atomic_size_t;
-typedef AO_t atomic_intptr_t;
-#define HAVE_ATOMIC_INTPTR_T
+typedef long     atomic_long;
+typedef intptr_t atomic_object_t;
+typedef intptr_t object_t;
 
 typedef enum memory_order {
   memory_order_relaxed,
@@ -53,7 +59,6 @@ typedef enum memory_order {
 } memory_order;
 #endif
 
-
 typedef memory_order SgMemoryOrder;
 typedef enum {
   SG_ATOMIC_FIXNUM,