diff options
| author | 2021-11-25 15:36:29 +0000 | |
|---|---|---|
| committer | 2021-11-26 12:58:39 +0000 | |
| commit | 8439e454770f2e5a62d78152442c078ffdbf19c1 (patch) | |
| tree | 5731dfbc771e6a6da13f99cdd784525db109d173 /compiler/jni/quick/jni_compiler.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 'compiler/jni/quick/jni_compiler.cc')
| -rw-r--r-- | compiler/jni/quick/jni_compiler.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/jni/quick/jni_compiler.cc b/compiler/jni/quick/jni_compiler.cc index 863f47b819..40110d747a 100644 --- a/compiler/jni/quick/jni_compiler.cc +++ b/compiler/jni/quick/jni_compiler.cc @@ -683,7 +683,7 @@ static JniCompiledMethod ArtJniCompileMethodInternal(const CompilerOptions& comp // // For baker read barrier, do a fast check whether the class is already marked. // - // Call into the runtime's `art_read_barrier_jni` and have it fix up + // Call into the runtime's `art_jni_read_barrier` and have it fix up // the class address if it was moved. // // The entrypoint preserves the method register and argument registers. @@ -702,7 +702,7 @@ static JniCompiledMethod ArtJniCompileMethodInternal(const CompilerOptions& comp } ThreadOffset<kPointerSize> read_barrier = QUICK_ENTRYPOINT_OFFSET(kPointerSize, - pReadBarrierJni); + pJniReadBarrier); __ CallFromThread(read_barrier); // Return to main path. |