From a426990170e8ce90316617b1c5f8d35ea1a22f95 Mon Sep 17 00:00:00 2001 From: AJR Date: Sun, 13 Aug 2023 14:40:45 -0400 Subject: m6800, m6805: Use manufacturer's syntax for disassembling indexed addressing modes --- src/devices/cpu/m6800/6800dasm.cpp | 6 +++--- src/devices/cpu/m6805/6805dasm.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/devices/cpu/m6800/6800dasm.cpp b/src/devices/cpu/m6800/6800dasm.cpp index 6dcb60e572c..37b1ff4793c 100644 --- a/src/devices/cpu/m6800/6800dasm.cpp +++ b/src/devices/cpu/m6800/6800dasm.cpp @@ -188,10 +188,10 @@ offs_t m680x_disassembler::disassemble(std::ostream &stream, offs_t pc, const da util::stream_format(stream, "#$%04X", params.r16(pc+1)); return 3 | flags | SUPPORTED; case idx: /* indexed + byte offset */ - util::stream_format(stream, "(x+$%02X)", params.r8(pc+1)); + util::stream_format(stream, "$%02X,x", params.r8(pc+1)); return 2 | flags | SUPPORTED; case imx: /* immediate, indexed + byte offset */ - util::stream_format(stream, "#$%02X,(x+$%02x)", params.r8(pc+1), params.r8(pc+2)); + util::stream_format(stream, "#$%02X,$%02x,x", params.r8(pc+1), params.r8(pc+2)); return 3 | flags | SUPPORTED; case dir: /* direct address */ util::stream_format(stream, "$%02X", params.r8(pc+1)); @@ -203,7 +203,7 @@ offs_t m680x_disassembler::disassemble(std::ostream &stream, offs_t pc, const da util::stream_format(stream, "$%04X", params.r16(pc+1)); return 3 | flags | SUPPORTED; case sx1: /* byte from address (s + 1) */ - util::stream_format(stream, "(s+1)"); + util::stream_format(stream, "1,s"); return 1 | flags | SUPPORTED; default: return 1 | flags | SUPPORTED; diff --git a/src/devices/cpu/m6805/6805dasm.cpp b/src/devices/cpu/m6805/6805dasm.cpp index f58d5d00ef7..3a3a0679784 100644 --- a/src/devices/cpu/m6805/6805dasm.cpp +++ b/src/devices/cpu/m6805/6805dasm.cpp @@ -183,15 +183,15 @@ offs_t m6805_base_disassembler::disassemble(std::ostream &stream, offs_t pc, con return 3 | flags | SUPPORTED; case md::IDX: // indexed - util::stream_format(stream, "(x)"); + util::stream_format(stream, ",x"); return 1 | flags | SUPPORTED; case md::IX1: // indexed + byte (zero page) - util::stream_format(stream, "(x+$%02X)", params.r8(pc+1)); + util::stream_format(stream, "$%02X,x", params.r8(pc+1)); return 2 | flags | SUPPORTED; case md::IX2: // indexed + word (16 bit address) - util::stream_format(stream, "(x+$%04X)", params.r16(pc+1)); + util::stream_format(stream, "$%04X,x", params.r16(pc+1)); return 3 | flags | SUPPORTED; } -- cgit v1.2.3