diff options
| author | 2020-04-09 14:01:34 -0400 | |
|---|---|---|
| committer | 2020-04-17 00:59:35 -0400 | |
| commit | 83761d5316465cb634e16dadea14d3d5060855d5 (patch) | |
| tree | 4ed389c60e36b9b22701497a64caf936b1b36e04 /src/core/loader/nro.cpp | |
| parent | service: ldr: Updates for new VMM. (diff) | |
| download | yuzu-83761d5316465cb634e16dadea14d3d5060855d5.tar.gz yuzu-83761d5316465cb634e16dadea14d3d5060855d5.tar.xz yuzu-83761d5316465cb634e16dadea14d3d5060855d5.zip | |
loader: elf/kip/nro: Updates for new VMM.
Diffstat (limited to 'src/core/loader/nro.cpp')
| -rw-r--r-- | src/core/loader/nro.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/loader/nro.cpp b/src/core/loader/nro.cpp index bc41fe161..5d7e8136e 100644 --- a/src/core/loader/nro.cpp +++ b/src/core/loader/nro.cpp | |||
| @@ -16,8 +16,8 @@ | |||
| 16 | #include "core/file_sys/vfs_offset.h" | 16 | #include "core/file_sys/vfs_offset.h" |
| 17 | #include "core/gdbstub/gdbstub.h" | 17 | #include "core/gdbstub/gdbstub.h" |
| 18 | #include "core/hle/kernel/code_set.h" | 18 | #include "core/hle/kernel/code_set.h" |
| 19 | #include "core/hle/kernel/memory/page_table.h" | ||
| 19 | #include "core/hle/kernel/process.h" | 20 | #include "core/hle/kernel/process.h" |
| 20 | #include "core/hle/kernel/vm_manager.h" | ||
| 21 | #include "core/hle/service/filesystem/filesystem.h" | 21 | #include "core/hle/service/filesystem/filesystem.h" |
| 22 | #include "core/loader/nro.h" | 22 | #include "core/loader/nro.h" |
| 23 | #include "core/loader/nso.h" | 23 | #include "core/loader/nso.h" |
| @@ -208,7 +208,7 @@ AppLoader_NRO::LoadResult AppLoader_NRO::Load(Kernel::Process& process) { | |||
| 208 | } | 208 | } |
| 209 | 209 | ||
| 210 | // Load NRO | 210 | // Load NRO |
| 211 | const VAddr base_address = process.VMManager().GetCodeRegionBaseAddress(); | 211 | const VAddr base_address = process.PageTable().GetCodeRegionStart(); |
| 212 | 212 | ||
| 213 | if (!LoadNro(process, *file, base_address)) { | 213 | if (!LoadNro(process, *file, base_address)) { |
| 214 | return {ResultStatus::ErrorLoadingNRO, {}}; | 214 | return {ResultStatus::ErrorLoadingNRO, {}}; |