diff options
| author | Cameron Esfahani <dirty@apple.com> | 2010-10-08 19:24:18 +0000 |
|---|---|---|
| committer | Cameron Esfahani <dirty@apple.com> | 2010-10-08 19:24:18 +0000 |
| commit | ec37b00b17fba355ac6d4a1bee918d3004c54584 (patch) | |
| tree | d36faba06a032e058b0c190859439261530e1686 /lib | |
| parent | e95f3195b8c65f377a59cc716bfda58c8f7c2f5e (diff) | |
Recommit 116056, now with the missing file...
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@116083 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Target/X86/X86ISelLowering.cpp | 6 | ||||
| -rw-r--r-- | lib/Target/X86/X86TargetMachine.cpp | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lib/Target/X86/X86ISelLowering.cpp b/lib/Target/X86/X86ISelLowering.cpp index 66f9612e02..27226d885d 100644 --- a/lib/Target/X86/X86ISelLowering.cpp +++ b/lib/Target/X86/X86ISelLowering.cpp @@ -1701,8 +1701,12 @@ X86TargetLowering::LowerFormalArguments(SDValue Chain, TotalNumXMMRegs = 0; if (IsWin64) { + const TargetFrameInfo &TFI = *getTargetMachine().getFrameInfo(); + // Get to the caller-allocated home save location. Add 8 to account + // for the return address. + int HomeOffset = TFI.getOffsetOfLocalArea() + 8; FuncInfo->setRegSaveFrameIndex( - MFI->CreateFixedObject(1, NumIntRegs * 8, false)); + MFI->CreateFixedObject(1, NumIntRegs * 8 + HomeOffset, false)); FuncInfo->setVarArgsFrameIndex(FuncInfo->getRegSaveFrameIndex()); } else { // For X86-64, if there are vararg parameters that are passed via diff --git a/lib/Target/X86/X86TargetMachine.cpp b/lib/Target/X86/X86TargetMachine.cpp index ad2980e558..4e435eecb1 100644 --- a/lib/Target/X86/X86TargetMachine.cpp +++ b/lib/Target/X86/X86TargetMachine.cpp @@ -121,7 +121,8 @@ X86TargetMachine::X86TargetMachine(const Target &T, const std::string &TT, Subtarget(TT, FS, is64Bit), FrameInfo(TargetFrameInfo::StackGrowsDown, Subtarget.getStackAlignment(), - Subtarget.is64Bit() ? -8 : -4), + (Subtarget.isTargetWin64() ? -40 : + (Subtarget.is64Bit() ? -8 : -4))), ELFWriterInfo(is64Bit, true) { DefRelocModel = getRelocationModel(); |