debugger: log MMR1

This commit is contained in:
folkert van heusden 2023-03-23 09:14:59 +01:00
parent 45890daf75
commit b33b688564
Signed by untrusted user who does not match committer: folkert
GPG key ID: 6B6455EDFEED3BD1
2 changed files with 4 additions and 2 deletions

View file

@ -2134,6 +2134,7 @@ std::map<std::string, std::vector<std::string> > cpu::disassemble(const uint16_t
out.insert({ "work-values", work_values_str });
out.insert({ "MMR0", { format("%06o", b->getMMR0()) } });
out.insert({ "MMR1", { format("%06o", b->getMMR1()) } });
out.insert({ "MMR2", { format("%06o", b->getMMR2()) } });
return out;

View file

@ -36,6 +36,7 @@ int disassemble(cpu *const c, console *const cnsl, const int pc, const bool inst
std::string instruction = data["instruction-text"].at(0);
std::string MMR0 = data["MMR0"].at(0);
std::string MMR1 = data["MMR1"].at(0);
std::string MMR2 = data["MMR2"].at(0);
std::string result;
@ -48,13 +49,13 @@ int disassemble(cpu *const c, console *const cnsl, const int pc, const bool inst
work_values.c_str()
);
else
result = format("R0: %s, R1: %s, R2: %s, R3: %s, R4: %s, R5: %s, SP: %s, PC: %06o, PSW: %s, instr: %s: %s - MMR0/2: %s/%s",
result = format("R0: %s, R1: %s, R2: %s, R3: %s, R4: %s, R5: %s, SP: %s, PC: %06o, PSW: %s, instr: %s: %s - MMR0/1/2: %s/%s/%s",
registers[0].c_str(), registers[1].c_str(), registers[2].c_str(), registers[3].c_str(), registers[4].c_str(), registers[5].c_str(),
registers[6].c_str(), pc,
psw.c_str(),
instruction_values.c_str(),
instruction.c_str(),
MMR0.c_str(), MMR2.c_str()
MMR0.c_str(), MMR1.c_str(), MMR2.c_str()
);
#if defined(COMPARE_OUTPUT)
{