Grazvydas Ignotas : port.h: Make use of compiler support for pointer atomic ops.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: af6066c28892dd08be650e3dcfdd84eb8954e5f9
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=af6066c28892dd08be650e3dcf...

Author: Grazvydas Ignotas <notasas(a)gmail.com>
Date:   Tue May 12 03:17:37 2015 +0300

port.h: Make use of compiler support for pointer atomic ops.

---

 include/wine/port.h     | 16 ++++++++++++++++
 libs/port/interlocked.c |  6 ++++++
 2 files changed, 22 insertions(+)

diff --git a/include/wine/port.h b/include/wine/port.h
index 4910f34..2989b39 100644
--- a/include/wine/port.h
+++ b/include/wine/port.h
@@ -456,8 +456,24 @@ extern int interlocked_xchg_add( int *dest, int incr );
 extern int interlocked_xchg( int *dest, int val );
 #endif
 
+#if (defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) && __SIZEOF_POINTER__ == 4) \
+ || (defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8) && __SIZEOF_POINTER__ == 8)
+static inline void *interlocked_cmpxchg_ptr( void **dest, void *xchg, void *compare )
+{
+    return __sync_val_compare_and_swap( dest, compare, xchg );
+}
+
+static inline void *interlocked_xchg_ptr( void **dest, void *val )
+{
+    void *ret;
+    do ret = *dest; while (!__sync_bool_compare_and_swap( dest, ret, val ));
+    return ret;
+}
+#else
 extern void *interlocked_cmpxchg_ptr( void **dest, void *xchg, void *compare );
 extern void *interlocked_xchg_ptr( void **dest, void *val );
+#endif
+
 #if defined(__x86_64__) || defined(__aarch64__) || defined(_WIN64)
 extern unsigned char interlocked_cmpxchg128( __int64 *dest, __int64 xchg_high,
                                              __int64 xchg_low, __int64 *compare );
diff --git a/libs/port/interlocked.c b/libs/port/interlocked.c
index b63c50a..cd6201a 100644
--- a/libs/port/interlocked.c
+++ b/libs/port/interlocked.c
@@ -289,6 +289,8 @@ int interlocked_cmpxchg( int *dest, int xchg, int compare )
 }
 #endif
 
+#if !(defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) && __SIZEOF_POINTER__ == 4) \
+ && !(defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8) && __SIZEOF_POINTER__ == 8)
 void *interlocked_cmpxchg_ptr( void **dest, void *xchg, void *compare )
 {
     pthread_mutex_lock( &interlocked_mutex );
@@ -301,6 +303,7 @@ void *interlocked_cmpxchg_ptr( void **dest, void *xchg, void *compare )
     pthread_mutex_unlock( &interlocked_mutex );
     return compare;
 }
+#endif
 
 #ifndef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8
 __int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int64 compare )
@@ -329,6 +332,8 @@ int interlocked_xchg( int *dest, int val )
 }
 #endif
 
+#if !(defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) && __SIZEOF_POINTER__ == 4) \
+ && !(defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8) && __SIZEOF_POINTER__ == 8)
 void *interlocked_xchg_ptr( void **dest, void *val )
 {
     void *retv;
@@ -338,6 +343,7 @@ void *interlocked_xchg_ptr( void **dest, void *val )
     pthread_mutex_unlock( &interlocked_mutex );
     return retv;
 }
+#endif
 
 #ifndef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4
 int interlocked_xchg_add( int *dest, int incr )