Make sure that BRCOND branches can be converted into long branches too.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@21198 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Target/PowerPC/PPCAsmPrinter.cpp b/lib/Target/PowerPC/PPCAsmPrinter.cpp
index 3006f62410336b7c5221380d3db8dd2e2ca98741..bfc61675de7fb27879ad783ab6d17ebae464026c 100644 (file)
--- a/lib/Target/PowerPC/PPCAsmPrinter.cpp
+++ b/lib/Target/PowerPC/PPCAsmPrinter.cpp
@@ -107,7 +107,7 @@ namespace {
       // Branches can take an immediate operand.  This is used by the branch
       // selection pass to print $+8, an eight byte displacement from the PC.
       if (MI->getOperand(OpNo).isImmediate()) {
-        O << "$+" << MI->getOperand(OpNo).getImmedValue() << '\n';
+        O << "$+" << MI->getOperand(OpNo).getImmedValue();
       } else {
         printOp(MI->getOperand(OpNo), 
                 TM.getInstrInfo()->isCall(MI->getOpcode()));

diff --git a/lib/Target/PowerPC/PPCISelPattern.cpp b/lib/Target/PowerPC/PPCISelPattern.cpp
index 5496ac4ddbce6f31e28b81bf635c6b52d4fe6338..f6b47fc8740d9ee054bffb3e1c51ecad1d1405ff 100644 (file)
--- a/lib/Target/PowerPC/PPCISelPattern.cpp
+++ b/lib/Target/PowerPC/PPCISelPattern.cpp
@@ -1022,7 +1022,9 @@ void ISel::SelectBranchCC(SDOperand N)
       }
     }
   } else {
-    BuildMI(BB, Opc, 2).addReg(PPC::CR0).addMBB(Dest);
+    BuildMI(BB, PPC::COND_BRANCH, 4).addReg(PPC::CR0).addImm(Opc)
+      .addMBB(Dest).addMBB(It);
+    //BuildMI(BB, Opc, 2).addReg(PPC::CR0).addMBB(Dest);
   }
   return;
 }