Atomic op cleanup.

Replaced VM-local macros for barrier and CAS calls with the actual
versions provided by cutils.

 ATOMIC_CMP_SWAP(addr,old,new) --> android_atomic_release_cas(old,new,addr)

 MEM_BARRIER --> ANDROID_MEMBAR_FULL

Renamed android_quasiatomic* to dvmQuasiAtomic*.

Didn't change how anything works, just the names.

Change-Id: I8c68f28e1f7c9cb832183e0918d097dfe6a2cac8

1 files changed, 20 insertions, 20 deletions

diff --git a/vm/test/AtomicSpeed.c b/vm/test/AtomicSpeed.c
index 0f723fcb6..db64f369c 100644
--- a/vm/test/AtomicSpeed.c
+++ b/vm/test/AtomicSpeed.c
@@ -47,29 +47,29 @@ u8 dvmTestAtomicSpeedSub(int repeatCount)
         j += i; j += i; j += i; j += i; j += i;
 #else
         // succeed 10x (Dream: 155.9ns)
-        (void)ATOMIC_CMP_SWAP(valuePtr, 7, 7);
-        (void)ATOMIC_CMP_SWAP(valuePtr, 7, 7);
-        (void)ATOMIC_CMP_SWAP(valuePtr, 7, 7);
-        (void)ATOMIC_CMP_SWAP(valuePtr, 7, 7);
-        (void)ATOMIC_CMP_SWAP(valuePtr, 7, 7);
-        (void)ATOMIC_CMP_SWAP(valuePtr, 7, 7);
-        (void)ATOMIC_CMP_SWAP(valuePtr, 7, 7);
-        (void)ATOMIC_CMP_SWAP(valuePtr, 7, 7);
-        (void)ATOMIC_CMP_SWAP(valuePtr, 7, 7);
-        (void)ATOMIC_CMP_SWAP(valuePtr, 7, 7);
+        (void)android_atomic_release_cas(7, 7, valuePtr);
+        (void)android_atomic_release_cas(7, 7, valuePtr);
+        (void)android_atomic_release_cas(7, 7, valuePtr);
+        (void)android_atomic_release_cas(7, 7, valuePtr);
+        (void)android_atomic_release_cas(7, 7, valuePtr);
+        (void)android_atomic_release_cas(7, 7, valuePtr);
+        (void)android_atomic_release_cas(7, 7, valuePtr);
+        (void)android_atomic_release_cas(7, 7, valuePtr);
+        (void)android_atomic_release_cas(7, 7, valuePtr);
+        (void)android_atomic_release_cas(7, 7, valuePtr);
 
         // fail 10x (Dream: 158.5ns)
         /*
-        ATOMIC_CMP_SWAP(valuePtr, 6, 7);
-        ATOMIC_CMP_SWAP(valuePtr, 6, 7);
-        ATOMIC_CMP_SWAP(valuePtr, 6, 7);
-        ATOMIC_CMP_SWAP(valuePtr, 6, 7);
-        ATOMIC_CMP_SWAP(valuePtr, 6, 7);
-        ATOMIC_CMP_SWAP(valuePtr, 6, 7);
-        ATOMIC_CMP_SWAP(valuePtr, 6, 7);
-        ATOMIC_CMP_SWAP(valuePtr, 6, 7);
-        ATOMIC_CMP_SWAP(valuePtr, 6, 7);
-        ATOMIC_CMP_SWAP(valuePtr, 6, 7);
+        (void)android_atomic_release_cas(6, 7, valuePtr);
+        (void)android_atomic_release_cas(6, 7, valuePtr);
+        (void)android_atomic_release_cas(6, 7, valuePtr);
+        (void)android_atomic_release_cas(6, 7, valuePtr);
+        (void)android_atomic_release_cas(6, 7, valuePtr);
+        (void)android_atomic_release_cas(6, 7, valuePtr);
+        (void)android_atomic_release_cas(6, 7, valuePtr);
+        (void)android_atomic_release_cas(6, 7, valuePtr);
+        (void)android_atomic_release_cas(6, 7, valuePtr);
+        (void)android_atomic_release_cas(6, 7, valuePtr);
         */
 #endif
     }