make -show-inst be formatted a bit nicer. Before:
movl $3735928559, a ## inst: <MCInst 1273 <MCOperand Reg:0> <MCOperand Imm:1> <MCOperand Reg:0> <MCOperand Expr:(a)> <MCOperand Reg:0> <MCOperand Expr:(3735928559)>>
after:
movl $3735928559, a ## <MCInst #1273
## <MCOperand Reg:0>
## <MCOperand Imm:1>
## <MCOperand Reg:0>
## <MCOperand Expr:(a)>
## <MCOperand Reg:0>
## <MCOperand Expr:(3735928559)>>
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@95637 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/MC/MCAsmStreamer.cpp b/lib/MC/MCAsmStreamer.cpp
index 475e588..d2e4858 100644
--- a/lib/MC/MCAsmStreamer.cpp
+++ b/lib/MC/MCAsmStreamer.cpp
@@ -532,14 +532,6 @@
void MCAsmStreamer::EmitInstruction(const MCInst &Inst) {
assert(CurSection && "Cannot emit contents before setting section!");
- // Show the MCInst if enabled.
- if (ShowInst) {
- raw_ostream &OS = GetCommentOS();
- OS << "inst: ";
- Inst.print(OS, &MAI);
- OS << "\n";
- }
-
// Show the encoding in a comment if we have a code emitter.
if (Emitter) {
SmallString<256> Code;
@@ -557,6 +549,18 @@
OS << "]\n";
}
+ // Show the MCInst if enabled.
+ if (ShowInst) {
+ raw_ostream &OS = GetCommentOS();
+ OS << "<MCInst #" << Inst.getOpcode();
+
+ for (unsigned i = 0, e = Inst.getNumOperands(); i != e; ++i) {
+ OS << "\n ";
+ Inst.getOperand(i).print(OS, &MAI);
+ }
+ OS << ">\n";
+ }
+
// If we have an AsmPrinter, use that to print, otherwise dump the MCInst.
if (InstPrinter)
InstPrinter->printInst(&Inst);