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

disassembler

Browse source
This commit is contained in:
folkert van heusden 2022-03-22 12:16:35 +01:00
parent ab0c9f1a62
commit 42c065056c
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cpu.cpp
View file

@ -1253,7 +1253,7 @@ void cpu::disassemble()
// TODO: 100000011 // TODO: 100000011
if (do_opcode == 0b000) { if (do_opcode == 0b000) {
auto dst_text = addressing_to_string(dst_register, pc); auto dst_text = addressing_to_string(dst_register, (pc + 2) & 65535);
// single_operand_instructions // single_operand_instructions
switch(so_opcode) { switch(so_opcode) {
@ -1335,7 +1335,7 @@ void cpu::disassemble()
} }
else if (do_opcode == 0b111) { else if (do_opcode == 0b111) {
std::string src_text = format("R%d", (instruction >> 6) & 7); std::string src_text = format("R%d", (instruction >> 6) & 7);
auto dst_text = addressing_to_string(dst_register, pc); auto dst_text = addressing_to_string(dst_register, (pc + 2) & 65535);
uint8_t dst = instruction & 63; uint8_t dst = instruction & 63;
switch(ado_opcode) { // additional double operand switch(ado_opcode) { // additional double operand
@ -1537,13 +1537,13 @@ void cpu::disassemble()
text = format("TRAP %o", instruction & 255); text = format("TRAP %o", instruction & 255);
if ((instruction & ~0b111111) == 0b0000000001000000) { if ((instruction & ~0b111111) == 0b0000000001000000) {
auto dst_text = addressing_to_string(dst_register, pc); auto dst_text = addressing_to_string(dst_register, (pc + 2) & 65535);
text = std::string("JMP ") + dst_text.first; text = std::string("JMP ") + dst_text.first;
} }
if ((instruction & 0b1111111000000000) == 0b0000100000000000) { if ((instruction & 0b1111111000000000) == 0b0000100000000000) {
auto dst_text = addressing_to_string(src_register, pc); auto dst_text = addressing_to_string(src_register, (pc + 2) & 65535);
text = std::string("JSR ") + dst_text.first; text = std::string("JSR ") + dst_text.first;
} }