Load/Store constant offset propagation across basic blocks

oscar64/InterCode.cpp

@@ -2692,23 +2692,48 @@ void InterCodeBasicBlock::PerformMachineSpecificValueUsageCheck(const GrowingIns
 
 	if (!mVisited)
 	{
-		mVisited = true;
-
-		GrowingInstructionPtrArray ltvalue(tvalue);
-
-		tvalid.Clear();
+		GrowingInstructionPtrArray	ltvalue(tvalue);
 
-		if (mNumEntries != 1)
+		if (mLoopHead)
+		{
 			ltvalue.Clear();
-		else
+		}
+#if 0
+		else if (mNumEntries > 1)
+		{
+			lvalues.FlushAll();
+			ltvalue.Clear();
+		}
+#endif
+		else if (mNumEntries > 0)
 		{
-			for (i = 0; i < tvalue.Size(); i++)
+			if (mNumEntered > 0)
+			{
+				for (int i = 0; i < ltvalue.Size(); i++)
+				{
+					if (mMergeTValues[i] != ltvalue[i])
+						ltvalue[i] = nullptr;
+				}
+			}
+
+			mNumEntered++;
+
+			if (mNumEntered < mNumEntries)
 			{
-				if (ltvalue[i])
-					tvalid += i;
+				mMergeTValues = ltvalue;
+				return;
 			}
 		}
 
+		mVisited = true;
+
+		tvalid.Clear();
+		for (i = 0; i < ltvalue.Size(); i++)
+		{
+			if (ltvalue[i])
+				tvalid += i;
+		}
+
 		for (i = 0; i < mInstructions.Size(); i++)
 		{
 			CheckValueUsage(mInstructions[i], ltvalue);