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

[Chris Lattner]

Changes in directory llvm/lib/CodeGen:

LiveVariables.cpp updated: 1.16 -> 1.17
RegAllocLocal.cpp updated: 1.37 -> 1.38

---
Log message:

Finegrainify namespacification, use new MRegisterInfo::isVirtualRegister
method


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

Index: llvm/lib/CodeGen/LiveVariables.cpp
diff -u llvm/lib/CodeGen/LiveVariables.cpp:1.16 llvm/lib/CodeGen/LiveVariables.cpp:1.17
--- llvm/lib/CodeGen/LiveVariables.cpp:1.16	Fri Jan 30 16:08:53 2004
+++ llvm/lib/CodeGen/LiveVariables.cpp	Sat Jan 31 15:27:19 2004
@@ -58,7 +58,7 @@
 }
 
 LiveVariables::VarInfo &LiveVariables::getVarInfo(unsigned RegIdx) {
-  assert(RegIdx >= MRegisterInfo::FirstVirtualRegister &&
+  assert(MRegisterInfo::isVirtualRegister(RegIdx) &&
          "getVarInfo: not a virtual register!");
   RegIdx -= MRegisterInfo::FirstVirtualRegister;
   if (RegIdx >= VirtRegInfo.size()) {


Index: llvm/lib/CodeGen/RegAllocLocal.cpp
diff -u llvm/lib/CodeGen/RegAllocLocal.cpp:1.37 llvm/lib/CodeGen/RegAllocLocal.cpp:1.38
--- llvm/lib/CodeGen/RegAllocLocal.cpp:1.37	Tue Jan 13 00:24:30 2004
+++ llvm/lib/CodeGen/RegAllocLocal.cpp	Sat Jan 31 15:27:19 2004
@@ -25,8 +25,7 @@
 #include "Support/Debug.h"
 #include "Support/Statistic.h"
 #include <iostream>
-
-namespace llvm {
+using namespace llvm;
 
 namespace {
   Statistic<> NumSpilled ("ra-local", "Number of registers spilled");
@@ -75,14 +74,14 @@
     std::vector<bool> VirtRegModified;
 
     void markVirtRegModified(unsigned Reg, bool Val = true) {
-      assert(Reg >= MRegisterInfo::FirstVirtualRegister && "Illegal VirtReg!");
+      assert(MRegisterInfo::isVirtualRegister(Reg) && "Illegal VirtReg!");
       Reg -= MRegisterInfo::FirstVirtualRegister;
       if (VirtRegModified.size() <= Reg) VirtRegModified.resize(Reg+1);
       VirtRegModified[Reg] = Val;
     }
 
     bool isVirtRegModified(unsigned Reg) const {
-      assert(Reg >= MRegisterInfo::FirstVirtualRegister && "Illegal VirtReg!");
+      assert(MRegisterInfo::isVirtualRegister(Reg) && "Illegal VirtReg!");
       assert(Reg - MRegisterInfo::FirstVirtualRegister < VirtRegModified.size()
 	     && "Illegal virtual register!");
       return VirtRegModified[Reg - MRegisterInfo::FirstVirtualRegister];
@@ -524,7 +523,7 @@
              KE = LV->killed_end(MI); KI != KE; ++KI) {
         unsigned VirtReg = KI->second;
         unsigned PhysReg = VirtReg;
-        if (VirtReg >= MRegisterInfo::FirstVirtualRegister) {
+        if (MRegisterInfo::isVirtualRegister(VirtReg)) {
           std::map<unsigned, unsigned>::iterator I =
             Virt2PhysRegMap.find(VirtReg);
           assert(I != Virt2PhysRegMap.end());
@@ -602,7 +601,7 @@
              KE = LV->dead_end(MI); KI != KE; ++KI) {
         unsigned VirtReg = KI->second;
         unsigned PhysReg = VirtReg;
-        if (VirtReg >= MRegisterInfo::FirstVirtualRegister) {
+        if (MRegisterInfo::isVirtualRegister(VirtReg)) {
           std::map<unsigned, unsigned>::iterator I =
             Virt2PhysRegMap.find(VirtReg);
           assert(I != Virt2PhysRegMap.end());
@@ -668,8 +667,7 @@
   return true;
 }
 
-FunctionPass *createLocalRegisterAllocator() {
+FunctionPass *llvm::createLocalRegisterAllocator() {
   return new RA();
 }
 
-} // End llvm namespace