Tidy up naming for consistency and other cleanup. No functional change intended.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@157358 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chad Rosier 2012-05-23 23:45:10 +00:00
parent 39867e6646
commit 3fb6eca0cd

View File

@ -45,10 +45,10 @@ bool X86FrameLowering::hasReservedCallFrame(const MachineFunction &MF) const {
bool X86FrameLowering::hasFP(const MachineFunction &MF) const { bool X86FrameLowering::hasFP(const MachineFunction &MF) const {
const MachineFrameInfo *MFI = MF.getFrameInfo(); const MachineFrameInfo *MFI = MF.getFrameInfo();
const MachineModuleInfo &MMI = MF.getMMI(); const MachineModuleInfo &MMI = MF.getMMI();
const TargetRegisterInfo *RI = TM.getRegisterInfo(); const TargetRegisterInfo *RegInfo = TM.getRegisterInfo();
return (MF.getTarget().Options.DisableFramePointerElim(MF) || return (MF.getTarget().Options.DisableFramePointerElim(MF) ||
RI->needsStackRealignment(MF) || RegInfo->needsStackRealignment(MF) ||
MFI->hasVarSizedObjects() || MFI->hasVarSizedObjects() ||
MFI->isFrameAddressTaken() || MFI->isFrameAddressTaken() ||
MF.getInfo<X86MachineFunctionInfo>()->getForceFramePointer() || MF.getInfo<X86MachineFunctionInfo>()->getForceFramePointer() ||
@ -1142,16 +1142,16 @@ void X86FrameLowering::emitEpilogue(MachineFunction &MF,
} }
int X86FrameLowering::getFrameIndexOffset(const MachineFunction &MF, int FI) const { int X86FrameLowering::getFrameIndexOffset(const MachineFunction &MF, int FI) const {
const X86RegisterInfo *RI = const X86RegisterInfo *RegInfo =
static_cast<const X86RegisterInfo*>(MF.getTarget().getRegisterInfo()); static_cast<const X86RegisterInfo*>(MF.getTarget().getRegisterInfo());
const MachineFrameInfo *MFI = MF.getFrameInfo(); const MachineFrameInfo *MFI = MF.getFrameInfo();
int Offset = MFI->getObjectOffset(FI) - getOffsetOfLocalArea(); int Offset = MFI->getObjectOffset(FI) - getOffsetOfLocalArea();
uint64_t StackSize = MFI->getStackSize(); uint64_t StackSize = MFI->getStackSize();
if (RI->needsStackRealignment(MF)) { if (RegInfo->needsStackRealignment(MF)) {
if (FI < 0) { if (FI < 0) {
// Skip the saved EBP. // Skip the saved EBP.
Offset += RI->getSlotSize(); return Offset + RegInfo->getSlotSize();
} else { } else {
assert((-(Offset + StackSize)) % MFI->getObjectAlignment(FI) == 0); assert((-(Offset + StackSize)) % MFI->getObjectAlignment(FI) == 0);
return Offset + StackSize; return Offset + StackSize;
@ -1162,7 +1162,7 @@ int X86FrameLowering::getFrameIndexOffset(const MachineFunction &MF, int FI) con
return Offset + StackSize; return Offset + StackSize;
// Skip the saved EBP. // Skip the saved EBP.
Offset += RI->getSlotSize(); Offset += RegInfo->getSlotSize();
// Skip the RETADDR move area // Skip the RETADDR move area
const X86MachineFunctionInfo *X86FI = MF.getInfo<X86MachineFunctionInfo>(); const X86MachineFunctionInfo *X86FI = MF.getInfo<X86MachineFunctionInfo>();
@ -1176,16 +1176,15 @@ int X86FrameLowering::getFrameIndexOffset(const MachineFunction &MF, int FI) con
int X86FrameLowering::getFrameIndexReference(const MachineFunction &MF, int FI, int X86FrameLowering::getFrameIndexReference(const MachineFunction &MF, int FI,
unsigned &FrameReg) const { unsigned &FrameReg) const {
const X86RegisterInfo *RI = const X86RegisterInfo *RegInfo =
static_cast<const X86RegisterInfo*>(MF.getTarget().getRegisterInfo()); static_cast<const X86RegisterInfo*>(MF.getTarget().getRegisterInfo());
// We can't calculate offset from frame pointer if the stack is realigned, // We can't calculate offset from frame pointer if the stack is realigned,
// so enforce usage of stack pointer. // so enforce usage of stack pointer.
FrameReg = (RI->needsStackRealignment(MF)) ? RI->getStackRegister() FrameReg = (RegInfo->needsStackRealignment(MF)) ?
: RI->getFrameRegister(MF); RegInfo->getStackRegister() : RegInfo->getFrameRegister(MF);
return getFrameIndexOffset(MF, FI); return getFrameIndexOffset(MF, FI);
} }
bool X86FrameLowering::spillCalleeSavedRegisters(MachineBasicBlock &MBB, bool X86FrameLowering::spillCalleeSavedRegisters(MachineBasicBlock &MBB,
MachineBasicBlock::iterator MI, MachineBasicBlock::iterator MI,
const std::vector<CalleeSavedInfo> &CSI, const std::vector<CalleeSavedInfo> &CSI,