diff options
| author | Brian Carlstrom <bdc@google.com> | 2010-05-28 15:42:12 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2010-05-28 15:42:12 -0700 |
| commit | fbdcfb9ea9e2a78f295834424c3f24986ea45dac (patch) | |
| tree | 2ed37f79909dd50cfad01ad364a002508f057cbf /vm/test | |
| parent | 48064d18355ed8845d00707c63007c1292ea69a5 (diff) | |
| download | android_dalvik-fbdcfb9ea9e2a78f295834424c3f24986ea45dac.tar.gz android_dalvik-fbdcfb9ea9e2a78f295834424c3f24986ea45dac.tar.bz2 android_dalvik-fbdcfb9ea9e2a78f295834424c3f24986ea45dac.zip | |
Merge remote branch 'goog/dalvik-dev' into dalvik-dev-to-master
Change-Id: I0c0edb3ebf0d5e040d6bbbf60269fab0deb70ef9
Diffstat (limited to 'vm/test')
| -rw-r--r-- | vm/test/AtomicSpeed.c | 20 | ||||
| -rw-r--r-- | vm/test/TestHash.c | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/vm/test/AtomicSpeed.c b/vm/test/AtomicSpeed.c index e2ffbeff3..b569668fb 100644 --- a/vm/test/AtomicSpeed.c +++ b/vm/test/AtomicSpeed.c @@ -47,16 +47,16 @@ u8 dvmTestAtomicSpeedSub(int repeatCount) j += i; j += i; j += i; j += i; j += i; #else // succeed 10x (Dream: 155.9ns) - ATOMIC_CMP_SWAP(valuePtr, 7, 7); - ATOMIC_CMP_SWAP(valuePtr, 7, 7); - ATOMIC_CMP_SWAP(valuePtr, 7, 7); - ATOMIC_CMP_SWAP(valuePtr, 7, 7); - ATOMIC_CMP_SWAP(valuePtr, 7, 7); - ATOMIC_CMP_SWAP(valuePtr, 7, 7); - ATOMIC_CMP_SWAP(valuePtr, 7, 7); - ATOMIC_CMP_SWAP(valuePtr, 7, 7); - ATOMIC_CMP_SWAP(valuePtr, 7, 7); - 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)ATOMIC_CMP_SWAP(valuePtr, 7, 7); // fail 10x (Dream: 158.5ns) /* diff --git a/vm/test/TestHash.c b/vm/test/TestHash.c index 7233b15e1..26de14130 100644 --- a/vm/test/TestHash.c +++ b/vm/test/TestHash.c @@ -61,7 +61,7 @@ static void dumpIterator(HashTable* pTab) for (dvmHashIterBegin(pTab, &iter); !dvmHashIterDone(&iter); dvmHashIterNext(&iter)) { - const char* str = (const char*) dvmHashIterData(&iter); + //const char* str = (const char*) dvmHashIterData(&iter); //printf(" '%s'\n", str); // (should verify strings) count++; |