From cf4035a4c41ccfcc3e89a0cee25f5218a11b0705 Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Wed, 28 May 2014 22:43:01 -0700 Subject: ART: Use StackReference in Quick Stack Frame The method reference at the bottom of a quick frame is a stack reference and not a native pointer. This is important for 64b architectures, where the notions do not coincide. Change key methods to have StackReference* parameter instead of mirror::ArtMethod**. Make changes to invoke stubs for 64b archs, change the frame setup for JNI code (both generic JNI and compilers), tie up loose ends. Tested on x86 and x86-64 with host tests. On x86-64, tests succeed with jni compiler activated. x86-64 QCG was not tested. Tested on ARM32 with device tests. Fix ARM64 not saving x19 (used for wSUSPEND) on upcalls. Tested on ARM64 in interpreter-only + generic-jni mode. Fix ARM64 JNI Compiler to work with the CL. Tested on ARM64 in interpreter-only + jni compiler. Change-Id: I77931a0cbadd04d163b3eb8d6f6a6f8740578f13 --- compiler/jni/quick/calling_convention.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'compiler/jni/quick/calling_convention.h') diff --git a/compiler/jni/quick/calling_convention.h b/compiler/jni/quick/calling_convention.h index 2a6e7d96cd..efc0b42db4 100644 --- a/compiler/jni/quick/calling_convention.h +++ b/compiler/jni/quick/calling_convention.h @@ -319,7 +319,8 @@ class JniCallingConvention : public CallingConvention { // Position of handle scope and interior fields FrameOffset HandleScopeOffset() const { - return FrameOffset(this->displacement_.Int32Value() + frame_pointer_size_); // above Method* + return FrameOffset(this->displacement_.Int32Value() + sizeof(StackReference)); + // above Method reference } FrameOffset HandleScopeLinkOffset() const { -- cgit v1.2.3-59-g8ed1b