[llvm-commits] CVS: llvm/lib/CodeGen/LiveVariables.cpp PrologEpilogInserter.cpp RegAllocLocal.cpp

[Chris Lattner]

Changes in directory llvm/lib/CodeGen:

LiveVariables.cpp updated: 1.19 -> 1.20
PrologEpilogInserter.cpp updated: 1.16 -> 1.17
RegAllocLocal.cpp updated: 1.40 -> 1.41

---
Log message:

Eliminate users of MachineOperand::isPhysicalRegister


---
Diffs of the changes:  (+8 -5)

Index: llvm/lib/CodeGen/LiveVariables.cpp
diff -u llvm/lib/CodeGen/LiveVariables.cpp:1.19 llvm/lib/CodeGen/LiveVariables.cpp:1.20
--- llvm/lib/CodeGen/LiveVariables.cpp:1.19	Sun Feb  8 19:43:23 2004
+++ llvm/lib/CodeGen/LiveVariables.cpp	Tue Feb 10 14:41:10 2004
@@ -234,7 +234,8 @@
 	if (MO.isUse()) {
 	  if (MO.isVirtualRegister() && !MO.getVRegValueOrNull()) {
 	    HandleVirtRegUse(getVarInfo(MO.getReg()), MBB, MI);
-	  } else if (MO.isPhysicalRegister() && 
+	  } else if (MO.isRegister() &&
+                     MRegisterInfo::isPhysicalRegister(MO.getReg()) &&
                      AllocatablePhysicalRegisters[MO.getReg()]) {
 	    HandlePhysRegUse(MO.getReg(), MI);
 	  }
@@ -257,7 +258,8 @@
 	    VRInfo.DefBlock = MBB;                           // Created here...
 	    VRInfo.DefInst = MI;
 	    VRInfo.Kills.push_back(std::make_pair(MBB, MI)); // Defaults to dead
-	  } else if (MO.isPhysicalRegister() &&
+	  } else if (MO.isRegister() &&
+                     MRegisterInfo::isPhysicalRegister(MO.getReg()) &&
                      AllocatablePhysicalRegisters[MO.getReg()]) {
 	    HandlePhysRegDef(MO.getReg(), MI);
 	  }


Index: llvm/lib/CodeGen/PrologEpilogInserter.cpp
diff -u llvm/lib/CodeGen/PrologEpilogInserter.cpp:1.16 llvm/lib/CodeGen/PrologEpilogInserter.cpp:1.17
--- llvm/lib/CodeGen/PrologEpilogInserter.cpp:1.16	Sun Dec 14 07:24:16 2003
+++ llvm/lib/CodeGen/PrologEpilogInserter.cpp	Tue Feb 10 14:41:10 2004
@@ -118,7 +118,8 @@
 	  MachineOperand &MO = (*I)->getOperand(i);
 	  assert(!MO.isVirtualRegister() &&
 		 "Register allocation must be performed!");
-	  if (MO.isPhysicalRegister() && MO.isDef())
+	  if (MO.isRegister() && MO.isDef() &&
+              MRegisterInfo::isPhysicalRegister(MO.getReg()))
 	    ModifiedRegs[MO.getReg()] = true;         // Register is modified
 	}
 	++I;


Index: llvm/lib/CodeGen/RegAllocLocal.cpp
diff -u llvm/lib/CodeGen/RegAllocLocal.cpp:1.40 llvm/lib/CodeGen/RegAllocLocal.cpp:1.41
--- llvm/lib/CodeGen/RegAllocLocal.cpp:1.40	Sun Feb  8 20:12:04 2004
+++ llvm/lib/CodeGen/RegAllocLocal.cpp	Tue Feb 10 14:41:10 2004
@@ -556,8 +556,8 @@
     // Loop over all of the operands of the instruction, spilling registers that
     // are defined, and marking explicit destinations in the PhysRegsUsed map.
     for (unsigned i = 0, e = MI->getNumOperands(); i != e; ++i)
-      if (MI->getOperand(i).isDef() &&
-          MI->getOperand(i).isPhysicalRegister()) {
+      if (MI->getOperand(i).isDef() && MI->getOperand(i).isRegister() &&
+          MRegisterInfo::isPhysicalRegister(MI->getOperand(i).getReg())) {
         unsigned Reg = MI->getOperand(i).getAllocatedRegNum();
         spillPhysReg(MBB, I, Reg, true);  // Spill any existing value in the reg
         PhysRegsUsed[Reg] = 0;            // It is free and reserved now