summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVolcaEM <63682805+VolcaEM@users.noreply.github.com>2020-06-16 20:28:44 +0200
committerGitHub <noreply@github.com>2020-06-16 20:28:44 +0200
commitbd9495c9ab5c1b452c700c54c2bbacf290306741 (patch)
tree02c19b664476da44d57cc93155fed688f3875bf4
parentRevert IsValidNRO refactor but make it more readable (diff)
downloadyuzu-bd9495c9ab5c1b452c700c54c2bbacf290306741.tar
yuzu-bd9495c9ab5c1b452c700c54c2bbacf290306741.tar.gz
yuzu-bd9495c9ab5c1b452c700c54c2bbacf290306741.tar.bz2
yuzu-bd9495c9ab5c1b452c700c54c2bbacf290306741.tar.lz
yuzu-bd9495c9ab5c1b452c700c54c2bbacf290306741.tar.xz
yuzu-bd9495c9ab5c1b452c700c54c2bbacf290306741.tar.zst
yuzu-bd9495c9ab5c1b452c700c54c2bbacf290306741.zip
Diffstat (limited to '')
-rw-r--r--src/core/hle/service/ldr/ldr.cpp8
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
using SHA256Hash = std::array<u8, 0x20>;
-#pragma pack(1)
struct NRRHeader {
u32_le magic;
u32_le certification_signature_key_generation; // 9.0.0+
@@ -69,18 +68,14 @@ struct NRRHeader {
u32_le hash_count;
u64_le reserved_3;
};
-#pragma pack()
static_assert(sizeof(NRRHeader) == 0x350, "NRRHeader has invalid size.");
-#pragma pack(1)
struct SegmentHeader {
u32_le memory_offset;
u32_le memory_size;
};
-#pragma pack()
static_assert(sizeof(SegmentHeader) == 0x8, "SegmentHeader has invalid size.");
-#pragma pack(1)
struct NROHeader {
// Switchbrew calls this "Start" (0x10)
u32_le unused;
@@ -102,10 +97,8 @@ struct NROHeader {
// .apiInfo, .dynstr, .dynsym
std::array<SegmentHeader, 3> segment_headers_2;
};
-#pragma pack()
static_assert(sizeof(NROHeader) == 0x80, "NROHeader has invalid size.");
-#pragma pack(1)
struct NROInfo {
SHA256Hash hash{};
VAddr nro_address{};
@@ -117,7 +110,6 @@ struct NROInfo {
std::size_t data_size{};
VAddr src_addr{};
};
-#pragma pack()
static_assert(sizeof(NROInfo) == 0x60, "NROInfo has invalid size.");
class DebugMonitor final : public ServiceFramework<DebugMonitor> {