diff --git a/llvm/lib/Target/PowerPC/PPC64AsmPrinter.cpp b/llvm/lib/Target/PowerPC/PPC64AsmPrinter.cpp
index 11904c14713a..02f316c72b8c 100644
--- a/llvm/lib/Target/PowerPC/PPC64AsmPrinter.cpp
+++ b/llvm/lib/Target/PowerPC/PPC64AsmPrinter.cpp
@@ -570,8 +570,11 @@ void Printer::printMachineInstruction(const MachineInstr *MI) {
   }
 
   O << TII.getName(Opcode) << " ";
-  if (Opcode == PPC::LD || Opcode == PPC::LWA || 
-      Opcode == PPC::STDU || Opcode == PPC::STDUX) {
+  if (Opcode == PPC::BLR || Opcode == PPC::NOP) {
+    // FIXME: BuildMI() should handle 0 params
+    O << "\n";
+  } else if (ArgCount == 3 && 
+             (ArgType[1] == PPCII::Disimm16 || ArgType[1] == PPCII::Disimm14)) {
     printOp(MI->getOperand(0));
     O << ", ";
     MachineOperand MO = MI->getOperand(1);
@@ -582,20 +585,6 @@ void Printer::printMachineInstruction(const MachineInstr *MI) {
     O << "(";
     printOp(MI->getOperand(2));
     O << ")\n";
-  } else if (Opcode == PPC::BLR || Opcode == PPC::NOP) {
-    // FIXME: BuildMI() should handle 0 params
-    O << "\n";
-  } else if (ArgCount == 3 && ArgType[1] == PPCII::Disimm16) {
-    printOp(MI->getOperand(0));
-    O << ", ";
-    printImmOp(MI->getOperand(1), ArgType[1]);
-    O << "(";
-    if (MI->getOperand(2).hasAllocatedReg() &&
-        MI->getOperand(2).getReg() == PPC::R0)
-      O << "0";
-    else
-      printOp(MI->getOperand(2));
-    O << ")\n";
   } else {
     for (i = 0; i < ArgCount; ++i) {
       // addi and friends