[llvm-commits] CVS: llvm/lib/Target/ARM/ARMInstrInfo.cpp

[Evan Cheng]

Changes in directory llvm/lib/Target/ARM:

ARMInstrInfo.cpp updated: 1.34 -> 1.35
---
Log message:

Add a utility routine to check for unpredicated terminator instruction.

---
Diffs of the changes:  (+3 -3)

 ARMInstrInfo.cpp |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


Index: llvm/lib/Target/ARM/ARMInstrInfo.cpp
diff -u llvm/lib/Target/ARM/ARMInstrInfo.cpp:1.34 llvm/lib/Target/ARM/ARMInstrInfo.cpp:1.35
--- llvm/lib/Target/ARM/ARMInstrInfo.cpp:1.34	Fri Jun  8 04:14:47 2007
+++ llvm/lib/Target/ARM/ARMInstrInfo.cpp	Fri Jun  8 16:59:56 2007
@@ -304,7 +304,7 @@
                                  std::vector<MachineOperand> &Cond) const {
   // If the block has no terminators, it just falls into the block after it.
   MachineBasicBlock::iterator I = MBB.end();
-  if (I == MBB.begin() || !isTerminatorInstr((--I)->getOpcode()))
+  if (I == MBB.begin() || !isUnpredicatedTerminator(--I))
     return false;
   
   // Get the last instruction in the block.
@@ -313,7 +313,7 @@
   // If there is only one terminator instruction, process it.
   unsigned LastOpc = LastInst->getOpcode();
   if (I == MBB.begin() ||
-      isPredicated(--I) || !isTerminatorInstr(I->getOpcode())) {
+      isPredicated(--I) || !isUnpredicatedTerminator(I)) {
     if (LastOpc == ARM::B || LastOpc == ARM::tB) {
       TBB = LastInst->getOperand(0).getMachineBasicBlock();
       return false;
@@ -332,7 +332,7 @@
   
   // If there are three terminators, we don't know what sort of block this is.
   if (SecondLastInst && I != MBB.begin() &&
-      !isPredicated(--I) && isTerminatorInstr(I->getOpcode()))
+      !isPredicated(--I) && isUnpredicatedTerminator(I))
     return true;
   
   // If the block ends with ARM::B/ARM::tB and a ARM::Bcc/ARM::tBcc, handle it.