Reapply 91184 with fixes and an addition to the testcase to cover the problem

[oota-llvm.git] / lib / System / Atomic.cpp

diff --git a/lib/System/Atomic.cpp b/lib/System/Atomic.cpp
index 5676ca9d62c5ad3fe4e79bc8f3ead78462ca4d11..7ba8b774d5e0a0b3e590806e468f599d3b138100 100644 (file)
--- a/lib/System/Atomic.cpp
+++ b/lib/System/Atomic.cpp
@@ -59,7 +59,7 @@ sys::cas_flag sys::AtomicIncrement(volatile sys::cas_flag* ptr) {
 #elif defined(__GNUC__)
   return __sync_add_and_fetch(ptr, 1);
 #elif defined(_MSC_VER)
-  return InterlockedCompareExchange(ptr, new_value, old_value);
+  return InterlockedIncrement(ptr);
 #else
 #  error No atomic increment implementation for your platform!
 #endif
@@ -72,10 +72,41 @@ sys::cas_flag sys::AtomicDecrement(volatile sys::cas_flag* ptr) {
 #elif defined(__GNUC__)
   return __sync_sub_and_fetch(ptr, 1);
 #elif defined(_MSC_VER)
-  return InterlockedIncrement(ptr);
+  return InterlockedDecrement(ptr);
 #else
 #  error No atomic decrement implementation for your platform!
 #endif
 }
 
+sys::cas_flag sys::AtomicAdd(volatile sys::cas_flag* ptr, sys::cas_flag val) {
+#if LLVM_MULTITHREADED==0
+  *ptr += val;
+  return *ptr;
+#elif defined(__GNUC__)
+  return __sync_add_and_fetch(ptr, val);
+#elif defined(_MSC_VER)
+  return InterlockedExchangeAdd(ptr, val) + val;
+#else
+#  error No atomic add implementation for your platform!
+#endif
+}
+
+sys::cas_flag sys::AtomicMul(volatile sys::cas_flag* ptr, sys::cas_flag val) {
+  sys::cas_flag original, result;
+  do {
+    original = *ptr;
+    result = original * val;
+  } while (sys::CompareAndSwap(ptr, result, original) != original);
+
+  return result;
+}
+
+sys::cas_flag sys::AtomicDiv(volatile sys::cas_flag* ptr, sys::cas_flag val) {
+  sys::cas_flag original, result;
+  do {
+    original = *ptr;
+    result = original / val;
+  } while (sys::CompareAndSwap(ptr, result, original) != original);
 
+  return result;
+}