commit 65d1b22d0b02fb0111f69013163c8170e68392f1
author Ian Rogers <irogers@google.com> Fri Sep 27 10:59:41 2013 -0700
committer Ian Rogers <irogers@google.com> Fri Sep 27 10:59:41 2013 -0700
tree 7a031e64179ef59f7254be703a2e086b905528a1
parent d91d6d6a80748f277fd938a412211e5af28913b1

MIPS fix.

Bug 10094803.
Resolution stub needs to set $t9 to ensure the global pointer is calculated
correctly.
Fix copy-paste error in resolution stub in function being invoked.

Change-Id: I330b3052f87f47c10cbde2f7e6b271664185d7b0

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 cb82606..f9b703f 100644
--- a/runtime/arch/mips/quick_entrypoints_mips.S
+++ b/runtime/arch/mips/quick_entrypoints_mips.S
@@ -953,7 +953,7 @@
     GENERATE_GLOBAL_POINTER
     SETUP_REF_AND_ARGS_CALLEE_SAVE_FRAME
     move    $a2, rSELF             # pass Thread::Current
-    jal     artQuickProxyInvokeHandler  # (Method* called, receiver, Thread*, SP)
+    jal     artQuickResolutionTrampoline  # (Method* called, receiver, Thread*, SP)
     move    $a3, $sp               # pass $sp
     lw      $gp, 52($sp)           # restore $gp
     lw      $ra, 60($sp)           # restore $ra
@@ -962,6 +962,7 @@
     lw      $a1, 4($sp)            # restore non-callee save $a1
     lw      $a2, 8($sp)            # restore non-callee save $a2
     lw      $a3, 12($sp)           # restore non-callee save $a3
+    move    $t9, $v0               # code pointer must be in $t9 to generate the global pointer
     jr      $v0                    # tail call to method
 1:
     addiu   $sp, $sp, 64           # pop frame