commit 5fa60c3db4208df407113b5a69d295a9c93d53b1
author Jeff Hao <jeffhao@google.com> Thu Apr 04 17:57:01 2013 -0700
committer Jeff Hao <jeffhao@google.com> Fri Apr 05 11:01:06 2013 -0700
tree b56704a7f97cb524c2cf269700fabcae25bf0f08
parent a966e18b402b0568fc556c38d7ef2e7e8df943a2

Remove use of compiled proxy stub from portable.

ARM implementation is tested, but x86 and MIPS are not.

Change-Id: I497d650c55fe7fd4ea24d283c8d8ee99b1456610

src/oat/runtime/mips/runtime_support_mips.S

diff --git a/src/oat/runtime/mips/runtime_support_mips.S b/src/oat/runtime/mips/runtime_support_mips.S
index a4d3e9c..0fc2437 100644
--- a/src/oat/runtime/mips/runtime_support_mips.S
+++ b/src/oat/runtime/mips/runtime_support_mips.S
@@ -926,17 +926,31 @@
     RESTORE_REF_ONLY_CALLEE_SAVE_FRAME_AND_RETURN
 END art_quick_test_suspend
 
+    .extern artPortableProxyInvokeHandler
+ENTRY art_portable_proxy_invoke_handler
+    GENERATE_GLOBAL_POINTER
+    SETUP_REF_AND_ARGS_CALLEE_SAVE_FRAME
+    sw      $a0, 0($sp)            # place proxy method at bottom of frame
+    move    $a2, rSELF             # pass Thread::Current
+    jal     artPortableProxyInvokeHandler  # (Method* proxy method, receiver, Thread*, SP)
+    move    $a3, $sp               # pass $sp
+    lw      $ra, 44($sp)           # restore $ra
+    jr      $ra
+    addiu   $sp, $sp, 48           # pop frame
+    .cfi_adjust_cfa_offset -48
+END art_portable_proxy_invoke_handler
+
     /*
      * Called by managed code that is attempting to call a method on a proxy class. On entry
      * r0 holds the proxy method; r1, r2 and r3 may contain arguments.
      */
-    .extern artProxyInvokeHandler
+    .extern artQuickProxyInvokeHandler
 ENTRY art_quick_proxy_invoke_handler
     GENERATE_GLOBAL_POINTER
     SETUP_REF_AND_ARGS_CALLEE_SAVE_FRAME
     sw      $a0, 0($sp)            # place proxy method at bottom of frame
     move    $a2, rSELF             # pass Thread::Current
-    jal     artProxyInvokeHandler  # (Method* proxy method, receiver, Thread*, SP)
+    jal     artQuickProxyInvokeHandler  # (Method* proxy method, receiver, Thread*, SP)
     move    $a3, $sp               # pass $sp
     lw      $t0, THREAD_EXCEPTION_OFFSET(rSELF) # load Thread::Current()->exception_
     lw      $ra, 44($sp)           # restore $ra