Rename MO_VirtualRegister -> MO_Register. Clean up immediate handling.

[oota-llvm.git] / lib / Target / X86 / X86IntelAsmPrinter.h

diff --git a/lib/Target/X86/X86IntelAsmPrinter.h b/lib/Target/X86/X86IntelAsmPrinter.h
index 734ff2cec2b419bff12fac4942f0452086ea6768..c594e462551cc2b91f883e567cbf8169786d9ef5 100755 (executable)
--- a/lib/Target/X86/X86IntelAsmPrinter.h
+++ b/lib/Target/X86/X86IntelAsmPrinter.h
@@ -16,15 +16,12 @@
 
 #include "X86AsmPrinter.h"
 #include "llvm/CodeGen/ValueTypes.h"
-#include "llvm/Target/TargetMachine.h"
 #include "llvm/Target/MRegisterInfo.h"
 
 namespace llvm {
-namespace x86 {
 
 struct X86IntelAsmPrinter : public X86SharedAsmPrinter {
-  X86IntelAsmPrinter(std::ostream &O, TargetMachine &TM)
-    : X86SharedAsmPrinter(O, TM) { }
+  X86IntelAsmPrinter(std::ostream &O, X86TargetMachine &TM);
 
   virtual const char *getPassName() const {
     return "X86 Intel-Style Assembly Printer";
@@ -40,10 +37,9 @@ struct X86IntelAsmPrinter : public X86SharedAsmPrinter {
   void printOperand(const MachineInstr *MI, unsigned OpNo,
                     const char *Modifier = 0) {
     const MachineOperand &MO = MI->getOperand(OpNo);
-    if (MO.getType() == MachineOperand::MO_MachineRegister) {
-      assert(MRegisterInfo::isPhysicalRegister(MO.getReg())&&"Not physref??");
-      // Bug Workaround: See note in Printer::doInitialization about %.
-      O << "%" << TM.getRegisterInfo()->get(MO.getReg()).Name;
+    if (MO.isRegister()) {
+      assert(MRegisterInfo::isPhysicalRegister(MO.getReg()) && "Not physreg??");
+      O << TM.getRegisterInfo()->get(MO.getReg()).Name;
     } else {
       printOp(MO, Modifier);
     }
@@ -65,6 +61,10 @@ struct X86IntelAsmPrinter : public X86SharedAsmPrinter {
     O << "QWORD PTR ";
     printMemReference(MI, OpNo);
   }
+  void printi128mem(const MachineInstr *MI, unsigned OpNo) {
+    O << "XMMWORD PTR ";
+    printMemReference(MI, OpNo);
+  }
   void printf32mem(const MachineInstr *MI, unsigned OpNo) {
     O << "DWORD PTR ";
     printMemReference(MI, OpNo);
@@ -78,6 +78,11 @@ struct X86IntelAsmPrinter : public X86SharedAsmPrinter {
     printMemReference(MI, OpNo);
   }
 
+  bool printAsmMRegister(const MachineOperand &MO, const char Mode);
+  bool PrintAsmOperand(const MachineInstr *MI, unsigned OpNo,
+                       unsigned AsmVariant, const char *ExtraCode);
+  bool PrintAsmMemoryOperand(const MachineInstr *MI, unsigned OpNo,
+                             unsigned AsmVariant, const char *ExtraCode);
   void printMachineInstruction(const MachineInstr *MI);
   void printOp(const MachineOperand &MO, const char *Modifier = 0);
   void printSSECC(const MachineInstr *MI, unsigned Op);
@@ -85,9 +90,11 @@ struct X86IntelAsmPrinter : public X86SharedAsmPrinter {
   void printPICLabel(const MachineInstr *MI, unsigned Op);
   bool runOnMachineFunction(MachineFunction &F);
   bool doInitialization(Module &M);
+  bool doFinalization(Module &M);
+
+  virtual void EmitString(const ConstantArray *CVA) const;
 };
 
-} // end namespace x86
 } // end namespace llvm
 
 #endif