purgatory/yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nso: Add framework to support patching of uncompressed NSOs

Browse Source
This commit is contained in:
Zach Hilman 2018-09-29 22:16:09 -04:00
parent 42fb4e82d3
commit 003b44822a
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/core/loader/nso.cpp
View File

@ -10,6 +10,7 @@
#include "common/logging/log.h" #include "common/logging/log.h"
#include "common/swap.h" #include "common/swap.h"
#include "core/core.h" #include "core/core.h"
#include "core/file_sys/patch_manager.h"
#include "core/gdbstub/gdbstub.h" #include "core/gdbstub/gdbstub.h"
#include "core/hle/kernel/kernel.h" #include "core/hle/kernel/kernel.h"
#include "core/hle/kernel/process.h" #include "core/hle/kernel/process.h"
@ -92,7 +93,8 @@ static constexpr u32 PageAlignSize(u32 size) {
return (size + Memory::PAGE_MASK) & ~Memory::PAGE_MASK; return (size + Memory::PAGE_MASK) & ~Memory::PAGE_MASK;
} }
VAddr AppLoader_NSO::LoadModule(FileSys::VirtualFile file, VAddr load_base) { VAddr AppLoader_NSO::LoadModule(FileSys::VirtualFile file, VAddr load_base,
std::shared_ptr<FileSys::PatchManager> pm) {
if (file == nullptr) if (file == nullptr)
return {}; return {};
@ -141,6 +143,17 @@ VAddr AppLoader_NSO::LoadModule(FileSys::VirtualFile file, VAddr load_base) {
const u32 image_size{PageAlignSize(static_cast<u32>(program_image.size()) + bss_size)}; const u32 image_size{PageAlignSize(static_cast<u32>(program_image.size()) + bss_size)};
program_image.resize(image_size); program_image.resize(image_size);
// Apply patches if necessary
if (pm != nullptr && pm->HasNSOPatch(nso_header.build_id)) {
std::vector<u8> pi_header(program_image.size() + 0x100);
std::memcpy(pi_header.data(), &nso_header, sizeof(NsoHeader));
std::memcpy(pi_header.data() + 0x100, program_image.data(), program_image.size());
pi_header = pm->PatchNSO(pi_header);
std::memcpy(program_image.data(), pi_header.data() + 0x100, program_image.size());
}
// Load codeset for current process // Load codeset for current process
codeset->name = file->GetName(); codeset->name = file->GetName();
codeset->memory = std::make_shared<std::vector<u8>>(std::move(program_image)); codeset->memory = std::make_shared<std::vector<u8>>(std::move(program_image));

4
src/core/loader/nso.h
View File

@ -5,6 +5,7 @@
#pragma once #pragma once
#include "common/common_types.h" #include "common/common_types.h"
#include "core/file_sys/patch_manager.h"
#include "core/loader/linker.h" #include "core/loader/linker.h"
#include "core/loader/loader.h" #include "core/loader/loader.h"
@ -26,7 +27,8 @@ public:
return IdentifyType(file); return IdentifyType(file);
} }
static VAddr LoadModule(FileSys::VirtualFile file, VAddr load_base); static VAddr LoadModule(FileSys::VirtualFile file, VAddr load_base,
std::shared_ptr<FileSys::PatchManager> pm = nullptr);
ResultStatus Load(Kernel::Process& process) override; ResultStatus Load(Kernel::Process& process) override;
}; };