[core/loader] prevent program_image reallocations in NSO+KIP loading methods

Signed-off-by: lizzie <lizzie@eden-emu.dev>

src/core/file_sys/kernel_executable.cpp

@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -160,15 +163,15 @@ u32 KIP::GetMainThreadCpuCore() const {
     return header.default_core;
 }
 
-const std::vector<u8>& KIP::GetTextSection() const {
+std::span<const u8> KIP::GetTextSection() const {
     return decompressed_sections[0];
 }
 
-const std::vector<u8>& KIP::GetRODataSection() const {
+std::span<const u8> KIP::GetRODataSection() const {
     return decompressed_sections[1];
 }
 
-const std::vector<u8>& KIP::GetDataSection() const {
+std::span<const u8> KIP::GetDataSection() const {
     return decompressed_sections[2];
 }
 

src/core/file_sys/kernel_executable.h

@@ -1,9 +1,13 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
 
 #include <array>
+#include <span>
 #include <string>
 #include <vector>
 
@@ -70,9 +74,9 @@ public:
     u32 GetMainThreadStackSize() const;
     u32 GetMainThreadCpuCore() const;
 
-    const std::vector<u8>& GetTextSection() const;
-    const std::vector<u8>& GetRODataSection() const;
-    const std::vector<u8>& GetDataSection() const;
+    std::span<const u8> GetTextSection() const;
+    std::span<const u8> GetRODataSection() const;
+    std::span<const u8> GetDataSection() const;
 
     u32 GetTextOffset() const;
     u32 GetRODataOffset() const;

src/core/hle/kernel/code_set.h

@@ -7,9 +7,9 @@
 #pragma once
 
 #include <cstddef>
+#include <vector>
 
 #include "core/hle/kernel/k_typed_address.h"
-#include "core/hle/kernel/physical_memory.h"
 
 namespace Kernel {
 
@@ -97,8 +97,7 @@ struct CodeSet final {
 #endif
 
     /// The overall data that backs this code set.
-    Kernel::PhysicalMemory memory;
-
+    std::vector<u8> memory;
     /// The segments that comprise this code set.
     std::array<Segment, 3> segments;
 

src/core/hle/kernel/physical_memory.h

@@ -1,23 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include <vector>
-
-#include "common/alignment.h"
-
-namespace Kernel {
-
-// This encapsulation serves 2 purposes:
-// - First, to encapsulate host physical memory under a single type and set an
-// standard for managing it.
-// - Second to ensure all host backing memory used is aligned to 256 bytes due
-// to strict alignment restrictions on GPU memory.
-
-using PhysicalMemoryVector = std::vector<u8, Common::AlignmentAllocator<u8, 256>>;
-class PhysicalMemory final : public PhysicalMemoryVector {
-    using PhysicalMemoryVector::PhysicalMemoryVector;
-};
-
-} // namespace Kernel

src/core/hle/service/am/frontend/applet_error.cpp

@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -93,7 +96,7 @@ union Error::ErrorArguments {
 
 namespace {
 template <typename T>
-void CopyArgumentData(const std::vector<u8>& data, T& variable) {
+void CopyArgumentData(std::span<const u8> data, T& variable) {
     ASSERT(data.size() >= sizeof(T));
     std::memcpy(&variable, data.data(), sizeof(T));
 }

src/core/hle/service/am/frontend/applet_software_keyboard.cpp

@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -775,7 +778,7 @@ Result SoftwareKeyboard::RequestExit() {
 
 // Inline Software Keyboard Requests
 
-void SoftwareKeyboard::RequestFinalize(const std::vector<u8>& request_data) {
+void SoftwareKeyboard::RequestFinalize(std::span<const u8> request_data) {
     LOG_DEBUG(Service_AM, "Processing Request: Finalize");
 
     ChangeState(SwkbdState::NotInitialized);
@@ -783,17 +786,17 @@ void SoftwareKeyboard::RequestFinalize(const std::vector<u8>& request_data) {
     ExitKeyboard();
 }
 
-void SoftwareKeyboard::RequestSetUserWordInfo(const std::vector<u8>& request_data) {
+void SoftwareKeyboard::RequestSetUserWordInfo(std::span<const u8> request_data) {
     LOG_WARNING(Service_AM, "SetUserWordInfo is not implemented.");
 
     ReplyReleasedUserWordInfo();
 }
 
-void SoftwareKeyboard::RequestSetCustomizeDic(const std::vector<u8>& request_data) {
+void SoftwareKeyboard::RequestSetCustomizeDic(std::span<const u8> request_data) {
     LOG_WARNING(Service_AM, "SetCustomizeDic is not implemented.");
 }
 
-void SoftwareKeyboard::RequestCalc(const std::vector<u8>& request_data) {
+void SoftwareKeyboard::RequestCalc(std::span<const u8> request_data) {
     LOG_DEBUG(Service_AM, "Processing Request: Calc");
 
     ASSERT(request_data.size() >= sizeof(SwkbdRequestCommand) + sizeof(SwkbdCalcArgCommon));
@@ -930,17 +933,17 @@ void SoftwareKeyboard::RequestCalcNew() {
     }
 }
 
-void SoftwareKeyboard::RequestSetCustomizedDictionaries(const std::vector<u8>& request_data) {
+void SoftwareKeyboard::RequestSetCustomizedDictionaries(std::span<const u8> request_data) {
     LOG_WARNING(Service_AM, "SetCustomizedDictionaries is not implemented.");
 }
 
-void SoftwareKeyboard::RequestUnsetCustomizedDictionaries(const std::vector<u8>& request_data) {
+void SoftwareKeyboard::RequestUnsetCustomizedDictionaries(std::span<const u8> request_data) {
     LOG_WARNING(Service_AM, "(STUBBED) Processing Request: UnsetCustomizedDictionaries");
 
     ReplyUnsetCustomizedDictionaries();
 }
 
-void SoftwareKeyboard::RequestSetChangedStringV2Flag(const std::vector<u8>& request_data) {
+void SoftwareKeyboard::RequestSetChangedStringV2Flag(std::span<const u8> request_data) {
     LOG_DEBUG(Service_AM, "Processing Request: SetChangedStringV2Flag");
 
     ASSERT(request_data.size() == sizeof(SwkbdRequestCommand) + 1);
@@ -948,7 +951,7 @@ void SoftwareKeyboard::RequestSetChangedStringV2Flag(const std::vector<u8>& requ
     std::memcpy(&use_changed_string_v2, request_data.data() + sizeof(SwkbdRequestCommand), 1);
 }
 
-void SoftwareKeyboard::RequestSetMovedCursorV2Flag(const std::vector<u8>& request_data) {
+void SoftwareKeyboard::RequestSetMovedCursorV2Flag(std::span<const u8> request_data) {
     LOG_DEBUG(Service_AM, "Processing Request: SetMovedCursorV2Flag");
 
     ASSERT(request_data.size() == sizeof(SwkbdRequestCommand) + 1);

src/core/hle/service/am/frontend/applet_software_keyboard.h

@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -124,16 +127,16 @@ private:
 
     // Inline Software Keyboard Requests
 
-    void RequestFinalize(const std::vector<u8>& request_data);
-    void RequestSetUserWordInfo(const std::vector<u8>& request_data);
-    void RequestSetCustomizeDic(const std::vector<u8>& request_data);
-    void RequestCalc(const std::vector<u8>& request_data);
+    void RequestFinalize(std::span<const u8> request_data);
+    void RequestSetUserWordInfo(std::span<const u8> request_data);
+    void RequestSetCustomizeDic(std::span<const u8> request_data);
+    void RequestCalc(std::span<const u8> request_data);
     void RequestCalcOld();
     void RequestCalcNew();
-    void RequestSetCustomizedDictionaries(const std::vector<u8>& request_data);
-    void RequestUnsetCustomizedDictionaries(const std::vector<u8>& request_data);
-    void RequestSetChangedStringV2Flag(const std::vector<u8>& request_data);
-    void RequestSetMovedCursorV2Flag(const std::vector<u8>& request_data);
+    void RequestSetCustomizedDictionaries(std::span<const u8> request_data);
+    void RequestUnsetCustomizedDictionaries(std::span<const u8> request_data);
+    void RequestSetChangedStringV2Flag(std::span<const u8> request_data);
+    void RequestSetMovedCursorV2Flag(std::span<const u8> request_data);
 
     // Inline Software Keyboard Replies
 

src/core/hle/service/am/frontend/applet_web_browser.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 2020 yuzu Emulator Project
@@ -34,22 +34,21 @@ namespace Service::AM::Frontend {
 namespace {
 
 template <typename T>
-void ParseRawValue(T& value, const std::vector<u8>& data) {
+void ParseRawValue(T& value, std::span<const u8> data) {
     static_assert(std::is_trivially_copyable_v<T>,
                   "It's undefined behavior to use memcpy with non-trivially copyable objects");
     std::memcpy(&value, data.data(), data.size());
 }
 
 template <typename T>
-T ParseRawValue(const std::vector<u8>& data) {
+T ParseRawValue(std::span<const u8> data) {
     T value;
     ParseRawValue(value, data);
     return value;
 }
 
-std::string ParseStringValue(const std::vector<u8>& data) {
-    return Common::StringFromFixedZeroTerminatedBuffer(reinterpret_cast<const char*>(data.data()),
-                                                       data.size());
+std::string ParseStringValue(std::span<const u8> data) {
+    return Common::StringFromFixedZeroTerminatedBuffer(reinterpret_cast<const char*>(data.data()), data.size());
 }
 
 std::string GetMainURL(const std::string& url) {
@@ -72,7 +71,7 @@ std::string ResolveURL(const std::string& url) {
     return url.substr(0, index) + "lp1" + url.substr(index + 1);
 }
 
-WebArgInputTLVMap ReadWebArgs(const std::vector<u8>& web_arg, WebArgHeader& web_arg_header) {
+WebArgInputTLVMap ReadWebArgs(std::span<const u8> web_arg, WebArgHeader& web_arg_header) {
     std::memcpy(&web_arg_header, web_arg.data(), sizeof(WebArgHeader));
 
     if (web_arg.size() == sizeof(WebArgHeader)) {

src/core/hle/service/lm/lm.cpp

@@ -164,7 +164,7 @@ private:
         rb.Push(ResultSuccess);
     }
 
-    u64 ReadLeb128(const std::vector<u8>& data, std::size_t& offset) {
+    u64 ReadLeb128(std::span<const u8> data, std::size_t& offset) {
         u64 result{};
         u32 shift{};
 
@@ -180,7 +180,7 @@ private:
         return result;
     }
 
-    std::optional<std::string> ReadString(const std::vector<u8>& data, std::size_t& offset,
+    std::optional<std::string> ReadString(std::span<const u8> data, std::size_t& offset,
                                           std::size_t length) {
         if (length == 0) {
             return std::nullopt;
@@ -193,7 +193,7 @@ private:
         return output;
     }
 
-    u32_le ReadAsU32(const std::vector<u8>& data, std::size_t& offset, std::size_t length) {
+    u32_le ReadAsU32(std::span<const u8> data, std::size_t& offset, std::size_t length) {
         ASSERT(length == sizeof(u32));
         u32_le output{};
         std::memcpy(&output, data.data() + offset, sizeof(u32));
@@ -201,7 +201,7 @@ private:
         return output;
     }
 
-    u64_le ReadAsU64(const std::vector<u8>& data, std::size_t& offset, std::size_t length) {
+    u64_le ReadAsU64(std::span<const u8> data, std::size_t& offset, std::size_t length) {
         ASSERT(length == sizeof(u64));
         u64_le output{};
         std::memcpy(&output, data.data() + offset, sizeof(u64));
@@ -209,7 +209,7 @@ private:
         return output;
     }
 
-    void ParseLog(const LogPacketHeaderEntry entry, const std::vector<u8>& log_data) {
+    void ParseLog(const LogPacketHeaderEntry entry, std::span<const u8> log_data) {
         // Possible entries
         std::optional<std::string> text_log;
         std::optional<u32> line_number;

src/core/hle/service/ro/ro.cpp

@@ -176,11 +176,9 @@ struct ProcessContext {
         // Calculate hash.
         Sha256Hash hash;
         {
-            const u64 size = nro_header->GetSize();
-
+            const u64 size = nro_header->m_size;
             std::vector<u8> nro_data(size);
             m_process->GetMemory().ReadBlock(base_address, nro_data.data(), size);
-
             u32 hash_len = 0;
             EVP_Digest(nro_data.data(), nro_data.size(), hash.data(), &hash_len, EVP_sha256(), nullptr);
         }
@@ -204,9 +202,7 @@ struct ProcessContext {
         R_THROW(RO::ResultNotAuthorized);
     }
 
-    Result ValidateNro(ModuleId* out_module_id, u64* out_rx_size, u64* out_ro_size,
-                       u64* out_rw_size, u64 base_address, u64 expected_nro_size,
-                       u64 expected_bss_size) {
+    Result ValidateNro(ModuleId* out_module_id, u64* out_rx_size, u64* out_ro_size, u64* out_rw_size, u64 base_address, u64 expected_nro_size, u64 expected_bss_size) {
         // Ensure we have a process to work on.
         R_UNLESS(m_process != nullptr, RO::ResultInvalidProcess);
 
@@ -215,17 +211,17 @@ struct ProcessContext {
         m_process->GetMemory().ReadBlock(base_address, std::addressof(header), sizeof(header));
 
         // Validate header.
-        R_UNLESS(header.IsMagicValid(), RO::ResultInvalidNro);
+        R_UNLESS(header.m_magic == NRO_HEADER_MAGIC, RO::ResultInvalidNro);
 
         // Read sizes from header.
-        const u64 nro_size = header.GetSize();
-        const u64 text_ofs = header.GetTextOffset();
-        const u64 text_size = header.GetTextSize();
-        const u64 ro_ofs = header.GetRoOffset();
-        const u64 ro_size = header.GetRoSize();
-        const u64 rw_ofs = header.GetRwOffset();
-        const u64 rw_size = header.GetRwSize();
-        const u64 bss_size = header.GetBssSize();
+        const u64 nro_size = header.m_size;
+        const u64 text_ofs = header.m_text_offset;
+        const u64 text_size = header.m_text_size;
+        const u64 ro_ofs = header.m_ro_offset;
+        const u64 ro_size = header.m_ro_size;
+        const u64 rw_ofs = header.m_rw_offset;
+        const u64 rw_size = header.m_rw_size;
+        const u64 bss_size = header.m_bss_size;
 
         // Validate sizes meet expected.
         R_UNLESS(nro_size == expected_nro_size, RO::ResultInvalidNro);
@@ -251,7 +247,7 @@ struct ProcessContext {
         R_TRY(this->ValidateHasNroHash(base_address, std::addressof(header)));
 
         // Check if NRO has already been loaded.
-        const ModuleId* module_id = header.GetModuleId();
+        const ModuleId* module_id = std::addressof(header.m_module_id);
         R_UNLESS(R_FAILED(this->GetNroInfoByModuleId(nullptr, module_id)), RO::ResultAlreadyLoaded);
 
         // Apply patches to NRO.

src/core/hle/service/ro/ro_types.h

@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -112,52 +115,8 @@ private:
 };
 static_assert(sizeof(NrrHeader) == 0x350, "NrrHeader has wrong size");
 
-class NroHeader {
-public:
-    static constexpr u32 Magic = Common::MakeMagic('N', 'R', 'O', '0');
-
-public:
-    bool IsMagicValid() const {
-        return m_magic == Magic;
-    }
-
-    u32 GetSize() const {
-        return m_size;
-    }
-
-    u32 GetTextOffset() const {
-        return m_text_offset;
-    }
-
-    u32 GetTextSize() const {
-        return m_text_size;
-    }
-
-    u32 GetRoOffset() const {
-        return m_ro_offset;
-    }
-
-    u32 GetRoSize() const {
-        return m_ro_size;
-    }
-
-    u32 GetRwOffset() const {
-        return m_rw_offset;
-    }
-
-    u32 GetRwSize() const {
-        return m_rw_size;
-    }
-
-    u32 GetBssSize() const {
-        return m_bss_size;
-    }
-
-    const ModuleId* GetModuleId() const {
-        return std::addressof(m_module_id);
-    }
-
-private:
+static constexpr u32 NRO_HEADER_MAGIC = Common::MakeMagic('N', 'R', 'O', '0');
+struct NroHeader {
     u32 m_entrypoint_insn;
     u32 m_mod_offset;
     INSERT_PADDING_BYTES_NOINIT(0x8);

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<u8>& data, u32 offset) {
+    codeset.memory.resize(PageAlignSize(kip->GetBSSOffset()) + kip->GetBSSSize());
+    const auto load_segment = [&codeset](Kernel::CodeSet::Segment& segment, std::span<const u8> 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);
 

src/core/loader/nro.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 2018 yuzu Emulator Project
@@ -160,7 +160,7 @@ static bool LoadNroImpl(Core::System& system, Kernel::KProcess& process,
     }
 
     // Build program image
-    Kernel::PhysicalMemory program_image(PageAlignSize(nro_header.file_size));
+    std::vector<u8> program_image(PageAlignSize(nro_header.file_size));
     std::memcpy(program_image.data(), data.data(), program_image.size());
     if (program_image.size() != PageAlignSize(nro_header.file_size)) {
         return {};

src/core/loader/nso.cpp

@@ -4,6 +4,7 @@
 // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include <algorithm>
 #include <cinttypes>
 #include <cstring>
 #include <vector>
@@ -40,17 +41,6 @@ struct MODHeader {
 };
 static_assert(sizeof(MODHeader) == 0x1c, "MODHeader has incorrect size.");
 
-std::vector<u8> DecompressSegment(const std::vector<u8>& compressed_data,
-                                  const NSOSegmentHeader& header) {
-    std::vector<u8> uncompressed_data =
-        Common::Compression::DecompressDataLZ4(compressed_data, header.size);
-
-    ASSERT_MSG(uncompressed_data.size() == header.size, "{} != {}", header.size,
-               uncompressed_data.size());
-
-    return uncompressed_data;
-}
-
 constexpr u32 PageAlignSize(u32 size) {
     return static_cast<u32>((size + Core::Memory::YUZU_PAGEMASK) & ~Core::Memory::YUZU_PAGEMASK);
 }
@@ -76,24 +66,16 @@ FileType AppLoader_NSO::IdentifyType(const FileSys::VirtualFile& in_file) {
     return FileType::NSO;
 }
 
-std::optional<VAddr> AppLoader_NSO::LoadModule(Kernel::KProcess& process, Core::System& system,
-                                               const FileSys::VfsFile& nso_file, VAddr load_base,
-                                               bool should_pass_arguments, bool load_into_process,
-                                               std::optional<FileSys::PatchManager> pm,
-                                               std::vector<Core::NCE::Patcher>* patches,
-                                               s32 patch_index) {
-    if (nso_file.GetSize() < sizeof(NSOHeader)) {
+std::optional<VAddr> AppLoader_NSO::LoadModule(Kernel::KProcess& process, Core::System& system, const FileSys::VfsFile& nso_file, VAddr load_base, bool should_pass_arguments, bool load_into_process, std::optional<FileSys::PatchManager> pm, std::vector<Core::NCE::Patcher>* patches, s32 patch_index) {
+    if (nso_file.GetSize() < sizeof(NSOHeader))
         return std::nullopt;
-    }
-
     NSOHeader nso_header{};
-    if (sizeof(NSOHeader) != nso_file.ReadObject(&nso_header)) {
+    if (sizeof(NSOHeader) != nso_file.ReadObject(&nso_header))
         return std::nullopt;
-    }
-
-    if (nso_header.magic != Common::MakeMagic('N', 'S', 'O', '0')) {
+    if (nso_header.magic != Common::MakeMagic('N', 'S', 'O', '0'))
+        return std::nullopt;
+    if (nso_header.segments.empty())
         return std::nullopt;
-    }
 
     // Allocate some space at the beginning if we are patching in PreText mode.
     const size_t module_start = [&]() -> size_t {
@@ -110,42 +92,44 @@ std::optional<VAddr> AppLoader_NSO::LoadModule(Kernel::KProcess& process, Core::
         return 0;
     }();
 
-    // Build program image
+    auto const last_segment_it = &nso_header.segments[nso_header.segments.size() - 1];
+    // Build program image directly in codeset memory :)
     Kernel::CodeSet codeset;
-    Kernel::PhysicalMemory program_image;
-    for (std::size_t i = 0; i < nso_header.segments.size(); ++i) {
-        std::vector<u8> data = nso_file.ReadBytes(nso_header.segments_compressed_size[i],
-                                                  nso_header.segments[i].offset);
-        if (nso_header.IsSegmentCompressed(i)) {
-            data = DecompressSegment(data, nso_header.segments[i]);
+    codeset.memory.resize(module_start + last_segment_it->location + last_segment_it->size);
+    {
+        std::vector<u8> compressed_data(*std::ranges::max_element(nso_header.segments_compressed_size));
+        std::vector<u8> decompressed_size(std::ranges::max_element(nso_header.segments, [](auto const& a, auto const& b) {
+            return a.size < b.size;
+        })->size);
+        for (std::size_t i = 0; i < nso_header.segments.size(); ++i) {
+            nso_file.Read(compressed_data.data(), nso_header.segments_compressed_size[i], nso_header.segments[i].offset);
+            if (nso_header.IsSegmentCompressed(i)) {
+                int r = Common::Compression::DecompressDataLZ4(decompressed_size.data(), nso_header.segments[i].size, compressed_data.data(), nso_header.segments_compressed_size[i]);
+                ASSERT(r == int(nso_header.segments[i].size));
+                std::memcpy(codeset.memory.data() + module_start + nso_header.segments[i].location, decompressed_size.data(), nso_header.segments[i].size);
+            } else {
+                std::memcpy(codeset.memory.data() + module_start + nso_header.segments[i].location, compressed_data.data(), nso_header.segments[i].size);
+            }
+            codeset.segments[i].addr = module_start + nso_header.segments[i].location;
+            codeset.segments[i].offset = module_start + nso_header.segments[i].location;
+            codeset.segments[i].size = nso_header.segments[i].size;
         }
-        program_image.resize(module_start + nso_header.segments[i].location +
-                             static_cast<u32>(data.size()));
-        std::memcpy(program_image.data() + module_start + nso_header.segments[i].location,
-                    data.data(), data.size());
-        codeset.segments[i].addr = module_start + nso_header.segments[i].location;
-        codeset.segments[i].offset = module_start + nso_header.segments[i].location;
-        codeset.segments[i].size = nso_header.segments[i].size;
     }
 
     if (should_pass_arguments && !Settings::values.program_args.GetValue().empty()) {
         const auto arg_data{Settings::values.program_args.GetValue()};
 
         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());
+        NSOArgumentHeader args_header{NSO_ARGUMENT_DATA_ALLOCATION_SIZE, static_cast<u32_le>(arg_data.size()), {}};
+        const auto end_offset = codeset.memory.size();
+        codeset.memory.resize(u32(codeset.memory.size()) + NSO_ARGUMENT_DATA_ALLOCATION_SIZE);
+        std::memcpy(codeset.memory.data() + end_offset, &args_header, sizeof(NSOArgumentHeader));
+        std::memcpy(codeset.memory.data() + end_offset + sizeof(NSOArgumentHeader), arg_data.data(), arg_data.size());
     }
 
     codeset.DataSegment().size += nso_header.segments[2].bss_size;
-    u32 image_size{
-        PageAlignSize(static_cast<u32>(program_image.size()) + nso_header.segments[2].bss_size)};
-    program_image.resize(image_size);
+    u32 image_size = PageAlignSize(u32(codeset.memory.size()) + nso_header.segments[2].bss_size);
+    codeset.memory.resize(image_size);
 
     for (std::size_t i = 0; i < nso_header.segments.size(); ++i) {
         codeset.segments[i].size = PageAlignSize(codeset.segments[i].size);
@@ -154,8 +138,7 @@ std::optional<VAddr> AppLoader_NSO::LoadModule(Kernel::KProcess& process, Core::
     // Apply patches if necessary
     const auto name = nso_file.GetName();
     if (pm && (pm->HasNSOPatch(nso_header.build_id, name) || Settings::values.dump_nso)) {
-        std::span<u8> patchable_section(program_image.data() + module_start,
-                                        program_image.size() - module_start);
+        std::span<u8> patchable_section(codeset.memory.data() + module_start, codeset.memory.size() - module_start);
         std::vector<u8> pi_header(sizeof(NSOHeader) + patchable_section.size());
         std::memcpy(pi_header.data(), &nso_header, sizeof(NSOHeader));
         std::memcpy(pi_header.data() + sizeof(NSOHeader), patchable_section.data(),
@@ -174,15 +157,15 @@ std::optional<VAddr> AppLoader_NSO::LoadModule(Kernel::KProcess& process, Core::
         //Set module ID using build_id from the NSO header
         patch->SetModuleID(nso_header.build_id);
         // Patch SVCs and MRS calls in the guest code
-        while (!patch->PatchText(program_image, code)) {
+        while (!patch->PatchText(codeset.memory, code)) {
             patch = &patches->emplace_back();
             patch->SetModuleID(nso_header.build_id);  // In case the patcher is changed for big modules, the new patcher should also have the build_id
         }
     } else if (patch) {
-        // Relocate code patch and copy to the program_image.
+        // Relocate code patch and copy to the program image.
         // Save size before RelocateAndCopy (which may resize)
-        const size_t size_before_relocate = program_image.size();
-        if (patch->RelocateAndCopy(load_base, code, program_image, &process.GetPostHandlers())) {
+        const size_t size_before_relocate = codeset.memory.size();
+        if (patch->RelocateAndCopy(load_base, code, codeset.memory, &process.GetPostHandlers())) {
             // Update patch section.
             auto& patch_segment = codeset.PatchSegment();
             auto& post_patch_segment = codeset.PostPatchSegment();
@@ -203,7 +186,7 @@ std::optional<VAddr> AppLoader_NSO::LoadModule(Kernel::KProcess& process, Core::
         }
 
         // Refresh image_size to take account the patch section if it was added by RelocateAndCopy
-        image_size = static_cast<u32>(program_image.size());
+        image_size = static_cast<u32>(codeset.memory.size());
     }
 #endif
 
@@ -234,9 +217,7 @@ std::optional<VAddr> AppLoader_NSO::LoadModule(Kernel::KProcess& process, Core::
     }
 
     // Load codeset for current process
-    codeset.memory = std::move(program_image);
     process.LoadModule(std::move(codeset), load_base);
-
     return load_base + image_size;
 }