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

psx tracer - probably fix crash due to disposed delegate (didnt test)

This commit is contained in:
zeromus 2016-08-21 15:27:31 -05:00
parent 00d77a4253
commit 3435e5f70e
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.ITraceable.cs
View File

@ -12,7 +12,9 @@ namespace BizHawk.Emulation.Cores.Sony.PSX
{
public TraceBuffer Tracer { get; private set; }
public static string TraceHeader = "R3000A: PC, raw bytes, mnemonic, registers (GPRs, lo, hi, sr, cause, epc)";
public static string TraceHeader = "R3000A: PC, raw bytes, mnemonic, registers (GPRs, lo, hi, sr, cause, epc)";
OctoshockDll.ShockCallback_Trace trace_cb;
public void ShockTraceCallback(IntPtr opaque, uint PC, uint inst, string dis)
{
@ -26,9 +28,9 @@ namespace BizHawk.Emulation.Cores.Sony.PSX
string.Format("{0}:{1} ",
r.Key,
r.Value.Value.ToHexString(r.Value.BitSize / 4)));
}
Tracer.Put(new TraceInfo
}
Tracer.Put(new TraceInfo
{
Disassembly = string.Format("{0:X8}: {1:X8} {2}", PC, inst, dis.PadRight(20)),
RegisterInfo = sb.ToString().Trim()

2
BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs
View File

@ -323,6 +323,8 @@ namespace BizHawk.Emulation.Cores.Sony.PSX
SetMemoryDomains();
InitMemCallbacks();
trace_cb = new OctoshockDll.ShockCallback_Trace(ShockTraceCallback);
//set a default framebuffer based on the first frame of emulation, to cut down on flickering or whatever
//this is probably quixotic, but we have to pick something
{