1 files changed, 35 insertions, 36 deletions

diff --git a/lib/Target/X86/AsmPrinter/X86IntelInstPrinter.h b/lib/Target/X86/AsmPrinter/X86IntelInstPrinter.h
index 545bf84b916f1..a0beeb202e72b 100644
--- a/lib/Target/X86/AsmPrinter/X86IntelInstPrinter.h
+++ b/lib/Target/X86/AsmPrinter/X86IntelInstPrinter.h
@@ -22,77 +22,76 @@ namespace llvm {
   
 class X86IntelInstPrinter : public MCInstPrinter {
 public:
-  X86IntelInstPrinter(raw_ostream &O, const MCAsmInfo &MAI)
-    : MCInstPrinter(O, MAI) {}
+  X86IntelInstPrinter(const MCAsmInfo &MAI)
+    : MCInstPrinter(MAI) {}
   
-  virtual void printInst(const MCInst *MI);
+  virtual void printInst(const MCInst *MI, raw_ostream &OS);
   virtual StringRef getOpcodeName(unsigned Opcode) const;
   
   // Autogenerated by tblgen.
-  void printInstruction(const MCInst *MI);
+  void printInstruction(const MCInst *MI, raw_ostream &O);
   static const char *getRegisterName(unsigned RegNo);
   static const char *getInstructionName(unsigned Opcode);
 
 
-  void printOperand(const MCInst *MI, unsigned OpNo,
-                    const char *Modifier = 0);
-  void printMemReference(const MCInst *MI, unsigned Op);
-  void printLeaMemReference(const MCInst *MI, unsigned Op);
-  void printSSECC(const MCInst *MI, unsigned Op);
-  void print_pcrel_imm(const MCInst *MI, unsigned OpNo);
+  void printOperand(const MCInst *MI, unsigned OpNo, raw_ostream &O);
+  void printMemReference(const MCInst *MI, unsigned Op, raw_ostream &O);
+  void printLeaMemReference(const MCInst *MI, unsigned Op, raw_ostream &O);
+  void printSSECC(const MCInst *MI, unsigned Op, raw_ostream &O);
+  void print_pcrel_imm(const MCInst *MI, unsigned OpNo, raw_ostream &O);
   
-  void printopaquemem(const MCInst *MI, unsigned OpNo) {
+  void printopaquemem(const MCInst *MI, unsigned OpNo, raw_ostream &O) {
     O << "OPAQUE PTR ";
-    printMemReference(MI, OpNo);
+    printMemReference(MI, OpNo, O);
   }
   
-  void printi8mem(const MCInst *MI, unsigned OpNo) {
+  void printi8mem(const MCInst *MI, unsigned OpNo, raw_ostream &O) {
     O << "BYTE PTR ";
-    printMemReference(MI, OpNo);
+    printMemReference(MI, OpNo, O);
   }
-  void printi16mem(const MCInst *MI, unsigned OpNo) {
+  void printi16mem(const MCInst *MI, unsigned OpNo, raw_ostream &O) {
     O << "WORD PTR ";
-    printMemReference(MI, OpNo);
+    printMemReference(MI, OpNo, O);
   }
-  void printi32mem(const MCInst *MI, unsigned OpNo) {
+  void printi32mem(const MCInst *MI, unsigned OpNo, raw_ostream &O) {
     O << "DWORD PTR ";
-    printMemReference(MI, OpNo);
+    printMemReference(MI, OpNo, O);
   }
-  void printi64mem(const MCInst *MI, unsigned OpNo) {
+  void printi64mem(const MCInst *MI, unsigned OpNo, raw_ostream &O) {
     O << "QWORD PTR ";
-    printMemReference(MI, OpNo);
+    printMemReference(MI, OpNo, O);
   }
-  void printi128mem(const MCInst *MI, unsigned OpNo) {
+  void printi128mem(const MCInst *MI, unsigned OpNo, raw_ostream &O) {
     O << "XMMWORD PTR ";
-    printMemReference(MI, OpNo);
+    printMemReference(MI, OpNo, O);
   }
-  void printf32mem(const MCInst *MI, unsigned OpNo) {
+  void printf32mem(const MCInst *MI, unsigned OpNo, raw_ostream &O) {
     O << "DWORD PTR ";
-    printMemReference(MI, OpNo);
+    printMemReference(MI, OpNo, O);
   }
-  void printf64mem(const MCInst *MI, unsigned OpNo) {
+  void printf64mem(const MCInst *MI, unsigned OpNo, raw_ostream &O) {
     O << "QWORD PTR ";
-    printMemReference(MI, OpNo);
+    printMemReference(MI, OpNo, O);
   }
-  void printf80mem(const MCInst *MI, unsigned OpNo) {
+  void printf80mem(const MCInst *MI, unsigned OpNo, raw_ostream &O) {
     O << "XWORD PTR ";
-    printMemReference(MI, OpNo);
+    printMemReference(MI, OpNo, O);
   }
-  void printf128mem(const MCInst *MI, unsigned OpNo) {
+  void printf128mem(const MCInst *MI, unsigned OpNo, raw_ostream &O) {
     O << "XMMWORD PTR ";
-    printMemReference(MI, OpNo);
+    printMemReference(MI, OpNo, O);
   }
-  void printlea32mem(const MCInst *MI, unsigned OpNo) {
+  void printlea32mem(const MCInst *MI, unsigned OpNo, raw_ostream &O) {
     O << "DWORD PTR ";
-    printLeaMemReference(MI, OpNo);
+    printLeaMemReference(MI, OpNo, O);
   }
-  void printlea64mem(const MCInst *MI, unsigned OpNo) {
+  void printlea64mem(const MCInst *MI, unsigned OpNo, raw_ostream &O) {
     O << "QWORD PTR ";
-    printLeaMemReference(MI, OpNo);
+    printLeaMemReference(MI, OpNo, O);
   }
-  void printlea64_32mem(const MCInst *MI, unsigned OpNo) {
+  void printlea64_32mem(const MCInst *MI, unsigned OpNo, raw_ostream &O) {
     O << "QWORD PTR ";
-    printLeaMemReference(MI, OpNo);
+    printLeaMemReference(MI, OpNo, O);
   }
 };