dahjah/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2026-06-01 12:15:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Small improvements to sys_event_flag

Browse Source 
- From RE, only protocols SYS_SYNC_FIFO and SYS_SYNC_PRIORITY are valid
- Use conditional atomic op store in a few places
- Properly revert changes in sys_event_flag_set when aomic op fails
This commit is contained in:
eladash 2019-03-05 18:41:49 +02:00 committed by Ivan
parent bd259c8ae4
commit 26bcd0a4de
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
rpcs3/Emu/Cell/lv2/sys_event_flag.cpp
View File

@ -29,12 +29,7 @@ error_code sys_event_flag_create(vm::ptr<u32> id, vm::ptr<sys_event_flag_attribu
const u32 protocol = attr->protocol; const u32 protocol = attr->protocol;
if (protocol == SYS_SYNC_RETRY) if (protocol != SYS_SYNC_FIFO && protocol != SYS_SYNC_PRIORITY)
sys_event_flag.todo("sys_event_flag_create(): SYS_SYNC_RETRY");
if (protocol == SYS_SYNC_PRIORITY_INHERIT)
sys_event_flag.todo("sys_event_flag_create(): SYS_SYNC_PRIORITY_INHERIT");
if (protocol != SYS_SYNC_FIFO && protocol != SYS_SYNC_RETRY && protocol != SYS_SYNC_PRIORITY && protocol != SYS_SYNC_PRIORITY_INHERIT)
{ {
sys_event_flag.error("sys_event_flag_create(): unknown protocol (0x%x)", protocol); sys_event_flag.error("sys_event_flag_create(): unknown protocol (0x%x)", protocol);
return CELL_EINVAL; return CELL_EINVAL;
@ -115,10 +110,10 @@ error_code sys_event_flag_wait(ppu_thread& ppu, u32 id, u64 bitptn, u32 mode, vm
const auto flag = idm::get<lv2_obj, lv2_event_flag>(id, [&](lv2_event_flag& flag) -> CellError const auto flag = idm::get<lv2_obj, lv2_event_flag>(id, [&](lv2_event_flag& flag) -> CellError
{ {
if (flag.pattern.atomic_op([&](u64& pat) if (flag.pattern.fetch_op([&](u64& pat)
{ {
return lv2_event_flag::check_pattern(pat, bitptn, mode, &ppu.gpr[6]); return lv2_event_flag::check_pattern(pat, bitptn, mode, &ppu.gpr[6]);
})) }).second)
{ {
// TODO: is it possible to return EPERM in this case? // TODO: is it possible to return EPERM in this case?
return {}; return {};
@ -126,10 +121,10 @@ error_code sys_event_flag_wait(ppu_thread& ppu, u32 id, u64 bitptn, u32 mode, vm
std::lock_guard lock(flag.mutex); std::lock_guard lock(flag.mutex);
if (flag.pattern.atomic_op([&](u64& pat) if (flag.pattern.fetch_op([&](u64& pat)
{ {
return lv2_event_flag::check_pattern(pat, bitptn, mode, &ppu.gpr[6]); return lv2_event_flag::check_pattern(pat, bitptn, mode, &ppu.gpr[6]);
})) }).second)
{ {
return {}; return {};
} }
@ -223,10 +218,10 @@ error_code sys_event_flag_trywait(u32 id, u64 bitptn, u32 mode, vm::ptr<u64> res
const auto flag = idm::check<lv2_obj, lv2_event_flag>(id, [&](lv2_event_flag& flag) const auto flag = idm::check<lv2_obj, lv2_event_flag>(id, [&](lv2_event_flag& flag)
{ {
return flag.pattern.atomic_op([&](u64& pat) return flag.pattern.fetch_op([&](u64& pat)
{ {
return lv2_event_flag::check_pattern(pat, bitptn, mode, &pattern); return lv2_event_flag::check_pattern(pat, bitptn, mode, &pattern);
}); }).second;
}); });
if (!flag) if (!flag)
@ -291,6 +286,10 @@ error_code sys_event_flag_set(u32 id, u64 bitptn)
ppu.gpr[3] = CELL_OK; ppu.gpr[3] = CELL_OK;
count++; count++;
} }
else
{
ppu.gpr[3] = -1;
}
} }
return count; return count;