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

set/clear condition bits fix

Browse source
This commit is contained in:
folkert van heusden 2022-03-16 19:56:19 +01:00
parent 7953e8ce50
commit ebb7874812
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
cpu.cpp
View file

@ -1144,13 +1144,13 @@ std::pair<std::string, int> cpu::addressing_to_string(const uint8_t mode_registe
case 2:
if (reg == 7)
return { format("#%06o!2", next_word), 4 };
return { format("#%06o", next_word), 4 };
return { format("(%s)+", reg_name.c_str()), 2 };
case 3:
if (reg == 7)
return { format("@#%06o|%x|%d!3", next_word, next_word, next_word), 4 };
return { format("@#%06o|%x|%d", next_word, next_word, next_word), 4 };
return { format("@(%s)+", reg_name.c_str()), 2 };
@ -1162,15 +1162,15 @@ std::pair<std::string, int> cpu::addressing_to_string(const uint8_t mode_registe
case 6:
if (reg == 7)
return { format("%06o!6a", (pc + next_word + 2) & 65535), 4 };
return { format("%06o", (pc + next_word + 2) & 65535), 4 };
return { format("o%o(%s)!6b", next_word, reg_name.c_str()), 4 };
return { format("o%o(%s)", next_word, reg_name.c_str()), 4 };
case 7:
if (reg == 7)
return { format("@%06o!7a", next_word), 4 };
return { format("@%06o", next_word), 4 };
return { format("@o%o(%s)!7b", next_word, reg_name.c_str()), 4 };
return { format("@o%o(%s)", next_word, reg_name.c_str()), 4 };
}
return { "??", 0 };
@ -1425,7 +1425,7 @@ void cpu::disassemble()
text = format("SPL%d", instruction & 7);
if ((instruction & ~31) == 0b10100000) { // set condition bits
text = word_mode ? "S" : "CL";
text = instruction & 0b10000 ? "SE" : "CL";
if (instruction & 0b1000)
text += "N";
@ -1490,6 +1490,9 @@ void cpu::disassemble()
text = "RTS";
}
if (text.empty())
text = "???";
fprintf(stderr, "R0: %06o, R1: %06o, R2: %06o, R3: %06o, R4: %06o, R5: %06o, SP: %06o, PC: %06o, PSW: %d%d|%d|%d|%d%d%d%d%d, instr: %06o: %s\n",
getRegister(0), getRegister(1), getRegister(2), getRegister(3), getRegister(4), getRegister(5),
sp[psw >> 14], pc,