Load/Store constant offset propagation across basic blocks

oscar64/InterCode.cpp

@@ -2692,22 +2692,47 @@ void InterCodeBasicBlock::PerformMachineSpecificValueUsageCheck(const GrowingIns
 
 	if (!mVisited)
 	{
-		mVisited = true;
-
 		GrowingInstructionPtrArray	ltvalue(tvalue);
 
-		tvalid.Clear();
-
-		if (mNumEntries != 1)
-			ltvalue.Clear();
-		else
+		if (mLoopHead)
 		{
-			for (i = 0; i < tvalue.Size(); i++)
+			ltvalue.Clear();
+		}
+#if 0
+		else if (mNumEntries > 1)
+		{
+			lvalues.FlushAll();
+			ltvalue.Clear();
+		}
+#endif
+		else if (mNumEntries > 0)
+		{
+			if (mNumEntered > 0)
+			{
+				for (int i = 0; i < ltvalue.Size(); i++)
+				{
+					if (mMergeTValues[i] != ltvalue[i])
+						ltvalue[i] = nullptr;
+				}
+			}
+
+			mNumEntered++;
+
+			if (mNumEntered < mNumEntries)
+			{
+				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++)
 		{