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

fix some things that i didnt think of before

Browse Source
This commit is contained in:
Zach Hilman
2018-06-16 20:02:34 -04:00
parent b3b69e994e
commit 623a4167a0
2 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/common_types.h
View File

@@ -48,9 +48,6 @@ using PAddr = u64; ///< Represents a pointer in the ARM11 physical address space
using u128 = std::array<std::uint64_t, 2>; using u128 = std::array<std::uint64_t, 2>;
static_assert(sizeof(u128) == 16, "u128 must be 128 bits wide"); static_assert(sizeof(u128) == 16, "u128 must be 128 bits wide");
using u256 = std::array<std::uint64_t, 4>;
static_assert(sizeof(u256) == 32, "u256 must be 256 bits wide");
// An inheritable class to disallow the copy constructor and operator= functions // An inheritable class to disallow the copy constructor and operator= functions
class NonCopyable { class NonCopyable {
protected: protected:

22
src/core/loader/nca.cpp
View File

@@ -34,8 +34,8 @@ enum NcaContentType {
enum NcaSectionFilesystemType { NSFS_PFS0 = 0x2, NSFS_ROMFS = 0x3 }; enum NcaSectionFilesystemType { NSFS_PFS0 = 0x2, NSFS_ROMFS = 0x3 };
struct NcaSectionTableEntry { struct NcaSectionTableEntry {
u32 media_offset; u32_le media_offset;
u32 media_end_offset; u32_le media_end_offset;
INSERT_PADDING_BYTES(0x8); INSERT_PADDING_BYTES(0x8);
}; };
static_assert(sizeof(NcaSectionTableEntry) == 0x10, "NcaSectionTableEntry has incorrect size."); static_assert(sizeof(NcaSectionTableEntry) == 0x10, "NcaSectionTableEntry has incorrect size.");
@@ -43,15 +43,15 @@ static_assert(sizeof(NcaSectionTableEntry) == 0x10, "NcaSectionTableEntry has in
struct NcaHeader { struct NcaHeader {
u8 rsa_signature_1[0x100]; u8 rsa_signature_1[0x100];
u8 rsa_signature_2[0x100]; u8 rsa_signature_2[0x100];
u32 magic; u32_le magic;
u8 is_system; u8 is_system;
u8 content_type; u8 content_type;
u8 crypto_type; u8 crypto_type;
u8 key_index; u8 key_index;
u64 size; u64_le size;
u64 title_id; u64_le title_id;
INSERT_PADDING_BYTES(0x4); INSERT_PADDING_BYTES(0x4);
u32 sdk_version; u32_le sdk_version;
u8 crypto_type_2; u8 crypto_type_2;
INSERT_PADDING_BYTES(15); INSERT_PADDING_BYTES(15);
u8 rights_id[0x10]; u8 rights_id[0x10];
@@ -73,12 +73,12 @@ static_assert(sizeof(NcaSectionHeaderBlock) == 0x8, "NcaSectionHeaderBlock has i
struct Pfs0Superblock { struct Pfs0Superblock {
NcaSectionHeaderBlock header_block; NcaSectionHeaderBlock header_block;
std::array<u8, 0x20> hash; std::array<u8, 0x20> hash;
u32 size; u32_le size;
INSERT_PADDING_BYTES(4); INSERT_PADDING_BYTES(4);
u64 hash_table_offset; u64_le hash_table_offset;
u64 hash_table_size; u64_le hash_table_size;
u64 pfs0_header_offset; u64_le pfs0_header_offset;
u64 pfs0_size; u64_le pfs0_size;
INSERT_PADDING_BYTES(432); INSERT_PADDING_BYTES(432);
}; };
static_assert(sizeof(Pfs0Superblock) == 0x200, "Pfs0Superblock has incorrect size."); static_assert(sizeof(Pfs0Superblock) == 0x200, "Pfs0Superblock has incorrect size.");