diff options
Diffstat (limited to 'compiler/jni/quick/x86_64/calling_convention_x86_64.cc')
| -rw-r--r-- | compiler/jni/quick/x86_64/calling_convention_x86_64.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/compiler/jni/quick/x86_64/calling_convention_x86_64.cc b/compiler/jni/quick/x86_64/calling_convention_x86_64.cc index 7e92d12ce8..9c7eab1cc7 100644 --- a/compiler/jni/quick/x86_64/calling_convention_x86_64.cc +++ b/compiler/jni/quick/x86_64/calling_convention_x86_64.cc @@ -97,9 +97,9 @@ ManagedRegister X86_64ManagedRuntimeCallingConvention::CurrentParamRegister() { } FrameOffset X86_64ManagedRuntimeCallingConvention::CurrentParamStackOffset() { - return FrameOffset(displacement_.Int32Value() + // displacement - sizeof(StackReference<mirror::ArtMethod>) + // Method ref - (itr_slots_ * sizeof(uint32_t))); // offset into in args + return FrameOffset(displacement_.Int32Value() + // displacement + kX86_64PointerSize + // Method ref + itr_slots_ * sizeof(uint32_t)); // offset into in args } const ManagedRegisterEntrySpills& X86_64ManagedRuntimeCallingConvention::EntrySpills() { @@ -149,7 +149,7 @@ uint32_t X86_64JniCallingConvention::FpSpillMask() const { size_t X86_64JniCallingConvention::FrameSize() { // Method*, return address and callee save area size, local reference segment state - size_t frame_data_size = sizeof(StackReference<mirror::ArtMethod>) + + size_t frame_data_size = kX86_64PointerSize + (2 + CalleeSaveRegisters().size()) * kFramePointerSize; // References plus link_ (pointer) and number_of_references_ (uint32_t) for HandleScope header size_t handle_scope_size = HandleScope::SizeOf(kFramePointerSize, ReferenceCount()); |