diff options
author | Lioncash <mathew1800@gmail.com> | 2020-09-16 08:19:25 -0400 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2020-09-16 08:46:59 -0400 |
commit | 113a3972a6487430ab94f08a4a66742739ff48c2 (patch) | |
tree | 735e838e0e271449cecaedc6977c1831c9e39a3a /src/core/loader/nso.h | |
parent | 004bfefeb57898ad38af6255bc6ccc6bb1e35fbd (diff) |
core/loader: Remove dependencies on the global system instance
Now all that remains is:
18 instances in file_sys code
14 instances in GDB stub code (this can be tossed wholesale)
4 instances in HLE code
2 instances in settings code.
Diffstat (limited to 'src/core/loader/nso.h')
-rw-r--r-- | src/core/loader/nso.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/core/loader/nso.h b/src/core/loader/nso.h index b210830f0..4bd47787d 100644 --- a/src/core/loader/nso.h +++ b/src/core/loader/nso.h @@ -12,6 +12,10 @@ #include "core/file_sys/patch_manager.h" #include "core/loader/loader.h" +namespace Core { +class System; +} + namespace Kernel { class Process; } @@ -80,12 +84,12 @@ public: return IdentifyType(file); } - static std::optional<VAddr> LoadModule(Kernel::Process& process, const FileSys::VfsFile& file, - VAddr load_base, bool should_pass_arguments, - bool load_into_process, + static std::optional<VAddr> LoadModule(Kernel::Process& process, Core::System& system, + const FileSys::VfsFile& file, VAddr load_base, + bool should_pass_arguments, bool load_into_process, std::optional<FileSys::PatchManager> pm = {}); - LoadResult Load(Kernel::Process& process) override; + LoadResult Load(Kernel::Process& process, Core::System& system) override; ResultStatus ReadNSOModules(Modules& modules) override; |