upd78k2d, upd78k3d: Fix order of operands in instructions using two saddrs/saddrps (nw)

This commit is contained in:
AJR 2020-02-25 10:56:11 -05:00
parent 6928261f41
commit 7fb8e6a781
2 changed files with 12 additions and 12 deletions

View File

@ -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) 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"); 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)); format_saddr(stream, opcodes.r8(pc + 2));
stream << ",";
format_saddr(stream, opcodes.r8(pc + 1));
return 3 | SUPPORTED; 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) 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]); 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)); format_saddr(stream, opcodes.r8(pc + 2));
stream << ",";
format_saddr(stream, opcodes.r8(pc + 1));
return 3 | SUPPORTED; return 3 | SUPPORTED;
} }

View File

@ -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) offs_t upd78k3_disassembler::dasm_2a(std::ostream &stream, offs_t pc, const upd78k3_disassembler::data_buffer &opcodes)
{ {
util::stream_format(stream, "%-8s", "XCHW"); util::stream_format(stream, "%-8s", "XCHW");
format_saddrp(stream, opcodes.r8(pc + 1));
stream << ",";
format_saddrp(stream, opcodes.r8(pc + 2)); format_saddrp(stream, opcodes.r8(pc + 2));
stream << ",";
format_saddrp(stream, opcodes.r8(pc + 1));
return 3 | SUPPORTED; return 3 | SUPPORTED;
} }
offs_t upd78k3_disassembler::dasm_38(std::ostream &stream, u8 op, offs_t pc, const upd78k3_disassembler::data_buffer &opcodes) 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"); 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)); format_saddr(stream, opcodes.r8(pc + 2));
stream << ",";
format_saddr(stream, opcodes.r8(pc + 1));
return 3 | SUPPORTED; return 3 | SUPPORTED;
} }
offs_t upd78k3_disassembler::dasm_3c(std::ostream &stream, u8 op, offs_t pc, const upd78k3_disassembler::data_buffer &opcodes) 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]); 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)); format_saddrp(stream, opcodes.r8(pc + 2));
stream << ",";
format_saddrp(stream, opcodes.r8(pc + 1));
return 3 | SUPPORTED; 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) 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]); 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)); format_saddr(stream, opcodes.r8(pc + 2));
stream << ",";
format_saddr(stream, opcodes.r8(pc + 1));
return 3 | SUPPORTED; return 3 | SUPPORTED;
} }