Minor cleanup. No functional changes intended.

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

diff --git a/lib/System/Atomic.cpp b/lib/System/Atomic.cpp
index e720385e5f0bfe2978717972bd32ebe2e2d011d9..f9b55a186d1829fa0e6498d1e0e70aba46bed995 100644 (file)
--- a/lib/System/Atomic.cpp
+++ b/lib/System/Atomic.cpp
@@ -18,6 +18,7 @@ using namespace llvm;
 
 #if defined(_MSC_VER)
 #include <windows.h>
+#undef MemoryFence
 #endif
 
 void sys::MemoryFence() {
@@ -35,18 +36,77 @@ void sys::MemoryFence() {
 }
 
 sys::cas_flag sys::CompareAndSwap(volatile sys::cas_flag* ptr,
-                                       sys::cas_flag new_value,
-                                       sys::cas_flag old_value) {
+                                  sys::cas_flag new_value,
+                                  sys::cas_flag old_value) {
 #if LLVM_MULTITHREADED==0
-  sys::cas_flag result = *dest;
-  if (result == c)
-    *dest = exc;
+  sys::cas_flag result = *ptr;
+  if (result == old_value)
+    *ptr = new_value;
   return result;
 #elif defined(__GNUC__)
   return __sync_val_compare_and_swap(ptr, old_value, new_value);
 #elif defined(_MSC_VER)
-       return InterlockedCompareExchange(ptr, new_value, old_value);
+  return InterlockedCompareExchange(ptr, new_value, old_value);
 #else
 #  error No compare-and-swap implementation for your platform!
 #endif
-}
\ No newline at end of file
+}
+
+sys::cas_flag sys::AtomicIncrement(volatile sys::cas_flag* ptr) {
+#if LLVM_MULTITHREADED==0
+  ++(*ptr);
+  return *ptr;
+#elif defined(__GNUC__)
+  return __sync_add_and_fetch(ptr, 1);
+#elif defined(_MSC_VER)
+  return InterlockedIncrement(ptr);
+#else
+#  error No atomic increment implementation for your platform!
+#endif
+}
+
+sys::cas_flag sys::AtomicDecrement(volatile sys::cas_flag* ptr) {
+#if LLVM_MULTITHREADED==0
+  --(*ptr);
+  return *ptr;
+#elif defined(__GNUC__)
+  return __sync_sub_and_fetch(ptr, 1);
+#elif defined(_MSC_VER)
+  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 InterlockedAdd(ptr, 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;
+}