From 1643844eaf6eaf2801ffebff71e2aa7a284296fb Mon Sep 17 00:00:00 2001
From: "Adrian.Conlon" <adrian.conlon@gmail.com>
Date: Wed, 14 Jun 2017 20:14:32 +0100
Subject: [PATCH] Whoops: Roll back a "simplification" to the IX/IY +
 displacement handlers.  Caused to failing "fuse" tests.

Signed-off-by: Adrian.Conlon <adrian.conlon@gmail.com>
---
 Z80/src/Z80.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Z80/src/Z80.cpp b/Z80/src/Z80.cpp
index 8a4a143..48e5e32 100644
--- a/Z80/src/Z80.cpp
+++ b/Z80/src/Z80.cpp
@@ -911,11 +911,13 @@ void EightBit::Z80::executeCB(int x, int y, int z, int p, int q) {
 			}
 			break;
 		}
-		if (m_prefixDD || m_prefixFD) {
+		if (m_prefixDD || m_prefixFD)
 			adjustSZP(DISPLACED());
+		else
+			adjustSZP(R(z));
+		if (m_prefixDD || m_prefixFD) {
 			cycles += 23;
 		} else {
-			adjustSZP(R(z));
 			cycles += 8;
 			if (z == 6)
 				cycles += 7;