From 677f31ea9131a8f40db8fd7cd339f19cb0479712 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juhani=20Krekel=C3=A4?= Date: Sat, 27 Aug 2022 19:27:06 +0300 Subject: [PATCH] Follow reference assembler syntax in output of thingamajig_disasm.py --- thingamajig_disasm.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/thingamajig_disasm.py b/thingamajig_disasm.py index b057390..edaa5e3 100644 --- a/thingamajig_disasm.py +++ b/thingamajig_disasm.py @@ -76,7 +76,7 @@ def segment(binary, origin): def disasm(binary, origin = 0): for addr, raw, contents in segment(binary, origin): if type(contents) == Data: - statement = f'db 0x{contents.byte:02x}' + statement = f'data {contents.byte:02x}' else: mnemonic = opcodes[contents.opcode].mnemonic fields = [] @@ -85,9 +85,9 @@ def disasm(binary, origin = 0): if opcodes[contents.opcode].ry: fields.append(f'r{contents.ry}') if contents.immediate is not None: - fields.append(f'#0x{contents.immediate:02x}') + fields.append(f'#{contents.immediate:02x}') elif opcodes[contents.opcode].addr: - fields.append(f'0x{contents.addr:04x}') + fields.append(f'{contents.addr:04x}') if mnemonic == 'store': fields = ', '.join(reversed(fields))