commit c6d86725521841637bdd9564e71be3d9691db20f
author Douglas Leung <douglas.leung@imgtec.com> Wed Dec 10 16:15:17 2014 -0800
committer Douglas Leung <douglas.leung@imgtec.com> Mon Jan 12 16:32:25 2015 -0800
tree 052359801333c2973fac4b2f63eccb3977110bd4
parent 8fccea249b1a6f1469eeea42c2b2cca06ce1c70d

Fix refs_and_args callee save order for Mips32.

This patch fixes an ART crash while using the soft keyboard.

Change-Id: Ib2d651c460ce2707356986cd733bed23b0cabb21

runtime/arch/mips/quick_entrypoints_mips.S

diff --git a/runtime/arch/mips/quick_entrypoints_mips.S b/runtime/arch/mips/quick_entrypoints_mips.S
index 509f991..9d89b1b 100644
--- a/runtime/arch/mips/quick_entrypoints_mips.S
+++ b/runtime/arch/mips/quick_entrypoints_mips.S
@@ -190,12 +190,12 @@
     .cfi_rel_offset 19, 32
     sw     $s2, 28($sp)
     .cfi_rel_offset 18, 28
-    sw     $a3, 12($sp)
-    .cfi_rel_offset 7, 12
-    sw     $a2, 8($sp)
-    .cfi_rel_offset 6, 8
-    sw     $a1, 4($sp)
-    .cfi_rel_offset 5, 4
+    sw     $a3, 24($sp)
+    .cfi_rel_offset 7, 24
+    sw     $a2, 20($sp)
+    .cfi_rel_offset 6, 20
+    sw     $a1, 16($sp)
+    .cfi_rel_offset 5, 16
     # bottom will hold Method*
 .endm
 
@@ -257,11 +257,11 @@
     .cfi_restore 19
     lw     $s2, 28($sp)
     .cfi_restore 18
-    lw     $a3, 12($sp)
+    lw     $a3, 24($sp)
     .cfi_restore 7
-    lw     $a2, 8($sp)
+    lw     $a2, 20($sp)
     .cfi_restore 6
-    lw     $a1, 4($sp)
+    lw     $a1, 16($sp)
     .cfi_restore 5
     addiu  $sp, $sp, 64           # pop frame
     .cfi_adjust_cfa_offset -64