diff options
| author | bunnei <bunneidev@gmail.com> | 2020-01-24 16:31:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-24 16:31:43 +0100 |
| commit | f64adcfc37f15e31e8c6f772f56d8681512392d3 (patch) | |
| tree | d0c6aa694aff0c9fe161caac56c3126a009efebd /src | |
| parent | Merge pull request #2800 from FearlessTobi/port-4049 (diff) | |
| parent | loader: provide default arguments (zero byte) to NSOs (diff) | |
| download | yuzu-f64adcfc37f15e31e8c6f772f56d8681512392d3.tar yuzu-f64adcfc37f15e31e8c6f772f56d8681512392d3.tar.gz yuzu-f64adcfc37f15e31e8c6f772f56d8681512392d3.tar.bz2 yuzu-f64adcfc37f15e31e8c6f772f56d8681512392d3.tar.lz yuzu-f64adcfc37f15e31e8c6f772f56d8681512392d3.tar.xz yuzu-f64adcfc37f15e31e8c6f772f56d8681512392d3.tar.zst yuzu-f64adcfc37f15e31e8c6f772f56d8681512392d3.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/loader/nso.cpp | 11 | ||||
| -rw-r--r-- | src/core/loader/nso.h | 2 |
2 files changed, 10 insertions, 3 deletions
diff --git a/src/core/loader/nso.cpp b/src/core/loader/nso.cpp index 515c5accb..044067a5b 100644 --- a/src/core/loader/nso.cpp +++ b/src/core/loader/nso.cpp @@ -97,7 +97,8 @@ std::optional<VAddr> AppLoader_NSO::LoadModule(Kernel::Process& process, if (nso_header.IsSegmentCompressed(i)) { data = DecompressSegment(data, nso_header.segments[i]); } - program_image.resize(nso_header.segments[i].location + data.size()); + program_image.resize(nso_header.segments[i].location + + PageAlignSize(static_cast<u32>(data.size()))); std::memcpy(program_image.data() + nso_header.segments[i].location, data.data(), data.size()); codeset.segments[i].addr = nso_header.segments[i].location; @@ -105,8 +106,12 @@ std::optional<VAddr> AppLoader_NSO::LoadModule(Kernel::Process& process, 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; + if (should_pass_arguments) { + std::vector<u8> arg_data{Settings::values.program_args.begin(), + Settings::values.program_args.end()}; + if (arg_data.empty()) { + arg_data.resize(NSO_ARGUMENT_DEFAULT_SIZE); + } codeset.DataSegment().size += NSO_ARGUMENT_DATA_ALLOCATION_SIZE; NSOArgumentHeader args_header{ NSO_ARGUMENT_DATA_ALLOCATION_SIZE, static_cast<u32_le>(arg_data.size()), {}}; diff --git a/src/core/loader/nso.h b/src/core/loader/nso.h index 58cbe162d..d2d600cd9 100644 --- a/src/core/loader/nso.h +++ b/src/core/loader/nso.h @@ -56,6 +56,8 @@ static_assert(sizeof(NSOHeader) == 0x100, "NSOHeader has incorrect size."); static_assert(std::is_trivially_copyable_v<NSOHeader>, "NSOHeader must be trivially copyable."); constexpr u64 NSO_ARGUMENT_DATA_ALLOCATION_SIZE = 0x9000; +// NOTE: Official software default argument state is unverified. +constexpr u64 NSO_ARGUMENT_DEFAULT_SIZE = 1; struct NSOArgumentHeader { u32_le allocated_size; |