1
0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-24 19:52:54 +01:00

80 columns.

llvm-svn: 121370
This commit is contained in:
Jim Grosbach 2010-12-09 16:14:46 +00:00
parent 996691e79c
commit 9adf657f1a

View File

@ -458,7 +458,8 @@ ARMFrameInfo::ResolveFrameIndexReference(const MachineFunction &MF,
if (hasFP(MF) && AFI->hasStackFrame()) { if (hasFP(MF) && AFI->hasStackFrame()) {
// Use frame pointer to reference fixed objects. Use it for locals if // Use frame pointer to reference fixed objects. Use it for locals if
// there are VLAs (and thus the SP isn't reliable as a base). // there are VLAs (and thus the SP isn't reliable as a base).
if (isFixed || (MFI->hasVarSizedObjects() && !RegInfo->hasBasePointer(MF))) { if (isFixed || (MFI->hasVarSizedObjects() &&
!RegInfo->hasBasePointer(MF))) {
FrameReg = RegInfo->getFrameRegister(MF); FrameReg = RegInfo->getFrameRegister(MF);
return FPOffset; return FPOffset;
} else if (MFI->hasVarSizedObjects()) { } else if (MFI->hasVarSizedObjects()) {
@ -517,8 +518,9 @@ void ARMFrameInfo::emitPushInst(MachineBasicBlock &MBB,
if (!(Func)(Reg, STI.isTargetDarwin())) continue; if (!(Func)(Reg, STI.isTargetDarwin())) continue;
// Add the callee-saved register as live-in unless it's LR and // Add the callee-saved register as live-in unless it's LR and
// @llvm.returnaddress is called. If LR is returned for @llvm.returnaddress // @llvm.returnaddress is called. If LR is returned for
// then it's already added to the function and entry block live-in sets. // @llvm.returnaddress then it's already added to the function and
// entry block live-in sets.
bool isKill = true; bool isKill = true;
if (Reg == ARM::LR) { if (Reg == ARM::LR) {
if (MF.getFrameInfo()->isReturnAddressTaken() && if (MF.getFrameInfo()->isReturnAddressTaken() &&