Changes in directory llvm/lib/Target/PowerPC:
PPCBranchSelector.cpp updated: 1.35 -> 1.36
PPCISelDAGToDAG.cpp updated: 1.222 -> 1.223
PPCISelLowering.cpp updated: 1.229 -> 1.230
PPCInstrInfo.cpp updated: 1.32 -> 1.33
PPCInstrInfo.td updated: 1.267 -> 1.268
---
Log message:
rename PPC::COND_BRANCH to PPC::BCC
---
Diffs of the changes: (+18 -17)
PPCBranchSelector.cpp | 6 +++---
PPCISelDAGToDAG.cpp | 2 +-
PPCISelLowering.cpp | 2 +-
PPCInstrInfo.cpp | 14 +++++++-------
PPCInstrInfo.td | 11 ++++++-----
5 files changed, 18 insertions(+), 17 deletions(-)
Index: llvm/lib/Target/PowerPC/PPCBranchSelector.cpp
diff -u llvm/lib/Target/PowerPC/PPCBranchSelector.cpp:1.35
llvm/lib/Target/PowerPC/PPCBranchSelector.cpp:1.36
--- llvm/lib/Target/PowerPC/PPCBranchSelector.cpp:1.35 Fri Nov 17 16:10:59 2006
+++ llvm/lib/Target/PowerPC/PPCBranchSelector.cpp Fri Nov 17 16:14:47 2006
@@ -54,7 +54,7 @@
///
static unsigned getNumBytesForInstruction(MachineInstr *MI) {
switch (MI->getOpcode()) {
- case PPC::COND_BRANCH:
+ case PPC::BCC:
// while this will be 4 most of the time, if we emit 8 it is just a
// minor pessimization that saves us from having to worry about
// keeping the offsets up to date later when we emit long branch glue.
@@ -116,7 +116,7 @@
// We may end up deleting the MachineInstr that MBBI points to, so
// remember its opcode now so we can refer to it after calling erase()
unsigned ByteSize = getNumBytesForInstruction(MBBI);
- if (MBBI->getOpcode() != PPC::COND_BRANCH) {
+ if (MBBI->getOpcode() != PPC::BCC) {
ByteCount += ByteSize;
continue;
}
@@ -159,7 +159,7 @@
MBBJ = BuildMI(*MBB, MBBI, PPC::B, 1).addMBB(DestMBB);
}
- // Erase the psuedo COND_BRANCH instruction, and then back up the
+ // Erase the psuedo BCC instruction, and then back up the
// iterator so that when the for loop increments it, we end up in
// the correct place rather than iterating off the end.
MBB->erase(MBBI);
Index: llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp
diff -u llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp:1.222
llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp:1.223
--- llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp:1.222 Fri Nov 17 16:10:59 2006
+++ llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp Fri Nov 17 16:14:47 2006
@@ -1007,7 +1007,7 @@
SDOperand CondCode = SelectCC(N->getOperand(2), N->getOperand(3), CC);
SDOperand Ops[] = { CondCode, getI32Imm(getPredicateForSetCC(CC)),
N->getOperand(4), N->getOperand(0) };
- return CurDAG->SelectNodeTo(N, PPC::COND_BRANCH, MVT::Other, Ops, 4);
+ return CurDAG->SelectNodeTo(N, PPC::BCC, MVT::Other, Ops, 4);
}
case ISD::BRIND: {
// FIXME: Should custom lower this.
Index: llvm/lib/Target/PowerPC/PPCISelLowering.cpp
diff -u llvm/lib/Target/PowerPC/PPCISelLowering.cpp:1.229
llvm/lib/Target/PowerPC/PPCISelLowering.cpp:1.230
--- llvm/lib/Target/PowerPC/PPCISelLowering.cpp:1.229 Fri Nov 17 16:10:59 2006
+++ llvm/lib/Target/PowerPC/PPCISelLowering.cpp Fri Nov 17 16:14:47 2006
@@ -2613,7 +2613,7 @@
MachineBasicBlock *copy0MBB = new MachineBasicBlock(LLVM_BB);
MachineBasicBlock *sinkMBB = new MachineBasicBlock(LLVM_BB);
unsigned SelectPred = MI->getOperand(4).getImm();
- BuildMI(BB, PPC::COND_BRANCH, 3)
+ BuildMI(BB, PPC::BCC, 3)
.addReg(MI->getOperand(1).getReg()).addImm(SelectPred).addMBB(sinkMBB);
MachineFunction *F = BB->getParent();
F->getBasicBlockList().insert(It, copy0MBB);
Index: llvm/lib/Target/PowerPC/PPCInstrInfo.cpp
diff -u llvm/lib/Target/PowerPC/PPCInstrInfo.cpp:1.32
llvm/lib/Target/PowerPC/PPCInstrInfo.cpp:1.33
--- llvm/lib/Target/PowerPC/PPCInstrInfo.cpp:1.32 Fri Nov 17 16:10:59 2006
+++ llvm/lib/Target/PowerPC/PPCInstrInfo.cpp Fri Nov 17 16:14:47 2006
@@ -192,7 +192,7 @@
if (LastInst->getOpcode() == PPC::B) {
TBB = LastInst->getOperand(0).getMachineBasicBlock();
return false;
- } else if (LastInst->getOpcode() == PPC::COND_BRANCH) {
+ } else if (LastInst->getOpcode() == PPC::BCC) {
// Block ends with fall-through condbranch.
TBB = LastInst->getOperand(2).getMachineBasicBlock();
Cond.push_back(LastInst->getOperand(0));
@@ -211,8 +211,8 @@
isTerminatorInstr((--I)->getOpcode()))
return true;
- // If the block ends with PPC::B and PPC:COND_BRANCH, handle it.
- if (SecondLastInst->getOpcode() == PPC::COND_BRANCH &&
+ // If the block ends with PPC::B and PPC:BCC, handle it.
+ if (SecondLastInst->getOpcode() == PPC::BCC &&
LastInst->getOpcode() == PPC::B) {
TBB = SecondLastInst->getOperand(2).getMachineBasicBlock();
Cond.push_back(SecondLastInst->getOperand(0));
@@ -229,7 +229,7 @@
MachineBasicBlock::iterator I = MBB.end();
if (I == MBB.begin()) return;
--I;
- if (I->getOpcode() != PPC::B && I->getOpcode() != PPC::COND_BRANCH)
+ if (I->getOpcode() != PPC::B && I->getOpcode() != PPC::BCC)
return;
// Remove the branch.
@@ -239,7 +239,7 @@
if (I == MBB.begin()) return;
--I;
- if (I->getOpcode() != PPC::COND_BRANCH)
+ if (I->getOpcode() != PPC::BCC)
return;
// Remove the branch.
@@ -259,13 +259,13 @@
if (Cond.empty()) // Unconditional branch
BuildMI(&MBB, PPC::B, 1).addMBB(TBB);
else // Conditional branch
- BuildMI(&MBB, PPC::COND_BRANCH, 3)
+ BuildMI(&MBB, PPC::BCC, 3)
.addReg(Cond[0].getReg()).addImm(Cond[1].getImm()).addMBB(TBB);
return;
}
// Two-way Conditional Branch.
- BuildMI(&MBB, PPC::COND_BRANCH, 3)
+ BuildMI(&MBB, PPC::BCC, 3)
.addReg(Cond[0].getReg()).addImm(Cond[1].getImm()).addMBB(TBB);
BuildMI(&MBB, PPC::B, 1).addMBB(FBB);
}
Index: llvm/lib/Target/PowerPC/PPCInstrInfo.td
diff -u llvm/lib/Target/PowerPC/PPCInstrInfo.td:1.267
llvm/lib/Target/PowerPC/PPCInstrInfo.td:1.268
--- llvm/lib/Target/PowerPC/PPCInstrInfo.td:1.267 Fri Nov 17 16:10:59 2006
+++ llvm/lib/Target/PowerPC/PPCInstrInfo.td Fri Nov 17 16:14:47 2006
@@ -352,17 +352,18 @@
let isBranch = 1, isTerminator = 1, hasCtrlDep = 1,
noResults = 1, PPC970_Unit = 7 in {
- // COND_BRANCH is formed before branch selection, it is turned into Bcc
below.
- // 'opc' is a 'PPC::Predicate' value.
- def COND_BRANCH : Pseudo<(ops CRRC:$crS, u16imm:$opc, target:$dst),
- "${:comment} COND_BRANCH $crS, $opc, $dst",
- [(PPCcondbranch CRRC:$crS, imm:$opc, bb:$dst)]>;
let isBarrier = 1 in {
def B : IForm<18, 0, 0, (ops target:$dst),
"b $dst", BrB,
[(br bb:$dst)]>;
}
+ // BCC is formed before branch selection, it is turned into Bxx below.
+ // 'opc' is a 'PPC::Predicate' value.
+ def BCC : Pseudo<(ops CRRC:$crS, u16imm:$opc, target:$dst),
+ "${:comment} BCC $crS, $opc, $dst",
+ [(PPCcondbranch CRRC:$crS, imm:$opc, bb:$dst)]>;
+
def BLT : BForm<16, 0, 0, 12, 0, (ops CRRC:$crS, target:$block),
"blt $crS, $block", BrB>;
def BLE : BForm<16, 0, 0, 4, 1, (ops CRRC:$crS, target:$block),
_______________________________________________
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
