summaryrefslogtreecommitdiff
path: root/runtime/entrypoints/quick/quick_entrypoints.h
diff options
context:
space:
mode:
author Vladimir Marko <vmarko@google.com> 2021-11-25 15:36:29 +0000
committer Treehugger Robot <treehugger-gerrit@google.com> 2021-11-26 12:58:39 +0000
commit8439e454770f2e5a62d78152442c078ffdbf19c1 (patch)
tree5731dfbc771e6a6da13f99cdd784525db109d173 /runtime/entrypoints/quick/quick_entrypoints.h
parentf3416395d234a10770dab900809471304bb3c6ff (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/quick/quick_entrypoints.h')
-rw-r--r--runtime/entrypoints/quick/quick_entrypoints.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/entrypoints/quick/quick_entrypoints.h b/runtime/entrypoints/quick/quick_entrypoints.h
index cf5c697b76..a69cc5645c 100644
--- a/runtime/entrypoints/quick/quick_entrypoints.h
+++ b/runtime/entrypoints/quick/quick_entrypoints.h
@@ -75,9 +75,9 @@ extern "C" mirror::String* artStringBuilderAppend(uint32_t format,
Thread* self)
REQUIRES_SHARED(Locks::mutator_lock_) HOT_ATTR;
-extern "C" void artReadBarrierJni(ArtMethod* method)
+extern "C" void artJniReadBarrier(ArtMethod* method)
REQUIRES_SHARED(Locks::mutator_lock_) HOT_ATTR;
-extern "C" void artUnlockObjectFromJni(mirror::Object* locked, Thread* self)
+extern "C" void artJniUnlockObject(mirror::Object* locked, Thread* self)
REQUIRES_SHARED(Locks::mutator_lock_) HOT_ATTR;
// Read barrier entrypoints.