From 005add7e975d2008103c902395e978dca77676bd Mon Sep 17 00:00:00 2001 From: Ivan Chikish Date: Sun, 30 Jul 2023 12:09:17 +0300 Subject: [PATCH] [orbis-kernel] Fixup sys_dmem_container --- orbis-kernel/include/orbis/sys/sysproto.hpp | 2 +- orbis-kernel/src/sys/sys_sce.cpp | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/orbis-kernel/include/orbis/sys/sysproto.hpp b/orbis-kernel/include/orbis/sys/sysproto.hpp index 09f97bff6..ebe0d4452 100644 --- a/orbis-kernel/include/orbis/sys/sysproto.hpp +++ b/orbis-kernel/include/orbis/sys/sysproto.hpp @@ -674,7 +674,7 @@ SysResult sys_obs_eport_trigger(Thread *thread /* TODO */); SysResult sys_obs_eport_open(Thread *thread /* TODO */); SysResult sys_obs_eport_close(Thread *thread /* TODO */); SysResult sys_is_in_sandbox(Thread *thread /* TODO */); -SysResult sys_dmem_container(Thread *thread); +SysResult sys_dmem_container(Thread *thread, uint id); SysResult sys_get_authinfo(Thread *thread, pid_t pid, ptr info); SysResult sys_mname(Thread *thread, uint64_t address, uint64_t length, ptr name); diff --git a/orbis-kernel/src/sys/sys_sce.cpp b/orbis-kernel/src/sys/sys_sce.cpp index b26d95d8b..d8f402260 100644 --- a/orbis-kernel/src/sys/sys_sce.cpp +++ b/orbis-kernel/src/sys/sys_sce.cpp @@ -578,8 +578,11 @@ orbis::SysResult orbis::sys_is_in_sandbox(Thread *thread /* TODO */) { std::printf("sys_is_in_sandbox() -> 0\n"); return {}; } -orbis::SysResult orbis::sys_dmem_container(Thread *thread) { +orbis::SysResult orbis::sys_dmem_container(Thread *thread, uint id) { + ORBIS_LOG_NOTICE(__FUNCTION__, id); thread->retval[0] = 1; // returns default direct memory device + if (id + 1) + return ErrorCode::PERM; return {}; } orbis::SysResult orbis::sys_get_authinfo(Thread *thread, pid_t pid, @@ -718,6 +721,7 @@ orbis::SysResult orbis::sys_dynlib_get_proc_param(Thread *thread, return {}; } orbis::SysResult orbis::sys_dynlib_process_needed_and_relocate(Thread *thread) { + ORBIS_LOG_NOTICE(__FUNCTION__); if (auto processNeeded = thread->tproc->ops->processNeeded) { auto result = processNeeded(thread); @@ -741,6 +745,7 @@ orbis::SysResult orbis::sys_dynlib_process_needed_and_relocate(Thread *thread) { } } + ORBIS_LOG_WARNING(__FUNCTION__); return {}; } orbis::SysResult orbis::sys_sandbox_path(Thread *thread /* TODO */) {