summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2020-03-26 20:45:35 +0100
committerbunnei <bunneidev@gmail.com>2020-03-26 20:52:59 +0100
commit5228bd0bb98816988decdd2b825fadbbd19c4660 (patch)
treec703c9b4f8b531f7cdf7b4e81032e265670fb236
parentMerge pull request #3550 from hughesjs/hughesjs-readme-changes-1 (diff)
downloadyuzu-5228bd0bb98816988decdd2b825fadbbd19c4660.tar
yuzu-5228bd0bb98816988decdd2b825fadbbd19c4660.tar.gz
yuzu-5228bd0bb98816988decdd2b825fadbbd19c4660.tar.bz2
yuzu-5228bd0bb98816988decdd2b825fadbbd19c4660.tar.lz
yuzu-5228bd0bb98816988decdd2b825fadbbd19c4660.tar.xz
yuzu-5228bd0bb98816988decdd2b825fadbbd19c4660.tar.zst
yuzu-5228bd0bb98816988decdd2b825fadbbd19c4660.zip
-rw-r--r--src/core/hle/service/ldr/ldr.cpp20
1 files changed, 15 insertions, 5 deletions
diff --git a/src/core/hle/service/ldr/ldr.cpp b/src/core/hle/service/ldr/ldr.cpp
index 157aeec88..647943020 100644
--- a/src/core/hle/service/ldr/ldr.cpp
+++ b/src/core/hle/service/ldr/ldr.cpp
@@ -342,17 +342,27 @@ public:
return;
}
- ASSERT(
- vm_manager
- .MirrorMemory(*map_address, nro_address, nro_size, Kernel::MemoryState::ModuleCode)
- .IsSuccess());
+ // Mark text and read-only region as ModuleCode
+ ASSERT(vm_manager
+ .MirrorMemory(*map_address, nro_address, header.text_size + header.ro_size,
+ Kernel::MemoryState::ModuleCode)
+ .IsSuccess());
+ // Mark read/write region as ModuleCodeData, which is necessary if this region is used for
+ // TransferMemory (e.g. Final Fantasy VIII Remastered does this)
+ ASSERT(vm_manager
+ .MirrorMemory(*map_address + header.rw_offset, nro_address + header.rw_offset,
+ header.rw_size, Kernel::MemoryState::ModuleCodeData)
+ .IsSuccess());
+ // Revoke permissions from the old memory region
ASSERT(vm_manager.ReprotectRange(nro_address, nro_size, Kernel::VMAPermission::None)
.IsSuccess());
if (bss_size > 0) {
+ // Mark BSS region as ModuleCodeData, which is necessary if this region is used for
+ // TransferMemory (e.g. Final Fantasy VIII Remastered does this)
ASSERT(vm_manager
.MirrorMemory(*map_address + nro_size, bss_address, bss_size,
- Kernel::MemoryState::ModuleCode)
+ Kernel::MemoryState::ModuleCodeData)
.IsSuccess());
ASSERT(vm_manager.ReprotectRange(bss_address, bss_size, Kernel::VMAPermission::None)
.IsSuccess());