Subzero: Refactor Operand::dump().

src/IceInstX8632.cpp

 //===- subzero/src/IceInstX8632.cpp - X86-32 instruction implementation ---===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This file implements the InstX8632 and OperandX8632 classes,
@@ skipping 1338 matching lines @@
   Str << "\n";
 }
 
 void InstX8632Xchg::dump(const Cfg *Func) const {
   Ostream &Str = Func->getContext()->getStrDump();
   Type Ty = getSrc(0)->getType();
   Str << "xchg." << Ty << " ";
   dumpSources(Func);
 }
 
-void OperandX8632::dump(const Cfg *Func) const {
-  Ostream &Str = Func->getContext()->getStrDump();
-  Str << "<OperandX8632>";
-}
-
 void OperandX8632Mem::emit(const Cfg *Func) const {
   Ostream &Str = Func->getContext()->getStrEmit();
   Str << TypeX8632Attributes[getType()].WidthString << " ";
   if (SegmentReg != DefaultSegment) {
     assert(SegmentReg >= 0 && SegmentReg < SegReg_NUM);
     Str << InstX8632SegmentRegNames[SegmentReg] << ":";
   }
   // TODO: The following is an almost verbatim paste of dump().
   bool Dumped = false;
   Str << "[";
@@ skipping 24 matching lines @@
         Str << "+";
       Offset->emit(Func);
     }
   } else {
     // There is only the offset.
     Offset->emit(Func);
   }
   Str << "]";
 }
 
-void OperandX8632Mem::dump(const Cfg *Func) const {
-  Ostream &Str = Func->getContext()->getStrDump();
+void OperandX8632Mem::dump(const Cfg *Func, Ostream &Str) const {
   if (SegmentReg != DefaultSegment) {
     assert(SegmentReg >= 0 && SegmentReg < SegReg_NUM);
     Str << InstX8632SegmentRegNames[SegmentReg] << ":";
   }
   bool Dumped = false;
   Str << "[";
   if (Base) {
-    Base->dump(Func);
+    if (Func)
+      Base->dump(Func);
+    else
+      Base->dump(Str);
     Dumped = true;
   }
   if (Index) {
     assert(Base);
     Str << "+";
     if (Shift > 0)
       Str << (1u << Shift) << "*";
-    Index->dump(Func);
+    if (Func)
+      Index->dump(Func);
+    else
+      Index->dump(Str);
     Dumped = true;
   }
   // Pretty-print the Offset.
   bool OffsetIsZero = false;
   bool OffsetIsNegative = false;
   if (Offset == NULL) {
     OffsetIsZero = true;
   } else if (ConstantInteger *CI = llvm::dyn_cast<ConstantInteger>(Offset)) {
     OffsetIsZero = (CI->getValue() == 0);
     OffsetIsNegative = (static_cast<int64_t>(CI->getValue()) < 0);
   }
   if (Dumped) {
     if (!OffsetIsZero) {     // Suppress if Offset is known to be 0
       if (!OffsetIsNegative) // Suppress if Offset is known to be negative
         Str << "+";
-      Offset->dump(Func);
+      Offset->dump(Func, Str);
     }
   } else {
     // There is only the offset.
-    Offset->dump(Func);
+    Offset->dump(Func, Str);
   }
   Str << "]";
 }
 
 void VariableSplit::emit(const Cfg *Func) const {
   Ostream &Str = Func->getContext()->getStrEmit();
   assert(Var->getLocalUseNode() == NULL ||
          Var->getLocalUseNode() == Func->getCurrentNode());
   assert(!Var->hasReg());
   // The following is copied/adapted from TargetX8632::emitVariable().
   const TargetLowering *Target = Func->getTarget();
   const Type Ty = IceType_i32;
   Str << TypeX8632Attributes[Ty].WidthString << " ["
       << Target->getRegName(Target->getFrameOrStackReg(), Ty);
   int32_t Offset = Var->getStackOffset() + Target->getStackAdjustment();
   if (Part == High)
     Offset += 4;
   if (Offset) {
     if (Offset > 0)
       Str << "+";
     Str << Offset;
   }
   Str << "]";
 }
 
-void VariableSplit::dump(const Cfg *Func) const {
-  Ostream &Str = Func->getContext()->getStrDump();
+void VariableSplit::dump(const Cfg *Func, Ostream &Str) const {
   switch (Part) {
   case Low:
     Str << "low";
     break;
   case High:
     Str << "high";
     break;
   default:
     Str << "???";
     break;
   }
   Str << "(";
-  Var->dump(Func);
+  if (Func)
+    Var->dump(Func);
+  else
+    Var->dump(Str);
   Str << ")";
 }
 
 } // end of namespace Ice