diff options
| author | Carl Shapiro <cshapiro@google.com> | 2011-01-23 17:07:53 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-23 17:07:53 -0800 |
| commit | 42f5f6fd86903fb873026f5826b93a396f04549f (patch) | |
| tree | 4b8fa2be21afbe1a2bf5591c0cf8799dad0ea35b /vm/test | |
| parent | d0900d13fb7bb1706aff5205af7e2d6517335bee (diff) | |
| parent | 6f22f6bac408e487bcf8fcfd25ef6263cfaefd57 (diff) | |
| download | android_dalvik-42f5f6fd86903fb873026f5826b93a396f04549f.tar.gz android_dalvik-42f5f6fd86903fb873026f5826b93a396f04549f.tar.bz2 android_dalvik-42f5f6fd86903fb873026f5826b93a396f04549f.zip | |
am 6f22f6ba: am e1034238: am b387ce8a: Remove references to android_atomic_swap.
* commit '6f22f6bac408e487bcf8fcfd25ef6263cfaefd57':
Remove references to android_atomic_swap.
Diffstat (limited to 'vm/test')
| -rw-r--r-- | vm/test/AtomicTest.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/vm/test/AtomicTest.c b/vm/test/AtomicTest.c index 62333d0a2..52f29cc3b 100644 --- a/vm/test/AtomicTest.c +++ b/vm/test/AtomicTest.c @@ -61,7 +61,6 @@ static int andTest = 0; static int orTest = 0; static int casTest = 0; static int failingCasTest = 0; -static int swapTest = 0; static int64_t wideCasTest = 0x6600000077000000LL; /* @@ -342,19 +341,14 @@ bool dvmTestAtomicSpeed(void) */ andTest = 0xffd7fa96; orTest = 0x122221ff; - swapTest = 0x11111111; android_atomic_and(0xfffdaf96, &andTest); android_atomic_or(0xdeaaeb00, &orTest); - int oldSwap = android_atomic_swap(0x22222222, &swapTest); - int oldSwap2 = android_atomic_swap(0x33333333, &swapTest); if (android_atomic_release_cas(failingCasTest+1, failingCasTest-1, &failingCasTest) == 0) dvmFprintf(stdout, "failing test did not fail!\n"); dvmFprintf(stdout, "andTest = 0x%x\n", andTest); dvmFprintf(stdout, "orTest = 0x%x\n", orTest); - dvmFprintf(stdout, "swapTest = 0x%x -> 0x%x\n", oldSwap, oldSwap2); - dvmFprintf(stdout, "swapTest = 0x%x -> 0x%x\n", oldSwap2, swapTest); dvmFprintf(stdout, "failingCasTest = %d\n", failingCasTest); #ifdef TEST_BIONIC |