[llvm-commits] CVS: llvm/lib/Target/X86/X86ATTAsmPrinter.cpp X86InstrBuilder.h X86IntelAsmPrinter.cpp X86IntelAsmPrinter.h X86RegisterInfo.cpp

[Chris Lattner]

Changes in directory llvm/lib/Target/X86:

X86ATTAsmPrinter.cpp updated: 1.39 -> 1.40
X86InstrBuilder.h updated: 1.17 -> 1.18
X86IntelAsmPrinter.cpp updated: 1.37 -> 1.38
X86IntelAsmPrinter.h updated: 1.19 -> 1.20
X86RegisterInfo.cpp updated: 1.145 -> 1.146
---
Log message:

Remove a bunch more SparcV9 specific stuff


---
Diffs of the changes:  (+4 -11)

 X86ATTAsmPrinter.cpp   |    1 -
 X86InstrBuilder.h      |    2 +-
 X86IntelAsmPrinter.cpp |    6 ------
 X86IntelAsmPrinter.h   |    4 ++--
 X86RegisterInfo.cpp    |    2 +-
 5 files changed, 4 insertions(+), 11 deletions(-)


Index: llvm/lib/Target/X86/X86ATTAsmPrinter.cpp
diff -u llvm/lib/Target/X86/X86ATTAsmPrinter.cpp:1.39 llvm/lib/Target/X86/X86ATTAsmPrinter.cpp:1.40
--- llvm/lib/Target/X86/X86ATTAsmPrinter.cpp:1.39	Wed May  3 19:44:25 2006
+++ llvm/lib/Target/X86/X86ATTAsmPrinter.cpp	Wed May  3 20:15:02 2006
@@ -109,7 +109,6 @@
   const MRegisterInfo &RI = *TM.getRegisterInfo();
   switch (MO.getType()) {
   case MachineOperand::MO_VirtualRegister:
-  case MachineOperand::MO_MachineRegister:
     assert(MRegisterInfo::isPhysicalRegister(MO.getReg()) &&
            "Virtual registers should not make it this far!");
     O << '%';


Index: llvm/lib/Target/X86/X86InstrBuilder.h
diff -u llvm/lib/Target/X86/X86InstrBuilder.h:1.17 llvm/lib/Target/X86/X86InstrBuilder.h:1.18
--- llvm/lib/Target/X86/X86InstrBuilder.h:1.17	Thu Apr 21 18:38:14 2005
+++ llvm/lib/Target/X86/X86InstrBuilder.h	Wed May  3 20:15:02 2006
@@ -93,7 +93,7 @@
     assert (0);
   MIB.addZImm(AM.Scale).addReg(AM.IndexReg);
   if (AM.GV)
-    return MIB.addGlobalAddress(AM.GV, false, AM.Disp);
+    return MIB.addGlobalAddress(AM.GV, AM.Disp);
   else
     return MIB.addSImm(AM.Disp);
 }


Index: llvm/lib/Target/X86/X86IntelAsmPrinter.cpp
diff -u llvm/lib/Target/X86/X86IntelAsmPrinter.cpp:1.37 llvm/lib/Target/X86/X86IntelAsmPrinter.cpp:1.38
--- llvm/lib/Target/X86/X86IntelAsmPrinter.cpp:1.37	Wed May  3 19:44:25 2006
+++ llvm/lib/Target/X86/X86IntelAsmPrinter.cpp	Wed May  3 20:15:02 2006
@@ -115,12 +115,6 @@
   const MRegisterInfo &RI = *TM.getRegisterInfo();
   switch (MO.getType()) {
   case MachineOperand::MO_VirtualRegister:
-    if (Value *V = MO.getVRegValueOrNull()) {
-      O << "<" << V->getName() << ">";
-      return;
-    }
-    // FALLTHROUGH
-  case MachineOperand::MO_MachineRegister:
     if (MRegisterInfo::isPhysicalRegister(MO.getReg()))
       O << RI.get(MO.getReg()).Name;
     else


Index: llvm/lib/Target/X86/X86IntelAsmPrinter.h
diff -u llvm/lib/Target/X86/X86IntelAsmPrinter.h:1.19 llvm/lib/Target/X86/X86IntelAsmPrinter.h:1.20
--- llvm/lib/Target/X86/X86IntelAsmPrinter.h:1.19	Mon May  1 22:58:45 2006
+++ llvm/lib/Target/X86/X86IntelAsmPrinter.h	Wed May  3 20:15:02 2006
@@ -37,8 +37,8 @@
   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??");
+    if (MO.getType() == MachineOperand::MO_VirtualRegister) {
+      assert(MRegisterInfo::isPhysicalRegister(MO.getReg()) && "Not physreg??");
       O << TM.getRegisterInfo()->get(MO.getReg()).Name;
     } else {
       printOp(MO, Modifier);


Index: llvm/lib/Target/X86/X86RegisterInfo.cpp
diff -u llvm/lib/Target/X86/X86RegisterInfo.cpp:1.145 llvm/lib/Target/X86/X86RegisterInfo.cpp:1.146
--- llvm/lib/Target/X86/X86RegisterInfo.cpp:1.145	Thu Apr 27 21:23:35 2006
+++ llvm/lib/Target/X86/X86RegisterInfo.cpp	Wed May  3 20:15:02 2006
@@ -150,7 +150,7 @@
   else if (MI->getOperand(1).isGlobalAddress())
     return addFrameReference(BuildMI(Opcode, 5), FrameIndex)
       .addGlobalAddress(MI->getOperand(1).getGlobal(),
-                        false, MI->getOperand(1).getOffset());
+                        MI->getOperand(1).getOffset());
   else if (MI->getOperand(1).isJumpTableIndex())
     return addFrameReference(BuildMI(Opcode, 5), FrameIndex)
       .addJumpTableIndex(MI->getOperand(1).getJumpTableIndex());