summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-12-06 04:36:44 +0100
committerGitHub <noreply@github.com>2018-12-06 04:36:44 +0100
commitcca4665a69a2dffeadf6eee1f80723f05b51a933 (patch)
tree5deda969f4b903148170707bc2ade8d5e7b6179d /src/core
parentMerge pull request #1870 from heapo/pagetable_shrink_to_fit (diff)
parentservice/ldr: Deduplicate instruction cache clearing code in LoadNro() (diff)
downloadyuzu-cca4665a69a2dffeadf6eee1f80723f05b51a933.tar
yuzu-cca4665a69a2dffeadf6eee1f80723f05b51a933.tar.gz
yuzu-cca4665a69a2dffeadf6eee1f80723f05b51a933.tar.bz2
yuzu-cca4665a69a2dffeadf6eee1f80723f05b51a933.tar.lz
yuzu-cca4665a69a2dffeadf6eee1f80723f05b51a933.tar.xz
yuzu-cca4665a69a2dffeadf6eee1f80723f05b51a933.tar.zst
yuzu-cca4665a69a2dffeadf6eee1f80723f05b51a933.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/hle/service/ldr/ldr.cpp10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/core/hle/service/ldr/ldr.cpp b/src/core/hle/service/ldr/ldr.cpp
index ca119dd3a..453d90a22 100644
--- a/src/core/hle/service/ldr/ldr.cpp
+++ b/src/core/hle/service/ldr/ldr.cpp
@@ -335,10 +335,7 @@ public:
vm_manager.ReprotectRange(*map_address + header.rw_offset, header.rw_size,
Kernel::VMAPermission::ReadWrite);
- Core::System::GetInstance().ArmInterface(0).ClearInstructionCache();
- Core::System::GetInstance().ArmInterface(1).ClearInstructionCache();
- Core::System::GetInstance().ArmInterface(2).ClearInstructionCache();
- Core::System::GetInstance().ArmInterface(3).ClearInstructionCache();
+ Core::System::GetInstance().InvalidateCpuInstructionCaches();
nro.insert_or_assign(*map_address, NROInfo{hash, nro_size + bss_size});
@@ -391,10 +388,7 @@ public:
Kernel::MemoryState::ModuleCodeStatic) == RESULT_SUCCESS);
ASSERT(process->UnmapMemory(mapped_addr, 0, nro_size) == RESULT_SUCCESS);
- Core::System::GetInstance().ArmInterface(0).ClearInstructionCache();
- Core::System::GetInstance().ArmInterface(1).ClearInstructionCache();
- Core::System::GetInstance().ArmInterface(2).ClearInstructionCache();
- Core::System::GetInstance().ArmInterface(3).ClearInstructionCache();
+ Core::System::GetInstance().InvalidateCpuInstructionCaches();
nro.erase(iter);
IPC::ResponseBuilder rb{ctx, 2};