commit 135016a1feee5576014f377e8006057837ee73a2
author Dmitry Petrochenko <dmitry.petrochenko@intel.com> Thu Apr 03 14:35:54 2014 +0700
committer Andreas Gampe <agampe@google.com> Thu Apr 10 09:20:42 2014 -0700
tree 900578418eea8094513d6e22ab0bb9f616334fd7
parent 22839a631bb3591a1c0037c388d51a4f18b5fb5e

art: Use SIRT::GetAlignedSirtSizeTarget in calling convention

Calculate frame size based on SIRT::GetAlignedSirtSizeTarget existing method.

Make offset functions pointer-size-dependent for cross-compiling. Add
a test to check whether our computations are correct.

Change-Id: Ic66daf6f9908890eda906bdcbbc4444c4fef614f
Signed-off-by: Dmitry Petrochenko <dmitry.petrochenko@intel.com>

compiler/jni/quick/calling_convention.h

diff --git a/compiler/jni/quick/calling_convention.h b/compiler/jni/quick/calling_convention.h
index 7e1cf63..76d237e 100644
--- a/compiler/jni/quick/calling_convention.h
+++ b/compiler/jni/quick/calling_convention.h
@@ -299,17 +299,17 @@
 
   FrameOffset SirtLinkOffset() const {
     return FrameOffset(SirtOffset().Int32Value() +
-                       StackIndirectReferenceTable::LinkOffset());
+                       StackIndirectReferenceTable::LinkOffset(frame_pointer_size_));
   }
 
   FrameOffset SirtNumRefsOffset() const {
     return FrameOffset(SirtOffset().Int32Value() +
-                       StackIndirectReferenceTable::NumberOfReferencesOffset());
+                       StackIndirectReferenceTable::NumberOfReferencesOffset(frame_pointer_size_));
   }
 
   FrameOffset SirtReferencesOffset() const {
     return FrameOffset(SirtOffset().Int32Value() +
-                       StackIndirectReferenceTable::ReferencesOffset());
+                       StackIndirectReferenceTable::ReferencesOffset(frame_pointer_size_));
   }
 
   virtual ~JniCallingConvention() {}