Allow specification of no clamping blocks in GameConfig.

Author: jpd002

GameConfig.xml

@@ -1,4 +1,11 @@
 <GameConfigs>
+	<GameConfig Executable="SCUS_973.16;1" Title="Sly 2: Band of Thieves">
+		<Vu1BlockNoClamping BlockKey="36605D29AD96FFFE30895C24E0016A2B;40" />
+		<Vu1BlockNoClamping BlockKey="D28BFBE4C726F016DCA80BECE7C4114B;40" />
+		<Vu1BlockNoClamping BlockKey="4E7ED78F963A2076ECF775BFAA3D8AFB;40" />
+		<Vu1BlockNoClamping BlockKey="2BBED1DEDFAAA676D34A4B8975CFD17D;40" />
+		<Vu1BlockNoClamping BlockKey="C2A5656FA61988893D4F67239AB837FC;64" />
+	</GameConfig>
 	<GameConfig Executable="SLUS_200.18;1" Title="Onimusha: Warlords">
 		<BlockFpRoundingMode Address="0x001025D8" Mode="NEAREST" Description="Fixes inability to go inside the hole." />
 	</GameConfig>

Source/GameConfig.cpp

@@ -10,11 +10,30 @@
 #include "Log.h"
 #include "PS2VM.h"
 #include "ee/EeExecutor.h"
+#include "ee/VuExecutor.h"
 
 #define LOG_NAME "GameConfig"
 
 #define GAMECONFIG_FILENAME "GameConfig.xml"
 
+template <typename BlockKeyType>
+static std::optional<BlockKeyType> ParseBlockKey(const char* blockKeyString)
+{
+	BlockKeyType blockKey;
+	int parseCount = sscanf(blockKeyString, "%08X%08X%08X%08X;%d",
+	                        &blockKey.first.nV[3], &blockKey.first.nV[2],
+	                        &blockKey.first.nV[1], &blockKey.first.nV[0],
+	                        &blockKey.second);
+	if(parseCount == 5)
+	{
+		return std::optional<BlockKeyType>(blockKey);
+	}
+	else
+	{
+		return std::optional<BlockKeyType>();
+	}
+}
+
 void CGameConfig::ApplyGameConfig(CPS2VM& virtualMachine)
 {
 	std::unique_ptr<Framework::Xml::CNode> document;
@@ -44,9 +63,11 @@ void CGameConfig::ApplyGameConfig(CPS2VM& virtualMachine)
 	CEeExecutor::BlockFpRoundingModeMap blockFpRoundingModes;
 	CEeExecutor::BlockFpUseAccurateAddSubSet blockFpUseAccurateAddSub;
 	CEeExecutor::IdleLoopBlockMap idleLoopBlocks;
+	CVuExecutor::BlockNoClampingSet blockNoClamping;
 
 	const char* executableName = virtualMachine.m_ee->m_os->GetExecutableName();
 	auto eeExecutor = static_cast<CEeExecutor*>(virtualMachine.m_ee->m_EE.m_executor.get());
+	auto vu1Executor = static_cast<CVuExecutor*>(virtualMachine.m_ee->m_vpu1->GetContext().m_executor.get());
 	auto eeRam = virtualMachine.m_ee->m_ram;
 
 	for(Framework::Xml::CFilteringNodeIterator itNode(gameConfigsNode, "GameConfig");
@@ -149,25 +170,38 @@ void CGameConfig::ApplyGameConfig(CPS2VM& virtualMachine)
 			if(sscanf(addressString, "%x", &address) == 0) continue;
 			if(checkBlockKeyString)
 			{
-				CEeExecutor::CachedBlockKey blockKey;
-				int parseCount = sscanf(checkBlockKeyString, "%08X%08X%08X%08X;%d",
-				                        &blockKey.first.nV[3], &blockKey.first.nV[2],
-				                        &blockKey.first.nV[1], &blockKey.first.nV[0],
-				                        &blockKey.second);
-				if(parseCount != 5)
+				auto blockKey = ParseBlockKey<CEeExecutor::CachedBlockKey>(checkBlockKeyString);
+				if(!blockKey.has_value())
 				{
 					continue;
 				}
-				checkBlockKey = blockKey;
+				checkBlockKey = blockKey.value();
 			}
 
 			idleLoopBlocks.insert(std::make_pair(address, checkBlockKey));
 		}
 
+		for(Framework::Xml::CFilteringNodeIterator itNode(gameConfigNode, "Vu1BlockNoClamping");
+		    !itNode.IsEnd(); itNode++)
+		{
+			auto node = (*itNode);
+
+			const char* blockKeyString = node->GetAttribute("BlockKey");
+			if(!blockKeyString) continue;
+
+			auto blockKey = ParseBlockKey<CVuExecutor::CachedBlockKey>(blockKeyString);
+			if(blockKey.has_value())
+			{
+				blockNoClamping.insert(blockKey.value());
+			}
+		}
+
 		eeExecutor->SetBlockFpRoundingModes(std::move(blockFpRoundingModes));
 		eeExecutor->SetBlockFpUseAccurateAddSub(std::move(blockFpUseAccurateAddSub));
 		eeExecutor->SetIdleLoopBlocks(std::move(idleLoopBlocks));
 
+		vu1Executor->SetBlockNoClamping(std::move(blockNoClamping));
+
 		break;
 	}
 }

Source/ee/VuExecutor.cpp

@@ -16,9 +16,15 @@ CVuExecutor::CVuExecutor(CMIPS& context, uint32 maxAddress)
 {
 }
 
+void CVuExecutor::SetBlockNoClamping(BlockNoClampingSet blockNoClamping)
+{
+	m_blockNoClamping = std::move(blockNoClamping);
+}
+
 void CVuExecutor::Reset()
 {
 	m_cachedBlocks.clear();
+	m_blockNoClamping.clear();
 	CGenericMipsExecutor::Reset();
 }
 
@@ -72,6 +78,11 @@ BasicBlockPtr CVuExecutor::BlockFactory(CMIPS& context, uint32 begin, uint32 end
 	{
 		result->AddBlockCompileHints(blockCompileHintsIterator->hints);
 	}
+	if(auto blockNoClamping = m_blockNoClamping.find(blockKey);
+	   blockNoClamping != std::end(m_blockNoClamping))
+	{
+		result->AddBlockCompileHints(VUShared::COMPILEHINT_NO_CLAMPING);
+	}
 
 	result->Compile();
 	if(!hasBreakpoint)

Source/ee/VuExecutor.h

@@ -6,13 +6,17 @@
 class CVuExecutor : public CGenericMipsExecutor<BlockLookupOneWay, 8>
 {
 public:
+	using CachedBlockKey = std::pair<uint128, uint32>;
+	using BlockNoClampingSet = std::set<CachedBlockKey>;
+
 	CVuExecutor(CMIPS&, uint32);
 	virtual ~CVuExecutor() = default;
 
+	void SetBlockNoClamping(BlockNoClampingSet);
+
 	void Reset() override;
 
 protected:
-	typedef std::pair<uint128, uint32> CachedBlockKey;
 	typedef std::multimap<CachedBlockKey, BasicBlockPtr> CachedBlockMap;
 
 	struct BLOCK_COMPILE_HINTS
@@ -26,4 +30,6 @@ class CVuExecutor : public CGenericMipsExecutor<BlockLookupOneWay, 8>
 
 	static const BLOCK_COMPILE_HINTS g_blockCompileHints[];
 	CachedBlockMap m_cachedBlocks;
+
+	BlockNoClampingSet m_blockNoClamping;
 };