summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author smf- <smf-@users.noreply.github.com>2018-01-13 21:30:29 +0000
committer smf- <smf-@users.noreply.github.com>2018-01-13 21:31:18 +0000
commit6831f9fa4f0dc385303aa4189c0c6f242ed5bbb7 (patch)
treef051296cd8e3fa5fb93b6ac9d3e791b9860e56e4
parent1905584a6b020a3815159660551d9c41d1b483b2 (diff)
this breaks more than it fixes. Revert "z80 disassembler, stopped invalid dd & fd instructions from eating the next byte [smf]"
This reverts commit 347396faed6a2c63cfd6783caad88b34c7115723.
-rw-r--r--src/devices/cpu/z80/z80dasm.cpp6
1 files 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];