From ad56a9215c49fb572458938e0d82c37f7841a5b4 Mon Sep 17 00:00:00 2001
From: Thomas Harte <thomas.harte@gmail.com>
Date: Mon, 29 May 2017 10:12:33 -0400
Subject: [PATCH] Implemented IN[I/D]x. 18 failures remaining.

---
 .../Mac/Clock SignalTests/FUSETests.swift     |  4 +-
 Processors/Z80/Z80.hpp                        | 42 +++++++++++++++++--
 2 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/OSBindings/Mac/Clock SignalTests/FUSETests.swift b/OSBindings/Mac/Clock SignalTests/FUSETests.swift
index 78ab3418d..014ba73ae 100644
--- a/OSBindings/Mac/Clock SignalTests/FUSETests.swift	
+++ b/OSBindings/Mac/Clock SignalTests/FUSETests.swift	
@@ -167,7 +167,7 @@ class FUSETests: XCTestCase {
 
 			let name = itemDictionary["name"] as! String
 
-//			if name != "edb1" {
+//			if name != "eda2" {
 //				continue;
 //			}
 
@@ -194,7 +194,7 @@ class FUSETests: XCTestCase {
 
 			let finalState = RegisterState(machine: machine)
 
-			XCTAssertEqual(finalState, targetState, "Failed \(name)")
+			XCTAssert(finalState == targetState, "Failed \(name)")
 //			if finalState != targetState {
 //				failures = failures + 1
 //				if failures == 5 {
diff --git a/Processors/Z80/Z80.hpp b/Processors/Z80/Z80.hpp
index f06fc0d62..b644c371a 100644
--- a/Processors/Z80/Z80.hpp
+++ b/Processors/Z80/Z80.hpp
@@ -1076,8 +1076,8 @@ template <class T> class Processor: public MicroOpScheduler<MicroOp> {
 
 #pragma mark - Repetition
 
-#define REPEAT()	\
-	if(parity_overflow_flag_) {	\
+#define REPEAT(test)	\
+	if(test) {	\
 		pc_.full -= 2;	\
 	} else {	\
 		move_to_next_program();	\
@@ -1096,7 +1096,7 @@ template <class T> class Processor: public MicroOpScheduler<MicroOp> {
 					case MicroOp::LDDR:
 					case MicroOp::LDIR: {
 						LDxR_STEP(MicroOp::LDIR);
-						REPEAT();
+						REPEAT(bc_.full);
 					} break;
 
 					case MicroOp::LDD:
@@ -1122,7 +1122,7 @@ template <class T> class Processor: public MicroOpScheduler<MicroOp> {
 					case MicroOp::CPDR:
 					case MicroOp::CPIR: {
 						CPxR_STEP(MicroOp::CPIR);
-						REPEAT();
+						REPEAT(bc_.full);
 					} break;
 
 					case MicroOp::CPD:
@@ -1132,6 +1132,40 @@ template <class T> class Processor: public MicroOpScheduler<MicroOp> {
 
 #undef CPxR_STEP
 
+#define INxR_STEP(incr)	\
+	bc_.bytes.high--;	\
+	hl_.full += (operation->type == incr) ? 1 : -1;	\
+	\
+	sign_result_ = zero_result_ = bit3_result_ = bit5_result_ = bc_.bytes.high;	\
+	subtract_flag_ = (temp8_ >> 6) & Flag::Subtract;	\
+	\
+	int next_bc = bc_.bytes.low + ((operation->type == incr) ? 1 : -1);	\
+	int summation = temp8_ + (next_bc&0xff);	\
+	\
+	if(summation > 0xff) {	\
+		carry_flag_ = Flag::Carry;	\
+		half_carry_flag_ = Flag::HalfCarry;	\
+	} else {	\
+		carry_flag_ = 0;	\
+		half_carry_flag_ = 0;	\
+	}	\
+	\
+	summation = (summation&7) ^ bc_.bytes.high;	\
+	set_parity(summation);
+
+					case MicroOp::INDR:
+					case MicroOp::INIR: {
+						INxR_STEP(MicroOp::INIR);
+						REPEAT(bc_.bytes.high);
+					} break;
+
+					case MicroOp::IND:
+					case MicroOp::INI: {
+						INxR_STEP(MicroOp::INI);
+					} break;
+
+#undef INxR_STEP
+
 #pragma mark - Bit Manipulation
 
 					case MicroOp::BIT: {