hipnosuer
/
Zuma
forked from ShuriZma/suyu
1
0
Fork 0
Code Pull Requests Activity

Merge pull request #4196 from ogniK5377/nrr-nro-fixes 

ldr: Cleanup NRO & NRR structs
This commit is contained in:
bunnei 2020-06-28 11:55:55 -04:00 committed by GitHub
parent d67c7d9a82 db824b59c8
commit 8596a12772
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,7 +46,7 @@ constexpr std::size_t DATA_INDEX{2};
struct NRRCertification { struct NRRCertification {
u64_le application_id_mask; u64_le application_id_mask;
u64_le application_id_pattern; u64_le application_id_pattern;
std::array<u8, 0x10> reserved; INSERT_PADDING_BYTES(0x10);
std::array<u8, 0x100> public_key; // Also known as modulus std::array<u8, 0x100> public_key; // Also known as modulus
std::array<u8, 0x100> signature; std::array<u8, 0x100> signature;
}; };
@ -55,16 +55,16 @@ static_assert(sizeof(NRRCertification) == 0x220, "NRRCertification has invalid s
struct NRRHeader { struct NRRHeader {
u32_le magic; u32_le magic;
u32_le certification_signature_key_generation; // 9.0.0+ u32_le certification_signature_key_generation; // 9.0.0+
u64_le reserved; INSERT_PADDING_WORDS(2);
NRRCertification certification; NRRCertification certification;
std::array<u8, 0x100> signature; std::array<u8, 0x100> signature;
u64_le application_id; u64_le application_id;
u32_le size; u32_le size;
u8 nrr_kind; // 7.0.0+ u8 nrr_kind; // 7.0.0+
std::array<u8, 3> reserved_2; INSERT_PADDING_BYTES(3);
u32_le hash_offset; u32_le hash_offset;
u32_le hash_count; u32_le hash_count;
u64_le reserved_3; INSERT_PADDING_WORDS(2);
}; };
static_assert(sizeof(NRRHeader) == 0x350, "NRRHeader has invalid size."); static_assert(sizeof(NRRHeader) == 0x350, "NRRHeader has invalid size.");
@ -76,9 +76,9 @@ static_assert(sizeof(SegmentHeader) == 0x8, "SegmentHeader has invalid size.");
struct NROHeader { struct NROHeader {
// Switchbrew calls this "Start" (0x10) // Switchbrew calls this "Start" (0x10)
u32_le unused; INSERT_PADDING_WORDS(1);
u32_le mod_offset; u32_le mod_offset;
u64_le padding; INSERT_PADDING_WORDS(2);
// Switchbrew calls this "Header" (0x70) // Switchbrew calls this "Header" (0x70)
u32_le magic; u32_le magic;
@ -88,10 +88,10 @@ struct NROHeader {
// .text, .ro, .data // .text, .ro, .data
std::array<SegmentHeader, 3> segment_headers; std::array<SegmentHeader, 3> segment_headers;
u32_le bss_size; u32_le bss_size;
u32_le reserved; INSERT_PADDING_WORDS(1);
std::array<u8, 0x20> build_id; std::array<u8, 0x20> build_id;
u32_le dso_handle_offset; u32_le dso_handle_offset;
u32_le unused_2; INSERT_PADDING_WORDS(1);
// .apiInfo, .dynstr, .dynsym // .apiInfo, .dynstr, .dynsym
std::array<SegmentHeader, 3> segment_headers_2; std::array<SegmentHeader, 3> segment_headers_2;
}; };