Add support for stored annotations to MCInst, and provide facilities for MC-based InstPrinters to print them out. Enhance the ARM and X86 InstPrinter's to do so in verbose mode.

llvm-svn: 139820

1 files changed, 21 insertions, 0 deletions

diff --git a/llvm/lib/MC/MCInst.cpp b/llvm/lib/MC/MCInst.cpp
index 4cb628b395c..ec97acc554f 100644
--- a/llvm/lib/MC/MCInst.cpp
+++ b/llvm/lib/MC/MCInst.cpp
@@ -41,6 +41,16 @@ void MCInst::print(raw_ostream &OS, const MCAsmInfo *MAI) const {
     OS << " ";
     getOperand(i).print(OS, MAI);
   }
+
+  if (getNumAnnotations()) {
+    OS << " # Annots: ";
+    for (unsigned i = 0, e = getNumAnnotations(); i != e; ++i) {
+      OS << " \"";
+      OS << getAnnotation(i);
+      OS << '"';
+    }
+  }
+
   OS << ">";
 }
 
@@ -57,6 +67,17 @@ void MCInst::dump_pretty(raw_ostream &OS, const MCAsmInfo *MAI,
     OS << Separator;
     getOperand(i).print(OS, MAI);
   }
+
+  if (getNumAnnotations()) {
+    OS << " # Annots: ";
+    for (unsigned i = 0, e = getNumAnnotations(); i != e; ++i) {
+      OS << Separator;
+      OS << '"';
+      OS << getAnnotation(i);
+      OS << '"';
+    }
+  }
+
   OS << ">";
 }