diff options
| author | Jan Tuomi <jans.tuomi@gmail.com> | 2024-02-21 15:46:30 +0200 |
|---|---|---|
| committer | Jan Tuomi <jans.tuomi@gmail.com> | 2024-02-21 15:46:30 +0200 |
| commit | aefe0cf3874c542669051b2b3cc21c9590aa970b (patch) | |
| tree | e8e6d12b2a261fa0dbde21654c999a14f43824bb /atk16_emu | |
| parent | f88be86978af5ebb92bc9f11e99015afc6b6c4f7 (diff) | |
Fix bugs
Diffstat (limited to 'atk16_emu')
| -rw-r--r-- | atk16_emu/cli.py | 16 | ||||
| -rw-r--r-- | atk16_emu/emu.py | 8 |
2 files changed, 20 insertions, 4 deletions
diff --git a/atk16_emu/cli.py b/atk16_emu/cli.py index 2e4721d..113eb87 100644 --- a/atk16_emu/cli.py +++ b/atk16_emu/cli.py @@ -47,3 +47,19 @@ machine = Machine() machine.load_rom_image(rom_image) machine.reset() machine.run_until_halted() + +print("Machine halted.") +print("===============") + +for i in range(8): + reg_name = f"r{chr(ord('a') + i)}" + value = getattr(machine, reg_name).value + print(f"{reg_name.upper()}: 0x{value:>04x} ({value})") + +print(f"PC: 0x{machine.pc.value:>04x} ({machine.pc.value})") +print(f"FR: carry={machine.fr.carry}\n " + f"overflow={machine.fr.overflow}\n " + f"zero={machine.fr.zero}\n " + f"sign={machine.fr.sign}") +for i in range(8): + print(f"RAM[{i}]: 0x{machine.ram.read(i):>04x} ({machine.ram.read(i)})") diff --git a/atk16_emu/emu.py b/atk16_emu/emu.py index 2f5b79a..1596222 100644 --- a/atk16_emu/emu.py +++ b/atk16_emu/emu.py @@ -288,7 +288,7 @@ class Machine: self.running = False except: - print(f"Error while executing instruction {instr:>016b} at address {pc_addr:>04x}", file=sys.stderr) + print(f"Error while executing instruction {instr:>016b} ({instr:>04x}) at address {pc_addr:>04x}", file=sys.stderr) raise def decode(self, instr: int): @@ -305,8 +305,8 @@ class Machine: alu_code=opdata & 0b000000000111) case 0b0010: return LDR(to_reg=(opdata & 0b111000000000) >> 9, addr_reg=(opdata & 0b000111000000) >> 6) - case 0b0011: return STR(addr_reg=(opdata & 0b000111000000) >> 6, - from_reg=(opdata & 0b000000111000) >> 3) + case 0b0011: return STR(from_reg=(opdata & 0b000111000000) >> 6, + addr_reg=(opdata & 0b000000111000) >> 3) case 0b0100: return LDI(to_reg=(opdata & 0b111000000000) >> 9, imm=opdata & 0b000111111111) case 0b0101: return JPR(addr_reg=(opdata & 0b000111000000) >> 6) @@ -323,4 +323,4 @@ class Machine: case 0b1110: return RTI() case 0b1111: return HLT() - raise ValueError(f"Invalid instruction: {instr:>016b}") + raise ValueError(f"Invalid instruction: {instr:>016b} ({instr:>04x})") |