diff options
| author | Andreas Gampe <agampe@google.com> | 2014-06-10 16:10:56 -0700 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2014-06-10 16:21:33 -0700 |
| commit | 4d0589c90971e19c25894414ae7da579269e1fe2 (patch) | |
| tree | 0bb8a8bea051cfee85e26719eaf4045da9fb2132 /runtime/entrypoints_order_test.cc | |
| parent | 69d57a89595c7c0fba7b7f7b7c6b431a92137215 (diff) | |
| download | art-4d0589c90971e19c25894414ae7da579269e1fe2.zip art-4d0589c90971e19c25894414ae7da579269e1fe2.tar.gz art-4d0589c90971e19c25894414ae7da579269e1fe2.tar.bz2 | |
ART: Move __memcmp16 from Bionic to ART
Handle __memcmp16 / MemCmp16 in ART. Import assembly implementations
for arm and mips from Bionic. Use a generic C version for all other
platforms.
Removes the memcmp16 quick entrypoint, as it is never used. Bump
the oat version and update thread.cc and checks to reflect the
structural change.
Change-Id: I54a5a1da2a0a43ef271c8aeda0bf2276b8b11ac6
Diffstat (limited to 'runtime/entrypoints_order_test.cc')
| -rw-r--r-- | runtime/entrypoints_order_test.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/runtime/entrypoints_order_test.cc b/runtime/entrypoints_order_test.cc index f33befb..0dd33cf 100644 --- a/runtime/entrypoints_order_test.cc +++ b/runtime/entrypoints_order_test.cc @@ -233,8 +233,7 @@ class EntrypointsOrderTest : public CommonRuntimeTest { EXPECT_OFFSET_DIFFNP(QuickEntryPoints, pShlLong, pShrLong, kPointerSize); EXPECT_OFFSET_DIFFNP(QuickEntryPoints, pShrLong, pUshrLong, kPointerSize); EXPECT_OFFSET_DIFFNP(QuickEntryPoints, pUshrLong, pIndexOf, kPointerSize); - EXPECT_OFFSET_DIFFNP(QuickEntryPoints, pIndexOf, pMemcmp16, kPointerSize); - EXPECT_OFFSET_DIFFNP(QuickEntryPoints, pMemcmp16, pStringCompareTo, kPointerSize); + EXPECT_OFFSET_DIFFNP(QuickEntryPoints, pIndexOf, pStringCompareTo, kPointerSize); EXPECT_OFFSET_DIFFNP(QuickEntryPoints, pStringCompareTo, pMemcpy, kPointerSize); EXPECT_OFFSET_DIFFNP(QuickEntryPoints, pMemcpy, pQuickImtConflictTrampoline, kPointerSize); EXPECT_OFFSET_DIFFNP(QuickEntryPoints, pQuickImtConflictTrampoline, pQuickResolutionTrampoline, |