diff options
| author | 2020-06-16 20:28:44 +0200 | |
|---|---|---|
| committer | 2020-06-16 20:28:44 +0200 | |
| commit | bd9495c9ab5c1b452c700c54c2bbacf290306741 (patch) | |
| tree | 02c19b664476da44d57cc93155fed688f3875bf4 /src | |
| parent | Revert IsValidNRO refactor but make it more readable (diff) | |
| download | yuzu-bd9495c9ab5c1b452c700c54c2bbacf290306741.tar.gz yuzu-bd9495c9ab5c1b452c700c54c2bbacf290306741.tar.xz yuzu-bd9495c9ab5c1b452c700c54c2bbacf290306741.zip | |
Remove unnecessary pragmas
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/service/ldr/ldr.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/core/hle/service/ldr/ldr.cpp b/src/core/hle/service/ldr/ldr.cpp index ca53a9923..9ce2db191 100644 --- a/src/core/hle/service/ldr/ldr.cpp +++ b/src/core/hle/service/ldr/ldr.cpp | |||
| @@ -54,7 +54,6 @@ static_assert(sizeof(NRRCertification) == 0x220, "NRRCertification has invalid s | |||
| 54 | 54 | ||
| 55 | using SHA256Hash = std::array<u8, 0x20>; | 55 | using SHA256Hash = std::array<u8, 0x20>; |
| 56 | 56 | ||
| 57 | #pragma pack(1) | ||
| 58 | struct NRRHeader { | 57 | struct NRRHeader { |
| 59 | u32_le magic; | 58 | u32_le magic; |
| 60 | u32_le certification_signature_key_generation; // 9.0.0+ | 59 | u32_le certification_signature_key_generation; // 9.0.0+ |
| @@ -69,18 +68,14 @@ struct NRRHeader { | |||
| 69 | u32_le hash_count; | 68 | u32_le hash_count; |
| 70 | u64_le reserved_3; | 69 | u64_le reserved_3; |
| 71 | }; | 70 | }; |
| 72 | #pragma pack() | ||
| 73 | static_assert(sizeof(NRRHeader) == 0x350, "NRRHeader has invalid size."); | 71 | static_assert(sizeof(NRRHeader) == 0x350, "NRRHeader has invalid size."); |
| 74 | 72 | ||
| 75 | #pragma pack(1) | ||
| 76 | struct SegmentHeader { | 73 | struct SegmentHeader { |
| 77 | u32_le memory_offset; | 74 | u32_le memory_offset; |
| 78 | u32_le memory_size; | 75 | u32_le memory_size; |
| 79 | }; | 76 | }; |
| 80 | #pragma pack() | ||
| 81 | static_assert(sizeof(SegmentHeader) == 0x8, "SegmentHeader has invalid size."); | 77 | static_assert(sizeof(SegmentHeader) == 0x8, "SegmentHeader has invalid size."); |
| 82 | 78 | ||
| 83 | #pragma pack(1) | ||
| 84 | struct NROHeader { | 79 | struct NROHeader { |
| 85 | // Switchbrew calls this "Start" (0x10) | 80 | // Switchbrew calls this "Start" (0x10) |
| 86 | u32_le unused; | 81 | u32_le unused; |
| @@ -102,10 +97,8 @@ struct NROHeader { | |||
| 102 | // .apiInfo, .dynstr, .dynsym | 97 | // .apiInfo, .dynstr, .dynsym |
| 103 | std::array<SegmentHeader, 3> segment_headers_2; | 98 | std::array<SegmentHeader, 3> segment_headers_2; |
| 104 | }; | 99 | }; |
| 105 | #pragma pack() | ||
| 106 | static_assert(sizeof(NROHeader) == 0x80, "NROHeader has invalid size."); | 100 | static_assert(sizeof(NROHeader) == 0x80, "NROHeader has invalid size."); |
| 107 | 101 | ||
| 108 | #pragma pack(1) | ||
| 109 | struct NROInfo { | 102 | struct NROInfo { |
| 110 | SHA256Hash hash{}; | 103 | SHA256Hash hash{}; |
| 111 | VAddr nro_address{}; | 104 | VAddr nro_address{}; |
| @@ -117,7 +110,6 @@ struct NROInfo { | |||
| 117 | std::size_t data_size{}; | 110 | std::size_t data_size{}; |
| 118 | VAddr src_addr{}; | 111 | VAddr src_addr{}; |
| 119 | }; | 112 | }; |
| 120 | #pragma pack() | ||
| 121 | static_assert(sizeof(NROInfo) == 0x60, "NROInfo has invalid size."); | 113 | static_assert(sizeof(NROInfo) == 0x60, "NROInfo has invalid size."); |
| 122 | 114 | ||
| 123 | class DebugMonitor final : public ServiceFramework<DebugMonitor> { | 115 | class DebugMonitor final : public ServiceFramework<DebugMonitor> { |