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

hook up melon mem cbs to frontend

This commit is contained in:
CasualPokePlayer 2022-02-03 19:06:56 -08:00
parent c8c8b1c05c
commit 7259a6413e
4 changed files with 52 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/LibMelonDS.cs
View File

@ -101,6 +101,15 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.NDS
[BizImport(CC)] [BizImport(CC)]
public abstract void SetReg(int ncpu, int index, int val); public abstract void SetReg(int ncpu, int index, int val);
[BizImport(CC)]
public abstract int GetCallbackCycleOffset();
[UnmanagedFunctionPointer(CC)]
public delegate void MemoryCallback(uint addr);
[BizImport(CC)]
public abstract void SetMemoryCallback(int which, MemoryCallback callback);
// bit 0 -> ARM9 or ARM7 // bit 0 -> ARM9 or ARM7
// bit 1 -> ARM or THUMB mode // bit 1 -> ARM or THUMB mode
public enum CpuTypes : uint public enum CpuTypes : uint
@ -112,7 +121,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.NDS
} }
[UnmanagedFunctionPointer(CC)] [UnmanagedFunctionPointer(CC)]
public delegate void TraceCallback(CpuTypes _cpu, IntPtr _regs, uint _opcode, long _ccoffset); public delegate void TraceCallback(CpuTypes _cpu, IntPtr _regs, uint _opcode);
[BizImport(CC)] [BizImport(CC)]
public abstract void SetTraceCallback(TraceCallback callback); public abstract void SetTraceCallback(TraceCallback callback);

43
src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.IDebuggable.cs
View File

@ -7,11 +7,6 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.NDS
{ {
partial class NDS : IDebuggable partial class NDS : IDebuggable
{ {
[FeatureNotImplemented]
public IMemoryCallbackSystem MemoryCallbacks => throw new NotImplementedException(); // https://github.com/TASEmulators/BizHawk/issues/2585
public long TotalExecutedCycles => CycleCount;
public IDictionary<string, RegisterValue> GetCpuFlagsAndRegisters() public IDictionary<string, RegisterValue> GetCpuFlagsAndRegisters()
{ {
uint[] regs = new uint[2 * 16]; uint[] regs = new uint[2 * 16];
@ -52,5 +47,43 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.NDS
[FeatureNotImplemented] [FeatureNotImplemented]
public void Step(StepType type) => throw new NotImplementedException(); public void Step(StepType type) => throw new NotImplementedException();
public long TotalExecutedCycles => CycleCount + _core.GetCallbackCycleOffset();
public IMemoryCallbackSystem MemoryCallbacks => _memorycallbacks;
private readonly MemoryCallbackSystem _memorycallbacks = new(new[] { "System Bus" });
private LibMelonDS.MemoryCallback _readcb;
private LibMelonDS.MemoryCallback _writecb;
private LibMelonDS.MemoryCallback _execcb;
private void InitMemoryCallbacks()
{
LibMelonDS.MemoryCallback CreateCallback(MemoryCallbackFlags flags, Func<bool> getHasCBOfType)
{
var rawFlags = (uint)flags;
return (address) =>
{
if (getHasCBOfType())
{
MemoryCallbacks.CallMemoryCallbacks(address, 0, rawFlags, "System Bus");
}
};
}
_readcb = CreateCallback(MemoryCallbackFlags.AccessRead, () => MemoryCallbacks.HasReads);
_writecb = CreateCallback(MemoryCallbackFlags.AccessWrite, () => MemoryCallbacks.HasWrites);
_execcb = CreateCallback(MemoryCallbackFlags.AccessExecute, () => MemoryCallbacks.HasExecutes);
_memorycallbacks.ActiveChanged += SetMemoryCallbacks;
}
private void SetMemoryCallbacks()
{
_core.SetMemoryCallback(0, MemoryCallbacks.HasReads ? _readcb : null);
_core.SetMemoryCallback(1, MemoryCallbacks.HasWrites ? _writecb : null);
_core.SetMemoryCallback(2, MemoryCallbacks.HasExecutes ? _execcb : null);
}
} }
} }

4
src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.ITraceable.cs
View File

@ -10,7 +10,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.NDS
private ITraceable Tracer { get; } private ITraceable Tracer { get; }
private readonly LibMelonDS.TraceCallback _tracecb; private readonly LibMelonDS.TraceCallback _tracecb;
private void MakeTrace(LibMelonDS.CpuTypes _cpu, IntPtr _regs, uint _opcode, long _ccoffset) private void MakeTrace(LibMelonDS.CpuTypes _cpu, IntPtr _regs, uint _opcode)
{ {
string cpu = _cpu switch string cpu = _cpu switch
{ {
@ -47,7 +47,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.NDS
(uint)regs[13], (uint)regs[13],
(uint)regs[14], (uint)regs[14],
(uint)regs[15], (uint)regs[15],
CycleCount + _ccoffset, TotalExecutedCycles,
cpu))); cpu)));
} }
} }

3
src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.cs
View File

@ -50,6 +50,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.NDS
bool gbacartpresent = roms.Count > 1; bool gbacartpresent = roms.Count > 1;
bool gbasrampresent = roms.Count == 3; bool gbasrampresent = roms.Count == 3;
InitMemoryCallbacks();
_tracecb = MakeTrace; _tracecb = MakeTrace;
_core = PreInit<LibMelonDS>(new WaterboxOptions _core = PreInit<LibMelonDS>(new WaterboxOptions
@ -62,7 +63,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.NDS
MmapHeapSizeKB = 1024 * 1024, MmapHeapSizeKB = 1024 * 1024,
SkipCoreConsistencyCheck = CoreComm.CorePreferences.HasFlag(CoreComm.CorePreferencesFlags.WaterboxCoreConsistencyCheck), SkipCoreConsistencyCheck = CoreComm.CorePreferences.HasFlag(CoreComm.CorePreferencesFlags.WaterboxCoreConsistencyCheck),
SkipMemoryConsistencyCheck = CoreComm.CorePreferences.HasFlag(CoreComm.CorePreferencesFlags.WaterboxMemoryConsistencyCheck), SkipMemoryConsistencyCheck = CoreComm.CorePreferences.HasFlag(CoreComm.CorePreferencesFlags.WaterboxMemoryConsistencyCheck),
}, new Delegate[] { _tracecb }); }, new Delegate[] { _readcb, _writecb, _execcb, _tracecb });
var bios7 = IsDSi || _syncSettings.UseRealBIOS var bios7 = IsDSi || _syncSettings.UseRealBIOS
? CoreComm.CoreFileProvider.GetFirmwareOrThrow(new("NDS", "bios7")) ? CoreComm.CoreFileProvider.GetFirmwareOrThrow(new("NDS", "bios7"))