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/jni_internal_arm.cc

diff --git a/src/jni_internal_arm.cc b/src/jni_internal_arm.cc
index 93380b1..f1ed092 100644
--- a/src/jni_internal_arm.cc
+++ b/src/jni_internal_arm.cc
@@ -46,7 +46,7 @@
   // Move the managed thread pointer into R9.
   __ mov(R9, ShifterOperand(R2));
 
-  // Reset R4 to suspend check intercal
+  // Reset R4 to suspend check interval
   __ LoadImmediate(R4, SUSPEND_CHECK_INTERVAL);
 
   // Move frame down for arguments less 3 pushed values above
@@ -106,15 +106,10 @@
   __ blx(IP);
 
   // If the method returns a value, store it to the result pointer.
-  char ch = method->GetShorty()->CharAt(0);
-  if (ch != 'V') {
+  if (!method->IsReturnVoid()) {
     // Load the result JValue pointer of the stub caller's out args.
     __ LoadFromOffset(kLoadWord, IP, SP, frame_size);
-    if (ch == 'D' || ch == 'J') {
-      __ StoreToOffset(kStoreWordPair, R0, IP, 0);
-    } else {
-      __ StoreToOffset(kStoreWord, R0, IP, 0);
-    }
+    __ StoreToOffset(method->IsReturnALongOrDouble() ? kStoreWordPair : kStoreWord, R0, IP, 0);
   }
 
   // Remove the frame less the spilled R4, R9 and LR