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/utils/x86/assembler_x86.cc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'compiler/utils/x86/assembler_x86.cc') diff --git a/compiler/utils/x86/assembler_x86.cc b/compiler/utils/x86/assembler_x86.cc index 0791c63f90..56c6536fe5 100644 --- a/compiler/utils/x86/assembler_x86.cc +++ b/compiler/utils/x86/assembler_x86.cc @@ -1411,10 +1411,12 @@ void X86Assembler::BuildFrame(size_t frame_size, ManagedRegister method_reg, } // return address then method on stack addl(ESP, Immediate(-frame_size + (spill_regs.size() * kFramePointerSize) + - kFramePointerSize /*method*/ + kFramePointerSize /*return address*/)); + sizeof(StackReference) /*method*/ + + kFramePointerSize /*return address*/)); pushl(method_reg.AsX86().AsCpuRegister()); for (size_t i = 0; i < entry_spills.size(); ++i) { - movl(Address(ESP, frame_size + kFramePointerSize + (i * kFramePointerSize)), + movl(Address(ESP, frame_size + sizeof(StackReference) + + (i * kFramePointerSize)), entry_spills.at(i).AsX86().AsCpuRegister()); } } @@ -1422,7 +1424,8 @@ void X86Assembler::BuildFrame(size_t frame_size, ManagedRegister method_reg, void X86Assembler::RemoveFrame(size_t frame_size, const std::vector& spill_regs) { CHECK_ALIGNED(frame_size, kStackAlignment); - addl(ESP, Immediate(frame_size - (spill_regs.size() * kFramePointerSize) - kFramePointerSize)); + addl(ESP, Immediate(frame_size - (spill_regs.size() * kFramePointerSize) - + sizeof(StackReference))); for (size_t i = 0; i < spill_regs.size(); ++i) { popl(spill_regs.at(i).AsX86().AsCpuRegister()); } -- cgit v1.2.3-59-g8ed1b