commit c3d131e1ec030b4ff5c44fe2a45d5fb45b3295af
author Douglas Leung <douglas@mips.com> Wed Jul 16 17:32:41 2014 -0700
committer Douglas Leung <douglas@mips.com> Wed Jul 16 20:22:53 2014 -0700
tree 721a028c24936097b32bbc9448035901d3429000
parent 81457a3cd8fca14396b5785a4e4c8070c259b07a

Fix test 304-method-tracing failure for Mips.

Change-Id: Id5ce9fd3c880dd568b11a1deea7e42ea587934ba
Signed-off-by: Douglas Leung <douglas@mips.com>

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 ada1523..8786222 100644
--- a/runtime/arch/mips/quick_entrypoints_mips.S
+++ b/runtime/arch/mips/quick_entrypoints_mips.S
@@ -1076,14 +1076,15 @@
     .cfi_startproc
     addiu    $t9, $ra, 4    # put current address into $t9 to rebuild $gp
     GENERATE_GLOBAL_POINTER
-    move     $t0, $sp       # remember bottom of caller's frame
+    move     $ra, $zero     # link register is to here, so clobber with 0 for later checks
     SETUP_REF_ONLY_CALLEE_SAVE_FRAME
+    move     $t0, $sp       # remember bottom of caller's frame
     addiu    $sp, $sp, -48  # save return values and set up args
     .cfi_adjust_cfa_offset 48
     sw       $v0, 32($sp)
-    .cfi_rel_offset 2, 0
+    .cfi_rel_offset 2, 32
     sw       $v1, 36($sp)
-    .cfi_rel_offset 3, 4
+    .cfi_rel_offset 3, 36 
     s.s      $f0, 40($sp)
     s.s      $f1, 44($sp)
     s.s      $f0, 16($sp)   # pass fpr result