folkert/KEK
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

"examine" now wants p/v instead of b/w

Browse source
This commit is contained in:
folkert van heusden 2024-03-29 23:50:13 +01:00
parent a3af6ef422
commit af8aa61876
Signed by untrusted user who does not match committer: folkert
GPG key ID: 6B6455EDFEED3BD1
1 changed files with 7 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
debugger.cpp
View file

@ -324,14 +324,11 @@ void debugger(console *const cnsl, bus *const b, std::atomic_uint32_t *const sto
if (parts.size() < 3) if (parts.size() < 3)
cnsl->put_string_lf("parameter missing"); cnsl->put_string_lf("parameter missing");
else { else {
uint16_t addr = std::stoi(parts[2], nullptr, 8); uint32_t addr = std::stoi(parts[1], nullptr, 8);
int val = -1; int n = parts.size() == 4 ? atoi(parts[3].c_str()) : 1;
int n = parts.size() == 4 ? atoi(parts[3].c_str()) : 1; if (parts[2] != "p" && parts[2] != "v") {
bool word = parts[1] == "w"; cnsl->put_string_lf("expected p (physical address) or v (virtual address)");
if (parts[1] != "w" && parts[1] != "b") {
cnsl->put_string_lf("expected b or w");
continue; continue;
} }
@ -339,10 +336,7 @@ void debugger(console *const cnsl, bus *const b, std::atomic_uint32_t *const sto
std::string out; std::string out;
for(int i=0; i<n; i++) { for(int i=0; i<n; i++) {
if (!word) int val = parts[2] == "v" ? b->read(addr + i, wm_word, rm_cur, true) : b->readPhysical(addr + i);
val = b->read(addr + i, wm_byte, rm_cur, true);
else if (word)
val = b->read(addr + i, wm_word, rm_cur, true);
if (val == -1) { if (val == -1) {
cnsl->put_string_lf(format("Can't read from %06o\n", addr + i)); cnsl->put_string_lf(format("Can't read from %06o\n", addr + i));
@ -356,10 +350,7 @@ void debugger(console *const cnsl, bus *const b, std::atomic_uint32_t *const sto
if (i > 0) if (i > 0)
out += " "; out += " ";
if (word) out += format("%06o", val);
out += format("%06o", val);
else
out += format("%03o", val);
} }
} }
@ -452,7 +443,7 @@ void debugger(console *const cnsl, bus *const b, std::atomic_uint32_t *const sto
#if !defined(ESP32) #if !defined(ESP32)
cnsl->put_string_lf("quit/q - stop emulator"); cnsl->put_string_lf("quit/q - stop emulator");
#endif #endif
cnsl->put_string_lf("examine/e - show memory address (<b|w> <octal address> [<n>])"); cnsl->put_string_lf("examine/e - show memory address (<octal address> <p|v> [<n>])");
cnsl->put_string_lf("reset/r - reset cpu/bus/etc"); cnsl->put_string_lf("reset/r - reset cpu/bus/etc");
cnsl->put_string_lf("single/s - run 1 instruction (implicit 'disassemble' command)"); cnsl->put_string_lf("single/s - run 1 instruction (implicit 'disassemble' command)");
cnsl->put_string_lf("sbp/cbp/lbp - set/clear/list breakpoint(s)"); cnsl->put_string_lf("sbp/cbp/lbp - set/clear/list breakpoint(s)");