From 0c855e004727c8af60eb9789605fc9cc8dde8c47 Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Mon, 20 Sep 2021 04:53:46 +1000 Subject: [PATCH] Add debug util for reproducing #2805 --- src/BizHawk.Client.EmuHawk/MainForm.Debug.cs | 14 ++++++++++++++ .../Nintendo/GBA/MGBAMemoryCallbackSystem.cs | 15 +++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/src/BizHawk.Client.EmuHawk/MainForm.Debug.cs b/src/BizHawk.Client.EmuHawk/MainForm.Debug.cs index 23fba88057..b399fd4457 100644 --- a/src/BizHawk.Client.EmuHawk/MainForm.Debug.cs +++ b/src/BizHawk.Client.EmuHawk/MainForm.Debug.cs @@ -9,6 +9,8 @@ using System.Windows.Forms; using BizHawk.Client.Common; using BizHawk.Client.EmuHawk.Properties; using BizHawk.Emulation.Common; +using BizHawk.Emulation.Cores; +using BizHawk.Emulation.Cores.Nintendo.GBA; using BizHawk.Emulation.Cores.Nintendo.N64; using BizHawk.WinForms.Controls; @@ -99,6 +101,18 @@ namespace BizHawk.Client.EmuHawk { DropDownItems = { + new DebugVSystemMenuItem("GBA") + { + DropDownItems = + { + new DebugVSystemChildItem( + "Reproduce #2805", + () => ((MGBAMemoryCallbackSystem) Emulator.AsDebuggable().MemoryCallbacks).Debug2805()) + { + RequiresCore = CoreNames.Mgba, + }, + }, + }, new DebugVSystemMenuItem("N64") { DropDownItems = diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAMemoryCallbackSystem.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAMemoryCallbackSystem.cs index a4e57ec538..4b9c5b8fd6 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAMemoryCallbackSystem.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAMemoryCallbackSystem.cs @@ -122,6 +122,21 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA callback?.Callback?.Invoke(pc, 0, 0); } } + + private MemoryCallbackDelegate DebugCallback = null; + + private bool DebugCallbackExecuted = false; + + public void Debug2805() + { + DebugCallback = (_, _, _) => + { + Console.WriteLine(DebugCallbackExecuted ? "subsequent call" : "first call"); + Remove(DebugCallback); + DebugCallbackExecuted = true; + }; + Add(new MemoryCallback("System Bus", MemoryCallbackType.Write, "Plugin Hook", DebugCallback, 0x020096E0, null)); + } } internal class CallbackContainer