From e7001b24257ac18a1ba797ae539cb3c2ae2407eb Mon Sep 17 00:00:00 2001
From: "Adrian.Conlon" <adrian.conlon@gmail.com>
Date: Sat, 12 Aug 2017 14:22:10 +0100
Subject: [PATCH] Now runs the first pass of the translated Z80 tests as
 LR35902 style instructions

Signed-off-by: Adrian.Conlon <adrian.conlon@gmail.com>
---
 LR35902/fusetest_LR35902/FuseRegisterState.cpp | 5 -----
 LR35902/fusetest_LR35902/FuseRegisterState.h   | 5 +----
 LR35902/fusetest_LR35902/FuseTestSuite.cpp     | 7 ++-----
 3 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/LR35902/fusetest_LR35902/FuseRegisterState.cpp b/LR35902/fusetest_LR35902/FuseRegisterState.cpp
index f2ab57a..ec414ec 100644
--- a/LR35902/fusetest_LR35902/FuseRegisterState.cpp
+++ b/LR35902/fusetest_LR35902/FuseRegisterState.cpp
@@ -20,11 +20,6 @@ void Fuse::RegisterState::readExternal(std::ifstream& file) {
 }
 
 void Fuse::RegisterState::readInternal(std::ifstream& file) {
-	file >> i;
-	file >> r;
-	file >> iff1;
-	file >> iff2;
-	file >> im;
 	file >> halted;
 
 	file >> std::dec;
diff --git a/LR35902/fusetest_LR35902/FuseRegisterState.h b/LR35902/fusetest_LR35902/FuseRegisterState.h
index b169978..c0af515 100644
--- a/LR35902/fusetest_LR35902/FuseRegisterState.h
+++ b/LR35902/fusetest_LR35902/FuseRegisterState.h
@@ -10,12 +10,9 @@ namespace Fuse {
 	class RegisterState {
 	public:
 		enum {
-			AF, BC, DE, HL, AF_, BC_, DE_, HL_, IX, IY, SP, PC, MEMPTR, NUMBER_OF_REGISTERS
+			AF, BC, DE, HL, SP, PC, NUMBER_OF_REGISTERS
 		};
 		std::vector<EightBit::register16_t> registers;
-		int i, r;
-		bool iff1, iff2;
-		int im;
 		bool halted;
 		int tstates;
 
diff --git a/LR35902/fusetest_LR35902/FuseTestSuite.cpp b/LR35902/fusetest_LR35902/FuseTestSuite.cpp
index 774f976..365b7c0 100644
--- a/LR35902/fusetest_LR35902/FuseTestSuite.cpp
+++ b/LR35902/fusetest_LR35902/FuseTestSuite.cpp
@@ -3,11 +3,8 @@
 #include "FuseTestRunner.h"
 
 Fuse::TestSuite::TestSuite(std::string path) {
-	m_tests.read(path + ".in.z80");
-	m_tests.write(path + ".in");
-
-	m_results.read(path + ".expected.z80");
-	m_results.write(path + ".expected");
+	m_tests.read(path + ".in");
+	m_results.read(path + ".expected");
 }
 
 void Fuse::TestSuite::run() {