summaryrefslogtreecommitdiff
path: root/src/core/loader/nax.cpp
diff options
context:
space:
mode:
authorGravatar Lioncash2020-09-16 08:19:25 -0400
committerGravatar Lioncash2020-09-16 08:46:59 -0400
commit113a3972a6487430ab94f08a4a66742739ff48c2 (patch)
tree735e838e0e271449cecaedc6977c1831c9e39a3a /src/core/loader/nax.cpp
parentMerge pull request #4658 from lioncash/copy3 (diff)
downloadyuzu-113a3972a6487430ab94f08a4a66742739ff48c2.tar.gz
yuzu-113a3972a6487430ab94f08a4a66742739ff48c2.tar.xz
yuzu-113a3972a6487430ab94f08a4a66742739ff48c2.zip
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/nax.cpp')
-rw-r--r--src/core/loader/nax.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/loader/nax.cpp b/src/core/loader/nax.cpp
index a152981a0..49028177b 100644
--- a/src/core/loader/nax.cpp
+++ b/src/core/loader/nax.cpp
@@ -41,7 +41,8 @@ FileType AppLoader_NAX::GetFileType() const {
41 return IdentifyTypeImpl(*nax); 41 return IdentifyTypeImpl(*nax);
42} 42}
43 43
44AppLoader_NAX::LoadResult AppLoader_NAX::Load(Kernel::Process& process) { 44AppLoader_NAX::LoadResult AppLoader_NAX::Load(Kernel::Process& process,
45 [[maybe_unused]] Core::System& system) {
45 if (is_loaded) { 46 if (is_loaded) {
46 return {ResultStatus::ErrorAlreadyLoaded, {}}; 47 return {ResultStatus::ErrorAlreadyLoaded, {}};
47 } 48 }
@@ -65,7 +66,7 @@ AppLoader_NAX::LoadResult AppLoader_NAX::Load(Kernel::Process& process) {
65 return {nca_status, {}}; 66 return {nca_status, {}};
66 } 67 }
67 68
68 const auto result = nca_loader->Load(process); 69 const auto result = nca_loader->Load(process, system);
69 if (result.first != ResultStatus::Success) { 70 if (result.first != ResultStatus::Success) {
70 return result; 71 return result;
71 } 72 }