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

log SP of each run mode

Browse source
This commit is contained in:
folkert van heusden 2023-03-24 10:54:26 +01:00
parent 19a733be0d
commit 5b38f238e8
Signed by untrusted user who does not match committer: folkert
GPG key ID: 6B6455EDFEED3BD1
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
cpu.cpp
View file

@ -796,7 +796,7 @@ bool cpu::single_operand_instructions(const uint16_t instr)
set_flags = putGAM(g_dst, r); set_flags = putGAM(g_dst, r);
} }
else { else {
auto g_dst = getGAM(dst_mode, dst_reg, word_mode, false, false); auto g_dst = getGAM(dst_mode, dst_reg, word_mode, false, false);
set_flags = putGAM(g_dst, 0); set_flags = putGAM(g_dst, 0);
} }
@ -2124,6 +2124,13 @@ std::map<std::string, std::vector<std::string> > cpu::disassemble(const uint16_t
out.insert({ "registers", registers }); out.insert({ "registers", registers });
std::vector<std::string> registers_sp;
for(int i=0; i<4; i++)
registers_sp.push_back(format("%06o", sp[i]));
out.insert({ "sp", registers_sp });
// PSW // PSW
std::string psw_str = format("%d%d|%d|%d|%c%c%c%c%c", psw >> 14, (psw >> 12) & 3, (psw >> 11) & 1, (psw >> 5) & 7, std::string psw_str = format("%d%d|%d|%d|%c%c%c%c%c", psw >> 14, (psw >> 12) & 3, (psw >> 11) & 1, (psw >> 5) & 7,
psw & 16?'t':'-', psw & 8?'n':'-', psw & 4?'z':'-', psw & 2 ? 'v':'-', psw & 1 ? 'c':'-'); psw & 16?'t':'-', psw & 8?'n':'-', psw & 4?'z':'-', psw & 2 ? 'v':'-', psw & 1 ? 'c':'-');
@ -2179,7 +2186,7 @@ void cpu::step_b()
DOLOG(warning, true, "UNHANDLED instruction %06o @ %06o", instr, temp_pc); DOLOG(warning, true, "UNHANDLED instruction %06o @ %06o", instr, temp_pc);
// trap(010); floating point nog niet geimplementeerd trap(010); // floating point nog niet geimplementeerd
} }
catch(const int exception) { catch(const int exception) {
DOLOG(debug, true, "bus-trap during execution of command (%d)", exception); DOLOG(debug, true, "bus-trap during execution of command (%d)", exception);

6
debugger.cpp
View file

@ -76,6 +76,12 @@ int disassemble(cpu *const c, console *const cnsl, const int pc, const bool inst
else else
DOLOG(debug, true, "%s", result.c_str()); DOLOG(debug, true, "%s", result.c_str());
std::string sp;
for(auto sp_val : data["sp"])
sp += (sp.empty() ? "" : ",") + sp_val;
DOLOG(debug, true, "SP: %s", sp.c_str());
return data["instruction-values"].size() * 2; return data["instruction-values"].size() * 2;
} }