commit 7715c68b5f137ff5ffa4f2e1fee0a96fa6cfffb4
author Shih-wei Liao <sliao@google.com> Mon Sep 05 04:04:36 2011 -0700
committer Shih-wei Liao <sliao@google.com> Mon Sep 05 04:04:36 2011 -0700
tree b1925f7af14759500a417b74da6d0bbd83c28437
parent a8f3fe90a4329631ea78a6c2956350e56c3d0884

Fix the calling convention bug where we didn't account for Method*.

Change-Id: Ic54f0a3e15377d7f161fa3d719eb762f969ef729

src/calling_convention_arm.cc

diff --git a/src/calling_convention_arm.cc b/src/calling_convention_arm.cc
index 9c7ba6f..78f0c6c 100644
--- a/src/calling_convention_arm.cc
+++ b/src/calling_convention_arm.cc
@@ -68,7 +68,9 @@
 
 FrameOffset ManagedRuntimeCallingConvention::CurrentParamStackOffset() {
   CHECK_GE(itr_slots_, 3u);
-  return FrameOffset(displacement_.Int32Value() + (itr_slots_ * kPointerSize));
+  return FrameOffset(displacement_.Int32Value() +   // displacement
+                     kPointerSize +                 // Method*
+                     (itr_slots_ * kPointerSize));  // offset into in args
 }
 
 // JNI calling convention