[RyuJIT/ARM32] Apply review feedback
authorHyung-Kyu Choi <hk0110.choi@samsung.com>
Fri, 7 Jul 2017 05:20:10 +0000 (14:20 +0900)
committerHyung-Kyu Choi <hk0110.choi@samsung.com>
Fri, 7 Jul 2017 05:20:10 +0000 (14:20 +0900)
Rename vairable and rewrite code to use less #ifdef

Signed-off-by: Hyung-Kyu Choi <hk0110.choi@samsung.com>
src/jit/lsra.cpp

index ae6a6b1..ddab7f9 100644 (file)
@@ -5750,17 +5750,14 @@ regNumber LinearScan::tryAllocateFreeReg(Interval* currentInterval, RefPosition*
     {
         if (intervalToUnassign != nullptr)
         {
+            RegRecord* physRegToUnassign = availablePhysRegInterval;
 #ifdef _TARGET_ARM_
-            RegRecord* unassignedPhysReg = availablePhysRegInterval;
             // We should unassign a double register if availablePhysRegInterval is part of the double register
             if (availablePhysRegInterval->assignedInterval->registerType == TYP_DOUBLE &&
                 !genIsValidDoubleReg(availablePhysRegInterval->regNum))
-                unassignedPhysReg = findAnotherHalfRegRec(availablePhysRegInterval);
-
-            unassignPhysReg(unassignedPhysReg, intervalToUnassign->recentRefPosition);
-#else
-            unassignPhysReg(availablePhysRegInterval, intervalToUnassign->recentRefPosition);
+                physRegToUnassign = findAnotherHalfRegRec(availablePhysRegInterval);
 #endif
+            unassignPhysReg(physRegToUnassign, intervalToUnassign->recentRefPosition);
             if (bestScore & VALUE_AVAILABLE)
             {
                 assert(intervalToUnassign->isConstant);
@@ -5770,11 +5767,7 @@ regNumber LinearScan::tryAllocateFreeReg(Interval* currentInterval, RefPosition*
             // the next ref, remember it.
             else if ((bestScore & UNASSIGNED) != 0 && intervalToUnassign != nullptr)
             {
-#ifdef _TARGET_ARM_
-                updatePreviousInterval(unassignedPhysReg, intervalToUnassign, intervalToUnassign->registerType);
-#else
-                updatePreviousInterval(availablePhysRegInterval, intervalToUnassign, intervalToUnassign->registerType);
-#endif
+                updatePreviousInterval(physRegToUnassign, intervalToUnassign, intervalToUnassign->registerType);
             }
         }
         else