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

sys_ppu_thread: Fixed up sys_ppu_thread_join()'s check for detached threads

Browse source 
sys_game: Corrected sys_game_set_system_sw_version()'s error code
This commit is contained in:
brian218 2024-06-10 11:13:45 +08:00 • committed by Elad Ashkenazi
parent 6fff22391c
commit c73302f715
4 changed files with 21 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

46
rpcs3/Emu/Cell/lv2/sys_ppu_thread.cpp
View file

@ -185,24 +185,20 @@ error_code sys_ppu_thread_join(ppu_thread& ppu, u32 thread_id, vm::ptr<u64> vptr
{
CellError result = thread.joiner.atomic_op([&](ppu_join_status& value) -> CellError
{
if (value == ppu_join_status::zombie)
switch (value)
{
case ppu_join_status::joinable:
value = ppu_join_status{ppu.id};
return {};
case ppu_join_status::zombie:
value = ppu_join_status::exited;
return CELL_EAGAIN;
}
if (value == ppu_join_status::exited)
{
case ppu_join_status::exited:
return CELL_ESRCH;
}
if (value >= ppu_join_status::max)
{
case ppu_join_status::detached:
default:
return CELL_EINVAL;
}
value = ppu_join_status{ppu.id};
return {};
});
if (!result)
@ -273,29 +269,21 @@ error_code sys_ppu_thread_detach(ppu_thread& ppu, u32 thread_id)
{
result = thread.joiner.atomic_op([](ppu_join_status& value) -> CellError
{
if (value == ppu_join_status::zombie)
switch (value)
{
case ppu_join_status::joinable:
value = ppu_join_status::detached;
return {};
case ppu_join_status::detached:
return CELL_EINVAL;
case ppu_join_status::zombie:
value = ppu_join_status::exited;
return CELL_EAGAIN;
}
if (value == ppu_join_status::exited)
{
case ppu_join_status::exited:
return CELL_ESRCH;
}
if (value == ppu_join_status::detached)
{
return CELL_EINVAL;
}
if (value >= ppu_join_status::max)
{
default:
return CELL_EBUSY;
}
value = ppu_join_status::detached;
return {};
});
// Remove ID on EAGAIN