[llvm-commits] CVS: llvm/lib/Target/X86/X86RegisterInfo.cpp X86InstrInfo.cpp PeepholeOptimizer.cpp InstSelectSimple.cpp

[Alkis Evlogimenos]

Changes in directory llvm/lib/Target/X86:

X86RegisterInfo.cpp updated: 1.66 -> 1.67
X86InstrInfo.cpp updated: 1.22 -> 1.23
PeepholeOptimizer.cpp updated: 1.27 -> 1.28
InstSelectSimple.cpp updated: 1.167 -> 1.168

---
Log message:

Move MOTy::UseType enum into MachineOperand. This eliminates the
switch statements in the constructors and simplifies the
implementation of the getUseType() member function. You will have to
specify defs using MachineOperand::Def instead of MOTy::Def though
(similarly for Use and UseAndDef).


---
Diffs of the changes:  (+15 -9)

Index: llvm/lib/Target/X86/X86RegisterInfo.cpp
diff -u llvm/lib/Target/X86/X86RegisterInfo.cpp:1.66 llvm/lib/Target/X86/X86RegisterInfo.cpp:1.67
--- llvm/lib/Target/X86/X86RegisterInfo.cpp:1.66	Sun Feb 22 00:54:26 2004
+++ llvm/lib/Target/X86/X86RegisterInfo.cpp	Sun Feb 22 13:23:26 2004
@@ -295,10 +295,12 @@
 
       MachineInstr *New;
       if (Old->getOpcode() == X86::ADJCALLSTACKDOWN) {
-	New=BuildMI(X86::SUBri32, 1, X86::ESP, MOTy::UseAndDef).addZImm(Amount);
+	New=BuildMI(X86::SUBri32, 1, X86::ESP, MachineOperand::UseAndDef)
+              .addZImm(Amount);
       } else {
 	assert(Old->getOpcode() == X86::ADJCALLSTACKUP);
-	New=BuildMI(X86::ADDri32, 1, X86::ESP, MOTy::UseAndDef).addZImm(Amount);
+	New=BuildMI(X86::ADDri32, 1, X86::ESP, MachineOperand::UseAndDef)
+              .addZImm(Amount);
       }
 
       // Replace the pseudo instruction with a new instruction...
@@ -360,7 +362,8 @@
     int EBPOffset = MFI->getObjectOffset(MFI->getObjectIndexBegin())+4;
 
     if (NumBytes) {   // adjust stack pointer: ESP -= numbytes
-      MI= BuildMI(X86::SUBri32, 1, X86::ESP, MOTy::UseAndDef).addZImm(NumBytes);
+      MI= BuildMI(X86::SUBri32, 1, X86::ESP, MachineOperand::UseAndDef)
+            .addZImm(NumBytes);
       MBB.insert(MBBI, MI);
     }
 
@@ -396,7 +399,8 @@
 
     if (NumBytes) {
       // adjust stack pointer: ESP -= numbytes
-      MI= BuildMI(X86::SUBri32, 1, X86::ESP, MOTy::UseAndDef).addZImm(NumBytes);
+      MI= BuildMI(X86::SUBri32, 1, X86::ESP, MachineOperand::UseAndDef)
+            .addZImm(NumBytes);
       MBB.insert(MBBI, MI);
     }
   }
@@ -427,7 +431,8 @@
     unsigned NumBytes = MFI->getStackSize();
 
     if (NumBytes) {    // adjust stack pointer back: ESP += numbytes
-      MI =BuildMI(X86::ADDri32, 1, X86::ESP, MOTy::UseAndDef).addZImm(NumBytes);
+      MI =BuildMI(X86::ADDri32, 1, X86::ESP, MachineOperand::UseAndDef)
+            .addZImm(NumBytes);
       MBB.insert(MBBI, MI);
     }
   }


Index: llvm/lib/Target/X86/X86InstrInfo.cpp
diff -u llvm/lib/Target/X86/X86InstrInfo.cpp:1.22 llvm/lib/Target/X86/X86InstrInfo.cpp:1.23
--- llvm/lib/Target/X86/X86InstrInfo.cpp:1.22	Fri Feb 13 15:01:19 2004
+++ llvm/lib/Target/X86/X86InstrInfo.cpp	Sun Feb 22 13:23:26 2004
@@ -29,8 +29,8 @@
 // another instruction, e.g. X86: `xchg ax, ax'; SparcV9: `sethi r0, r0, r0'
 //
 MachineInstr* X86InstrInfo::createNOPinstr() const {
-  return BuildMI(X86::XCHGrr16, 2).addReg(X86::AX, MOTy::UseAndDef)
-                                  .addReg(X86::AX, MOTy::UseAndDef);
+  return BuildMI(X86::XCHGrr16, 2).addReg(X86::AX, MachineOperand::UseAndDef)
+                                  .addReg(X86::AX, MachineOperand::UseAndDef);
 }
 
 


Index: llvm/lib/Target/X86/PeepholeOptimizer.cpp
diff -u llvm/lib/Target/X86/PeepholeOptimizer.cpp:1.27 llvm/lib/Target/X86/PeepholeOptimizer.cpp:1.28
--- llvm/lib/Target/X86/PeepholeOptimizer.cpp:1.27	Sat Feb 21 22:44:58 2004
+++ llvm/lib/Target/X86/PeepholeOptimizer.cpp	Sun Feb 22 13:23:26 2004
@@ -149,7 +149,8 @@
         }
         unsigned R0 = MI->getOperand(0).getReg();
         I = MBB.insert(MBB.erase(I),
-                    BuildMI(Opcode, 1, R0, MOTy::UseAndDef).addZImm((char)Val));
+                    BuildMI(Opcode, 1, R0, MachineOperand::UseAndDef)
+                      .addZImm((char)Val));
         return true;
       }
     }


Index: llvm/lib/Target/X86/InstSelectSimple.cpp
diff -u llvm/lib/Target/X86/InstSelectSimple.cpp:1.167 llvm/lib/Target/X86/InstSelectSimple.cpp:1.168
--- llvm/lib/Target/X86/InstSelectSimple.cpp:1.167	Sun Feb 22 11:35:42 2004
+++ llvm/lib/Target/X86/InstSelectSimple.cpp	Sun Feb 22 13:23:26 2004
@@ -43,7 +43,7 @@
                                       unsigned DestReg) {
   MachineInstr *MI = new MachineInstr(Opcode, NumOperands+1, true, true);
   MBB->insert(I, MI);
-  return MachineInstrBuilder(MI).addReg(DestReg, MOTy::Def);
+  return MachineInstrBuilder(MI).addReg(DestReg, MachineOperand::Def);
 }
 
 /// BMI - A special BuildMI variant that takes an iterator to insert the