ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

emergency containment on bad code

This commit is contained in:
nattthebear 2020-07-26 15:11:29 -04:00
parent 105250f60d
commit 9339c02b82
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/LibmGBA.cs
View File

@ -183,18 +183,18 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
[UnmanagedFunctionPointer(cc)]
public delegate void TraceCallback(string msg);
[BizImport(cc, Compatibility = true)]
public abstract void BizSetTraceCallback(TraceCallback cb);
// [BizImport(cc, Compatibility = true)]
// public abstract void BizSetTraceCallback(TraceCallback cb);
[UnmanagedFunctionPointer(cc)]
public delegate void MemCallback(uint addr, mWatchpointType type, uint oldValue, uint newValue);
[BizImport(cc, Compatibility = true)]
public abstract void BizSetMemCallback(MemCallback cb);
// [BizImport(cc, Compatibility = true)]
// public abstract void BizSetMemCallback(MemCallback cb);
[UnmanagedFunctionPointer(cc)]
public delegate void ExecCallback(uint pc);
[BizImport(cc, Compatibility = true)]
public abstract void BizSetExecCallback(ExecCallback cb);
// [BizImport(cc, Compatibility = true)]
// public abstract void BizSetExecCallback(ExecCallback cb);
[BizImport(cc, Compatibility = true)]
public abstract int BizSetWatchpoint(IntPtr ctx, uint addr, mWatchpointType type);

2
src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAHawk.cs
View File

@ -125,7 +125,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
WireMemoryDomainPointers();
}
LibmGBA.BizSetTraceCallback(Tracer.Enabled ? _tracecb : null);
// LibmGBA.BizSetTraceCallback(Tracer.Enabled ? _tracecb : null);
IsLagFrame = LibmGBA.BizAdvance(
Core,

6
src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAMemoryCallbackSystem.cs
View File

@ -56,11 +56,11 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
{
_executeCallback = RunExecCallback;
_execPcs[callback.Address.Value] = callback;
MGBAHawk.ZZHacky.BizSetExecCallback(_executeCallback);
// MGBAHawk.ZZHacky.BizSetExecCallback(_executeCallback);
}
else
{
MGBAHawk.ZZHacky.BizSetMemCallback(container.CallDelegate);
// MGBAHawk.ZZHacky.BizSetMemCallback(container.CallDelegate);
container.ID = MGBAHawk.ZZHacky.BizSetWatchpoint(_mgba.Core, callback.Address.Value, container.WatchPointType);
}
@ -79,7 +79,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
if (_callbacks.All(cb => cb.Callback.Type != MemoryCallbackType.Execute))
{
_executeCallback = null;
MGBAHawk.ZZHacky.BizSetExecCallback(null);
// MGBAHawk.ZZHacky.BizSetExecCallback(null);
}
}
else if (MGBAHawk.ZZHacky.BizClearWatchpoint(_mgba.Core, cbToRemove.ID))