update exec callbacks for genplus-gx

- closes TASEmulators#3813
VelpaChallenger · Nov 5, 2023 · 0524f46 · 0524f46
1 parent dafc7d3
commit 0524f46
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 4 deletions.
diff --git a/Assets/dll/gpgx.wbx.zst b/Assets/dll/gpgx.wbx.zst
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.IDebuggable.cs b/src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.IDebuggable.cs
@@ -64,7 +64,7 @@ private void InitMemCallbacks()
 				if (MemoryCallbacks.HasExecutes)
 				{
 					uint flags = (uint)MemoryCallbackFlags.AccessExecute;
-					MemoryCallbacks.CallMemoryCallbacks(a, 0, flags, "M68K BUS");
+					MemoryCallbacks.CallMemoryCallbacks(a, val, flags, "M68K BUS");
 				}
 			});
 			ReadCallback = new LibGPGX.mem_cb((a, val) =>

diff --git a/waterbox/gpgx/cinterface/callbacks.h b/waterbox/gpgx/cinterface/callbacks.h
@@ -7,7 +7,7 @@
 
 typedef ECL_ENTRY void (*CDCallback)(int32 addr, int32 addrtype, int32 flags);
 
-extern ECL_ENTRY void (*biz_execcb)(unsigned addr);
+extern ECL_ENTRY void (*biz_execcb)(unsigned addr, unsigned int value);
 extern ECL_ENTRY void (*biz_readcb)(unsigned addr, unsigned int value);
 extern ECL_ENTRY void (*biz_writecb)(unsigned addr, unsigned int value);
 extern CDCallback biz_cdcallback;

diff --git a/waterbox/gpgx/cinterface/cinterface.c b/waterbox/gpgx/cinterface/cinterface.c
@@ -55,7 +55,7 @@ static uint8_t brm_format[0x40] =
 	0x52,0x41,0x4d,0x5f,0x43,0x41,0x52,0x54,0x52,0x49,0x44,0x47,0x45,0x5f,0x5f,0x5f
 };
 
-ECL_ENTRY void (*biz_execcb)(unsigned addr);
+ECL_ENTRY void (*biz_execcb)(unsigned addr, unsigned int value);
 ECL_ENTRY void (*biz_readcb)(unsigned addr, unsigned int value);
 ECL_ENTRY void (*biz_writecb)(unsigned addr, unsigned int value);
 CDCallback biz_cdcallback = NULL;

diff --git a/waterbox/gpgx/core/m68k/m68kcpu.c b/waterbox/gpgx/core/m68k/m68kcpu.c
@@ -340,7 +340,7 @@ void m68k_run(unsigned int cycles)
     m68ki_use_data_space() /* auto-disable (see m68kcpu.h) */
 
 	if (biz_execcb)
-		biz_execcb(REG_PC);
+		biz_execcb(REG_PC, 0); //All read/write/exec callbacks require address and value, but for exec the functionality is not fully implemented, so I am passing 0 as value.
 
 	if(biz_cdcallback)
 	{