Convert the remaining instructions over, branches and calls. Fix a couple
minor bugs
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@24762 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Target/Sparc/SparcAsmPrinter.cpp b/lib/Target/Sparc/SparcAsmPrinter.cpp
index c983d5f..a21f499 100644
--- a/lib/Target/Sparc/SparcAsmPrinter.cpp
+++ b/lib/Target/Sparc/SparcAsmPrinter.cpp
@@ -70,7 +70,6 @@
void emitGlobalConstant(const Constant *CV);
void printConstantPool(MachineConstantPool *MCP);
void printOperand(const MachineInstr *MI, int opNum);
- void printMachineInstruction(const MachineInstr *MI);
bool printInstruction(const MachineInstr *MI); // autogenerated.
bool runOnMachineFunction(MachineFunction &F);
bool doInitialization(Module &M);
@@ -357,7 +356,8 @@
for (MachineBasicBlock::const_iterator II = I->begin(), E = I->end();
II != E; ++II) {
// Print the assembly for the instruction.
- printMachineInstruction(II);
+ O << "\t";
+ printInstruction(II);
}
}
@@ -421,42 +421,6 @@
if (CloseParen) O << ")";
}
-/// printMachineInstruction -- Print out a single SparcV8 LLVM instruction
-/// MI in GAS syntax to the current output stream.
-///
-void SparcV8AsmPrinter::printMachineInstruction(const MachineInstr *MI) {
- O << "\t";
- if (printInstruction(MI)) return;
-
- unsigned Opcode = MI->getOpcode();
- const TargetInstrInfo &TII = *TM.getInstrInfo();
- const TargetInstrDescriptor &Desc = TII.get(Opcode);
-
- O << Desc.Name << " ";
-
- // print non-immediate, non-register-def operands
- // then print immediate operands
- // then print register-def operands.
- std::vector<int> print_order;
- for (unsigned i = 0; i < MI->getNumOperands (); ++i)
- if (!(MI->getOperand (i).isImmediate ()
- || (MI->getOperand (i).isRegister ()
- && MI->getOperand (i).isDef ())))
- print_order.push_back (i);
- for (unsigned i = 0; i < MI->getNumOperands (); ++i)
- if (MI->getOperand (i).isImmediate ())
- print_order.push_back (i);
- for (unsigned i = 0; i < MI->getNumOperands (); ++i)
- if (MI->getOperand (i).isRegister () && MI->getOperand (i).isDef ())
- print_order.push_back (i);
- for (unsigned i = 0, e = print_order.size (); i != e; ++i) {
- printOperand (MI, print_order[i]);
- if (i != (print_order.size () - 1))
- O << ", ";
- }
- O << "\n";
-}
-
bool SparcV8AsmPrinter::doInitialization(Module &M) {
Mang = new Mangler(M);
return false; // success