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

fix tracelogger buffer management on cpp side

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

BIN
output/dll/octoshock.dll
View File

Binary file not shown.

5
psx/octoshock/psx/cpu.cpp
View File

@ -31,7 +31,7 @@ void* g_ShockTraceCallbackOpaque = NULL;
ShockCallback_Trace g_ShockTraceCallback = NULL; ShockCallback_Trace g_ShockTraceCallback = NULL;
ShockCallback_Mem g_ShockMemCallback; ShockCallback_Mem g_ShockMemCallback;
eShockMemCb g_ShockMemCbType; eShockMemCb g_ShockMemCbType;
const char *disasm_buf = NULL; char disasm_buf[128];
/* TODO /* TODO
Make sure load delays are correct. Make sure load delays are correct.
@ -57,7 +57,6 @@ PS_CPU::PS_CPU()
memset(FastMap, 0, sizeof(FastMap)); memset(FastMap, 0, sizeof(FastMap));
memset(DummyPage, 0xFF, sizeof(DummyPage)); // 0xFF to trigger an illegal instruction exception, so we'll know what's up when debugging. memset(DummyPage, 0xFF, sizeof(DummyPage)); // 0xFF to trigger an illegal instruction exception, so we'll know what's up when debugging.
disasm_buf = (char*)malloc(100);
for(uint64 a = 0x00000000; a < (1ULL << 32); a += FAST_MAP_PSIZE) for(uint64 a = 0x00000000; a < (1ULL << 32); a += FAST_MAP_PSIZE)
SetFastMap(DummyPage, a, FAST_MAP_PSIZE); SetFastMap(DummyPage, a, FAST_MAP_PSIZE);
@ -577,7 +576,7 @@ pscpu_timestamp_t PS_CPU::RunReal(pscpu_timestamp_t timestamp_in)
if (g_ShockTraceCallback) if (g_ShockTraceCallback)
{ {
//_asm int 3; //_asm int 3;
shock_Util_DisassembleMIPS(PC, instr, (void *)disasm_buf, sizeof(disasm_buf)); shock_Util_DisassembleMIPS(PC, instr, disasm_buf, ARRAY_SIZE(disasm_buf));
g_ShockTraceCallback(NULL, PC, instr, disasm_buf); g_ShockTraceCallback(NULL, PC, instr, disasm_buf);
} }