wip

erincatto · erincatto · Jul 7, 2023 · Apr 9, 2023 · Apr 12, 2023 · Apr 14, 2023
commit b98fbe868524829fb12a7dd23b1ec1378344ec9c
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -82,8 +82,8 @@ set_target_properties(box2d PROPERTIES
 )
 
 if (MSVC)
-	target_compile_options(box2d PRIVATE /W4 /WX /experimental:c11atomics)
-	# target_compile_options(box2d PRIVATE /W4 /WX)
+	# target_compile_options(box2d PRIVATE /W4 /WX /experimental:c11atomics)
+	target_compile_options(box2d PRIVATE /W4 /WX)
 else()
 	target_compile_options(box2d PRIVATE -Wall -Wextra -Wpedantic -Werror)
 endif()

diff --git a/src/atomic.inl b/src/atomic.inl
@@ -2,8 +2,47 @@
 
 #if defined(_MSC_VER) && !defined(__clang__)
 
-//#define WIN32_LEAN_AND_MEAN
-//#include <windows.h>
+#if 1
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+
+// Returns the initial value
+static inline long atomic_fetch_add_long(volatile long* obj, long val)
+{
+	return InterlockedExchangeAdd(obj, val);
+}
+
+// Returns the initial value
+static inline long atomic_fetch_sub_long(volatile long* obj, long val)
+{
+	return InterlockedExchangeAdd(obj, -val);
+}
+
+// Returns the initial value
+static inline long atomic_store_long(volatile long* obj, long val)
+{
+	return InterlockedExchange(obj, val);
+}
+
+static inline long atomic_load_long(const volatile long* obj)
+{
+	return *obj;
+}
+
+static inline bool atomic_compare_exchange_weak_long(volatile long* obj, long* expected, int32_t desired)
+{
+	long current = InterlockedCompareExchange(obj, desired, *expected);
+	if (current == *expected)
+	{
+		return true;
+	}
+
+	*expected = current;
+	return false;
+}
+
+#else
+
 #include <intrin.h>
 
 // Returns the initial value
@@ -52,6 +91,7 @@ static inline bool atomic_compare_exchange_weak_long(volatile long* obj, long* e
 	*expected = current;
 	return false;
 }
+#endif
 
 #else
 

diff --git a/src/island_builder.c b/src/island_builder.c
@@ -329,8 +329,13 @@ void b2FinishIslands(b2IslandBuilder* builder, const int32_t* awakeBodies, int32
 
 void b2ResetIslands(b2IslandBuilder* builder, b2StackAllocator *allocator)
 {
-	b2FreeStackItem(allocator, builder->sortedIslands);
-	builder->sortedIslands = NULL;
+	// Some of this stuff is NULL if the time step is zero.
+
+	if (builder->sortedIslands != NULL)
+	{
+		b2FreeStackItem(allocator, builder->sortedIslands);
+		builder->sortedIslands = NULL;
+	}
 
 	if (builder->contactIslands != NULL)
 	{
@@ -348,10 +353,13 @@ void b2ResetIslands(b2IslandBuilder* builder, b2StackAllocator *allocator)
 		builder->jointIslands = NULL;
 	}
 
-	b2FreeStackItem(allocator, builder->bodyIslandEnds);
-	builder->bodyIslandEnds = NULL;
-	b2FreeStackItem(allocator, builder->bodyIslands);
-	builder->bodyIslands = NULL;
+	if (builder->bodyIslands != NULL)
+	{
+		b2FreeStackItem(allocator, builder->bodyIslandEnds);
+		builder->bodyIslandEnds = NULL;
+		b2FreeStackItem(allocator, builder->bodyIslands);
+		builder->bodyIslands = NULL;
+	}
 
 	b2FreeStackItem(allocator, builder->contactLinks);
 	builder->contactLinks = NULL;