diff options
| author | 2015-04-28 12:37:09 +0100 | |
|---|---|---|
| committer | 2015-04-28 12:38:22 +0100 | |
| commit | a3c382738bc54f464a57e2b51b51ad305eb03dd2 (patch) | |
| tree | f0438a852e264dae0c46af599c73391affa14742 | |
| parent | 3adfc4bbe6c42d574bd2069d8e38a13d5ad98ccf (diff) | |
ART: Fix MIPS entrypoint downcall macros.
Broken by not updating the MIPS assembly after rebase of
https://android-review.googlesource.com/79174
Change-Id: I6258c254c0652e92357d306640c461d9523da227
| -rw-r--r-- | runtime/arch/mips/quick_entrypoints_mips.S | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/runtime/arch/mips/quick_entrypoints_mips.S b/runtime/arch/mips/quick_entrypoints_mips.S index af9ef1ff35..ee5c59f96f 100644 --- a/runtime/arch/mips/quick_entrypoints_mips.S +++ b/runtime/arch/mips/quick_entrypoints_mips.S @@ -982,6 +982,7 @@ ENTRY art_quick_set_obj_instance RETURN_IF_ZERO END art_quick_set_obj_instance +// Macro to facilitate adding new allocation entrypoints. .macro ONE_ARG_DOWNCALL name, entrypoint, return .extern \entrypoint ENTRY \name @@ -992,19 +993,6 @@ ENTRY \name END \name .endm -// Macro to facilitate adding new allocation entrypoints. -.macro ONE_ARG_DOWNCALL name, entrypoint, return - .extern \entrypoint -ENTRY \name - GENERATE_GLOBAL_POINTER - SETUP_REF_ONLY_CALLEE_SAVE_FRAME # save callee saves in case of GC - move $a1, rSELF # pass Thread::Current - jal \entrypoint - move $a2, $sp # pass $sp - \return -END \name -.endm - .macro TWO_ARG_DOWNCALL name, entrypoint, return .extern \entrypoint ENTRY \name @@ -1028,11 +1016,9 @@ END \name .macro FOUR_ARG_DOWNCALL name, entrypoint, return .extern \entrypoint ENTRY \name - GENERATE_GLOBAL_POINTER - SETUP_REF_ONLY_CALLEE_SAVE_FRAME # save callee saves in case of GC - sw rSELF, 16($sp) # pass Thread::Current + SETUP_REFS_ONLY_CALLEE_SAVE_FRAME # save callee saves in case of GC jal \entrypoint - sw $sp, 20($sp) # pass $sp + sw rSELF, 16($sp) # pass Thread::Current \return END \name .endm |