From 37469faa8b5505083a53d6417abdb999d2c873d2 Mon Sep 17 00:00:00 2001
From: goyuken <goyuken@4bbf4f03-6f44-549e-7e59-35d4b0962838>
Date: Mon, 10 Feb 2014 05:02:30 +0000
Subject: [PATCH] PCE CDL: prevent loading of an existing CDL that doesn't
 match the emu's memory map

---
 BizHawk.Client.EmuHawk/tools/PCE/PCECDL.cs  | 14 +++++++--
 BizHawk.Emulation.Cores/CPUs/HuC6280/CDL.cs | 32 ++++++++++++++++++---
 2 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/BizHawk.Client.EmuHawk/tools/PCE/PCECDL.cs b/BizHawk.Client.EmuHawk/tools/PCE/PCECDL.cs
index 4ab17fa832..dbf9e9266c 100644
--- a/BizHawk.Client.EmuHawk/tools/PCE/PCECDL.cs
+++ b/BizHawk.Client.EmuHawk/tools/PCE/PCECDL.cs
@@ -112,9 +112,17 @@ namespace BizHawk.Client.EmuHawk
 				{
 					using (FileStream fs = new FileStream(ofd.FileName, FileMode.Open, FileAccess.Read))
 					{
-						CDL = CodeDataLog.Load(fs);
-						emu.Cpu.CDL = CDL;
-						UpdateDisplay();
+						var newCDL = CodeDataLog.Load(fs);
+						if (!newCDL.CheckConsistency(emu.Cpu.Mappings))
+						{
+							MessageBox.Show(this, "CDL file does not match emulator's current memory map!");
+						}
+						else
+						{
+							CDL = newCDL;
+							emu.Cpu.CDL = CDL;
+							UpdateDisplay();
+						}
 					}
 				}
 			}
diff --git a/BizHawk.Emulation.Cores/CPUs/HuC6280/CDL.cs b/BizHawk.Emulation.Cores/CPUs/HuC6280/CDL.cs
index 63f93c3bcf..406602a8c0 100644
--- a/BizHawk.Emulation.Cores/CPUs/HuC6280/CDL.cs
+++ b/BizHawk.Emulation.Cores/CPUs/HuC6280/CDL.cs
@@ -69,10 +69,23 @@ namespace BizHawk.Emulation.Cores.Components.H6280
 			return t;
 		}
 
-		public static CodeDataLog Create(IEnumerable<HuC6280.MemMapping> mm)
+		public bool CheckConsistency(IEnumerable<HuC6280.MemMapping> mm)
 		{
-			var t = new CodeDataLog();
+			var sizes = SizesFromHuMap(mm);
+			if (sizes.Count != Count)
+				return false;
+			foreach (var kvp in sizes)
+			{
+				if (ContainsKey(kvp.Key))
+					return false;
+				if (this[kvp.Key].Length != kvp.Value)
+					return false;
+			}
+			return true;
+		}
 
+		private static Dictionary<string, int> SizesFromHuMap(IEnumerable<HuC6280.MemMapping> mm)
+		{
 			Dictionary<string, int> sizes = new Dictionary<string, int>();
 			foreach (var m in mm)
 			{
@@ -80,10 +93,21 @@ namespace BizHawk.Emulation.Cores.Components.H6280
 					sizes[m.Name] = m.MaxOffs;
 			}
 
-			foreach (var kvp in sizes)
+			List<string> keys = new List<string>(sizes.Keys);
+			foreach (var key in keys)
 			{
 				// becase we were looking at offsets, and each bank is 8192 big, we need to add that size
-				t[kvp.Key] = new byte[kvp.Value + 8192];
+				sizes[key] += 8192;
+			}
+			return sizes;
+		}
+
+		public static CodeDataLog Create(IEnumerable<HuC6280.MemMapping> mm)
+		{
+			var t = new CodeDataLog();
+			foreach (var kvp in SizesFromHuMap(mm))
+			{
+				t[kvp.Key] = new byte[kvp.Value];
 			}
 			return t;
 		}