Rewrote uses of deprecated `MachineFunction::get(BasicBlock *BB)'.

[oota-llvm.git] / lib / Target / SparcV9 / RegAlloc / LiveRangeInfo.h

diff --git a/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.h b/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.h
index 1eee1aea5e3a14ef975b62437aaa73e130d879ba..48abdc0da5ab59909d5f9aecdf1343d6c8ba6623 100644 (file)
--- a/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.h
+++ b/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.h
@@ -1,43 +1,38 @@
-/* Title:   LiveRangeInfo.h
-   Author:  Ruchira Sasanka
-   Date:    Jun 30, 01
-   Purpose: 
-
-   This file contains the class LiveRangeInfo which constructs and keeps 
-   the LiveRangMap which contains all the live ranges used in a method.
-
-   Assumptions: 
-
-   All variables (llvm Values) are defined before they are used. However, a 
-   constant may not be defined in the machine instruction stream if it can be
-   used as an immediate value within a machine instruction. However, register
-   allocation does not have to worry about immediate constants since they
-   do not require registers.
-
-   Since an llvm Value has a list of uses associated, it is sufficient to
-   record only the defs in a Live Range.
-
-*/
-
+//===-- LiveRangeInfo.h - Track all LiveRanges for a Function ----*- C++ -*-==//
+//
+// This file contains the class LiveRangeInfo which constructs and keeps 
+// the LiveRangMap which contains all the live ranges used in a method.
+//
+// Assumptions: 
+//
+// All variables (llvm Values) are defined before they are used. However, a 
+// constant may not be defined in the machine instruction stream if it can be
+// used as an immediate value within a machine instruction. However, register
+// allocation does not have to worry about immediate constants since they
+// do not require registers.
+//
+// Since an llvm Value has a list of uses associated, it is sufficient to
+// record only the defs in a Live Range.
+//
+//===----------------------------------------------------------------------===//
 
 #ifndef LIVE_RANGE_INFO_H
 #define LIVE_RANGE_INFO_H
 
-#include "llvm/Type.h"
-#include "llvm/Method.h"
-#include "llvm/CodeGen/MachineInstr.h"
-
-#include "llvm/Analysis/LiveVar/LiveVarSet.h"
-
-#include "llvm/CodeGen/IGNode.h"
-#include "llvm/CodeGen/LiveRange.h"
-#include "llvm/CodeGen/RegClass.h"
-
-
-typedef hash_map <const Value *,  LiveRange *, hashFuncValue> LiveRangeMapType;
-typedef vector <const MachineInstr *> CallRetInstrListType;
+#include "Support/HashExtras.h"
+#include "llvm/Analysis/LiveVar/ValueSet.h"
 
+class LiveRange;
+class MachineInstr;
+class RegClass;
+class MachineRegInfo;
+class TargetMachine;
+class Value;
+class Function;
+class Instruction;
 
+typedef hash_map<const Value*, LiveRange*> LiveRangeMapType;
+typedef std::vector<MachineInstr*> CallRetInstrListType;
 
 //----------------------------------------------------------------------------
 // Class LiveRangeInfo
@@ -46,20 +41,15 @@ typedef vector <const MachineInstr *> CallRetInstrListType;
 // ranges used in a method. Also contain methods to coalesce live ranges.
 //----------------------------------------------------------------------------
 
-class LiveRangeInfo 
-{
-
-private:
-
-  const Method *const Meth;         // Method for which live range info is held
-
+class LiveRangeInfo {
+  const Function *const Meth;       // Func for which live range info is held
   LiveRangeMapType  LiveRangeMap;   // A map from Value * to LiveRange * to 
                                     // record all live ranges in a method
                                     // created by constructLiveRanges
   
   const TargetMachine& TM;          // target machine description
 
-  vector<RegClass *> & RegClassList;// a vector containing register classess
+  std::vector<RegClass *> & RegClassList;// vector containing register classess
 
   const MachineRegInfo& MRI;        // machine reg info
 
@@ -68,21 +58,27 @@ private:
 
   //------------ Private methods (see LiveRangeInfo.cpp for description)-------
 
-  void unionAndUpdateLRs(LiveRange *L1, LiveRange *L2);
+  LiveRange* createNewLiveRange         (const Value* Def,
+                                         bool isCC = false);
 
-  void addInterference(const Instruction *const Inst, 
-                      const LiveVarSet *const LVSet);
-  
-  void suggestRegs4CallRets();
+  LiveRange* createOrAddToLiveRange     (const Value* Def,
+                                         bool isCC = false);
+
+  void unionAndUpdateLRs                (LiveRange *L1,
+                                         LiveRange *L2);
 
-  const Method* getMethod() { return Meth; }
+  void addInterference                  (const Instruction *Inst,
+                                         const ValueSet *LVSet);
+  
+  void suggestRegs4CallRets             ();
 
+  const Function *getMethod             () const { return Meth; }
 
 public:
   
-  LiveRangeInfo(const Method *const M, 
+  LiveRangeInfo(const Function *F, 
                const TargetMachine& tm,
-               vector<RegClass *> & RCList);
+               std::vector<RegClass *> & RCList);
 
 
   // Destructor to destroy all LiveRanges in the LiveRange Map
@@ -91,15 +87,6 @@ public:
   // Main entry point for live range construction
   //
   void constructLiveRanges();
-
-  // This method is used to add a live range created elsewhere (e.g.,
-  // in machine specific code) to the common live range map
-  //
-  inline void addLRToMap(const Value *Val, LiveRange *LR) {
-    assert( Val && LR && "Val/LR is NULL!\n");
-    assert( (! LiveRangeMap[ Val ]) && "LR already set in map");
-    LiveRangeMap[ Val ] = LR;
-  }
   
   // return the common live range map for this method
   //
@@ -109,7 +96,7 @@ public:
   // Method sed to get the corresponding live range of a Value
   //
   inline LiveRange *getLiveRangeForValue( const Value *const Val) 
-    { return LiveRangeMap[ Val ]; }
+    { return LiveRangeMap[Val]; }
 
   // Method used to get the Call and Return instruction list
   //
@@ -125,10 +112,6 @@ public:
   // debugging method to print the live ranges
   //
   void printLiveRanges();
-
 };
 
-
-
-
 #endif