From c0d61620506ef4d70b1aa60bc9961f08ce9a939f Mon Sep 17 00:00:00 2001
From: VolcaEM <63682805+VolcaEM@users.noreply.github.com>
Date: Tue, 16 Jun 2020 20:24:58 +0200
Subject: [PATCH] Revert IsValidNRO refactor but make it more readable
---
src/core/hle/service/ldr/ldr.cpp | 39 +++++++++++---------------------
1 file changed, 13 insertions(+), 26 deletions(-)
diff --git a/src/core/hle/service/ldr/ldr.cpp b/src/core/hle/service/ldr/ldr.cpp
index 6daea34089..ca53a99234 100644
--- a/src/core/hle/service/ldr/ldr.cpp
+++ b/src/core/hle/service/ldr/ldr.cpp
@@ -615,36 +615,23 @@ private:
}
static bool IsValidNRO(const NROHeader& header, u64 nro_size, u64 bss_size) {
+ return header.magic == Common::MakeMagic('N', 'R', 'O', '0') &&
+ header.nro_size == nro_size && header.bss_size == bss_size &&
- const bool valid_magic = header.magic == Common::MakeMagic('N', 'R', 'O', '0');
+ header.segment_headers[RO_INDEX].memory_offset ==
+ header.segment_headers[TEXT_INDEX].memory_offset +
+ header.segment_headers[TEXT_INDEX].memory_size &&
- const bool valid_nro_size = header.nro_size == nro_size;
+ header.segment_headers[DATA_INDEX].memory_offset ==
+ header.segment_headers[RO_INDEX].memory_offset +
+ header.segment_headers[RO_INDEX].memory_size &&
- const bool valid_bss_size = header.bss_size == bss_size;
+ nro_size == header.segment_headers[DATA_INDEX].memory_offset +
+ header.segment_headers[DATA_INDEX].memory_size &&
- const bool valid_ro_offset = header.segment_headers[RO_INDEX].memory_offset ==
- header.segment_headers[TEXT_INDEX].memory_offset +
- header.segment_headers[TEXT_INDEX].memory_size;
-
- const bool valid_data_offset = header.segment_headers[DATA_INDEX].memory_offset ==
- header.segment_headers[RO_INDEX].memory_offset +
- header.segment_headers[RO_INDEX].memory_size;
-
- const bool valid_nro_calculated_size =
- nro_size == header.segment_headers[DATA_INDEX].memory_offset +
- header.segment_headers[DATA_INDEX].memory_size;
-
- const bool text_aligned =
- Common::Is4KBAligned(header.segment_headers[TEXT_INDEX].memory_size);
-
- const bool ro_aligned = Common::Is4KBAligned(header.segment_headers[RO_INDEX].memory_size);
-
- const bool data_aligned =
- Common::Is4KBAligned(header.segment_headers[DATA_INDEX].memory_size);
-
- return valid_magic && valid_nro_size && valid_bss_size && valid_ro_offset &&
- valid_data_offset && valid_nro_calculated_size && text_aligned && ro_aligned &&
- data_aligned;
+ Common::Is4KBAligned(header.segment_headers[TEXT_INDEX].memory_size) &&
+ Common::Is4KBAligned(header.segment_headers[RO_INDEX].memory_size) &&
+ Common::Is4KBAligned(header.segment_headers[DATA_INDEX].memory_size);
}
Core::System& system;
};