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

loader/nso: Fix definition of the NSO header struct

Browse Source 
The total struct itself is 0x100 (256) bytes in size, so we should be
providing that amount of data.

Without the data, this can result in omitted data from the final loaded
NSO file.
This commit is contained in:
Lioncash 2019-03-22 12:55:03 -04:00
parent ee49e1fcb6
commit 90e27ea003
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,20 +34,32 @@ struct NsoSegmentHeader {
static_assert(sizeof(NsoSegmentHeader) == 0x10, "NsoSegmentHeader has incorrect size."); static_assert(sizeof(NsoSegmentHeader) == 0x10, "NsoSegmentHeader has incorrect size.");
struct NsoHeader { struct NsoHeader {
using SHA256Hash = std::array<u8, 0x20>;
struct RODataRelativeExtent {
u32 data_offset;
u32 size;
};
u32_le magic; u32_le magic;
u32_le version; u32_le version;
INSERT_PADDING_WORDS(1); u32 reserved;
u8 flags; u32_le flags;
std::array<NsoSegmentHeader, 3> segments; // Text, RoData, Data (in that order) std::array<NsoSegmentHeader, 3> segments; // Text, RoData, Data (in that order)
std::array<u8, 0x20> build_id; std::array<u8, 0x20> build_id;
std::array<u32_le, 3> segments_compressed_size; std::array<u32_le, 3> segments_compressed_size;
std::array<u8, 0x1C> padding;
RODataRelativeExtent api_info_extent;
RODataRelativeExtent dynstr_extent;
RODataRelativeExtent dynsyn_extent;
std::array<SHA256Hash, 3> segment_hashes;
bool IsSegmentCompressed(size_t segment_num) const { bool IsSegmentCompressed(size_t segment_num) const {
ASSERT_MSG(segment_num < 3, "Invalid segment {}", segment_num); ASSERT_MSG(segment_num < 3, "Invalid segment {}", segment_num);
return ((flags >> segment_num) & 1); return ((flags >> segment_num) & 1);
} }
}; };
static_assert(sizeof(NsoHeader) == 0x6c, "NsoHeader has incorrect size."); static_assert(sizeof(NsoHeader) == 0x100, "NsoHeader has incorrect size.");
static_assert(std::is_trivially_copyable_v<NsoHeader>, "NsoHeader isn't trivially copyable."); static_assert(std::is_trivially_copyable_v<NsoHeader>, "NsoHeader isn't trivially copyable.");
struct ModHeader { struct ModHeader {