1 files changed, 20 insertions, 17 deletions
diff --git a/lib/Target/SystemZ/AsmPrinter/SystemZAsmPrinter.cpp b/lib/Target/SystemZ/AsmPrinter/SystemZAsmPrinter.cpp
index 349ac3e..77f5b2d 100644
--- a/lib/Target/SystemZ/AsmPrinter/SystemZAsmPrinter.cpp
+++ b/lib/Target/SystemZ/AsmPrinter/SystemZAsmPrinter.cpp
@@ -48,21 +48,21 @@ namespace {
       return "SystemZ Assembly Printer";
     }
 
-    void printOperand(const MachineInstr *MI, int OpNum,
+    void printOperand(const MachineInstr *MI, int OpNum, raw_ostream &O,
                       const char* Modifier = 0);
-    void printPCRelImmOperand(const MachineInstr *MI, int OpNum);
-    void printRIAddrOperand(const MachineInstr *MI, int OpNum,
+    void printPCRelImmOperand(const MachineInstr *MI, int OpNum, raw_ostream &O);
+    void printRIAddrOperand(const MachineInstr *MI, int OpNum, raw_ostream &O,
                             const char* Modifier = 0);
-    void printRRIAddrOperand(const MachineInstr *MI, int OpNum,
+    void printRRIAddrOperand(const MachineInstr *MI, int OpNum, raw_ostream &O,
                              const char* Modifier = 0);
-    void printS16ImmOperand(const MachineInstr *MI, int OpNum) {
+    void printS16ImmOperand(const MachineInstr *MI, int OpNum, raw_ostream &O) {
       O << (int16_t)MI->getOperand(OpNum).getImm();
     }
-    void printS32ImmOperand(const MachineInstr *MI, int OpNum) {
+    void printS32ImmOperand(const MachineInstr *MI, int OpNum, raw_ostream &O) {
       O << (int32_t)MI->getOperand(OpNum).getImm();
     }
 
-    void printInstruction(const MachineInstr *MI);  // autogenerated.
+    void printInstruction(const MachineInstr *MI, raw_ostream &O);
     static const char *getRegisterName(unsigned RegNo);
 
     void EmitInstruction(const MachineInstr *MI);
@@ -78,11 +78,12 @@ namespace {
 
 void SystemZAsmPrinter::EmitInstruction(const MachineInstr *MI) {
   // Call the autogenerated instruction printer routines.
-  printInstruction(MI);
+  printInstruction(MI, O);
   OutStreamer.AddBlankLine();
 }
 
-void SystemZAsmPrinter::printPCRelImmOperand(const MachineInstr *MI, int OpNum){
+void SystemZAsmPrinter::printPCRelImmOperand(const MachineInstr *MI, int OpNum,
+                                             raw_ostream &O) {
   const MachineOperand &MO = MI->getOperand(OpNum);
   switch (MO.getType()) {
   case MachineOperand::MO_Immediate:
@@ -121,7 +122,7 @@ void SystemZAsmPrinter::printPCRelImmOperand(const MachineInstr *MI, int OpNum){
 
 
 void SystemZAsmPrinter::printOperand(const MachineInstr *MI, int OpNum,
-                                     const char* Modifier) {
+                                     raw_ostream &O, const char *Modifier) {
   const MachineOperand &MO = MI->getOperand(OpNum);
   switch (MO.getType()) {
   case MachineOperand::MO_Register: {
@@ -181,35 +182,37 @@ void SystemZAsmPrinter::printOperand(const MachineInstr *MI, int OpNum,
 }
 
 void SystemZAsmPrinter::printRIAddrOperand(const MachineInstr *MI, int OpNum,
-                                           const char* Modifier) {
+                                           raw_ostream &O,
+                                           const char *Modifier) {
   const MachineOperand &Base = MI->getOperand(OpNum);
 
   // Print displacement operand.
-  printOperand(MI, OpNum+1);
+  printOperand(MI, OpNum+1, O);
 
   // Print base operand (if any)
   if (Base.getReg()) {
     O << '(';
-    printOperand(MI, OpNum);
+    printOperand(MI, OpNum, O);
     O << ')';
   }
 }
 
 void SystemZAsmPrinter::printRRIAddrOperand(const MachineInstr *MI, int OpNum,
-                                            const char* Modifier) {
+                                            raw_ostream &O,
+                                            const char *Modifier) {
   const MachineOperand &Base = MI->getOperand(OpNum);
   const MachineOperand &Index = MI->getOperand(OpNum+2);
 
   // Print displacement operand.
-  printOperand(MI, OpNum+1);
+  printOperand(MI, OpNum+1, O);
 
   // Print base operand (if any)
   if (Base.getReg()) {
     O << '(';
-    printOperand(MI, OpNum);
+    printOperand(MI, OpNum, O);
     if (Index.getReg()) {
       O << ',';
-      printOperand(MI, OpNum+2);
+      printOperand(MI, OpNum+2, O);
     }
     O << ')';
   } else