From e194c9f0c468378ab09a15dda1c67b3f30a8503e Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sat, 24 Jan 2015 14:52:20 +0000
Subject: [PATCH] Memory callbacks - check the HasReads/Writes/Executes flags
 during the call methods so that the responsibility does not fall on the core,
 remove the check in the PCE core

---
 .../Base Implementations/MemoryCallbackSystem.cs  | 15 ++++++++++++---
 BizHawk.Emulation.Cores/CPUs/HuC6280/Execute.cs   |  2 +-
 CpuCoreGenerator/HuC6280/CoreGenerator.cs         |  2 +-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/BizHawk.Emulation.Common/Base Implementations/MemoryCallbackSystem.cs b/BizHawk.Emulation.Common/Base Implementations/MemoryCallbackSystem.cs
index ea2fa89649..c9d7b9ac6f 100644
--- a/BizHawk.Emulation.Common/Base Implementations/MemoryCallbackSystem.cs	
+++ b/BizHawk.Emulation.Common/Base Implementations/MemoryCallbackSystem.cs	
@@ -51,17 +51,26 @@ namespace BizHawk.Emulation.Common
 
 		public void CallReads(uint addr)
 		{
-			Call(Reads, addr);
+			if (_hasReads)
+			{
+				Call(Reads, addr);
+			}
 		}
 
 		public void CallWrites(uint addr)
 		{
-			Call(Writes, addr);
+			if (_hasWrites)
+			{
+				Call(Writes, addr);
+			}
 		}
 
 		public void CallExecutes(uint addr)
 		{
-			Call(Execs, addr);
+			if (_hasExecutes)
+			{
+				Call(Execs, addr);
+			}
 		}
 
 		public bool HasReads
diff --git a/BizHawk.Emulation.Cores/CPUs/HuC6280/Execute.cs b/BizHawk.Emulation.Cores/CPUs/HuC6280/Execute.cs
index 73046df20c..165ca20fd9 100644
--- a/BizHawk.Emulation.Cores/CPUs/HuC6280/Execute.cs
+++ b/BizHawk.Emulation.Cores/CPUs/HuC6280/Execute.cs
@@ -59,7 +59,7 @@ namespace BizHawk.Emulation.Cores.Components.H6280
                 LagIFlag = FlagI;
 
                 if (Debug) Logger(State());
-                if (Core.MemoryCallbacks.HasExecutes) { Core.MemoryCallbacks.CallExecutes(PC); }
+                Core.MemoryCallbacks.CallExecutes(PC);
 
                 if (CDLLoggingActive) CDLOpcode();
 
diff --git a/CpuCoreGenerator/HuC6280/CoreGenerator.cs b/CpuCoreGenerator/HuC6280/CoreGenerator.cs
index 1793f2c2b9..fed57d880f 100644
--- a/CpuCoreGenerator/HuC6280/CoreGenerator.cs
+++ b/CpuCoreGenerator/HuC6280/CoreGenerator.cs
@@ -494,7 +494,7 @@ namespace HuC6280
             w.WriteLine("                LagIFlag = FlagI;");
             w.WriteLine();
             w.WriteLine("                if (Debug) Logger(State());");
-            w.WriteLine("                if (Core.MemoryCallbacks.HasExecutes) { Core.MemoryCallbacks.CallExecutes(PC); }");
+            w.WriteLine("                Core.MemoryCallbacks.CallExecutes(PC);");
             w.WriteLine("                if (CDLLoggingActive) CDLOpcode();");
             w.WriteLine();
             w.WriteLine("                byte opcode = ReadMemory(PC++);");