diff options
author | Lioncash <mathew1800@gmail.com> | 2018-09-30 00:47:00 +0200 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2018-09-30 08:30:01 +0200 |
commit | cf9d6c6f526fffb2bf414ff774c5d0281a73ecf4 (patch) | |
tree | a9e0bbc02013f0dbc6409af9c8685a8b8b9e9f32 /src/core/loader | |
parent | arm_interface: Add missing fpsr/tpidr members to the ThreadContext struct (diff) | |
download | yuzu-cf9d6c6f526fffb2bf414ff774c5d0281a73ecf4.tar yuzu-cf9d6c6f526fffb2bf414ff774c5d0281a73ecf4.tar.gz yuzu-cf9d6c6f526fffb2bf414ff774c5d0281a73ecf4.tar.bz2 yuzu-cf9d6c6f526fffb2bf414ff774c5d0281a73ecf4.tar.lz yuzu-cf9d6c6f526fffb2bf414ff774c5d0281a73ecf4.tar.xz yuzu-cf9d6c6f526fffb2bf414ff774c5d0281a73ecf4.tar.zst yuzu-cf9d6c6f526fffb2bf414ff774c5d0281a73ecf4.zip |
Diffstat (limited to 'src/core/loader')
-rw-r--r-- | src/core/loader/deconstructed_rom_directory.cpp | 2 | ||||
-rw-r--r-- | src/core/loader/elf.cpp | 2 | ||||
-rw-r--r-- | src/core/loader/nro.cpp | 2 | ||||
-rw-r--r-- | src/core/loader/nso.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/core/loader/deconstructed_rom_directory.cpp b/src/core/loader/deconstructed_rom_directory.cpp index 1b198cc5c..c1824b9c3 100644 --- a/src/core/loader/deconstructed_rom_directory.cpp +++ b/src/core/loader/deconstructed_rom_directory.cpp @@ -132,7 +132,7 @@ ResultStatus AppLoader_DeconstructedRomDirectory::Load(Kernel::Process& process) process.LoadFromMetadata(metadata); // Load NSO modules - const VAddr base_address = process.vm_manager.GetCodeRegionBaseAddress(); + const VAddr base_address = process.VMManager().GetCodeRegionBaseAddress(); VAddr next_load_addr = base_address; for (const auto& module : {"rtld", "main", "subsdk0", "subsdk1", "subsdk2", "subsdk3", "subsdk4", "subsdk5", "subsdk6", "subsdk7", "sdk"}) { diff --git a/src/core/loader/elf.cpp b/src/core/loader/elf.cpp index 5712a2a11..e67b49fc9 100644 --- a/src/core/loader/elf.cpp +++ b/src/core/loader/elf.cpp @@ -395,7 +395,7 @@ ResultStatus AppLoader_ELF::Load(Kernel::Process& process) { if (buffer.size() != file->GetSize()) return ResultStatus::ErrorIncorrectELFFileSize; - const VAddr base_address = process.vm_manager.GetCodeRegionBaseAddress(); + const VAddr base_address = process.VMManager().GetCodeRegionBaseAddress(); ElfReader elf_reader(&buffer[0]); SharedPtr<CodeSet> codeset = elf_reader.LoadInto(base_address); codeset->name = file->GetName(); diff --git a/src/core/loader/nro.cpp b/src/core/loader/nro.cpp index 8ad973c3a..c10f826a4 100644 --- a/src/core/loader/nro.cpp +++ b/src/core/loader/nro.cpp @@ -181,7 +181,7 @@ ResultStatus AppLoader_NRO::Load(Kernel::Process& process) { } // Load NRO - const VAddr base_address = process.vm_manager.GetCodeRegionBaseAddress(); + const VAddr base_address = process.VMManager().GetCodeRegionBaseAddress(); if (!LoadNro(file, base_address)) { return ResultStatus::ErrorLoadingNRO; diff --git a/src/core/loader/nso.cpp b/src/core/loader/nso.cpp index 6fe3e17a7..cbe2a3e53 100644 --- a/src/core/loader/nso.cpp +++ b/src/core/loader/nso.cpp @@ -159,7 +159,7 @@ ResultStatus AppLoader_NSO::Load(Kernel::Process& process) { } // Load module - const VAddr base_address = process.vm_manager.GetCodeRegionBaseAddress(); + const VAddr base_address = process.VMManager().GetCodeRegionBaseAddress(); LoadModule(file, base_address); LOG_DEBUG(Loader, "loaded module {} @ 0x{:X}", file->GetName(), base_address); |