From 06a08de68a95506a9cbe4633c58f6bdb5ded0c70 Mon Sep 17 00:00:00 2001 From: lizzie Date: Sat, 28 Feb 2026 01:06:33 +0100 Subject: [core/loader] prevent program_image reallocations in NSO+KIP loading methods (#3639) also changes some methods to std::span<> as well, but mainly std::vector<> in the NSO/KIP loading stuff is not needed to be memcpy'ed and memmove'd around this should save a marginal amount of loading time (RDR1) Signed-off-by: lizzie Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/3639 Reviewed-by: DraVee Reviewed-by: Maufeat Co-authored-by: lizzie Co-committed-by: lizzie --- src/core/loader/kip.cpp | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) (limited to 'src/core/loader/kip.cpp') diff --git a/src/core/loader/kip.cpp b/src/core/loader/kip.cpp index b61ce80bae..db6c98c5a3 100644 --- a/src/core/loader/kip.cpp +++ b/src/core/loader/kip.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project +// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later // SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project @@ -75,21 +75,16 @@ AppLoader::LoadResult AppLoader_KIP::Load(Kernel::KProcess& process, kip->GetKernelCapabilities()); Kernel::CodeSet codeset; - Kernel::PhysicalMemory program_image; - - const auto load_segment = [&program_image](Kernel::CodeSet::Segment& segment, const std::vector& data, u32 offset) { + codeset.memory.resize(PageAlignSize(kip->GetBSSOffset()) + kip->GetBSSSize()); + const auto load_segment = [&codeset](Kernel::CodeSet::Segment& segment, std::span data, u32 offset) { segment.addr = offset; segment.offset = offset; segment.size = PageAlignSize(u32(data.size())); - program_image.resize(offset + data.size()); - std::memcpy(program_image.data() + offset, data.data(), data.size()); + std::memcpy(codeset.memory.data() + offset, data.data(), data.size()); }; - load_segment(codeset.CodeSegment(), kip->GetTextSection(), kip->GetTextOffset()); load_segment(codeset.RODataSegment(), kip->GetRODataSection(), kip->GetRODataOffset()); load_segment(codeset.DataSegment(), kip->GetDataSection(), kip->GetDataOffset()); - - program_image.resize(PageAlignSize(kip->GetBSSOffset()) + kip->GetBSSSize()); codeset.DataSegment().size += kip->GetBSSSize(); // TODO: this is bad form of ASLR, it sucks @@ -98,13 +93,9 @@ AppLoader::LoadResult AppLoader_KIP::Load(Kernel::KProcess& process, : std::rand()) * 0x734287f27) & 0xfff000; // Setup the process code layout - if (process - .LoadFromMetadata(FileSys::ProgramMetadata::GetDefault(), program_image.size(), 0, aslr_offset, false) - .IsError()) { + if (process.LoadFromMetadata(FileSys::ProgramMetadata::GetDefault(), codeset.memory.size(), 0, aslr_offset, false).IsError()) { return {ResultStatus::ErrorNotInitialized, {}}; } - - codeset.memory = std::move(program_image); const VAddr base_address = GetInteger(process.GetEntryPoint()); process.LoadModule(std::move(codeset), base_address); -- cgit v1.2.3