From 544d484690b4d02b2d6d02ad61c65fcb50beaca3 Mon Sep 17 00:00:00 2001
From: jakcron <jkrcarr@gmail.com>
Date: Fri, 7 Jul 2017 09:56:49 +1000
Subject: [PATCH] [nx] Added operators to AciHeader::sSection.

---
 lib/nx/AciHeader.cpp | 18 ++++++------------
 lib/nx/AciHeader.h   | 31 ++++++++++++++++++++++++++-----
 2 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/lib/nx/AciHeader.cpp b/lib/nx/AciHeader.cpp
index 234bc57..ede72b3 100644
--- a/lib/nx/AciHeader.cpp
+++ b/lib/nx/AciHeader.cpp
@@ -25,12 +25,9 @@ bool AciHeader::isEqual(const AciHeader & other) const
 {
 	return (mType == other.mType) \
 		&& (mProgramId == other.mProgramId) \
-		&& (mFac.offset == other.mFac.offset) \
-		&& (mFac.size == other.mFac.size) \
-		&& (mSac.offset == other.mSac.offset) \
-		&& (mSac.size == other.mSac.size) \
-		&& (mKc.offset == other.mKc.offset) \
-		&& (mKc.size == other.mKc.size);
+		&& (mFac == other.mFac) \
+		&& (mSac == other.mSac) \
+		&& (mKc == other.mKc);
 }
 
 void AciHeader::copyFrom(const AciHeader & other)
@@ -43,12 +40,9 @@ void AciHeader::copyFrom(const AciHeader & other)
 	{
 		mType = other.mType;
 		mProgramId = other.mProgramId;
-		mFac.offset = other.mFac.offset;
-		mFac.size = other.mFac.size;
-		mSac.offset = other.mSac.offset;
-		mSac.size = other.mSac.size;
-		mKc.offset = other.mKc.offset;
-		mKc.size = other.mKc.size;
+		mFac = other.mFac;
+		mSac = other.mSac;
+		mKc = other.mKc;
 	}
 }
 
diff --git a/lib/nx/AciHeader.h b/lib/nx/AciHeader.h
index 1c22694..f7d136f 100644
--- a/lib/nx/AciHeader.h
+++ b/lib/nx/AciHeader.h
@@ -19,6 +19,23 @@ namespace nx
 		{
 			size_t offset;
 			size_t size;
+
+			void operator=(const sSection& other)
+			{
+				offset = other.offset;
+				size = other.size;
+			}
+
+			bool operator==(const sSection& other) const
+			{
+				return (offset == other.offset) \
+					&& (size == other.size);
+			}
+
+			bool operator!=(const sSection& other) const
+			{
+				return !operator==(other);
+			}
 		};
 
 		AciHeader();
@@ -61,26 +78,30 @@ namespace nx
 		{
 		private:
 			u8 signature_[4];
-			u8 reserved_1[12];
-			u64 program_id_;
+			u32 size_; // includes prefacing signature, set only in ACID since it is signed
+			u8 reserved_1[8];
+			u64 program_id_; // set only in ACI0 (since ACID is generic)
 			u8 reserved_2[8];
 			struct sAciSection
 			{
 			private:
 				u32 offset_; // aligned by 0x10 from the last one
-				u32 mSize;
+				u32 size_;
 			public:
 				u32 offset() const { return le_word(offset_); }
 				void set_offset(u32 offset) { offset_ = le_word(offset); }
 
-				u32 size() const { return le_word(mSize); }
-				void set_size(u32 size) { mSize = le_word(size); }
+				u32 size() const { return le_word(size_); }
+				void set_size(u32 size) { size_ = le_word(size); }
 			} fac_, sac_, kc_;
 			u8 reserved_3[8];
 		public:
 			const char* signature() const { return (const char*)signature_; }
 			void set_signature(const char* signature) { memcpy(signature_, signature, 4); }
 
+			u32 size() const { return le_word(size_); }
+			void set_size(u32 size) { size_ = le_word(size); }
+
 			u64 program_id() const { return le_dword(program_id_); }
 			void set_program_id(u64 program_id) { program_id_ = le_dword(program_id); }