diff options
| -rw-r--r-- | runtime/arch/riscv64/quick_entrypoints_riscv64.S | 4 | ||||
| -rw-r--r-- | runtime/interpreter/mterp/riscv64/main.S | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/runtime/arch/riscv64/quick_entrypoints_riscv64.S b/runtime/arch/riscv64/quick_entrypoints_riscv64.S index 19fa3c35ac..a94b66173d 100644 --- a/runtime/arch/riscv64/quick_entrypoints_riscv64.S +++ b/runtime/arch/riscv64/quick_entrypoints_riscv64.S @@ -380,7 +380,7 @@ ENTRY art_quick_generic_jni_trampoline .Lcall_method_exit_hook: fmv.d.x fa0, a0 li a4, FRAME_SIZE_SAVE_REFS_AND_ARGS - jal art_quick_method_exit_hook + call art_quick_method_exit_hook j .Lcall_method_exit_hook_done .Lexception_in_native: @@ -548,7 +548,7 @@ END art_quick_proxy_invoke_handler ENTRY \c_name SETUP_SAVE_ALL_CALLEE_SAVES_FRAME // save all registers as basis for long jump context. mv a1, xSELF // pass Thread::Current. - jal \cxx_name // \cxx_name(arg, Thread*). + call \cxx_name // \cxx_name(arg, Thread*). ebreak END \c_name .endm diff --git a/runtime/interpreter/mterp/riscv64/main.S b/runtime/interpreter/mterp/riscv64/main.S index 41b930b698..bbd818b86d 100644 --- a/runtime/interpreter/mterp/riscv64/main.S +++ b/runtime/interpreter/mterp/riscv64/main.S @@ -100,7 +100,7 @@ .macro NTERP_TRAMPOLINE name, helper ENTRY \name SETUP_SAVE_REFS_ONLY_FRAME - jal \helper + call \helper RESTORE_SAVE_REFS_ONLY_FRAME lw t0, THREAD_EXCEPTION_OFFSET(xSELF) bnez t0, nterp_deliver_pending_exception @@ -204,7 +204,7 @@ END \name andi t0, t0, THREAD_SUSPEND_OR_CHECKPOINT_REQUEST beqz t0, \continue EXPORT_PC - jal art_quick_test_suspend + call art_quick_test_suspend .endm // Fetch the next instruction, from xPC into xINST. @@ -277,7 +277,7 @@ END \name 4: mv a1, zero // dex_pc_ptr=nullptr mv a2, zero // vergs=nullptr - jal nterp_hot_method + call nterp_hot_method j 2b .endm |