diff options
author | David Marcec <dmarcecguzman@gmail.com> | 2019-09-21 10:56:13 +0200 |
---|---|---|
committer | David Marcec <dmarcecguzman@gmail.com> | 2019-09-22 08:30:31 +0200 |
commit | 482a03f8a5479cec0d61dc251fa82c5b273ed22a (patch) | |
tree | 6e1f843fcf2c633586597b021dd05fbaf437ab9b /src | |
parent | Deglobalize System: IRS (diff) | |
download | yuzu-482a03f8a5479cec0d61dc251fa82c5b273ed22a.tar yuzu-482a03f8a5479cec0d61dc251fa82c5b273ed22a.tar.gz yuzu-482a03f8a5479cec0d61dc251fa82c5b273ed22a.tar.bz2 yuzu-482a03f8a5479cec0d61dc251fa82c5b273ed22a.tar.lz yuzu-482a03f8a5479cec0d61dc251fa82c5b273ed22a.tar.xz yuzu-482a03f8a5479cec0d61dc251fa82c5b273ed22a.tar.zst yuzu-482a03f8a5479cec0d61dc251fa82c5b273ed22a.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/service/ldr/ldr.cpp | 11 | ||||
-rw-r--r-- | src/core/hle/service/ldr/ldr.h | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/core/hle/service/ldr/ldr.cpp b/src/core/hle/service/ldr/ldr.cpp index 8ddad8682..3164ca26e 100644 --- a/src/core/hle/service/ldr/ldr.cpp +++ b/src/core/hle/service/ldr/ldr.cpp @@ -78,7 +78,7 @@ public: class RelocatableObject final : public ServiceFramework<RelocatableObject> { public: - explicit RelocatableObject() : ServiceFramework{"ldr:ro"} { + explicit RelocatableObject(Core::System& system) : ServiceFramework{"ldr:ro"}, system(system) { // clang-format off static const FunctionInfo functions[] = { {0, &RelocatableObject::LoadNro, "LoadNro"}, @@ -364,7 +364,7 @@ public: vm_manager.ReprotectRange(*map_address + header.rw_offset, header.rw_size, Kernel::VMAPermission::ReadWrite); - Core::System::GetInstance().InvalidateCpuInstructionCaches(); + system.InvalidateCpuInstructionCaches(); nro.insert_or_assign(*map_address, NROInfo{hash, nro_address, nro_size, bss_address, bss_size}); @@ -430,7 +430,7 @@ public: .IsSuccess()); } - Core::System::GetInstance().InvalidateCpuInstructionCaches(); + system.InvalidateCpuInstructionCaches(); nro.erase(iter); IPC::ResponseBuilder rb{ctx, 2}; @@ -516,13 +516,14 @@ private: Common::Is4KBAligned(header.text_size) && Common::Is4KBAligned(header.ro_size) && Common::Is4KBAligned(header.rw_size); } + Core::System& system; }; -void InstallInterfaces(SM::ServiceManager& sm) { +void InstallInterfaces(SM::ServiceManager& sm, Core::System& system) { std::make_shared<DebugMonitor>()->InstallAsService(sm); std::make_shared<ProcessManager>()->InstallAsService(sm); std::make_shared<Shell>()->InstallAsService(sm); - std::make_shared<RelocatableObject>()->InstallAsService(sm); + std::make_shared<RelocatableObject>(system)->InstallAsService(sm); } } // namespace Service::LDR diff --git a/src/core/hle/service/ldr/ldr.h b/src/core/hle/service/ldr/ldr.h index 412410c4f..7ac8c0b65 100644 --- a/src/core/hle/service/ldr/ldr.h +++ b/src/core/hle/service/ldr/ldr.h @@ -11,6 +11,6 @@ class ServiceManager; namespace Service::LDR { /// Registers all LDR services with the specified service manager. -void InstallInterfaces(SM::ServiceManager& sm); +void InstallInterfaces(SM::ServiceManager& sm, Core::System& system); } // namespace Service::LDR |