[llvm-commits] CVS: llvm/include/llvm/CodeGen/MachineFunction.h

[Chris Lattner]

Changes in directory llvm/include/llvm/CodeGen:

MachineFunction.h updated: 1.53 -> 1.54
---
Log message:

allow a virtual register to be associated with live-in values.


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

 MachineFunction.h |   21 ++++++++++++++-------
 1 files changed, 14 insertions(+), 7 deletions(-)


Index: llvm/include/llvm/CodeGen/MachineFunction.h
diff -u llvm/include/llvm/CodeGen/MachineFunction.h:1.53 llvm/include/llvm/CodeGen/MachineFunction.h:1.54
--- llvm/include/llvm/CodeGen/MachineFunction.h:1.53	Thu Apr 21 22:45:18 2005
+++ llvm/include/llvm/CodeGen/MachineFunction.h	Fri May 13 02:07:52 2005
@@ -108,7 +108,10 @@
   /// LiveIns/LiveOuts - Keep track of the physical registers that are
   /// livein/liveout of the function.  Live in values are typically arguments in
   /// registers, live out values are typically return values in registers.
-  std::vector<unsigned> LiveIns, LiveOuts;
+  /// LiveIn values are allowed to have virtual registers associated with them,
+  /// stored in the second element.
+  std::vector<std::pair<unsigned, unsigned> > LiveIns;
+  std::vector<unsigned> LiveOuts;
 
 public:
   MachineFunction(const Function *Fn, const TargetMachine &TM);
@@ -177,16 +180,20 @@
 
   /// addLiveIn/Out - Add the specified register as a live in/out.  Note that it
   /// is an error to add the same register to the same set more than once.
-  void addLiveIn(unsigned Reg) { LiveIns.push_back(Reg); }
+  void addLiveIn(unsigned Reg, unsigned vreg = 0) {
+    LiveIns.push_back(std::make_pair(Reg, vreg));
+  }
   void addLiveOut(unsigned Reg) { LiveOuts.push_back(Reg); }
 
   // Iteration support for live in/out sets.  These sets are kept in sorted
   // order by their register number.
-  typedef std::vector<unsigned>::const_iterator liveinout_iterator;
-  liveinout_iterator livein_begin() const { return LiveIns.begin(); }
-  liveinout_iterator livein_end()   const { return LiveIns.end(); }
-  liveinout_iterator liveout_begin() const { return LiveOuts.begin(); }
-  liveinout_iterator liveout_end()   const { return LiveOuts.end(); }
+  typedef std::vector<std::pair<unsigned,unsigned> >::const_iterator
+  livein_iterator;
+  typedef std::vector<unsigned>::const_iterator liveout_iterator;
+  livein_iterator livein_begin() const { return LiveIns.begin(); }
+  livein_iterator livein_end()   const { return LiveIns.end(); }
+  liveout_iterator liveout_begin() const { return LiveOuts.begin(); }
+  liveout_iterator liveout_end()   const { return LiveOuts.end(); }
 
   /// getBlockNumbered - MachineBasicBlocks are automatically numbered when they
   /// are inserted into the machine function.  The block number for a machine