From 7695febfa1f3ef45fbac5fe674c1371c88f483b6 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 2 Dec 2018 22:24:43 -0500 Subject: loader/nso: Remove dependency on the System class Similar to the NRO changes, we can also pass the process explicitly as a parameter from Load instead of indirecting through the System class. --- src/core/loader/nso.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/core/loader/nso.h') diff --git a/src/core/loader/nso.h b/src/core/loader/nso.h index 433306139..0c1defbb6 100644 --- a/src/core/loader/nso.h +++ b/src/core/loader/nso.h @@ -10,6 +10,10 @@ #include "core/loader/linker.h" #include "core/loader/loader.h" +namespace Kernel { +class Process; +} + namespace Loader { constexpr u64 NSO_ARGUMENT_DATA_ALLOCATION_SIZE = 0x9000; @@ -37,8 +41,8 @@ public: return IdentifyType(file); } - static std::optional LoadModule(const FileSys::VfsFile& file, VAddr load_base, - bool should_pass_arguments, + static std::optional LoadModule(Kernel::Process& process, const FileSys::VfsFile& file, + VAddr load_base, bool should_pass_arguments, std::optional pm = {}); ResultStatus Load(Kernel::Process& process) override; -- cgit v1.2.3