From 31d83d0d6e3a49c16e2da718ec80ceb828ea114a Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@users.noreply.github.com>
Date: Sat, 24 Apr 2021 23:20:00 -0400
Subject: [PATCH] fix crash in PCE debugger by adding peek and poke to the cpu
 instead of using read/write memory which triggers callbacks. however, the
 peek and poke are incomplete, as this requires deeper development (in this
 case, implementation in the memory maps)

---
 .../CPUs/HuC6280/HuC6280.cs                      | 16 +++++++++++++---
 .../PC Engine/PCEngine.IMemoryDomains.cs         |  4 ++--
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/BizHawk.Emulation.Cores/CPUs/HuC6280/HuC6280.cs b/src/BizHawk.Emulation.Cores/CPUs/HuC6280/HuC6280.cs
index 81e92d782d..bead4faf0b 100644
--- a/src/BizHawk.Emulation.Cores/CPUs/HuC6280/HuC6280.cs
+++ b/src/BizHawk.Emulation.Cores/CPUs/HuC6280/HuC6280.cs
@@ -322,10 +322,15 @@ namespace BizHawk.Emulation.Cores.Components.H6280
 
 		public IMemoryCallbackSystem MemoryCallbacks;
 
-		public byte ReadMemory(ushort address)
+		public byte PeekMemory(ushort address)
 		{
 			byte page = MPR[address >> 13];
-			var result = ReadMemory21((page << 13) | (address & 0x1FFF));
+			return ReadMemory21((page << 13) | (address & 0x1FFF));
+		}
+
+		public byte ReadMemory(ushort address)
+		{
+			byte result = PeekMemory(address);
 
 			if (MemoryCallbacks.HasReads)
 			{
@@ -336,10 +341,15 @@ namespace BizHawk.Emulation.Cores.Components.H6280
 			return result;
 		}
 
-		public void WriteMemory(ushort address, byte value)
+		public void PokeMemory(ushort address, byte value)
 		{
 			byte page = MPR[address >> 13];
 			WriteMemory21((page << 13) | (address & 0x1FFF), value);
+		}
+
+		public void WriteMemory(ushort address, byte value)
+		{
+			PokeMemory(address, value);
 			if (MemoryCallbacks.HasWrites)
 			{
 				uint flags = (uint)(MemoryCallbackFlags.AccessWrite);
diff --git a/src/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.IMemoryDomains.cs b/src/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.IMemoryDomains.cs
index 665c101ad5..a96ea7cea5 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.IMemoryDomains.cs	
+++ b/src/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.IMemoryDomains.cs	
@@ -37,13 +37,13 @@ namespace BizHawk.Emulation.Cores.PCEngine
 				{
 					if (addr < 0 || addr >= 0x10000)
 						throw new ArgumentOutOfRangeException();
-					return Cpu.ReadMemory((ushort)addr);
+					return Cpu.PeekMemory((ushort)addr);
 				},
 				(addr, value) =>
 				{
 					if (addr < 0 || addr >= 0x10000)
 						throw new ArgumentOutOfRangeException();
-					Cpu.WriteMemory((ushort)addr, value);
+					Cpu.PokeMemory((ushort)addr, value);
 				},
 				wordSize: 2);
 			domains.Add(cpuBusDomain);