diff options
| author | bunnei <bunneidev@gmail.com> | 2018-07-21 07:57:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-21 07:57:18 +0200 |
| commit | d85cfc94e294e4dff0a3094a7a057cf003fec692 (patch) | |
| tree | 5d23323e2fcc3b2841bd96703093903edc007dd6 | |
| parent | Merge pull request #743 from lioncash/view (diff) | |
| parent | Loader: Only print the module names and addresses if they actually exist. (diff) | |
| download | yuzu-d85cfc94e294e4dff0a3094a7a057cf003fec692.tar yuzu-d85cfc94e294e4dff0a3094a7a057cf003fec692.tar.gz yuzu-d85cfc94e294e4dff0a3094a7a057cf003fec692.tar.bz2 yuzu-d85cfc94e294e4dff0a3094a7a057cf003fec692.tar.lz yuzu-d85cfc94e294e4dff0a3094a7a057cf003fec692.tar.xz yuzu-d85cfc94e294e4dff0a3094a7a057cf003fec692.tar.zst yuzu-d85cfc94e294e4dff0a3094a7a057cf003fec692.zip | |
| -rw-r--r-- | src/core/loader/deconstructed_rom_directory.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/core/loader/deconstructed_rom_directory.cpp b/src/core/loader/deconstructed_rom_directory.cpp index 19b8667ba..394963a69 100644 --- a/src/core/loader/deconstructed_rom_directory.cpp +++ b/src/core/loader/deconstructed_rom_directory.cpp @@ -83,16 +83,13 @@ ResultStatus AppLoader_DeconstructedRomDirectory::Load( VAddr next_load_addr{Memory::PROCESS_IMAGE_VADDR}; for (const auto& module : {"rtld", "main", "subsdk0", "subsdk1", "subsdk2", "subsdk3", "subsdk4", "subsdk5", "subsdk6", "subsdk7", "sdk"}) { - const VAddr load_addr = next_load_addr; const FileSys::VirtualFile module_file = dir->GetFile(module); - if (module_file != nullptr) + if (module_file != nullptr) { + const VAddr load_addr = next_load_addr; next_load_addr = AppLoader_NSO::LoadModule(module_file, load_addr); - if (next_load_addr) { LOG_DEBUG(Loader, "loaded module {} @ 0x{:X}", module, load_addr); // Register module with GDBStub GDBStub::RegisterModule(module, load_addr, next_load_addr - 1, false); - } else { - next_load_addr = load_addr; } } |