[PATCH] D40385: [mips][compiler-rt] Provide 64bit atomic add and sub

[Simon Dardis via Phabricator via llvm-commits]

sdardis updated this revision to Diff 124216.
sdardis added a comment.

Update as per initial review comments.


https://reviews.llvm.org/D40385

Files:
  lib/sanitizer_common/sanitizer_atomic_clang.h


Index: lib/sanitizer_common/sanitizer_atomic_clang.h
===================================================================
--- lib/sanitizer_common/sanitizer_atomic_clang.h
+++ lib/sanitizer_common/sanitizer_atomic_clang.h
@@ -48,14 +48,30 @@
     typename T::Type v, memory_order mo) {
   (void)mo;
   DCHECK(!((uptr)a % sizeof(*a)));
+#if defined(_MIPS_SIM) && _MIPS_SIM == _ABIO32
+  typedef typename T::Type Type;
+  if (sizeof(T) == 8) {
+    Type volatile *val_ptr = const_cast<Type volatile *>(&a->val_dont_use);
+    return __mips_sync_fetch_and_add<u64>(
+          reinterpret_cast<u64 volatile *>(val_ptr), (u64)v);
+  }
+#endif
   return __sync_fetch_and_add(&a->val_dont_use, v);
 }
 
 template<typename T>
 INLINE typename T::Type atomic_fetch_sub(volatile T *a,
     typename T::Type v, memory_order mo) {
   (void)mo;
   DCHECK(!((uptr)a % sizeof(*a)));
+#if defined(_MIPS_SIM) && _MIPS_SIM == _ABIO32
+  typedef typename T::Type Type;
+  if (sizeof(T) == 8) {
+    Type volatile *val_ptr = const_cast<Type volatile *>(&a->val_dont_use);
+    return __mips_sync_fetch_and_add<u64>(
+          reinterpret_cast<u64 volatile *>(val_ptr), -((u64)(v)));
+  }
+#endif
   return __sync_fetch_and_add(&a->val_dont_use, -v);
 }
 
@@ -79,7 +95,7 @@
   Type cmpv = *cmp;
   Type prev;
 #if defined(_MIPS_SIM) && _MIPS_SIM == _ABIO32
-  if (sizeof(*a) == 8) {
+  if (sizeof(T) == 8) {
     Type volatile *val_ptr = const_cast<Type volatile *>(&a->val_dont_use);
     prev = __mips_sync_val_compare_and_swap<u64>(
         reinterpret_cast<u64 volatile *>(val_ptr), (u64)cmpv, (u64)xchg);


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D40385.124216.patch
Type: text/x-patch
Size: 1591 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20171124/d4a06bb7/attachment.bin>