diff options
| author | 2019-04-09 19:16:37 -0400 | |
|---|---|---|
| committer | 2019-04-09 19:16:37 -0400 | |
| commit | 61f63bb994e358b925771bd51898822573e5780e (patch) | |
| tree | a6a9f12b12b5946c04ccaf0856e0f3a94bbffe17 /src/core/loader/nso.cpp | |
| parent | Merge pull request #2366 from FernandoS27/xmad-fix (diff) | |
| parent | patch_manager: Dump NSO name with build ID (diff) | |
| download | yuzu-61f63bb994e358b925771bd51898822573e5780e.tar.gz yuzu-61f63bb994e358b925771bd51898822573e5780e.tar.xz yuzu-61f63bb994e358b925771bd51898822573e5780e.zip | |
Merge pull request #1957 from DarkLordZach/title-provider
file_sys: Provide generic interface for accessing game data
Diffstat (limited to 'src/core/loader/nso.cpp')
| -rw-r--r-- | src/core/loader/nso.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/loader/nso.cpp b/src/core/loader/nso.cpp index ffe2eea8a..d7c47c197 100644 --- a/src/core/loader/nso.cpp +++ b/src/core/loader/nso.cpp | |||
| @@ -21,6 +21,8 @@ | |||
| 21 | #include "core/memory.h" | 21 | #include "core/memory.h" |
| 22 | #include "core/settings.h" | 22 | #include "core/settings.h" |
| 23 | 23 | ||
| 24 | #pragma optimize("", off) | ||
| 25 | |||
| 24 | namespace Loader { | 26 | namespace Loader { |
| 25 | namespace { | 27 | namespace { |
| 26 | struct MODHeader { | 28 | struct MODHeader { |
| @@ -136,13 +138,13 @@ std::optional<VAddr> AppLoader_NSO::LoadModule(Kernel::Process& process, | |||
| 136 | 138 | ||
| 137 | // Apply patches if necessary | 139 | // Apply patches if necessary |
| 138 | if (pm && (pm->HasNSOPatch(nso_header.build_id) || Settings::values.dump_nso)) { | 140 | if (pm && (pm->HasNSOPatch(nso_header.build_id) || Settings::values.dump_nso)) { |
| 139 | std::vector<u8> pi_header(sizeof(NSOHeader) + program_image.size()); | 141 | std::vector<u8> pi_header; |
| 140 | pi_header.insert(pi_header.begin(), reinterpret_cast<u8*>(&nso_header), | 142 | pi_header.insert(pi_header.begin(), reinterpret_cast<u8*>(&nso_header), |
| 141 | reinterpret_cast<u8*>(&nso_header) + sizeof(NSOHeader)); | 143 | reinterpret_cast<u8*>(&nso_header) + sizeof(NSOHeader)); |
| 142 | pi_header.insert(pi_header.begin() + sizeof(NSOHeader), program_image.begin(), | 144 | pi_header.insert(pi_header.begin() + sizeof(NSOHeader), program_image.begin(), |
| 143 | program_image.end()); | 145 | program_image.end()); |
| 144 | 146 | ||
| 145 | pi_header = pm->PatchNSO(pi_header); | 147 | pi_header = pm->PatchNSO(pi_header, file.GetName()); |
| 146 | 148 | ||
| 147 | std::copy(pi_header.begin() + sizeof(NSOHeader), pi_header.end(), program_image.begin()); | 149 | std::copy(pi_header.begin() + sizeof(NSOHeader), pi_header.end(), program_image.begin()); |
| 148 | } | 150 | } |