From 7fb8e6a78132988ef24d7dc6b114e18d49a76e7b Mon Sep 17 00:00:00 2001 From: AJR Date: Tue, 25 Feb 2020 10:56:11 -0500 Subject: [PATCH] upd78k2d, upd78k3d: Fix order of operands in instructions using two saddrs/saddrps (nw) --- src/devices/cpu/upd78k/upd78k2d.cpp | 8 ++++---- src/devices/cpu/upd78k/upd78k3d.cpp | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/devices/cpu/upd78k/upd78k2d.cpp b/src/devices/cpu/upd78k/upd78k2d.cpp index 9016faea8b3..7fcc4bd85a2 100644 --- a/src/devices/cpu/upd78k/upd78k2d.cpp +++ b/src/devices/cpu/upd78k/upd78k2d.cpp @@ -229,9 +229,9 @@ offs_t upd78k2_disassembler::dasm_29(std::ostream &stream, offs_t pc, const upd7 offs_t upd78k2_disassembler::dasm_38(std::ostream &stream, u8 op, offs_t pc, const upd78k2_disassembler::data_buffer &opcodes) { util::stream_format(stream, "%-8s", BIT(op, 0) ? "XCH" : "MOV"); - format_saddr(stream, opcodes.r8(pc + 1)); - stream << ","; format_saddr(stream, opcodes.r8(pc + 2)); + stream << ","; + format_saddr(stream, opcodes.r8(pc + 1)); return 3 | SUPPORTED; } @@ -272,9 +272,9 @@ offs_t upd78k2_disassembler::dasm_50(std::ostream &stream, u8 op) offs_t upd78k2_disassembler::dasm_78(std::ostream &stream, u8 op, offs_t pc, const upd78k2_disassembler::data_buffer &opcodes) { util::stream_format(stream, "%-8s", s_alu_ops[op & 0x07]); - format_saddr(stream, opcodes.r8(pc + 1)); - stream << ","; format_saddr(stream, opcodes.r8(pc + 2)); + stream << ","; + format_saddr(stream, opcodes.r8(pc + 1)); return 3 | SUPPORTED; } diff --git a/src/devices/cpu/upd78k/upd78k3d.cpp b/src/devices/cpu/upd78k/upd78k3d.cpp index 28f19d5f735..5d270e227aa 100644 --- a/src/devices/cpu/upd78k/upd78k3d.cpp +++ b/src/devices/cpu/upd78k/upd78k3d.cpp @@ -598,27 +598,27 @@ offs_t upd78k3_disassembler::dasm_24xx(std::ostream &stream, u8 op, u8 rr) offs_t upd78k3_disassembler::dasm_2a(std::ostream &stream, offs_t pc, const upd78k3_disassembler::data_buffer &opcodes) { util::stream_format(stream, "%-8s", "XCHW"); - format_saddrp(stream, opcodes.r8(pc + 1)); - stream << ","; format_saddrp(stream, opcodes.r8(pc + 2)); + stream << ","; + format_saddrp(stream, opcodes.r8(pc + 1)); return 3 | SUPPORTED; } offs_t upd78k3_disassembler::dasm_38(std::ostream &stream, u8 op, offs_t pc, const upd78k3_disassembler::data_buffer &opcodes) { util::stream_format(stream, "%-8s", BIT(op, 0) ? "XCH" : "MOV"); - format_saddr(stream, opcodes.r8(pc + 1)); - stream << ","; format_saddr(stream, opcodes.r8(pc + 2)); + stream << ","; + format_saddr(stream, opcodes.r8(pc + 1)); return 3 | SUPPORTED; } offs_t upd78k3_disassembler::dasm_3c(std::ostream &stream, u8 op, offs_t pc, const upd78k3_disassembler::data_buffer &opcodes) { util::stream_format(stream, "%-8s", s_16bit_ops[op & 0x03]); - format_saddrp(stream, opcodes.r8(pc + 1)); - stream << ","; format_saddrp(stream, opcodes.r8(pc + 2)); + stream << ","; + format_saddrp(stream, opcodes.r8(pc + 1)); return 3 | SUPPORTED; } @@ -658,9 +658,9 @@ offs_t upd78k3_disassembler::dasm_50(std::ostream &stream, u8 op) offs_t upd78k3_disassembler::dasm_78(std::ostream &stream, u8 op, offs_t pc, const upd78k3_disassembler::data_buffer &opcodes) { util::stream_format(stream, "%-8s", s_alu_ops[op & 0x07]); - format_saddr(stream, opcodes.r8(pc + 1)); - stream << ","; format_saddr(stream, opcodes.r8(pc + 2)); + stream << ","; + format_saddr(stream, opcodes.r8(pc + 1)); return 3 | SUPPORTED; }