From b33b6885641fc9945d21ead44a327af66bcc0285 Mon Sep 17 00:00:00 2001 From: folkert van heusden Date: Thu, 23 Mar 2023 09:14:59 +0100 Subject: [PATCH] debugger: log MMR1 --- cpu.cpp | 1 + debugger.cpp | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cpu.cpp b/cpu.cpp index 4d57aca..dcc1595 100644 --- a/cpu.cpp +++ b/cpu.cpp @@ -2134,6 +2134,7 @@ std::map > 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; diff --git a/debugger.cpp b/debugger.cpp index 7d6e25c..dcecc73 100644 --- a/debugger.cpp +++ b/debugger.cpp @@ -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) {