diff options
| author | bunnei <bunneidev@gmail.com> | 2018-02-25 16:44:51 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-25 16:44:51 -0800 |
| commit | 7e45669ccbf50139910ca6e565fbd6f4fddfdf27 (patch) | |
| tree | 3e59a99cc6a5740b42e0e279c79e0a511adb717a /src/core/loader/nso.cpp | |
| parent | c45173c9a64d9f2e4430ee5f2463a1db8351c722 (diff) | |
| parent | e29710818f7cd6ca2eadf52d74d039a593a98bb0 (diff) | |
Merge pull request #222 from shinyquagsire23/npdm-parsing
NPDM Parsing
Diffstat (limited to 'src/core/loader/nso.cpp')
| -rw-r--r-- | src/core/loader/nso.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/loader/nso.cpp b/src/core/loader/nso.cpp index 407025da0..7f8d24dd6 100644 --- a/src/core/loader/nso.cpp +++ b/src/core/loader/nso.cpp @@ -92,7 +92,7 @@ static constexpr u32 PageAlignSize(u32 size) { return (size + Memory::PAGE_MASK) & ~Memory::PAGE_MASK; } -VAddr AppLoader_NSO::LoadModule(const std::string& path, VAddr load_base) { +VAddr AppLoader_NSO::LoadModule(const std::string& path, VAddr load_base, u64 tid) { FileUtil::IOFile file(path, "rb"); if (!file.IsOpen()) { return {}; @@ -109,7 +109,7 @@ VAddr AppLoader_NSO::LoadModule(const std::string& path, VAddr load_base) { } // Build program image - Kernel::SharedPtr<Kernel::CodeSet> codeset = Kernel::CodeSet::Create("", 0); + Kernel::SharedPtr<Kernel::CodeSet> codeset = Kernel::CodeSet::Create("", tid); std::vector<u8> program_image; for (int i = 0; i < nso_header.segments.size(); ++i) { std::vector<u8> data = @@ -158,7 +158,7 @@ ResultStatus AppLoader_NSO::Load(Kernel::SharedPtr<Kernel::Process>& process) { process = Kernel::Process::Create("main"); // Load module - LoadModule(filepath, Memory::PROCESS_IMAGE_VADDR); + LoadModule(filepath, Memory::PROCESS_IMAGE_VADDR, 0); LOG_DEBUG(Loader, "loaded module %s @ 0x%" PRIx64, filepath.c_str(), Memory::PROCESS_IMAGE_VADDR); |
