fixup! [SPARC] Support reserving arbitrary general purpose registers

Author: koachan

clang/include/clang/Driver/Options.td

@@ -5730,16 +5730,16 @@ def mvis3 : Flag<["-"], "mvis3">, Group<m_sparc_Features_Group>;
 def mno_vis3 : Flag<["-"], "mno-vis3">, Group<m_sparc_Features_Group>;
 def mhard_quad_float : Flag<["-"], "mhard-quad-float">, Group<m_sparc_Features_Group>;
 def msoft_quad_float : Flag<["-"], "msoft-quad-float">, Group<m_sparc_Features_Group>;
-foreach i = {1-7} in
+foreach i = 1 ... 7 in
   def ffixed_g#i : Flag<["-"], "ffixed-g"#i>, Group<m_sparc_Features_Group>,
     HelpText<"Reserve the G"#i#" register (SPARC only)">;
-foreach i = {0-5} in
+foreach i = 0 ... 5 in
   def ffixed_o#i : Flag<["-"], "ffixed-o"#i>, Group<m_sparc_Features_Group>,
     HelpText<"Reserve the O"#i#" register (SPARC only)">;
-foreach i = {0-7} in
+foreach i = 0 ... 7 in
   def ffixed_l#i : Flag<["-"], "ffixed-l"#i>, Group<m_sparc_Features_Group>,
     HelpText<"Reserve the L"#i#" register (SPARC only)">;
-foreach i = {0-5} in
+foreach i = 0 ... 5 in
   def ffixed_i#i : Flag<["-"], "ffixed-i"#i>, Group<m_sparc_Features_Group>,
     HelpText<"Reserve the I"#i#" register (SPARC only)">;
 } // let Flags = [TargetSpecific]

llvm/lib/Target/Sparc/Sparc.td

@@ -66,16 +66,16 @@ def FeatureSoftFloat : SubtargetFeature<"soft-float", "UseSoftFloat", "true",
 include "LeonFeatures.td"
 
 //==== Register allocation tweaks needed by some low-level software
-foreach i = {1-7} in
+foreach i = 1 ... 7  in
     def FeatureReserveG#i : SubtargetFeature<"reserve-g"#i, "ReserveGRegister["#i#"]", "true",
                                              "Reserve G"#i#", making it unavailable as a GPR">;
-foreach i = {0-5} in
+foreach i = 0 ... 5 in
     def FeatureReserveO#i : SubtargetFeature<"reserve-o"#i, "ReserveORegister["#i#"]", "true",
                                              "Reserve O"#i#", making it unavailable as a GPR">;
-foreach i = {0-7} in
+foreach i = 0 ... 7 in
     def FeatureReserveL#i : SubtargetFeature<"reserve-l"#i, "ReserveLRegister["#i#"]", "true",
                                              "Reserve L"#i#", making it unavailable as a GPR">;
-foreach i = {0-5} in
+foreach i = 0 ... 5 in
     def FeatureReserveI#i : SubtargetFeature<"reserve-i"#i, "ReserveIRegister["#i#"]", "true",
                                              "Reserve I"#i#", making it unavailable as a GPR">;
 

llvm/lib/Target/Sparc/SparcISelLowering.cpp

@@ -1130,18 +1130,9 @@ Register SparcTargetLowering::getRegisterByName(const char* RegName, LLT VT,
     .Case("g4", SP::G4).Case("g5", SP::G5).Case("g6", SP::G6).Case("g7", SP::G7)
     .Default(0);
 
-  const SparcRegisterInfo *MRI = Subtarget->getRegisterInfo();
-  unsigned DwarfRegNum = MRI->getDwarfRegNum(Reg, false);
-  if (!MRI->isReservedReg(MF, Reg)) {
-    bool IsG = DwarfRegNum < 8, IsO = DwarfRegNum >= 8 && DwarfRegNum < 16,
-         IsL = DwarfRegNum >= 16 && DwarfRegNum < 24, IsI = DwarfRegNum >= 24;
-    unsigned NumInBank = DwarfRegNum % 8;
-    if ((IsG && !Subtarget->isGRegisterReserved(NumInBank)) ||
-        (IsO && !Subtarget->isORegisterReserved(NumInBank)) ||
-        (IsL && !Subtarget->isLRegisterReserved(NumInBank)) ||
-        (IsI && !Subtarget->isIRegisterReserved(NumInBank)))
-      Reg = 0;
-  }
+  const SparcRegisterInfo *TRI = Subtarget->getRegisterInfo();
+  if (!TRI->isReservedReg(MF, Reg))
+    Reg = 0;
 
   if (Reg)
     return Reg;

llvm/lib/Target/Sparc/SparcRegisterInfo.cpp

@@ -128,10 +128,10 @@ bool SparcRegisterInfo::isReservedReg(const MachineFunction &MF,
 
 bool SparcRegisterInfo::isAnyArgRegReserved(const MachineFunction &MF) const {
   bool Outgoing =
-      llvm::any_of(*SP::GPROutgoingArgRegClass.MC,
+      llvm::any_of(SP::GPROutgoingArgRegClass,
                    [this, &MF](MCPhysReg r) { return isReservedReg(MF, r); });
   bool Incoming =
-      llvm::any_of(*SP::GPRIncomingArgRegClass.MC,
+      llvm::any_of(SP::GPRIncomingArgRegClass,
                    [this, &MF](MCPhysReg r) { return isReservedReg(MF, r); });
   return Outgoing || Incoming;
 }