Skip to content

fix: semaphore syscalls return sid on success instead of KE_OK #136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ran-j merged 3 commits into from
Jun 21, 2026
Merged

fix: semaphore syscalls return sid on success instead of KE_OK #136

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0a5e0af
fix: semaphore syscalls return sid on success instead of KE_OK
smmathews Jun 19, 2026
cb28e1a
fix: update stale KE_OK assertions in expansion and SIF RPC tests
smmathews Jun 20, 2026
e6bf596
fix: tighten WaitSema count-decrement guard to ret == sid
smmathews Jun 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions ps2xRuntime/src/lib/Kernel/Syscalls/Sync.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,8 @@ namespace ps2_syscalls
}
sema->cv.notify_all();

setReturnS32(ctx, KE_OK);
// PS2 EE BIOS returns sid on success.
setReturnS32(ctx, sid);
}

void iDeleteSema(uint8_t *rdram, R5900Context *ctx, PS2Runtime *runtime)
Expand All @@ -236,7 +237,8 @@ namespace ps2_syscalls
return;
}

int ret = KE_OK;
// PS2 EE BIOS returns sid on success; KE_SEMA_OVF overrides on overflow.
int ret = sid;
int beforeCount = 0;
int afterCount = 0;
{
Expand Down Expand Up @@ -286,7 +288,7 @@ namespace ps2_syscalls
auto info = ensureCurrentThreadInfo(ctx);
throwIfTerminated(info);
std::unique_lock<std::mutex> lock(sema->m);
int ret = 0;
int ret = sid; // PS2 EE BIOS returns sid on success.

if (sema->count == 0)
{
Expand Down Expand Up @@ -318,7 +320,7 @@ namespace ps2_syscalls
{
bool forced = info ? info->forceRelease.load() : false;
bool terminated = info ? info->terminated.load() : false;
return sema->count > 0 || sema->deleted || forced || terminated; //
return sema->count > 0 || sema->deleted || forced || terminated;
});
}
sema->waiters--;
Expand Down Expand Up @@ -346,7 +348,7 @@ namespace ps2_syscalls
}
}

if (ret == 0 && sema->count > 0)
if (ret >= 0 && sema->count > 0)

@ran-j ran-j Jun 20, 2026

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think is better to check ret == sid

@smmathews smmathews Jun 20, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

agreed. done.

{
sema->count--;
}
Expand Down Expand Up @@ -380,7 +382,7 @@ namespace ps2_syscalls
if (sema->count > 0)
{
sema->count--;
setReturnS32(ctx, KE_OK);
setReturnS32(ctx, sid); // PS2 EE BIOS returns sid on success.
return;
}

Expand Down
4 changes: 2 additions & 2 deletions ps2xTest/src/ps2_runtime_expansion_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -942,7 +942,7 @@ void register_ps2_runtime_expansion_tests()
R5900Context pollCtx{};
setRegU32(pollCtx, 4, static_cast<uint32_t>(sid));
PollSema(rdram.data(), &pollCtx, &runtime);
if (getRegS32(pollCtx, 2) == KE_OK)
if (getRegS32(pollCtx, 2) == sid)
{
pollOkCount.fetch_add(1, std::memory_order_relaxed);
}
Expand All @@ -963,7 +963,7 @@ void register_ps2_runtime_expansion_tests()
R5900Context signalCtx{};
setRegU32(signalCtx, 4, static_cast<uint32_t>(sid));
SignalSema(rdram.data(), &signalCtx, &runtime);
if (getRegS32(signalCtx, 2) == KE_OK)
if (getRegS32(signalCtx, 2) == sid)
{
signalOkCount.fetch_add(1, std::memory_order_relaxed);
}
Expand Down
Loading