diff options
| author | 2021-11-25 15:36:29 +0000 | |
|---|---|---|
| committer | 2021-11-26 12:58:39 +0000 | |
| commit | 8439e454770f2e5a62d78152442c078ffdbf19c1 (patch) | |
| tree | 5731dfbc771e6a6da13f99cdd784525db109d173 /runtime/entrypoints_order_test.cc | |
| parent | f3416395d234a10770dab900809471304bb3c6ff (diff) | |
Clean up JNI entrypoint assembly.
Move JNI entrypoints to `jni_entrypoints_<arch>.S` and
shared helper macros to `asm_support_<arch>.S`. Introduce
some new macros to reduce code duplication. Fix x86-64
using ESP in the JNI lock slow path.
Rename JNI lock/unlock and read barrier entrypoints to pull
the "jni" to the front and drop "quick" from their names.
Test: m test-art-host-gtest
Test: testrunner.py --host --optimizing
Test: run-gtests.sh
Test: testrunner.py --target --optimizing
Bug: 172332525
Change-Id: I20d059b07b308283db6c4e36a508480d91ad07fc
Diffstat (limited to 'runtime/entrypoints_order_test.cc')
| -rw-r--r-- | runtime/entrypoints_order_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/entrypoints_order_test.cc b/runtime/entrypoints_order_test.cc index c3f1dba967..00d5523179 100644 --- a/runtime/entrypoints_order_test.cc +++ b/runtime/entrypoints_order_test.cc @@ -336,9 +336,9 @@ class EntrypointsOrderTest : public CommonRuntimeTest { sizeof(void*)); EXPECT_OFFSET_DIFFNP(QuickEntryPoints, pUpdateInlineCache, pCompileOptimized, sizeof(void*)); - EXPECT_OFFSET_DIFFNP(QuickEntryPoints, pCompileOptimized, pReadBarrierJni, + EXPECT_OFFSET_DIFFNP(QuickEntryPoints, pCompileOptimized, pJniReadBarrier, sizeof(void*)); - EXPECT_OFFSET_DIFFNP(QuickEntryPoints, pReadBarrierJni, pReadBarrierMarkReg00, + EXPECT_OFFSET_DIFFNP(QuickEntryPoints, pJniReadBarrier, pReadBarrierMarkReg00, sizeof(void*)); EXPECT_OFFSET_DIFFNP(QuickEntryPoints, pReadBarrierMarkReg00, pReadBarrierMarkReg01, sizeof(void*)); |