From 6831f9fa4f0dc385303aa4189c0c6f242ed5bbb7 Mon Sep 17 00:00:00 2001 From: smf- Date: Sat, 13 Jan 2018 21:30:29 +0000 Subject: this breaks more than it fixes. Revert "z80 disassembler, stopped invalid dd & fd instructions from eating the next byte [smf]" This reverts commit 347396faed6a2c63cfd6783caad88b34c7115723. --- src/devices/cpu/z80/z80dasm.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/devices/cpu/z80/z80dasm.cpp b/src/devices/cpu/z80/z80dasm.cpp index a7b8e20d7e1..b59b3a38eb6 100644 --- a/src/devices/cpu/z80/z80dasm.cpp +++ b/src/devices/cpu/z80/z80dasm.cpp @@ -420,10 +420,9 @@ offs_t z80_disassembler::disassemble(std::ostream &stream, offs_t pc, const data case 0xdd: { ixy = "ix"; - u8 op1 = opcodes.r8(pos); + u8 op1 = opcodes.r8(pos++); if( op1 == 0xcb ) { - pos++; offset = params.r8(pos++); op1 = params.r8(pos++); d = &mnemonic_xx_cb[op1]; @@ -435,10 +434,9 @@ offs_t z80_disassembler::disassemble(std::ostream &stream, offs_t pc, const data case 0xfd: { ixy = "iy"; - u8 op1 = opcodes.r8(pos); + u8 op1 = opcodes.r8(pos++); if( op1 == 0xcb ) { - pos++; offset = params.r8(pos++); op1 = params.r8(pos++); d = &mnemonic_xx_cb[op1]; -- cgit v1.2.3