summaryrefslogtreecommitdiff
path: root/src/core/loader/elf.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2020-04-09 14:01:34 -0400
committerGravatar bunnei2020-04-17 00:59:35 -0400
commit83761d5316465cb634e16dadea14d3d5060855d5 (patch)
tree4ed389c60e36b9b22701497a64caf936b1b36e04 /src/core/loader/elf.cpp
parentservice: ldr: Updates for new VMM. (diff)
downloadyuzu-83761d5316465cb634e16dadea14d3d5060855d5.tar.gz
yuzu-83761d5316465cb634e16dadea14d3d5060855d5.tar.xz
yuzu-83761d5316465cb634e16dadea14d3d5060855d5.zip
loader: elf/kip/nro: Updates for new VMM.
Diffstat (limited to 'src/core/loader/elf.cpp')
-rw-r--r--src/core/loader/elf.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/loader/elf.cpp b/src/core/loader/elf.cpp
index b01400325..1e9ed2837 100644
--- a/src/core/loader/elf.cpp
+++ b/src/core/loader/elf.cpp
@@ -10,8 +10,8 @@
10#include "common/file_util.h" 10#include "common/file_util.h"
11#include "common/logging/log.h" 11#include "common/logging/log.h"
12#include "core/hle/kernel/code_set.h" 12#include "core/hle/kernel/code_set.h"
13#include "core/hle/kernel/memory/page_table.h"
13#include "core/hle/kernel/process.h" 14#include "core/hle/kernel/process.h"
14#include "core/hle/kernel/vm_manager.h"
15#include "core/loader/elf.h" 15#include "core/loader/elf.h"
16#include "core/memory.h" 16#include "core/memory.h"
17 17
@@ -393,7 +393,7 @@ AppLoader_ELF::LoadResult AppLoader_ELF::Load(Kernel::Process& process) {
393 return {ResultStatus::ErrorIncorrectELFFileSize, {}}; 393 return {ResultStatus::ErrorIncorrectELFFileSize, {}};
394 } 394 }
395 395
396 const VAddr base_address = process.VMManager().GetCodeRegionBaseAddress(); 396 const VAddr base_address = process.PageTable().GetCodeRegionStart();
397 ElfReader elf_reader(&buffer[0]); 397 ElfReader elf_reader(&buffer[0]);
398 Kernel::CodeSet codeset = elf_reader.LoadInto(base_address); 398 Kernel::CodeSet codeset = elf_reader.LoadInto(base_address);
399 const VAddr entry_point = codeset.entrypoint; 399 const VAddr entry_point = codeset.entrypoint;