Macintosh-SW/mpw
1
0
Fork 0
mirror of https://github.com/ksherlock/mpw.git synced 2024-11-28 23:49:26 +00:00
Code Issues Projects Releases Wiki Activity

better debugger memory logging

Browse Source
This commit is contained in:
Kelvin Sherlock 2013-09-01 15:32:39 -04:00
parent e1ff46a97a
commit d275c389e6
1 changed files with 32 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
bin/debugger.cpp
View File

@ -211,7 +211,6 @@ namespace {
} }
bool step(bool trace) bool step(bool trace)
{ {
// return false to break (toolbreak, address break, etc.) // return false to break (toolbreak, address break, etc.)
@ -219,9 +218,11 @@ namespace {
uint16_t op; uint16_t op;
memBreak = false; memBreak = false;
uint32_t prevPC = cpuGetPC();
cpuExecuteInstruction(); cpuExecuteInstruction();
uint32_t pc = cpuGetPC(); uint32_t pc = cpuGetPC();
if (trace) disasm(pc, &op); if (trace) disasm(pc, &op);
else op = Debug::ReadWord(pc); else op = Debug::ReadWord(pc);
@ -246,6 +247,7 @@ namespace {
if (memBreak) if (memBreak)
{ {
if (!trace) disasm(pc);
printf("Memory break\n"); printf("Memory break\n");
memBreak = false; memBreak = false;
return false; return false;
@ -296,6 +298,31 @@ namespace {
} }
static void LogWrite(int size, uint32_t value)
{
fprintf(stdout, " write %d bytes", size);
switch(size)
{
case 1:
fprintf(stdout, " [%02x]\n", value);
break;
case 2:
fprintf(stdout, " [%04x]\n", value);
break;
case 3:
fprintf(stdout, " [%06x]\n", value);
break;
case 4:
fprintf(stdout, " [%08x]\n", value);
break;
default:
fprintf(stdout, "\n");
break;
}
}
void MemoryLogger(uint32_t address, int size, int readWrite, uint32_t value) void MemoryLogger(uint32_t address, int size, int readWrite, uint32_t value)
{ {
@ -307,25 +334,7 @@ namespace {
fprintf(stdout, "%-20s %08x - ", name, address); fprintf(stdout, "%-20s %08x - ", name, address);
if (readWrite) if (readWrite)
{ {
fprintf(stdout, " write %d bytes", size); LogWrite(size, value);
switch(size)
{
case 1:
fprintf(stdout, " [%02x]\n", value);
break;
case 2:
fprintf(stdout, " [%04x]\n", value);
break;
case 3:
fprintf(stdout, " [%06x]\n", value);
break;
case 4:
fprintf(stdout, " [%08x]\n", value);
break;
default:
fprintf(stdout, "\n");
break;
}
} }
else else
{ {
@ -344,7 +353,8 @@ namespace {
if (!wbrkMap.lookup(address)) return; if (!wbrkMap.lookup(address)) return;
printf("Write $%08x\n", address); printf("Memory Break $%08x - ", address);
LogWrite(size, value);
// todo -- print previous value, old value. // todo -- print previous value, old value.
memBreak = true; memBreak = true;
@ -353,7 +363,7 @@ namespace {
{ {
if (!rbrkMap.lookup(address)) return; if (!rbrkMap.lookup(address)) return;
printf("Read $%08x\n", address); printf("Memory Break $%08x - read %d bytes\n", address, size);
memBreak = true; memBreak = true;
} }