From 8d5ead52a92675c258113d3dfa71bf8fceba5d9f Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Tue, 22 Apr 2014 08:30:19 +0000 Subject: [PATCH] Revert "64bit changes to the stack walker for the Quick ABI." This reverts commit 5cb328362a633302ca0fcdbaa0da7d94069df051. Change-Id: Icc0ec1a9f15c2e4e9103e732d7ba75a4feb853b1 --- runtime/entrypoints/quick/quick_trampoline_entrypoints.cc | 11 +++++++++++ runtime/instruction_set.h | 10 ---------- runtime/stack.h | 11 +++++------ 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc b/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc index 741b7dd57..2b29591fb 100644 --- a/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc +++ b/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc @@ -34,6 +34,12 @@ namespace art { // Visits the arguments as saved to the stack by a Runtime::kRefAndArgs callee save frame. class QuickArgumentVisitor { + // Size of each spilled GPR. +#ifdef __LP64__ + static constexpr size_t kBytesPerGprSpillLocation = 8; +#else + static constexpr size_t kBytesPerGprSpillLocation = 4; +#endif // Number of bytes for each out register in the caller method's frame. static constexpr size_t kBytesStackArgLocation = 4; #if defined(__arm__) @@ -55,6 +61,7 @@ class QuickArgumentVisitor { static constexpr bool kQuickSoftFloatAbi = true; // This is a soft float ABI. static constexpr size_t kNumQuickGprArgs = 3; // 3 arguments passed in GPRs. static constexpr size_t kNumQuickFprArgs = 0; // 0 arguments passed in FPRs. + static constexpr size_t kBytesPerFprSpillLocation = 4; // FPR spill size is 4 bytes. static constexpr size_t kQuickCalleeSaveFrame_RefAndArgs_Fpr1Offset = 0; // Offset of first FPR arg. static constexpr size_t kQuickCalleeSaveFrame_RefAndArgs_Gpr1Offset = 8; // Offset of first GPR arg. static constexpr size_t kQuickCalleeSaveFrame_RefAndArgs_LrOffset = 44; // Offset of return address. @@ -86,6 +93,7 @@ class QuickArgumentVisitor { static constexpr bool kQuickSoftFloatAbi = false; // This is a hard float ABI. static constexpr size_t kNumQuickGprArgs = 7; // 7 arguments passed in GPRs. static constexpr size_t kNumQuickFprArgs = 8; // 8 arguments passed in FPRs. + static constexpr size_t kBytesPerFprSpillLocation = 8; // FPR spill size is 8 bytes. static constexpr size_t kQuickCalleeSaveFrame_RefAndArgs_Fpr1Offset =16; // Offset of first FPR arg. static constexpr size_t kQuickCalleeSaveFrame_RefAndArgs_Gpr1Offset = 144; // Offset of first GPR arg. static constexpr size_t kQuickCalleeSaveFrame_RefAndArgs_LrOffset = 296; // Offset of return address. @@ -111,6 +119,7 @@ class QuickArgumentVisitor { static constexpr bool kQuickSoftFloatAbi = true; // This is a soft float ABI. static constexpr size_t kNumQuickGprArgs = 3; // 3 arguments passed in GPRs. static constexpr size_t kNumQuickFprArgs = 0; // 0 arguments passed in FPRs. + static constexpr size_t kBytesPerFprSpillLocation = 4; // FPR spill size is 4 bytes. static constexpr size_t kQuickCalleeSaveFrame_RefAndArgs_Fpr1Offset = 0; // Offset of first FPR arg. static constexpr size_t kQuickCalleeSaveFrame_RefAndArgs_Gpr1Offset = 4; // Offset of first GPR arg. static constexpr size_t kQuickCalleeSaveFrame_RefAndArgs_LrOffset = 60; // Offset of return address. @@ -136,6 +145,7 @@ class QuickArgumentVisitor { static constexpr bool kQuickSoftFloatAbi = true; // This is a soft float ABI. static constexpr size_t kNumQuickGprArgs = 3; // 3 arguments passed in GPRs. static constexpr size_t kNumQuickFprArgs = 0; // 0 arguments passed in FPRs. + static constexpr size_t kBytesPerFprSpillLocation = 8; // FPR spill size is 8 bytes. static constexpr size_t kQuickCalleeSaveFrame_RefAndArgs_Fpr1Offset = 0; // Offset of first FPR arg. static constexpr size_t kQuickCalleeSaveFrame_RefAndArgs_Gpr1Offset = 4; // Offset of first GPR arg. static constexpr size_t kQuickCalleeSaveFrame_RefAndArgs_LrOffset = 28; // Offset of return address. @@ -174,6 +184,7 @@ class QuickArgumentVisitor { static constexpr bool kQuickSoftFloatAbi = false; // This is a hard float ABI. static constexpr size_t kNumQuickGprArgs = 5; // 3 arguments passed in GPRs. static constexpr size_t kNumQuickFprArgs = 8; // 0 arguments passed in FPRs. + static constexpr size_t kBytesPerFprSpillLocation = 8; // FPR spill size is 8 bytes. static constexpr size_t kQuickCalleeSaveFrame_RefAndArgs_Fpr1Offset = 16; // Offset of first FPR arg. static constexpr size_t kQuickCalleeSaveFrame_RefAndArgs_Gpr1Offset = 80; // Offset of first GPR arg. static constexpr size_t kQuickCalleeSaveFrame_RefAndArgs_LrOffset = 168; // Offset of return address. diff --git a/runtime/instruction_set.h b/runtime/instruction_set.h index 4eebaa6b1..c746e0630 100644 --- a/runtime/instruction_set.h +++ b/runtime/instruction_set.h @@ -41,24 +41,14 @@ bool Is64BitInstructionSet(InstructionSet isa); #if defined(__arm__) static constexpr InstructionSet kRuntimeISA = kArm; -static constexpr size_t kBytesPerGprSpillLocation = 4; -static constexpr size_t kBytesPerFprSpillLocation = 4; #elif defined(__aarch64__) static constexpr InstructionSet kRuntimeISA = kArm64; -static constexpr size_t kBytesPerGprSpillLocation = 8; -static constexpr size_t kBytesPerFprSpillLocation = 8; #elif defined(__mips__) static constexpr InstructionSet kRuntimeISA = kMips; -static constexpr size_t kBytesPerGprSpillLocation = 4; -static constexpr size_t kBytesPerFprSpillLocation = 4; #elif defined(__i386__) static constexpr InstructionSet kRuntimeISA = kX86; -static constexpr size_t kBytesPerGprSpillLocation = 4; -static constexpr size_t kBytesPerFprSpillLocation = 8; #elif defined(__x86_64__) static constexpr InstructionSet kRuntimeISA = kX86_64; -static constexpr size_t kBytesPerGprSpillLocation = 8; -static constexpr size_t kBytesPerFprSpillLocation = 8; #else static constexpr InstructionSet kRuntimeISA = kNone; #endif diff --git a/runtime/stack.h b/runtime/stack.h index deba38909..ab903d640 100644 --- a/runtime/stack.h +++ b/runtime/stack.h @@ -637,12 +637,11 @@ class StackVisitor { size_t frame_size, int reg) { DCHECK_EQ(frame_size & (kStackAlignment - 1), 0U); DCHECK_NE(reg, static_cast(kVRegInvalid)); - int spills = __builtin_popcount(core_spills) * kBytesPerGprSpillLocation - + __builtin_popcount(fp_spills) * kBytesPerFprSpillLocation - + sizeof(uint32_t); // Filler. + + int num_spills = __builtin_popcount(core_spills) + __builtin_popcount(fp_spills) + 1; // Filler. int num_ins = code_item->ins_size_; int num_regs = code_item->registers_size_ - num_ins; - int locals_start = frame_size - spills - num_regs * sizeof(uint32_t); + int locals_start = frame_size - ((num_spills + num_regs) * sizeof(uint32_t)); if (reg == static_cast(kVRegMethodPtrBaseReg)) { // The current method pointer corresponds to special location on stack. return 0; @@ -661,13 +660,13 @@ class StackVisitor { return locals_start + (reg * sizeof(uint32_t)); } else { // Handle ins. - return frame_size + ((reg - num_regs) * sizeof(uint32_t)) + kWordSize; + return frame_size + ((reg - num_regs) * sizeof(uint32_t)) + sizeof(StackReference); } } static int GetOutVROffset(uint16_t out_num) { // According to stack model, the first out is above the Method ptr. - return kWordSize + (out_num * sizeof(uint32_t)); + return sizeof(StackReference) + (out_num * sizeof(uint32_t)); } uintptr_t GetCurrentQuickFramePc() const { -- 2.11.0