RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-05 22:47:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

SPU reservations: Do not illegally dereference reservation data

Browse source
This commit is contained in:
Eladash 2020-09-15 21:19:58 +03:00 • committed by Ivan
parent a28ab0a408
commit 6dcd482dd0
4 changed files with 90 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

30
rpcs3/Emu/Memory/vm.cpp
View file

@ -188,7 +188,7 @@ namespace vm
break;
}
range_lock->store(0);
range_lock->release(0);
}
std::shared_lock lock(g_mutex, std::try_to_lock);
@ -289,7 +289,35 @@ namespace vm
// Block or signal new range locks
g_range_lock = addr | u64{size} << 35 | flags;
const auto range = utils::address_range::start_length(addr, size);
while (true)
{
const u64 bads = for_all_range_locks([&](u32 addr2, u32 size2)
{
// TODO (currently not possible): handle 2 64K pages (inverse range), or more pages
if (g_shareable[addr2 >> 16])
{
addr2 &= 0xffff;
}
ASSUME(size2);
if (range.overlaps(utils::address_range::start_length(addr2, size2))) [[unlikely]]
{
return 1;
}
return 0;
});
if (!bads) [[likely]]
{
break;
}
_mm_pause();
}
}
void passive_lock(cpu_thread& cpu)