[llvm-commits] CVS: llvm/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.h PhyRegAlloc.cpp PhyRegAlloc.h RegClass.cpp RegClass.h

[Brian Gaeke]

Changes in directory llvm/lib/Target/SparcV9/RegAlloc:

LiveRangeInfo.h updated: 1.23 -> 1.24
PhyRegAlloc.cpp updated: 1.150 -> 1.151
PhyRegAlloc.h updated: 1.67 -> 1.68
RegClass.cpp updated: 1.29 -> 1.30
RegClass.h updated: 1.22 -> 1.23

---
Log message:

Collapse together the abstract superclass TargetRegInfo and SparcV9RegInfo, its
only concrete implementation.


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

Index: llvm/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.h
diff -u llvm/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.h:1.23 llvm/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.h:1.24
--- llvm/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.h:1.23	Tue Nov 11 16:41:33 2003
+++ llvm/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.h	Wed Jun  2 21:45:09 2004
@@ -34,7 +34,7 @@
 class LiveRange;
 class MachineInstr;
 class RegClass;
-class TargetRegInfo;
+class SparcV9RegInfo;
 class TargetMachine;
 class Value;
 class Function;
@@ -59,7 +59,7 @@
 
   std::vector<RegClass *> & RegClassList;// vector containing register classess
 
-  const TargetRegInfo& MRI;        // machine reg info
+  const SparcV9RegInfo& MRI;        // machine reg info
 
   std::vector<MachineInstr*> CallRetInstrList;  // a list of all call/ret instrs
 


Index: llvm/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp
diff -u llvm/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp:1.150 llvm/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp:1.151
--- llvm/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp:1.150	Wed Jun  2 00:55:00 2004
+++ llvm/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp	Wed Jun  2 21:45:09 2004
@@ -1003,7 +1003,7 @@
 /// setRelRegsUsedByThisInst().
 ///
 static void markRegisterUsed(int RegNo, RegClass *RC, int RegType,
-                             const TargetRegInfo &TRI) {
+                             const SparcV9RegInfo &TRI) {
   unsigned classId = 0;
   int classRegNum = TRI.getClassRegNum(RegNo, classId);
   if (RC->getID() == classId)


Index: llvm/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.h
diff -u llvm/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.h:1.67 llvm/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.h:1.68
--- llvm/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.h:1.67	Wed Jun  2 00:55:00 2004
+++ llvm/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.h	Wed Jun  2 21:45:09 2004
@@ -69,7 +69,7 @@
   FunctionLiveVarInfo *LVI;             // LV information for this method 
                                         // (already computed for BBs) 
   LiveRangeInfo *LRI;                   // LR info  (will be computed)
-  const TargetRegInfo &MRI;             // Machine Register information
+  const SparcV9RegInfo &MRI;            // Machine Register information
   const unsigned NumOfRegClasses;       // recorded here for efficiency
 
   // Map to indicate whether operands of each MachineInstr have been


Index: llvm/lib/Target/SparcV9/RegAlloc/RegClass.cpp
diff -u llvm/lib/Target/SparcV9/RegAlloc/RegClass.cpp:1.29 llvm/lib/Target/SparcV9/RegAlloc/RegClass.cpp:1.30
--- llvm/lib/Target/SparcV9/RegAlloc/RegClass.cpp:1.29	Fri Apr 23 13:15:47 2004
+++ llvm/lib/Target/SparcV9/RegAlloc/RegClass.cpp	Wed Jun  2 21:45:09 2004
@@ -23,7 +23,7 @@
 // createInterferenceGraph() above.
 //----------------------------------------------------------------------------
 RegClass::RegClass(const Function *M, 
-                   const TargetRegInfo *_MRI_,
+                   const SparcV9RegInfo *_MRI_,
 		   const TargetRegClassInfo *_MRC_)
                   :  Meth(M), MRI(_MRI_), MRC(_MRC_),
                      RegClassID( _MRC_->getRegClassID() ),


Index: llvm/lib/Target/SparcV9/RegAlloc/RegClass.h
diff -u llvm/lib/Target/SparcV9/RegAlloc/RegClass.h:1.22 llvm/lib/Target/SparcV9/RegAlloc/RegClass.h:1.23
--- llvm/lib/Target/SparcV9/RegAlloc/RegClass.h:1.22	Fri Apr 23 13:15:47 2004
+++ llvm/lib/Target/SparcV9/RegAlloc/RegClass.h	Wed Jun  2 21:45:09 2004
@@ -45,7 +45,7 @@
 //-----------------------------------------------------------------------------
 class RegClass {
   const Function *const Meth;           // Function we are working on
-  const TargetRegInfo *MRI;             // Machine register information 
+  const SparcV9RegInfo *MRI;            // Machine register information 
   const TargetRegClassInfo *const MRC;  // Machine reg. class for this RegClass
   const unsigned RegClassID;            // my int ID
 
@@ -87,7 +87,7 @@
  public:
 
   RegClass(const Function *M,
-	   const TargetRegInfo *_MRI_,
+	   const SparcV9RegInfo *_MRI_,
 	   const TargetRegClassInfo *_MRC_);
 
   inline void createInterferenceGraph() { IG.createGraph(); }