archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-14 02:38:37 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

PPU/SPU: give up on conditional stores if locking fails

Browse source 
Restores Non-TSX behaviour partially.
This commit is contained in:
Nekotekina 2020-10-15 12:40:53 +03:00
parent 1b89ad00e7
commit 494953997e
2 changed files with 25 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

21
rpcs3/Emu/Cell/SPUThread.cpp
View file

@ -2118,27 +2118,20 @@ bool spu_thread::do_putllc(const spu_mfc_cmd& args)
}
}
while (res.bts(std::countr_zero<u32>(vm::rsrv_unique_lock)))
auto [_oldd, _ok] = res.fetch_op([&](u64& r)
{
// Give up if reservation has been updated
if ((res & -128) != rtime)
if ((r & -128) != rtime || (r & 127))
{
return false;
}
if (state && check_state())
{
return false;
}
else
{
busy_wait(100);
}
}
r += vm::rsrv_unique_lock;
return true;
});
if ((res & -128) != rtime)
if (!_ok)
{
res -= vm::rsrv_unique_lock;
// Already locked or updated: give up
return false;
}