updated suggesting/coloring of call & return args & implicit operands

llvm-svn: 830

Author: Ruchira Sasanka

llvm/lib/Target/Sparc/Sparc.cpp

@@ -32,6 +32,7 @@ const MachineInstrDescriptor SparcMachineInstrDesc[] = {
 // that implements the Sparc backend. (the llvm/CodeGen/Sparc.h interface)
 //----------------------------------------------------------------------------
 //
+
 TargetMachine *allocateSparcTargetMachine() { return new UltraSparc(); }
 
 

llvm/lib/Target/Sparc/SparcInternals.h

@@ -158,6 +158,13 @@ class UltraSparcRegInfo : public MachineRegInfo
   MachineInstr * getCopy2RegMI(const Value *SrcVal, const unsigned Reg,
 			       unsigned RegClassID) const ;
 
+
+  void suggestReg4RetAddr(const MachineInstr * RetMI, 
+			  LiveRangeInfo& LRI) const;
+
+  void suggestReg4CallAddr(const MachineInstr * CallMI) const;
+
+
   Value *getValue4ReturnAddr( const MachineInstr * MInst ) const ;
 
   int getRegType(const LiveRange *const LR) const {
@@ -291,25 +298,25 @@ class UltraSparcRegInfo : public MachineRegInfo
   void suggestRegs4MethodArgs(const Method *const Meth, 
 			      LiveRangeInfo& LRI) const;
 
-  void suggestRegs4CallArgs(const CallInst *const CallI, 
+  void suggestRegs4CallArgs(const MachineInstr *const CallMI, 
 			    LiveRangeInfo& LRI, vector<RegClass *> RCL) const; 
 
-  void suggestReg4RetValue(const ReturnInst *const RetI, 
-			    LiveRangeInfo& LRI) const;
+  void suggestReg4RetValue(const MachineInstr *const RetMI, 
+			    LiveRangeInfo& LRI ) const;
 
 
   void colorMethodArgs(const Method *const Meth,  LiveRangeInfo& LRI,
 		       AddedInstrns *const FirstAI) const;
 
-  void colorCallArgs(const CallInst *const CallI, LiveRangeInfo& LRI,
+  void colorCallArgs(const MachineInstr *const CallMI, LiveRangeInfo& LRI,
 		     AddedInstrns *const CallAI) const;
 
-  void colorRetValue(const ReturnInst *const RetI,   LiveRangeInfo& LRI,
+  void colorRetValue(const MachineInstr *const RetI,   LiveRangeInfo& LRI,
 		     AddedInstrns *const RetAI) const;
 
 
-  bool handleSpecialMInstr(const MachineInstr * MInst, 
-			   LiveRangeInfo& LRI, vector<RegClass *> RCL) const;
+  // bool handleSpecialMInstr(const MachineInstr * MInst, 
+  //			   LiveRangeInfo& LRI, vector<RegClass *> RCL) const;
 
 
     static void printReg(const LiveRange *const LR)  ;

llvm/lib/Target/Sparc/SparcRegClassInfo.h

@@ -22,9 +22,9 @@ static string const IntRegNames[] =
   {  
     "o0", "o1", "o2", "o3", "o4", "o5",       "o7",
     "l0", "l1", "l2", "l3", "l4", "l5", "l6", "l7",
-    "i0", "i1", "i2", "i3", "i4", "i5",       "i7",
+    "i0", "i1", "i2", "i3", "i4", "i5",  
     "g0", "g1", "g2", "g3", "g4", "g5",  "g6", "g7", 
-    "i6", "o6" }; 
+    "i6", "i7", "o6" }; 
 
 
 
@@ -46,7 +46,7 @@ class SparcIntRegOrder{
      // --- following colors are NON-volatile across function calls
 
      l0, l1, l2, l3, l4, l5, l6, l7,    //  %l0-%l7
-     i0, i1, i2, i3, i4, i5, i7,         // %i0-%i5: i's need not be preserved 
+     i0, i1, i2, i3, i4, i5,         // %i0-%i5: i's need not be preserved 
 
      // %i6 is the fp - so not allocated
      // %i7 is the ret address by convention - can be used for others
@@ -56,7 +56,7 @@ class SparcIntRegOrder{
      // --- following colors are not available for allocation within this phase
      // --- but can appear for pre-colored ranges 
 
-     g0,  g1, g2, g3, g4, g5, g6, g7, i6,  o6
+     g0,  g1, g2, g3, g4, g5, g6, g7, i6, i7,  o6