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

Fix sys_semaphore_wait (on timeout)

Browse source
This commit is contained in:
Nekotekina 2017-07-26 22:35:45 +03:00
parent 5d8640109d
commit 7fa42cfaad
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
rpcs3/Emu/Cell/lv2/sys_semaphore.cpp
View file

@ -131,7 +131,13 @@ error_code sys_semaphore_wait(ppu_thread& ppu, u32 sem_id, u64 timeout)
{ {
semaphore_lock lock(sem->mutex); semaphore_lock lock(sem->mutex);
const s32 val = sem->val.fetch_op([](s32& val) if (!sem->unqueue(sem->sq, &ppu))
{
timeout = 0;
continue;
}
verify(HERE), 0 > sem->val.fetch_op([](s32& val)
{ {
if (val < 0) if (val < 0)
{ {
@ -139,13 +145,6 @@ error_code sys_semaphore_wait(ppu_thread& ppu, u32 sem_id, u64 timeout)
} }
}); });
if (val >= 0)
{
timeout = 0;
continue;
}
verify(HERE), sem->unqueue(sem->sq, &ppu);
ppu.gpr[3] = CELL_ETIMEDOUT; ppu.gpr[3] = CELL_ETIMEDOUT;
break; break;
} }