mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-03-29 22:20:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

sys_spu: Fix order of some checks

Browse Source
This commit is contained in:
Elad Ashkenazi 2024-10-15 09:43:39 +03:00 committed by Elad
parent e0e1c729cd
commit e58a3ab7e0
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
rpcs3/Emu/Cell/lv2/sys_spu.cpp
View File

@ -1831,6 +1831,11 @@ error_code sys_spu_thread_write_snr(ppu_thread& ppu, u32 id, u32 number, u32 val
sys_spu.trace("sys_spu_thread_write_snr(id=0x%x, number=%d, value=0x%x)", id, number, value); sys_spu.trace("sys_spu_thread_write_snr(id=0x%x, number=%d, value=0x%x)", id, number, value);
if (number > 1)
{
return CELL_EINVAL;
}
const auto [thread, group] = lv2_spu_group::get_thread(id); const auto [thread, group] = lv2_spu_group::get_thread(id);
if (!thread) [[unlikely]] if (!thread) [[unlikely]]
@ -1838,11 +1843,6 @@ error_code sys_spu_thread_write_snr(ppu_thread& ppu, u32 id, u32 number, u32 val
return CELL_ESRCH; return CELL_ESRCH;
} }
if (number > 1)
{
return CELL_EINVAL;
}
thread->push_snr(number, value); thread->push_snr(number, value);
return CELL_OK; return CELL_OK;
@ -2090,6 +2090,11 @@ error_code sys_spu_thread_group_connect_event_all_threads(ppu_thread& ppu, u32 i
sys_spu.warning("sys_spu_thread_group_connect_event_all_threads(id=0x%x, eq=0x%x, req=0x%llx, spup=*0x%x)", id, eq, req, spup); sys_spu.warning("sys_spu_thread_group_connect_event_all_threads(id=0x%x, eq=0x%x, req=0x%llx, spup=*0x%x)", id, eq, req, spup);
if (!req)
{
return CELL_EINVAL;
}
const auto group = idm::get<lv2_spu_group>(id); const auto group = idm::get<lv2_spu_group>(id);
const auto queue = idm::get<lv2_obj, lv2_event_queue>(eq); const auto queue = idm::get<lv2_obj, lv2_event_queue>(eq);
@ -2098,11 +2103,6 @@ error_code sys_spu_thread_group_connect_event_all_threads(ppu_thread& ppu, u32 i
return CELL_ESRCH; return CELL_ESRCH;
} }
if (!req)
{
return CELL_EINVAL;
}
std::unique_lock lock(group->mutex); std::unique_lock lock(group->mutex);
if (auto state = +group->run_state; if (auto state = +group->run_state;
@ -2172,6 +2172,11 @@ error_code sys_spu_thread_group_disconnect_event_all_threads(ppu_thread& ppu, u3
sys_spu.warning("sys_spu_thread_group_disconnect_event_all_threads(id=0x%x, spup=%d)", id, spup); sys_spu.warning("sys_spu_thread_group_disconnect_event_all_threads(id=0x%x, spup=%d)", id, spup);
if (spup > 63)
{
return CELL_EINVAL;
}
const auto group = idm::get<lv2_spu_group>(id); const auto group = idm::get<lv2_spu_group>(id);
if (!group) if (!group)
@ -2179,11 +2184,6 @@ error_code sys_spu_thread_group_disconnect_event_all_threads(ppu_thread& ppu, u3
return CELL_ESRCH; return CELL_ESRCH;
} }
if (spup > 63)
{
return CELL_EINVAL;
}
std::lock_guard lock(group->mutex); std::lock_guard lock(group->mutex);
for (auto& t : group->threads) for (auto& t : group->threads)