commit ae67599981e17cdfd51418c35e56e2a7c5ef4c72
author Ian Rogers <irogers@google.com> Sun Oct 09 17:10:22 2011 -0700
committer Ian Rogers <irogers@google.com> Sun Oct 09 18:23:51 2011 -0700
tree 628f154344135cb51c94a9885b5cfae9e7a35f37
parent c10717a0b86d5719556ac3286fcb47aa2f2416fc

Various assembly fixes.

Change-Id: I42655af8dc3d7201d53c3393cdc585d9faa8cb82

src/stub_arm.cc

diff --git a/src/stub_arm.cc b/src/stub_arm.cc
index bb36415..b959377 100644
--- a/src/stub_arm.cc
+++ b/src/stub_arm.cc
@@ -32,7 +32,7 @@
   // Restore registers which may have been modified by GC and R0 which will now hold the method*
   __ DecreaseFrameSize(12);
   __ PopList(save);
-  __ mov(PC, ShifterOperand(R12));  // Leaf call to method's code
+  __ bx(R12);  // Leaf call to method's code
 
   __ bkpt(0);
 
@@ -89,11 +89,11 @@
   __ LoadFromOffset(kLoadWord, R12, TR, OFFSETOF_MEMBER(Thread, pFindNativeMethod));
   __ blx(R12);
   __ mov(R12, ShifterOperand(R0));  // Save result of FindNativeMethod in R12
-  __ AddConstant(SP, 12);  // Restore registers (including outgoing arguments)
+  __ AddConstant(SP, 12);           // Restore registers (including outgoing arguments)
   __ PopList(save);
   __ cmp(R12, ShifterOperand(0));
-  __ mov(PC, ShifterOperand(R12), NE);  // If R12 != 0 tail call into native code
-  __ mov(PC, ShifterOperand(LR));  // Return to caller to handle exception
+  __ bx(R12, NE);                   // If R12 != 0 tail call into native code
+  __ bx(LR);                        // Return to caller to handle exception
 
   assembler->EmitSlowPaths();