ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4983 from degasus/jitcache 

JitCache: Fix two block invalidation issues.
This commit is contained in:
Anthony 2017-02-28 09:20:24 -08:00 committed by GitHub
parent e375c96693 ffa61fcf57
commit fcc05c0b0e
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Source/Core/Core/PowerPC/JitCommon/JitCache.cpp
View File

@ -243,7 +243,16 @@ void JitBaseBlockCache::ErasePhysicalRange(u32 address, u32 length)
// And remove the block.
DestroyBlock(*block);
block_map.erase(block->physicalAddress);
auto block_map_iter = block_map.equal_range(block->physicalAddress);
while (block_map_iter.first != block_map_iter.second)
{
if (&block_map_iter.first->second == block)
{
block_map.erase(block_map_iter.first);
break;
}
block_map_iter.first++;
}
iter = start->second.erase(iter);
}
else
@ -306,8 +315,14 @@ void JitBaseBlockCache::LinkBlock(JitBlock& block)
void JitBaseBlockCache::UnlinkBlock(const JitBlock& block)
{
auto ppp = links_to.equal_range(block.effectiveAddress);
// Unlink all exits of this block.
for (auto& e : block.linkData)
{
WriteLinkBlock(e, nullptr);
}
// Unlink all exits of other blocks which points to this block
auto ppp = links_to.equal_range(block.effectiveAddress);
for (auto iter = ppp.first; iter != ppp.second; ++iter)
{
JitBlock& sourceBlock = *iter->second;