Skip to content

fix(runtime): route SifSetReg and SifGetReg syscalls #240

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

Open
hedgeg0d wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(runtime): route SifSetReg and SifGetReg syscalls #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions ps2xRuntime/src/lib/Kernel/Syscalls/Dispatcher.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,12 @@ namespace ps2_syscalls
case static_cast<uint32_t>(-0x78):
ps2_stubs::sceSifSetDChain(rdram, ctx, runtime);
return true;
case 0x79:
ps2_stubs::sceSifSetReg(rdram, ctx, runtime);
return true;
case 0x7A:
ps2_stubs::sceSifGetReg(rdram, ctx, runtime);
return true;
case 0x7F:
GetMemorySize(rdram, ctx, runtime);
return true;
Expand Down
24 changes: 24 additions & 0 deletions ps2xTest/src/ps2_runtime_kernel_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1162,6 +1162,30 @@ void register_ps2_runtime_kernel_tests()
"FindAddress should return address of first matching word");
});

tc.Run("numeric syscall 0x79/0x7A route SifSetReg/SifGetReg", [](TestCase &t)
{
TestEnv env;
constexpr uint32_t kSifReg = 0x80000000u;
constexpr uint32_t kValue = 0x11223344u;

setRegU32(env.ctx, 4, kSifReg);
setRegU32(env.ctx, 5, kValue);
t.IsTrue(callSyscall(0x79u, env.rdram.data(), &env.ctx, &env.runtime),
"SifSetReg syscall should dispatch");

setRegU32(env.ctx, 4, kSifReg);
t.IsTrue(callSyscall(0x7Au, env.rdram.data(), &env.ctx, &env.runtime),
"SifGetReg syscall should dispatch");
t.Equals(static_cast<uint32_t>(getRegS32(env.ctx, 2)),
kValue,
"SifGetReg should return the value written by SifSetReg");

// Restore the shared SIF register state for other tests.
setRegU32(env.ctx, 4, kSifReg);
setRegU32(env.ctx, 5, 0u);
callSyscall(0x79u, env.rdram.data(), &env.ctx, &env.runtime);
});

tc.Run("numeric syscall 0x83 supports KSEG aliases", [](TestCase &t)
{
TestEnv env;
Expand Down