Fixed mRegCost int/float cross-indexing

Author: bfiete

IDEHelper/Backend/BeMCContext.cpp

@@ -877,17 +877,18 @@ void BeMCColorizer::Node::AdjustRegCost(X64CPURegister reg, int adjust)
 	BF_ASSERT((int)reg >= 0);
 	BF_ASSERT((int)reg < X64Reg_COUNT);
 
-#ifdef BE_REGCOST_SIZE
+#ifdef BE_REGCOST_SIZE		
 	int costIdx = sRegCostIdxMap[(int)reg];
+	bool isFloat = (reg >= X64Reg_XMM0_f64) && (reg <= X64Reg_M128_XMM15);
+	if (isFloat != mRegCostFloat)
+		costIdx = -1;
 #else
 	int costIdx = (int)reg;
 #endif
 	if (costIdx == -1)
 		return;
 	int newCost = mRegCost[costIdx] + adjust;
-	mRegCost[costIdx] = newCost;
-	if (newCost < mLowestRegCost)
-		mLowestRegCost = newCost;
+	mRegCost[costIdx] = newCost;	
 }
 
 int BeMCColorizer::Node::GetRegCost(X64CPURegister reg)
@@ -897,6 +898,9 @@ int BeMCColorizer::Node::GetRegCost(X64CPURegister reg)
 
 #ifdef BE_REGCOST_SIZE
 	int costIdx = sRegCostIdxMap[(int)reg];
+	bool isFloat = (reg >= X64Reg_XMM0_f64) && (reg <= X64Reg_M128_XMM15);
+	if (isFloat != mRegCostFloat)
+		costIdx = -1;
 #else
 	int costIdx = (int)reg;
 #endif
@@ -1408,8 +1412,10 @@ void BeMCColorizer::AssignRegs(RegKind regKind)
 
 				if (canBeReg)
 				{
+#ifdef BE_REGCOST_SIZE
 					if (clearCosts)
-						node->ClearRegCosts();
+						node->SetRegCostFloat();
+#endif
 					node->mInGraph = true;
 					node->mGraphEdgeCount = 0;
 					vregGraph.push_back(vregIdx);

IDEHelper/Backend/BeMCContext.h

@@ -1127,14 +1127,13 @@ class BeMCColorizer
 		int mGraphEdgeCount;
 		bool mInGraph;
 		bool mSpilled;
-		bool mWantsReg;
+		bool mWantsReg;		
 #ifdef BE_REGCOST_SIZE
-		int mRegCost[BE_REGCOST_SIZE];
+		bool mRegCostFloat;
+		int mRegCost[BE_REGCOST_SIZE];		
 #else
 		int mRegCost[X64Reg_COUNT];
-#endif
-
-		int mLowestRegCost;
+#endif		
 		int mMemCost;
 		//int mActualVRegIdx;
 
@@ -1145,10 +1144,10 @@ class BeMCColorizer
 
 		void AdjustRegCost(X64CPURegister reg, int adjust);
 
-		void ClearRegCosts()
-		{
-			mLowestRegCost = 0;
+		void SetRegCostFloat()
+		{			
 			memset(mRegCost, 0, sizeof(mRegCost));
+			mRegCostFloat = true;
 		}
 
 		int GetRegCost(X64CPURegister reg);
@@ -1158,9 +1157,9 @@ class BeMCColorizer
 			mWantsReg = false;
 			mInGraph = false;
 			mSpilled = false;
-			mGraphEdgeCount = 0;
-			mLowestRegCost = 0;
+			mGraphEdgeCount = 0;			
 			mMemCost = 0;
+			mRegCostFloat = false;
 			memset(mRegCost, 0, sizeof(mRegCost));
 			//mActualVRegIdx = -1;
 		}