commit d62a3bfa66ff066c62dc259515d3d698d2281696
author Chris Lattner <sabre@nondot.org> Mon Feb 06 23:41:19 2006 +0000
committer Chris Lattner <sabre@nondot.org> Mon Feb 06 23:41:19 2006 +0000
tree 93f2a818e0be818f6ddcdee939e8bc0e549ad52b
parent 5c76b499aafa73fbfa5508a0c95db9e64445bc47

Eliminate the printCallOperand method, using a 'call' modifier on
printOperand instead.

llvm-svn: 26025

llvm/lib/Target/X86/X86ATTAsmPrinter.cpp

diff --git a/llvm/lib/Target/X86/X86ATTAsmPrinter.cpp b/llvm/lib/Target/X86/X86ATTAsmPrinter.cpp
index d9b263ae..353cd54 100755
--- a/llvm/lib/Target/X86/X86ATTAsmPrinter.cpp
+++ b/llvm/lib/Target/X86/X86ATTAsmPrinter.cpp
@@ -63,7 +63,9 @@
   return false;
 }
 
-void X86ATTAsmPrinter::printOp(const MachineOperand &MO, bool isCallOp) {
+void X86ATTAsmPrinter::printOperand(const MachineInstr *MI, unsigned OpNo,
+                                    const char *Modifier) {
+  const MachineOperand &MO = MI->getOperand(OpNo);
   const MRegisterInfo &RI = *TM.getRegisterInfo();
   switch (MO.getType()) {
   case MachineOperand::MO_VirtualRegister:
@@ -92,6 +94,7 @@
     abort ();
     return;
   case MachineOperand::MO_GlobalAddress: {
+    bool isCallOp = Modifier && !strcmp(Modifier, "call");
     // Darwin block shameless ripped from PowerPCAsmPrinter.cpp
     if (forDarwin) {
       if (!isCallOp) O << '$';
@@ -132,7 +135,8 @@
       O << Offset;
     return;
   }
-  case MachineOperand::MO_ExternalSymbol:
+  case MachineOperand::MO_ExternalSymbol: {
+    bool isCallOp = Modifier && !strcmp(Modifier, "call");
     if (isCallOp && forDarwin) {
       std::string Name(GlobalPrefix); Name += MO.getSymbolName();
       FnStubs.insert(Name);
@@ -142,6 +146,7 @@
     if (!isCallOp) O << '$';
     O << GlobalPrefix << MO.getSymbolName();
     return;
+  }
   default:
     O << "<unknown operand type>"; return;
   }
@@ -183,7 +188,7 @@
       O << "+" << DispSpec.getImmedValue();
     if (IndexReg.getReg()) {
       O << "(,";
-      printOp(IndexReg);
+      printOperand(MI, Op+2);
       if (ScaleVal != 1)
         O << "," << ScaleVal;
       O << ")";
@@ -192,7 +197,7 @@
   }
 
   if (DispSpec.isGlobalAddress()) {
-    printOp(DispSpec, true);
+    printOperand(MI, Op+3, "call");
   } else {
     int DispVal = DispSpec.getImmedValue();
     if (DispVal || (!IndexReg.getReg() && !BaseReg.getReg()))
@@ -202,11 +207,11 @@
   if (IndexReg.getReg() || BaseReg.getReg()) {
     O << "(";
     if (BaseReg.getReg())
-      printOp(BaseReg);
+      printOperand(MI, Op);
 
     if (IndexReg.getReg()) {
       O << ",";
-      printOp(IndexReg);
+      printOperand(MI, Op+2);
       if (ScaleVal != 1)
         O << "," << ScaleVal;
     }