Changeset 118603 in webkit

Timestamp:

May 25, 2012, 8:09:34 PM (14 years ago)

Author:

fpizlo@apple.com

Message:

weakCompareAndSwap should work on Windows
​https://bugs.webkit.org/show_bug.cgi?id=87549

Reviewed by Jessie Berlin.

• wtf/Atomics.h:

(WTF):
(WTF::weakCompareAndSwap):

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/Atomics.h (modified) (2 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2012-05-25  Filip Pizlo  <fpizlo@apple.com>
+
+        weakCompareAndSwap should work on Windows
+        https://bugs.webkit.org/show_bug.cgi?id=87549
+
+        Reviewed by Jessie Berlin.
+
+        * wtf/Atomics.h:
+        (WTF):
+        (WTF::weakCompareAndSwap):
+
 2012-05-24  Allan Sandfeld Jensen  <allan.jensen@nokia.com>
 

trunk/Source/WTF/wtf/Atomics.h

@@ -119 +119 @@
 #endif
 
+#if OS(WINDOWS)
+inline bool weakCompareAndSwap(volatile unsigned* location, unsigned expected, unsigned newValue)
+{
+    return InterlockedCompareExchange(reinterpret_cast<LONG volatile*>(location), static_cast<LONG>(newValue), static_cast<LONG>(expected)) == static_cast<LONG>(expected);
+}
+
+inline bool weakCompareAndSwap(void*volatile* location, void* expected, void* newValue)
+{
+    return InterlockedCompareExchangePointer(location, newValue, expected) == expected;
+}
+#else // OS(WINDOWS) --> not windows
 #if COMPILER(GCC) && !COMPILER(CLANG) // Work around a gcc bug 
 inline bool weakCompareAndSwap(volatile unsigned* location, unsigned expected, unsigned newValue) 
@@ -185 +196 @@
 #endif // ENABLE(COMPARE_AND_SWAP)
 }
+#endif // OS(WINDOWS) (end of the not-windows case)
 
 inline bool weakCompareAndSwapUIntPtr(volatile uintptr_t* location, uintptr_t expected, uintptr_t newValue)