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 | d57f9ecd4ad0b1dc95c7851dfff6c99895b84d87 (patch) | |
| tree | 7304f5d6f68aa5b68d69b3f065d1c65343200527 /llvm/lib/Target | |
| parent | 2f38b940e38ffabb6ba5b5f5baa88a7d7a471675 (diff) | |
| download | bcm5719-llvm-d57f9ecd4ad0b1dc95c7851dfff6c99895b84d87.tar.gz bcm5719-llvm-d57f9ecd4ad0b1dc95c7851dfff6c99895b84d87.zip | |
Recommit 116056, now with the missing file...
llvm-svn: 116083
Diffstat (limited to 'llvm/lib/Target')
| -rw-r--r-- | llvm/lib/Target/X86/X86ISelLowering.cpp | 6 | ||||
| -rw-r--r-- | llvm/lib/Target/X86/X86TargetMachine.cpp | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/llvm/lib/Target/X86/X86ISelLowering.cpp b/llvm/lib/Target/X86/X86ISelLowering.cpp index 66f9612e027..27226d885d7 100644 --- a/llvm/lib/Target/X86/X86ISelLowering.cpp +++ b/llvm/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/llvm/lib/Target/X86/X86TargetMachine.cpp b/llvm/lib/Target/X86/X86TargetMachine.cpp index ad2980e558b..4e435eecb1e 100644 --- a/llvm/lib/Target/X86/X86TargetMachine.cpp +++ b/llvm/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(); |
