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
diff --git a/runtime/arch/mips/quick_entrypoints_mips.S b/runtime/arch/mips/quick_entrypoints_mips.S
index af9ef1f..ee5c59f 100644
--- a/runtime/arch/mips/quick_entrypoints_mips.S
+++ b/runtime/arch/mips/quick_entrypoints_mips.S
@@ -982,6 +982,7 @@
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 @@
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 @@
.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