diff options
| author | bunnei <bunneidev@gmail.com> | 2018-01-07 12:44:36 -0500 | 
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2018-01-07 12:44:36 -0500 | 
| commit | bc77a7580ee675d4e0ac220c63835258b2a87d41 (patch) | |
| tree | 3bfec4069c4cb8c5225b4f612cdfd0d93eb81cb6 | |
| parent | 79e0dd249e2cff0a0554663a050c1b35499cc13e (diff) | |
nso: Always load the filepath specified by the user.
| -rw-r--r-- | src/core/loader/nso.cpp | 4 | 
1 files changed, 3 insertions, 1 deletions
diff --git a/src/core/loader/nso.cpp b/src/core/loader/nso.cpp index 0e45dadcb..ed8ed66bc 100644 --- a/src/core/loader/nso.cpp +++ b/src/core/loader/nso.cpp @@ -157,7 +157,7 @@ ResultStatus AppLoader_NSO::Load(Kernel::SharedPtr<Kernel::Process>& process) {      // Load NSO modules      VAddr next_load_addr{Memory::PROCESS_IMAGE_VADDR}; -    for (const auto& module : {"rtld", "main", "sdk", "subsdk0", "subsdk1", "subsdk2", "subsdk3"}) { +    for (const auto& module : {"rtld", "sdk", "subsdk0", "subsdk1", "subsdk2", "subsdk3"}) {          const std::string path = filepath.substr(0, filepath.find_last_of("/\\")) + "/" + module;          const VAddr load_addr = next_load_addr;          next_load_addr = LoadNso(path, load_addr); @@ -167,6 +167,8 @@ ResultStatus AppLoader_NSO::Load(Kernel::SharedPtr<Kernel::Process>& process) {              next_load_addr = load_addr;          }      } +    // Load "main" module +    LoadNso(filepath, next_load_addr);      process->svc_access_mask.set();      process->address_mappings = default_address_mappings;  | 
