yuzu-emu
/
yuzu-android
Archived
1
0
Fork 0
Code

Merge pull request #1864 from lioncash/nrr 

service/ldr: Amend layouts of NRO and NRR headers
This commit is contained in:
bunnei 2018-12-07 22:26:31 -05:00 committed by GitHub
parent b9e80e97b7 05a6f1f676
commit 3bddd5351e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/hle/service/ldr/ldr.cpp
View File

@ -408,13 +408,13 @@ private:
using SHA256Hash = std::array<u8, 0x20>; using SHA256Hash = std::array<u8, 0x20>;
struct NROHeader { struct NROHeader {
u32_le entrypoint_insn; INSERT_PADDING_WORDS(1);
u32_le mod_offset; u32_le mod_offset;
INSERT_PADDING_WORDS(2); INSERT_PADDING_WORDS(2);
u32_le magic; u32_le magic;
INSERT_PADDING_WORDS(1); u32_le version;
u32_le nro_size; u32_le nro_size;
INSERT_PADDING_WORDS(1); u32_le flags;
u32_le text_offset; u32_le text_offset;
u32_le text_size; u32_le text_size;
u32_le ro_offset; u32_le ro_offset;
@ -430,9 +430,10 @@ private:
struct NRRHeader { struct NRRHeader {
u32_le magic; u32_le magic;
INSERT_PADDING_BYTES(0x1C); INSERT_PADDING_BYTES(12);
u64_le title_id_mask; u64_le title_id_mask;
u64_le title_id_pattern; u64_le title_id_pattern;
INSERT_PADDING_BYTES(16);
std::array<u8, 0x100> modulus; std::array<u8, 0x100> modulus;
std::array<u8, 0x100> signature_1; std::array<u8, 0x100> signature_1;
std::array<u8, 0x100> signature_2; std::array<u8, 0x100> signature_2;