diff options
author | Sebastien Hertz <shertz@google.com> | 2015-01-20 16:06:43 +0100 |
---|---|---|
committer | Nicolas Geoffray <ngeoffray@google.com> | 2015-03-03 11:22:00 +0000 |
commit | 7cde48c56df5b57aed524cce44c902bc720f2d6c (patch) | |
tree | b9b9e33b29f46bfe0c2da89c7e3e87c8ee419ccc /compiler/utils/arm64/assembler_arm64.cc | |
parent | 4b39eeea67b0fecf21588d7b00e92eb844014c24 (diff) | |
download | art-7cde48c56df5b57aed524cce44c902bc720f2d6c.zip art-7cde48c56df5b57aed524cce44c902bc720f2d6c.tar.gz art-7cde48c56df5b57aed524cce44c902bc720f2d6c.tar.bz2 |
Stack support for Optimizing compiler
Allows to read/write DEX registers from physical register or stack
location when the method is compiled with the Optimizing compiler.
Required fixing arm and arm64 JNI compiler by saving floating
point registers.
Bug: 18547544
Change-Id: I401579f251d1c0a130f6cf4a93a960cdcd7518f5
Diffstat (limited to 'compiler/utils/arm64/assembler_arm64.cc')
-rw-r--r-- | compiler/utils/arm64/assembler_arm64.cc | 37 |
1 files changed, 36 insertions, 1 deletions
diff --git a/compiler/utils/arm64/assembler_arm64.cc b/compiler/utils/arm64/assembler_arm64.cc index 21014c8..58c7367 100644 --- a/compiler/utils/arm64/assembler_arm64.cc +++ b/compiler/utils/arm64/assembler_arm64.cc @@ -639,6 +639,7 @@ void Arm64Assembler::EmitExceptionPoll(Arm64Exception *exception) { } constexpr size_t kFramePointerSize = 8; +constexpr unsigned int kJniRefSpillRegsSize = 11 + 8; void Arm64Assembler::BuildFrame(size_t frame_size, ManagedRegister method_reg, const std::vector<ManagedRegister>& callee_save_regs, @@ -648,7 +649,7 @@ void Arm64Assembler::BuildFrame(size_t frame_size, ManagedRegister method_reg, // TODO: *create APCS FP - end of FP chain; // *add support for saving a different set of callee regs. - // For now we check that the size of callee regs vector is 11. + // For now we check that the size of callee regs vector is 11 core registers and 8 fp registers. CHECK_EQ(callee_save_regs.size(), kJniRefSpillRegsSize); // Increase frame to required size - must be at least space to push StackReference<Method>. CHECK_GT(frame_size, kJniRefSpillRegsSize * kFramePointerSize); @@ -682,6 +683,23 @@ void Arm64Assembler::BuildFrame(size_t frame_size, ManagedRegister method_reg, reg_offset -= 8; StoreToOffset(X20, SP, reg_offset); + reg_offset -= 8; + StoreDToOffset(D15, SP, reg_offset); + reg_offset -= 8; + StoreDToOffset(D14, SP, reg_offset); + reg_offset -= 8; + StoreDToOffset(D13, SP, reg_offset); + reg_offset -= 8; + StoreDToOffset(D12, SP, reg_offset); + reg_offset -= 8; + StoreDToOffset(D11, SP, reg_offset); + reg_offset -= 8; + StoreDToOffset(D10, SP, reg_offset); + reg_offset -= 8; + StoreDToOffset(D9, SP, reg_offset); + reg_offset -= 8; + StoreDToOffset(D8, SP, reg_offset); + // Move TR(Caller saved) to ETR(Callee saved). The original (ETR)X21 has been saved on stack. // This way we make sure that TR is not trashed by native code. ___ Mov(reg_x(ETR), reg_x(TR)); @@ -753,6 +771,23 @@ void Arm64Assembler::RemoveFrame(size_t frame_size, const std::vector<ManagedReg reg_offset -= 8; LoadFromOffset(X20, SP, reg_offset); + reg_offset -= 8; + LoadDFromOffset(D15, SP, reg_offset); + reg_offset -= 8; + LoadDFromOffset(D14, SP, reg_offset); + reg_offset -= 8; + LoadDFromOffset(D13, SP, reg_offset); + reg_offset -= 8; + LoadDFromOffset(D12, SP, reg_offset); + reg_offset -= 8; + LoadDFromOffset(D11, SP, reg_offset); + reg_offset -= 8; + LoadDFromOffset(D10, SP, reg_offset); + reg_offset -= 8; + LoadDFromOffset(D9, SP, reg_offset); + reg_offset -= 8; + LoadDFromOffset(D8, SP, reg_offset); + // Decrease frame size to start of callee saved regs. DecreaseFrameSize(frame_size); |