From d27a0a9b2cfd378e2ec9a24e29c361f9ff6785ca Mon Sep 17 00:00:00 2001 From: Lang Hames Date: Tue, 7 Apr 2015 06:12:21 +0000 Subject: [PATCH] [Orc] Save all the x86-64 GPRs before re-entering the JIT. The re-entry code should work for all calling conventions. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@234298 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/ExecutionEngine/Orc/OrcTargetSupport.cpp | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/lib/ExecutionEngine/Orc/OrcTargetSupport.cpp b/lib/ExecutionEngine/Orc/OrcTargetSupport.cpp index 67861c34b32..fc56e67b85c 100644 --- a/lib/ExecutionEngine/Orc/OrcTargetSupport.cpp +++ b/lib/ExecutionEngine/Orc/OrcTargetSupport.cpp @@ -25,10 +25,12 @@ void OrcX86_64::insertResolverBlock( // address. const unsigned X86_64_TrampolineLength = 6; - // List of x86-64 GPRs to save. - std::array GPRs = {{ - "rbx", "r12", "r13", "r14", "r15", // Callee saved (rbp preserved below). - "rdi", "rsi", "rdx", "rcx", "r8", "r9", // Int args. + // List of x86-64 GPRs to save. Note - RBP saved separately below. + std::array GPRs = {{ + "rax", "rbx", "rcx", "rdx", + "rsi", "rdi", "r8", "r9", + "r10", "r11", "r12", "r13", + "r14", "r15" }}; // Address of the executeCompileCallback function. @@ -62,7 +64,12 @@ void OrcX86_64::insertResolverBlock( AsmStream << " pushq %" << GPR << "\n"; // Store floating-point state with FXSAVE. - AsmStream << " subq $512, %rsp\n" + // Note: We need to keep the stack 16-byte aligned, so if we've emitted an odd + // number of 64-bit pushes so far (GPRs.size() plus 1 for RBP) then add + // an extra 64 bits of padding to the FXSave area. + unsigned Padding = (GPRs.size() + 1) % 2 ? 8 : 0; + unsigned FXSaveSize = 512 + Padding; + AsmStream << " subq $" << FXSaveSize << ", %rsp\n" << " fxsave (%rsp)\n" // Load callback manager address, compute trampoline address, call JIT. @@ -79,7 +86,7 @@ void OrcX86_64::insertResolverBlock( // Restore the floating point state. << " fxrstor (%rsp)\n" - << " addq $512, %rsp\n"; + << " addq $" << FXSaveSize << ", %rsp\n"; for (const auto &GPR : make_range(GPRs.rbegin(), GPRs.rend())) AsmStream << " popq %" << GPR << "\n"; -- 2.34.1