RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-01-10 18:50:03 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

rpcsx-os: fix sdk version fetching

Browse source
This commit is contained in:
DH 2024-09-02 20:32:27 +03:00
parent b2e180e533
commit 84d2add72d
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
orbis-kernel/include/orbis/thread/Process.hpp
View file

@ -69,7 +69,7 @@ struct Process final {
EventEmitter event;
std::optional<sint> exitStatus;
std::uint32_t sdkVersion = -1;
std::uint32_t sdkVersion = 0;
std::uint64_t nextTlsSlot = 1;
std::uint64_t lastTlsOffset = 0;

9
orbis-kernel/src/sys/sys_sysctl.cpp
View file

@ -206,8 +206,13 @@ SysResult kern_sysctl(Thread *thread, ptr<sint> name, uint namelen,
return ErrorCode::INVAL;
}
ORBIS_RET_ON_ERROR(uwrite(ptr<uint32_t>(old), process->sdkVersion));
ORBIS_LOG_ERROR("get sdk version by pid", name[3], process->sdkVersion);
auto sdkVersion = process->sdkVersion;
if (sdkVersion == 0) {
sdkVersion = g_context.fwSdkVersion;
}
ORBIS_RET_ON_ERROR(uwrite(ptr<uint32_t>(old), sdkVersion));
ORBIS_LOG_ERROR("get sdk version by pid", name[3], sdkVersion);
return uwrite(oldlenp, sizeof(uint32_t));
}

2
rpcsx-os/main.cpp
View file

@ -564,7 +564,7 @@ ExecEnv ps4CreateExecEnv(orbis::Thread *mainThread,
std::uint64_t entryPoint = executableModule->entryPoint;
if (mainThread->tproc->processParam != nullptr &&
mainThread->tproc->processParamSize <= sizeof(Ps4ProcessParam)) {
mainThread->tproc->processParamSize >= sizeof(Ps4ProcessParam)) {
auto processParam =
reinterpret_cast<std::byte *>(mainThread->tproc->processParam);