mirrors/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-04-20 11:36:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

SPU: Fix Accurate DMA edge case

Browse source
This commit is contained in:
Eladash 2020-10-31 19:27:28 +02:00 • committed by Ivan
parent 78c986b5dd
commit 3c639ff8e1
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
rpcs3/Emu/Cell/PPUThread.cpp
View file

@ -1796,6 +1796,8 @@ static bool ppu_store_reservation(ppu_thread& ppu, u32 addr, u64 reg_value)
// Aligned 8-byte reservations will be used here
addr &= -8;
const u64 lock_bits = g_cfg.core.spu_accurate_dma ? vm::rsrv_unique_lock : 1;
auto [_oldd, _ok] = res.fetch_op([&](u64& r)
{
if ((r & -128) != rtime || (r & 127))
@ -1804,7 +1806,7 @@ static bool ppu_store_reservation(ppu_thread& ppu, u32 addr, u64 reg_value)
}
// Despite using shared lock, doesn't allow other shared locks (TODO)
r += 1;
r += lock_bits;
return true;
});
@ -1818,11 +1820,11 @@ static bool ppu_store_reservation(ppu_thread& ppu, u32 addr, u64 reg_value)
// Store previous value in old_data on failure
if (data.compare_exchange(old_data, new_data))
{
res += 127;
res += 128 - lock_bits;
return true;
}
const u64 old_rtime = res.fetch_sub(1);
const u64 old_rtime = res.fetch_sub(lock_bits);
// TODO: disabled with this setting on, since it's dangerous to mix
if (!g_cfg.core.ppu_128_reservations_loop_max_length)