From 7dd27fd5c832d6a02f0452e4c0a9dceed1ac4cea Mon Sep 17 00:00:00 2001
From: jakcron <jkrcarr@gmail.com>
Date: Sat, 15 Jul 2017 18:59:15 +1000
Subject: [PATCH] [nx] Unbroke MemoryMappingHandler forloop bugfix. Fixed typo
 in KcBinary::importBinary().

---
 lib/nx/KcBinary.cpp             |  2 +-
 lib/nx/MemoryMappingHandler.cpp | 13 +++++++------
 lib/nx/MemoryMappingHandler.h   | 24 ++++++++++++++++++------
 3 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/lib/nx/KcBinary.cpp b/lib/nx/KcBinary.cpp
index ee2baa7..45993d6 100644
--- a/lib/nx/KcBinary.cpp
+++ b/lib/nx/KcBinary.cpp
@@ -123,7 +123,7 @@ void nx::KcBinary::importBinary(const u8 * bytes, size_t len)
 	mSystemCalls.importKernelCapabilityList(systemCallCaps);
 	mMemoryMap.importKernelCapabilityList(memoryMapCaps);
 	mInterupts.importKernelCapabilityList(interuptCaps);
-	mMiscParams.importKernelCapabilityList(memoryMapCaps);
+	mMiscParams.importKernelCapabilityList(miscParamCaps);
 	mKernelVersion.importKernelCapabilityList(kernelVersionCaps);
 	mHandleTableSize.importKernelCapabilityList(handleTableSizeCaps);
 	mMiscFlags.importKernelCapabilityList(miscFlagsCaps);
diff --git a/lib/nx/MemoryMappingHandler.cpp b/lib/nx/MemoryMappingHandler.cpp
index 17d771f..c37a123 100644
--- a/lib/nx/MemoryMappingHandler.cpp
+++ b/lib/nx/MemoryMappingHandler.cpp
@@ -35,15 +35,16 @@ void nx::MemoryMappingHandler::importKernelCapabilityList(const fnd::List<Kernel
 
 	mMemRange.clear();
 	mMemPage.clear();
-	for (size_t i = 0; i < entries.getSize(); i++)
+	for (size_t i = 0; i < entries.getSize();)
 	{
 		// has flag means "MemMap"
 		if (entries[i].isMultiplePages())
 		{
+
 			// this entry is the last one or the next one isn't a memory map
 			if ((i + 1) == entries.getSize() || entries[i+1].isMultiplePages() == false)
 			{
-				throw fnd::Exception(kModuleName, "Illegal page address");
+				throw fnd::Exception(kModuleName, "No paired entry");
 			}
 
 			// check valid page address
@@ -59,7 +60,7 @@ void nx::MemoryMappingHandler::importKernelCapabilityList(const fnd::List<Kernel
 			}
 
 			// add to list
-			mMemRange.addElement({ entries[i].getPage(), entries[i+1].getPage(), !entries[i].getFlag(), !entries[i+1].getFlag() });
+			mMemRange.addElement({ entries[i].getPage(), entries[i+1].getPage(), entries[i].getFlag() ? MEM_RO : MEM_RW, entries[i+1].getFlag() ? MAP_STATIC : MAP_IO });
 
 			// increment i by two
 			i += 2;
@@ -74,7 +75,7 @@ void nx::MemoryMappingHandler::importKernelCapabilityList(const fnd::List<Kernel
 			}
 
 			// add to list
-			mMemPage.addElement({ entries[i].getPage(), 1, true, true });
+			mMemPage.addElement({ entries[i].getPage(), 1, MEM_RW, MAP_IO });
 
 			// increment i by one
 			i += 1;
@@ -96,11 +97,11 @@ void nx::MemoryMappingHandler::exportKernelCapabilityList(fnd::List<KernelCapabi
 	for (size_t i = 0; i < mMemRange.getSize(); i++)
 	{
 		cap.setPage(mMemRange[i].addr & kMaxPageAddr);
-		cap.setFlag(!mMemRange[i].isRW);
+		cap.setFlag(mMemRange[i].perm == MEM_RO);
 		caps.addElement(cap.getKernelCapability());
 
 		cap.setPage(mMemRange[i].size & kMaxPageNum);
-		cap.setFlag(!mMemRange[i].isIO);
+		cap.setFlag(mMemRange[i].type == MAP_STATIC);
 		caps.addElement(cap.getKernelCapability());
 	}
 
diff --git a/lib/nx/MemoryMappingHandler.h b/lib/nx/MemoryMappingHandler.h
index c1992fe..0eb23c4 100644
--- a/lib/nx/MemoryMappingHandler.h
+++ b/lib/nx/MemoryMappingHandler.h
@@ -7,19 +7,31 @@ namespace nx
 		public IKernelCapabilityHandler
 	{
 	public:
+		enum MemoryPerm
+		{
+			MEM_RW,
+			MEM_RO
+		};
+
+		enum MappingType
+		{
+			MAP_IO,
+			MAP_STATIC
+		};
+
 		struct sMemoryMapping
 		{
 			u32 addr; // page index
 			u32 size; // page num
-			bool isRW;
-			bool isIO;
+			MemoryPerm perm;
+			MappingType type;
 
 			bool operator==(const sMemoryMapping& other) const
 			{
 				return (addr == other.addr) \
 					&& (size == other.size) \
-					&& (isRW == other.isRW) \
-					&& (isIO == other.isIO);
+					&& (perm == other.perm) \
+					&& (type == other.type);
 			}
 
 			bool operator!=(const sMemoryMapping& other) const
@@ -31,8 +43,8 @@ namespace nx
 			{
 				addr = other.addr;
 				size = other.size;
-				isRW = other.isRW;
-				isIO = other.isIO;
+				perm = other.perm;
+				type = other.type;
 
 				return *this;
 			}