operators() that operate on regNum

Author: kunalspathak

src/coreclr/jit/lsra.cpp

@@ -4949,7 +4949,7 @@ void LinearScan::freeRegisters(regMaskTP regsToFree)
         if (regRecord->assignedInterval != nullptr && (regRecord->assignedInterval->registerType == TYP_DOUBLE))
         {
             assert(genIsValidDoubleReg(nextReg));
-            regsToFree ^= genRegMask(regNumber(nextReg + 1));
+            regsToFree ^= regNumber(nextReg + 1);
         }
 #endif
         freeRegister(regRecord);
@@ -9750,8 +9750,7 @@ void LinearScan::resolveEdge(BasicBlock*      fromBlock,
     while (targetCandidates.IsNonEmpty())
     {
         regNumber targetReg     = genFirstRegNumFromMask(targetCandidates);
-        regMaskTP targetRegMask = genRegMask(targetReg);
-        targetCandidates ^= targetRegMask;
+        targetCandidates ^= targetReg;
         if (location[targetReg] == REG_NA)
         {
 #ifdef TARGET_ARM
@@ -9764,13 +9763,13 @@ void LinearScan::resolveEdge(BasicBlock*      fromBlock,
                 regNumber anotherHalfRegNum = REG_NEXT(targetReg);
                 if (location[anotherHalfRegNum] == REG_NA)
                 {
-                    targetRegsReady |= targetRegMask;
+                    targetRegsReady |= targetReg;
                 }
             }
             else
 #endif // TARGET_ARM
             {
-                targetRegsReady |= targetRegMask;
+                targetRegsReady |= targetReg;
             }
         }
     }
@@ -9781,9 +9780,8 @@ void LinearScan::resolveEdge(BasicBlock*      fromBlock,
         while (targetRegsReady.IsNonEmpty())
         {
             regNumber targetReg     = genFirstRegNumFromMask(targetRegsReady);
-            regMaskTP targetRegMask = genRegMask(targetReg);
-            targetRegsToDo ^= targetRegMask;
-            targetRegsReady ^= targetRegMask;
+            targetRegsToDo ^= targetReg;
+            targetRegsReady ^= targetReg;
             assert(location[targetReg] != targetReg);
             assert(targetReg < REG_COUNT);
             regNumber sourceReg = (regNumber)source[targetReg];

src/coreclr/jit/lsrabuild.cpp

@@ -2116,12 +2116,12 @@ void LinearScan::UpdateRegStateForStructArg(LclVarDsc* argDsc)
         if ((genRegMask(argDsc->GetArgReg()) & RBM_ALLFLOAT) != RBM_NONE)
         {
             assert((genRegMask(argDsc->GetArgReg()) & RBM_FLTARG_REGS) != RBM_NONE);
-            floatRegState->rsCalleeRegArgMaskLiveIn |= genRegMask(argDsc->GetArgReg());
+            floatRegState->rsCalleeRegArgMaskLiveIn |= argDsc->GetArgReg();
         }
         else
         {
             assert((genRegMask(argDsc->GetArgReg()) & fullIntArgRegMask(compiler->info.compCallConv)) != RBM_NONE);
-            intRegState->rsCalleeRegArgMaskLiveIn |= genRegMask(argDsc->GetArgReg());
+            intRegState->rsCalleeRegArgMaskLiveIn |= argDsc->GetArgReg();
         }
     }
 
@@ -2130,12 +2130,12 @@ void LinearScan::UpdateRegStateForStructArg(LclVarDsc* argDsc)
         if (genRegMask(argDsc->GetOtherArgReg()) & (RBM_ALLFLOAT))
         {
             assert(genRegMask(argDsc->GetOtherArgReg()) & (RBM_FLTARG_REGS));
-            floatRegState->rsCalleeRegArgMaskLiveIn |= genRegMask(argDsc->GetOtherArgReg());
+            floatRegState->rsCalleeRegArgMaskLiveIn |= argDsc->GetOtherArgReg();
         }
         else
         {
             assert((genRegMask(argDsc->GetOtherArgReg()) & fullIntArgRegMask(compiler->info.compCallConv)) != RBM_NONE);
-            intRegState->rsCalleeRegArgMaskLiveIn |= genRegMask(argDsc->GetOtherArgReg());
+            intRegState->rsCalleeRegArgMaskLiveIn |= argDsc->GetOtherArgReg();
         }
     }
 }

src/coreclr/jit/regMaskTPOps.cpp

@@ -229,3 +229,25 @@ void regMaskTP::RemoveRegsetForType(SingleTypeRegSet regsToRemove, var_types typ
 
     return _registerTypeIndex[reg];
 }
+
+void regMaskTP::operator|=(const regNumber reg)
+{
+#ifdef HAS_MORE_THAN_64_REGISTERS
+    int         index = getRegisterTypeIndex(reg);
+    RegBitSet64 value = genRegMask(reg);
+    _registers[index] |= encodeForRegisterIndex(index, value);
+#else
+    low |= genSingleTypeRegMask(reg);
+#endif
+}
+
+void regMaskTP::operator^=(const regNumber reg)
+{
+#ifdef HAS_MORE_THAN_64_REGISTERS
+    int         index = getRegisterTypeIndex(reg);
+    RegBitSet64 value = genRegMask(reg);
+    _registers[index] ^= encodeForRegisterIndex(index, value);
+#else
+    low ^= genSingleTypeRegMask(reg);
+#endif
+}

src/coreclr/jit/target.h

@@ -413,6 +413,9 @@ struct regMaskTP
         high &= second.getHigh();
 #endif
     }
+
+    void operator|=(const regNumber reg);
+    void operator^=(const regNumber reg);
 };
 
 static regMaskTP operator^(const regMaskTP& first, const regMaskTP& second)