diff options
author | bunnei <bunneidev@gmail.com> | 2018-10-08 07:19:39 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-08 07:19:39 +0200 |
commit | ae982a9bdf75970de1e612d824df3f9cf7f5026b (patch) | |
tree | 1a03308eaa5c3c6bf55d6eee761446b925ae04f6 /src/core/loader/nso.cpp | |
parent | Merge pull request #1396 from DarkLordZach/packed-updates (diff) | |
parent | nso/nro: Use default allocation size for arg_data (diff) | |
download | yuzu-ae982a9bdf75970de1e612d824df3f9cf7f5026b.tar yuzu-ae982a9bdf75970de1e612d824df3f9cf7f5026b.tar.gz yuzu-ae982a9bdf75970de1e612d824df3f9cf7f5026b.tar.bz2 yuzu-ae982a9bdf75970de1e612d824df3f9cf7f5026b.tar.lz yuzu-ae982a9bdf75970de1e612d824df3f9cf7f5026b.tar.xz yuzu-ae982a9bdf75970de1e612d824df3f9cf7f5026b.tar.zst yuzu-ae982a9bdf75970de1e612d824df3f9cf7f5026b.zip |
Diffstat (limited to 'src/core/loader/nso.cpp')
-rw-r--r-- | src/core/loader/nso.cpp | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/src/core/loader/nso.cpp b/src/core/loader/nso.cpp index 2186b02af..28c6dd9b7 100644 --- a/src/core/loader/nso.cpp +++ b/src/core/loader/nso.cpp @@ -17,6 +17,7 @@ #include "core/hle/kernel/vm_manager.h" #include "core/loader/nso.h" #include "core/memory.h" +#include "core/settings.h" namespace Loader { @@ -94,6 +95,7 @@ static constexpr u32 PageAlignSize(u32 size) { } VAddr AppLoader_NSO::LoadModule(FileSys::VirtualFile file, VAddr load_base, + bool should_pass_arguments, boost::optional<FileSys::PatchManager> pm) { if (file == nullptr) return {}; @@ -125,6 +127,19 @@ VAddr AppLoader_NSO::LoadModule(FileSys::VirtualFile file, VAddr load_base, codeset->segments[i].size = PageAlignSize(static_cast<u32>(data.size())); } + if (should_pass_arguments && !Settings::values.program_args.empty()) { + const auto arg_data = Settings::values.program_args; + codeset->DataSegment().size += NSO_ARGUMENT_DATA_ALLOCATION_SIZE; + NSOArgumentHeader args_header{ + NSO_ARGUMENT_DATA_ALLOCATION_SIZE, static_cast<u32_le>(arg_data.size()), {}}; + const auto end_offset = program_image.size(); + program_image.resize(static_cast<u32>(program_image.size()) + + NSO_ARGUMENT_DATA_ALLOCATION_SIZE); + std::memcpy(program_image.data() + end_offset, &args_header, sizeof(NSOArgumentHeader)); + std::memcpy(program_image.data() + end_offset + sizeof(NSOArgumentHeader), arg_data.data(), + arg_data.size()); + } + // MOD header pointer is at .text offset + 4 u32 module_offset; std::memcpy(&module_offset, program_image.data() + 4, sizeof(u32)); @@ -172,7 +187,7 @@ ResultStatus AppLoader_NSO::Load(Kernel::Process& process) { // Load module const VAddr base_address = process.VMManager().GetCodeRegionBaseAddress(); - LoadModule(file, base_address); + LoadModule(file, base_address, true); LOG_DEBUG(Loader, "loaded module {} @ 0x{:X}", file->GetName(), base_address); process.Run(base_address, Kernel::THREADPRIO_DEFAULT, Memory::DEFAULT_STACK_SIZE); |