From 6fcc92f7fb885a83ca6e7e614d1a222539f58cf3 Mon Sep 17 00:00:00 2001 From: hap Date: Wed, 26 Jun 2024 21:00:10 +0200 Subject: z80dasm: small cleanup --- src/devices/cpu/z80/r800dasm.cpp | 17 +++++++++-------- src/devices/cpu/z80/z80dasm.cpp | 33 ++++++++++++++++++--------------- src/devices/cpu/z80/z80dasm.h | 1 + 3 files changed, 28 insertions(+), 23 deletions(-) diff --git a/src/devices/cpu/z80/r800dasm.cpp b/src/devices/cpu/z80/r800dasm.cpp index 655b21df3c5..462feb07dad 100644 --- a/src/devices/cpu/z80/r800dasm.cpp +++ b/src/devices/cpu/z80/r800dasm.cpp @@ -477,7 +477,7 @@ const r800_disassembler::r800dasm r800_disassembler::mnemonic_main[256] = char r800_disassembler::sign(s8 offset) { - return (offset < 0)? '-':'+'; + return (offset < 0) ? '-' : '+'; } u32 r800_disassembler::offs(s8 offset) @@ -549,7 +549,7 @@ offs_t r800_disassembler::disassemble(std::ostream &stream, offs_t pc, const dat { switch (*src) { - case '?': // illegal opcode + case '?': // illegal opcode util::stream_format(stream, "$%02x", op); break; case 'A': @@ -558,25 +558,25 @@ offs_t r800_disassembler::disassemble(std::ostream &stream, offs_t pc, const dat if (src != d->arguments) flags |= STEP_COND; break; - case 'B': // Byte op arg + case 'B': // Byte op arg util::stream_format(stream, "$%02X", params.r8(pos++)); break; - case 'N': // Immediate 16 bit + case 'N': // Immediate 16 bit util::stream_format(stream, "$%04X", params.r16(pos)); pos += 2; break; - case 'O': // Offset relative to PC + case 'O': // Offset relative to PC util::stream_format(stream, "$%04X", (pc + s8(params.r8(pos++)) + 2) & 0xffff); if (src != d->arguments) flags |= STEP_COND; break; - case 'P': // Port number + case 'P': // Port number util::stream_format(stream, "$%02X", params.r8(pos++)); break; - case 'V': // Break vector + case 'V': // Break vector util::stream_format(stream, "$%02X", op & 0x38); break; - case 'W': // Memory address word + case 'W': // Memory address word util::stream_format(stream, "$%04X", params.r16(pos)); pos += 2; break; @@ -591,6 +591,7 @@ offs_t r800_disassembler::disassemble(std::ostream &stream, offs_t pc, const dat break; default: stream << *src; + break; } src++; } diff --git a/src/devices/cpu/z80/z80dasm.cpp b/src/devices/cpu/z80/z80dasm.cpp index 5f76a8d2f64..b0e8f382457 100644 --- a/src/devices/cpu/z80/z80dasm.cpp +++ b/src/devices/cpu/z80/z80dasm.cpp @@ -2,7 +2,7 @@ // copyright-holders:Juergen Buchmueller /***************************************************************************** * - * z80dasm.c + * z80dasm.cpp * Portable Z80 disassembler * *****************************************************************************/ @@ -22,6 +22,7 @@ static const char *const s_mnemonic[] = "retn","rl" ,"rla" ,"rlc" ,"rlca","rld" ,"rr" ,"rra" , "rrc" ,"rrca","rrd" ,"rst" ,"sbc" ,"scf" ,"set" ,"sla" , "sll" ,"sra" ,"srl" ,"sub" ,"xor " + // z80n ,"swap","mirr","test", "bsla","bsra","bsrl","bsrf","brlc","mul" ,"otib","nreg", @@ -40,6 +41,7 @@ const u32 z80_disassembler::s_flags[] = STEP_OUT ,0 ,0 ,0 ,0 ,0 ,0 ,0 , 0 ,0 ,0 ,STEP_OVER,0 ,0 ,0 ,0 , 0 ,0 ,0 ,0 ,0 + // z80n ,0 ,0 ,0 , 0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 , @@ -350,7 +352,7 @@ const z80_disassembler::z80dasm z80_disassembler::mnemonic_main[256] = {zLD,"l,b"}, {zLD,"l,c"}, {zLD,"l,d"}, {zLD,"l,e"}, {zLD,"l,h"}, {zLD,"l,l"}, {zLD,"l,(hl)"}, {zLD,"l,a"}, {zLD,"(hl),b"}, {zLD,"(hl),c"}, {zLD,"(hl),d"}, {zLD,"(hl),e"}, - {zLD,"(hl),h"}, {zLD,"(hl),l"}, {zHLT,nullptr}, {zLD,"(hl),a"}, + {zLD,"(hl),h"}, {zLD,"(hl),l"}, {zHLT,nullptr}, {zLD,"(hl),a"}, {zLD,"a,b"}, {zLD,"a,c"}, {zLD,"a,d"}, {zLD,"a,e"}, {zLD,"a,h"}, {zLD,"a,l"}, {zLD,"a,(hl)"}, {zLD,"a,a"}, {zADD,"a,b"}, {zADD,"a,c"}, {zADD,"a,d"}, {zADD,"a,e"}, @@ -389,7 +391,7 @@ const z80_disassembler::z80dasm z80_disassembler::mnemonic_main[256] = char z80_disassembler::sign(s8 offset) { - return (offset < 0)? '-':'+'; + return (offset < 0) ? '-' : '+'; } u32 z80_disassembler::offs(s8 offset) @@ -432,7 +434,7 @@ offs_t z80_disassembler::disassemble(std::ostream &stream, offs_t pc, const data { ixy = "ix"; u8 op1 = opcodes.r8(pos++); - if( op1 == 0xcb ) + if (op1 == 0xcb) { offset = params.r8(pos++); op1 = params.r8(pos++); @@ -450,7 +452,7 @@ offs_t z80_disassembler::disassemble(std::ostream &stream, offs_t pc, const data { ixy = "iy"; u8 op1 = opcodes.r8(pos++); - if( op1 == 0xcb ) + if (op1 == 0xcb) { offset = params.r8(pos++); op1 = params.r8(pos++); @@ -470,15 +472,15 @@ offs_t z80_disassembler::disassemble(std::ostream &stream, offs_t pc, const data } uint32_t flags = s_flags[d->mnemonic]; - if( d->arguments ) + if (d->arguments) { util::stream_format(stream, "%-4s ", s_mnemonic[d->mnemonic]); const char *src = d->arguments; - while( *src ) + while (*src) { - switch( *src ) + switch (*src) { - case '?': /* illegal opcode */ + case '?': // illegal opcode util::stream_format(stream, "$%02x", op ); break; case 'A': @@ -487,25 +489,25 @@ offs_t z80_disassembler::disassemble(std::ostream &stream, offs_t pc, const data if (src != d->arguments) flags |= STEP_COND; break; - case 'B': /* Byte op arg */ + case 'B': // Byte op arg util::stream_format(stream, "$%02X", params.r8(pos++) ); break; - case 'N': /* Immediate 16 bit */ + case 'N': // Immediate 16 bit util::stream_format(stream, "$%04X", params.r16(pos) ); pos += 2; break; - case 'O': /* Offset relative to PC */ + case 'O': // Offset relative to PC util::stream_format(stream, "$%04X", (pc + s8(params.r8(pos++)) + 2) & 0xffff); if (src != d->arguments) flags |= STEP_COND; break; - case 'P': /* Port number */ + case 'P': // Port number util::stream_format(stream, "$%02X", params.r8(pos++) ); break; - case 'V': /* Restart vector */ + case 'V': // Restart vector util::stream_format(stream, "$%02X", op & 0x38 ); break; - case 'W': /* Memory address word */ + case 'W': // Memory address word util::stream_format(stream, "$%04X", params.r16(pos) ); pos += 2; break; @@ -520,6 +522,7 @@ offs_t z80_disassembler::disassemble(std::ostream &stream, offs_t pc, const data break; default: stream << *src; + break; } src++; } diff --git a/src/devices/cpu/z80/z80dasm.h b/src/devices/cpu/z80/z80dasm.h index 0a8983e3f15..5067e7f25e2 100644 --- a/src/devices/cpu/z80/z80dasm.h +++ b/src/devices/cpu/z80/z80dasm.h @@ -40,6 +40,7 @@ protected: zRETN ,zRL ,zRLA ,zRLC ,zRLCA ,zRLD ,zRR ,zRRA , zRRC ,zRRCA ,zRRD ,zRST ,zSBC ,zSCF ,zSET ,zSLA , zSLL ,zSRA ,zSRL ,zSUB ,zXOR + // z80n ,zSWAP ,zMIRR ,zTEST , zBSLA ,zBSRA ,zBSRL ,zBSRF ,zBRLC ,zMUL ,zOTIB ,zNREG , -- cgit v1.2.3