[llvm-commits] CVS: llvm/lib/Target/PowerPC/PPCInstrInfo.td PPCISelDAGToDAG.cpp

[Chris Lattner]

Changes in directory llvm/lib/Target/PowerPC:

PPCInstrInfo.td updated: 1.148 -> 1.149
PPCISelDAGToDAG.cpp updated: 1.135 -> 1.136
---
Log message:

Finish moving uncond br over to .td file, remove from .cpp file.



---
Diffs of the changes:  (+2 -4)

 PPCISelDAGToDAG.cpp |    4 +---
 PPCInstrInfo.td     |    2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)


Index: llvm/lib/Target/PowerPC/PPCInstrInfo.td
diff -u llvm/lib/Target/PowerPC/PPCInstrInfo.td:1.148 llvm/lib/Target/PowerPC/PPCInstrInfo.td:1.149
--- llvm/lib/Target/PowerPC/PPCInstrInfo.td:1.148	Sun Dec  4 12:42:54 2005
+++ llvm/lib/Target/PowerPC/PPCInstrInfo.td	Sun Dec  4 12:48:01 2005
@@ -190,7 +190,7 @@
 let Defs = [LR] in
   def MovePCtoLR : Pseudo<(ops piclabel:$label), "bl $label", []>;
 
-let isBranch = 1, isTerminator = 1 in {
+let isBranch = 1, isTerminator = 1, hasCtrlDep = 1 in {
   def COND_BRANCH : Pseudo<(ops CRRC:$crS, u16imm:$opc,
                                 target:$true, target:$false),
                            "; COND_BRANCH", []>;


Index: llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp
diff -u llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp:1.135 llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp:1.136
--- llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp:1.135	Thu Dec  1 12:09:22 2005
+++ llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp	Sun Dec  4 12:48:01 2005
@@ -873,6 +873,7 @@
   
   switch (N->getOpcode()) {
   default: break;
+  case ISD::BasicBlock:         return CodeGenMap[Op] = Op;
   case ISD::DYNAMIC_STACKALLOC: return SelectDYNAMIC_STACKALLOC(Op);
   case ISD::ADD_PARTS:          return SelectADD_PARTS(Op);
   case ISD::SUB_PARTS:          return SelectSUB_PARTS(Op);
@@ -1219,9 +1220,6 @@
     // Finally, select this to a blr (return) instruction.
     return CurDAG->SelectNodeTo(N, PPC::BLR, MVT::Other, Chain);
   }
-  case ISD::BR:
-    return CurDAG->SelectNodeTo(N, PPC::B, MVT::Other, N->getOperand(1),
-                                Select(N->getOperand(0)));
   case ISD::BR_CC:
   case ISD::BRTWOWAY_CC: {
     SDOperand Chain = Select(N->getOperand(0));