detabify llvm, patch by Mike Stump!

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@48577 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2008-03-20 01:22:40 +00:00
parent bed7e68498
commit 71a2cb25eb
7 changed files with 76 additions and 76 deletions

View File

@ -738,7 +738,7 @@ bool MachineInstr::addRegisterKilled(unsigned IncomingReg,
if (!Reg || IncomingReg == Reg || if (!Reg || IncomingReg == Reg ||
!TargetRegisterInfo::isPhysicalRegister(Reg) || !TargetRegisterInfo::isPhysicalRegister(Reg) ||
!TargetRegisterInfo::isPhysicalRegister(IncomingReg)) { !TargetRegisterInfo::isPhysicalRegister(IncomingReg)) {
++i; ++i;
continue; continue;
} }
@ -748,17 +748,17 @@ bool MachineInstr::addRegisterKilled(unsigned IncomingReg,
return true; return true;
if (RegInfo->isSubRegister(IncomingReg, Reg) && MO.isKill()) { if (RegInfo->isSubRegister(IncomingReg, Reg) && MO.isKill()) {
if (MO.isImplicit()) { if (MO.isImplicit()) {
// Remove this implicit use that marks the sub-register // Remove this implicit use that marks the sub-register
// "kill". Let the super-register take care of this // "kill". Let the super-register take care of this
// information. // information.
RemoveOperand(i); RemoveOperand(i);
--e; --e;
continue; continue;
} else { } else {
// The super-register is going to take care of this kill // The super-register is going to take care of this kill
// information. // information.
MO.setIsKill(false); MO.setIsKill(false);
} }
} }
} }
@ -781,9 +781,9 @@ bool MachineInstr::addRegisterKilled(unsigned IncomingReg,
} }
if (TargetRegisterInfo::isPhysicalRegister(Reg) && if (TargetRegisterInfo::isPhysicalRegister(Reg) &&
TargetRegisterInfo::isPhysicalRegister(IncomingReg) && TargetRegisterInfo::isPhysicalRegister(IncomingReg) &&
RegInfo->isSuperRegister(IncomingReg, Reg) && RegInfo->isSuperRegister(IncomingReg, Reg) &&
MO.isKill()) MO.isKill())
// A super-register kill already exists. // A super-register kill already exists.
return true; return true;
} }

View File

@ -520,57 +520,57 @@ void PEI::replaceFrameIndices(MachineFunction &Fn) {
if (I->getOpcode() == TargetInstrInfo::DECLARE) { if (I->getOpcode() == TargetInstrInfo::DECLARE) {
// Ignore it. // Ignore it.
++I; ++I;
continue; continue;
} }
if (I->getOpcode() == FrameSetupOpcode || if (I->getOpcode() == FrameSetupOpcode ||
I->getOpcode() == FrameDestroyOpcode) { I->getOpcode() == FrameDestroyOpcode) {
// Remember how much SP has been adjusted to create the call // Remember how much SP has been adjusted to create the call
// frame. // frame.
int Size = I->getOperand(0).getImm(); int Size = I->getOperand(0).getImm();
if ((!StackGrowsDown && I->getOpcode() == FrameSetupOpcode) || if ((!StackGrowsDown && I->getOpcode() == FrameSetupOpcode) ||
(StackGrowsDown && I->getOpcode() == FrameDestroyOpcode)) (StackGrowsDown && I->getOpcode() == FrameDestroyOpcode))
Size = -Size; Size = -Size;
SPAdj += Size; SPAdj += Size;
MachineBasicBlock::iterator PrevI = prior(I); MachineBasicBlock::iterator PrevI = prior(I);
TRI.eliminateCallFramePseudoInstr(Fn, *BB, I); TRI.eliminateCallFramePseudoInstr(Fn, *BB, I);
// Visit the instructions created by eliminateCallFramePseudoInstr(). // Visit the instructions created by eliminateCallFramePseudoInstr().
I = next(PrevI); I = next(PrevI);
continue; continue;
} }
bool DoIncr = true; bool DoIncr = true;
for (unsigned i = 0, e = MI->getNumOperands(); i != e; ++i) for (unsigned i = 0, e = MI->getNumOperands(); i != e; ++i)
if (MI->getOperand(i).isFrameIndex()) { if (MI->getOperand(i).isFrameIndex()) {
// Some instructions (e.g. inline asm instructions) can have // Some instructions (e.g. inline asm instructions) can have
// multiple frame indices and/or cause eliminateFrameIndex // multiple frame indices and/or cause eliminateFrameIndex
// to insert more than one instruction. We need the register // to insert more than one instruction. We need the register
// scavenger to go through all of these instructions so that // scavenger to go through all of these instructions so that
// it can update its register information. We keep the // it can update its register information. We keep the
// iterator at the point before insertion so that we can // iterator at the point before insertion so that we can
// revisit them in full. // revisit them in full.
bool AtBeginning = (I == BB->begin()); bool AtBeginning = (I == BB->begin());
if (!AtBeginning) --I; if (!AtBeginning) --I;
// If this instruction has a FrameIndex operand, we need to // If this instruction has a FrameIndex operand, we need to
// use that target machine register info object to eliminate // use that target machine register info object to eliminate
// it. // it.
TRI.eliminateFrameIndex(MI, SPAdj, RS); TRI.eliminateFrameIndex(MI, SPAdj, RS);
// Reset the iterator if we were at the beginning of the BB. // Reset the iterator if we were at the beginning of the BB.
if (AtBeginning) { if (AtBeginning) {
I = BB->begin(); I = BB->begin();
DoIncr = false; DoIncr = false;
} }
MI = 0; MI = 0;
break; break;
} }
if (DoIncr) ++I; if (DoIncr) ++I;

View File

@ -1247,7 +1247,7 @@ void DAGTypeLegalizer::ExpandSetCCOperands(SDOperand &NewLHS, SDOperand &NewRHS,
ISD::SETEQ, false, DagCombineInfo); ISD::SETEQ, false, DagCombineInfo);
if (!NewLHS.Val) if (!NewLHS.Val)
NewLHS = DAG.getSetCC(TLI.getSetCCResultType(LHSHi), LHSHi, RHSHi, NewLHS = DAG.getSetCC(TLI.getSetCCResultType(LHSHi), LHSHi, RHSHi,
ISD::SETEQ); ISD::SETEQ);
NewLHS = DAG.getNode(ISD::SELECT, Tmp1.getValueType(), NewLHS = DAG.getNode(ISD::SELECT, Tmp1.getValueType(),
NewLHS, Tmp1, Tmp2); NewLHS, Tmp1, Tmp2);
NewRHS = SDOperand(); NewRHS = SDOperand();

View File

@ -187,9 +187,9 @@ SDOperand DAGTypeLegalizer::PromoteResult_FP_TO_XINT(SDNode *N) {
SDOperand DAGTypeLegalizer::PromoteResult_SETCC(SDNode *N) { SDOperand DAGTypeLegalizer::PromoteResult_SETCC(SDNode *N) {
assert(isTypeLegal(TLI.getSetCCResultType(N->getOperand(0))) assert(isTypeLegal(TLI.getSetCCResultType(N->getOperand(0)))
&& "SetCC type is not legal??"); && "SetCC type is not legal??");
return DAG.getNode(ISD::SETCC, TLI.getSetCCResultType(N->getOperand(0)), return DAG.getNode(ISD::SETCC, TLI.getSetCCResultType(N->getOperand(0)),
N->getOperand(0), N->getOperand(1), N->getOperand(2)); N->getOperand(0), N->getOperand(1), N->getOperand(2));
} }
SDOperand DAGTypeLegalizer::PromoteResult_LOAD(LoadSDNode *N) { SDOperand DAGTypeLegalizer::PromoteResult_LOAD(LoadSDNode *N) {

View File

@ -366,7 +366,7 @@ PPCInstrInfo::StoreRegToStackSlot(unsigned SrcReg, bool isKill,
// FIXME (64-bit): Enable // FIXME (64-bit): Enable
NewMIs.push_back(addFrameReference(BuildMI(get(PPC::SPILL_CR)) NewMIs.push_back(addFrameReference(BuildMI(get(PPC::SPILL_CR))
.addReg(SrcReg, false, false, isKill), .addReg(SrcReg, false, false, isKill),
FrameIdx)); FrameIdx));
return true; return true;
} else { } else {
// FIXME: We use R0 here, because it isn't available for RA. We need to // FIXME: We use R0 here, because it isn't available for RA. We need to

View File

@ -483,12 +483,12 @@ void PPCRegisterInfo::lowerDynamicAlloc(MachineBasicBlock::iterator II,
} else if (LP64) { } else if (LP64) {
if (EnableRegisterScavenging) // FIXME (64-bit): Use "true" part. if (EnableRegisterScavenging) // FIXME (64-bit): Use "true" part.
BuildMI(MBB, II, TII.get(PPC::LD), Reg) BuildMI(MBB, II, TII.get(PPC::LD), Reg)
.addImm(0) .addImm(0)
.addReg(PPC::X1); .addReg(PPC::X1);
else else
BuildMI(MBB, II, TII.get(PPC::LD), PPC::X0) BuildMI(MBB, II, TII.get(PPC::LD), PPC::X0)
.addImm(0) .addImm(0)
.addReg(PPC::X1); .addReg(PPC::X1);
} else { } else {
BuildMI(MBB, II, TII.get(PPC::LWZ), Reg) BuildMI(MBB, II, TII.get(PPC::LWZ), Reg)
.addImm(0) .addImm(0)
@ -500,25 +500,25 @@ void PPCRegisterInfo::lowerDynamicAlloc(MachineBasicBlock::iterator II,
if (LP64) { if (LP64) {
if (EnableRegisterScavenging) // FIXME (64-bit): Use "true" part. if (EnableRegisterScavenging) // FIXME (64-bit): Use "true" part.
BuildMI(MBB, II, TII.get(PPC::STDUX)) BuildMI(MBB, II, TII.get(PPC::STDUX))
.addReg(Reg, false, false, true) .addReg(Reg, false, false, true)
.addReg(PPC::X1) .addReg(PPC::X1)
.addReg(MI.getOperand(1).getReg()); .addReg(MI.getOperand(1).getReg());
else else
BuildMI(MBB, II, TII.get(PPC::STDUX)) BuildMI(MBB, II, TII.get(PPC::STDUX))
.addReg(PPC::X0, false, false, true) .addReg(PPC::X0, false, false, true)
.addReg(PPC::X1) .addReg(PPC::X1)
.addReg(MI.getOperand(1).getReg()); .addReg(MI.getOperand(1).getReg());
if (!MI.getOperand(1).isKill()) if (!MI.getOperand(1).isKill())
BuildMI(MBB, II, TII.get(PPC::ADDI8), MI.getOperand(0).getReg()) BuildMI(MBB, II, TII.get(PPC::ADDI8), MI.getOperand(0).getReg())
.addReg(PPC::X1) .addReg(PPC::X1)
.addImm(maxCallFrameSize); .addImm(maxCallFrameSize);
else else
// Implicitly kill the register. // Implicitly kill the register.
BuildMI(MBB, II, TII.get(PPC::ADDI8), MI.getOperand(0).getReg()) BuildMI(MBB, II, TII.get(PPC::ADDI8), MI.getOperand(0).getReg())
.addReg(PPC::X1) .addReg(PPC::X1)
.addImm(maxCallFrameSize) .addImm(maxCallFrameSize)
.addReg(MI.getOperand(1).getReg(), false, true, true); .addReg(MI.getOperand(1).getReg(), false, true, true);
} else { } else {
BuildMI(MBB, II, TII.get(PPC::STWUX)) BuildMI(MBB, II, TII.get(PPC::STWUX))
.addReg(Reg, false, false, true) .addReg(Reg, false, false, true)
@ -527,14 +527,14 @@ void PPCRegisterInfo::lowerDynamicAlloc(MachineBasicBlock::iterator II,
if (!MI.getOperand(1).isKill()) if (!MI.getOperand(1).isKill())
BuildMI(MBB, II, TII.get(PPC::ADDI), MI.getOperand(0).getReg()) BuildMI(MBB, II, TII.get(PPC::ADDI), MI.getOperand(0).getReg())
.addReg(PPC::R1) .addReg(PPC::R1)
.addImm(maxCallFrameSize); .addImm(maxCallFrameSize);
else else
// Implicitly kill the register. // Implicitly kill the register.
BuildMI(MBB, II, TII.get(PPC::ADDI), MI.getOperand(0).getReg()) BuildMI(MBB, II, TII.get(PPC::ADDI), MI.getOperand(0).getReg())
.addReg(PPC::R1) .addReg(PPC::R1)
.addImm(maxCallFrameSize) .addImm(maxCallFrameSize)
.addReg(MI.getOperand(1).getReg(), false, true, true); .addReg(MI.getOperand(1).getReg(), false, true, true);
} }
// Discard the DYNALLOC instruction. // Discard the DYNALLOC instruction.
@ -945,7 +945,7 @@ PPCRegisterInfo::processFunctionBeforeCalleeSavedScan(MachineFunction &MF,
const TargetRegisterClass *G8RC = &PPC::G8RCRegClass; const TargetRegisterClass *G8RC = &PPC::G8RCRegClass;
const TargetRegisterClass *RC = IsPPC64 ? G8RC : GPRC; const TargetRegisterClass *RC = IsPPC64 ? G8RC : GPRC;
RS->setScavengingFrameIndex(MFI->CreateStackObject(RC->getSize(), RS->setScavengingFrameIndex(MFI->CreateStackObject(RC->getSize(),
RC->getAlignment())); RC->getAlignment()));
} }
} }

View File

@ -562,9 +562,9 @@ bool TreePatternNode::isIsomorphicTo(const TreePatternNode *N,
if (isLeaf()) { if (isLeaf()) {
if (DefInit *DI = dynamic_cast<DefInit*>(getLeafValue())) { if (DefInit *DI = dynamic_cast<DefInit*>(getLeafValue())) {
if (DefInit *NDI = dynamic_cast<DefInit*>(N->getLeafValue())) { if (DefInit *NDI = dynamic_cast<DefInit*>(N->getLeafValue())) {
return ((DI->getDef() == NDI->getDef()) return ((DI->getDef() == NDI->getDef())
&& (DepVars.find(getName()) == DepVars.end() && (DepVars.find(getName()) == DepVars.end()
|| getName() == N->getName())); || getName() == N->getName()));
} }
} }
return getLeafValue() == N->getLeafValue(); return getLeafValue() == N->getLeafValue();