Merge branch 'master' of https://github.com/MoleskiCoder/EightBit

Intel8080/test/Board.cpp

@@ -10,6 +10,17 @@ Board::Board(const Configuration& configuration)
   m_disassembler(*this) {
 }
 
+void Board::powerOn() {
+	EightBit::Bus::powerOn();
+	CPU().powerOn();
+	CPU().reset();
+}
+
+void Board::powerOff() {
+	CPU().powerOff();
+	EightBit::Bus::powerOff();
+}
+
 void Board::initialise() {
 
 	auto romDirectory = m_configuration.getRomDirectory();
@@ -29,9 +40,6 @@ void Board::initialise() {
 		m_cpu.ExecutingInstruction.connect(std::bind(&Board::Cpu_ExecutingInstruction_Debug, this, std::placeholders::_1));
 	}
 
-	CPU().powerOn();
-	CPU().reset();
-
 	poke(0, 0xc3);	// JMP
 	CPU().pokeWord(1, m_configuration.getStartAddress());
 
@@ -42,7 +50,7 @@ void Board::Cpu_ExecutingInstruction_Cpm(EightBit::Intel8080& cpu) {
 	switch (cpu.PC().word) {
 	case 0x0:	// CP/M warm start
 		if (++m_warmstartCount == 3) {
-			CPU().powerOff();
+			powerOff();
 			if (m_configuration.isProfileMode()) {
 				m_profiler.dump();
 			}

Intel8080/test/Board.h

@@ -17,9 +17,11 @@ public:
 	EightBit::Intel8080& CPU() { return m_cpu; }
 	const EightBit::Intel8080& CPU() const { return m_cpu; }
 
-	void initialise();
+	virtual void powerOn() final;
+	virtual void powerOff() final;
 
 protected:
+	virtual void initialise() final;
 	virtual EightBit::MemoryMapping mapping(uint16_t address) final {
 		return { m_ram, 0x0000, 0xffff, EightBit::MemoryMapping::ReadWrite };
 	}

Intel8080/test/test.cpp

@@ -8,14 +8,12 @@ int main(int, char*[]) {
 	Configuration configuration;
 
 #ifdef _DEBUG
-	//configuration.setDebugMode(true);
+	configuration.setDebugMode(true);
 	configuration.setProfileMode(true);
 #endif
-	//configuration.setDebugMode(true);
 
 	EightBit::TestHarness<Configuration, Board> harness(configuration);
-	harness.initialise();
+	harness.run();
-	harness.runLoop();
 
 	return 0;
 }

LR35902/fusetest_LR35902/FuseTestRunner.cpp

@@ -4,34 +4,39 @@
 
 Fuse::TestRunner::TestRunner(const Test& test, const ExpectedTestResult& expected)
 : m_test(test),
-  m_expected(expected),
+  m_expected(expected) {
-  m_ram(0x10000),
-  m_cpu(*this),
-  m_failed(false),
-  m_unimplemented(false) {
 }
 
 //
 
-void Fuse::TestRunner::initialise() {
+void Fuse::TestRunner::powerOn() {
-	m_cpu.powerOn();
+	EightBit::Bus::powerOn();
-	disableGameRom();
+	CPU().powerOn();
 	initialiseRegisters();
 	initialiseMemory();
 }
 
+void Fuse::TestRunner::powerOff() {
+	CPU().powerOff();
+	EightBit::Bus::powerOff();
+}
+
+void Fuse::TestRunner::initialise() {
+	disableGameRom();
+}
+
 void Fuse::TestRunner::initialiseRegisters() {
 
 	const auto& testState = m_test.registerState;
 	const auto& inputRegisters = testState.registers;
 
-	m_cpu.AF() = inputRegisters[Fuse::RegisterState::AF];
+	CPU().AF() = inputRegisters[Fuse::RegisterState::AF];
-	m_cpu.BC() = inputRegisters[Fuse::RegisterState::BC];
+	CPU().BC() = inputRegisters[Fuse::RegisterState::BC];
-	m_cpu.DE() = inputRegisters[Fuse::RegisterState::DE];
+	CPU().DE() = inputRegisters[Fuse::RegisterState::DE];
-	m_cpu.HL() = inputRegisters[Fuse::RegisterState::HL];
+	CPU().HL() = inputRegisters[Fuse::RegisterState::HL];
 
-	m_cpu.SP() = inputRegisters[Fuse::RegisterState::SP];
+	CPU().SP() = inputRegisters[Fuse::RegisterState::SP];
-	m_cpu.PC() = inputRegisters[Fuse::RegisterState::PC];
+	CPU().PC() = inputRegisters[Fuse::RegisterState::PC];
 }
 
 void Fuse::TestRunner::initialiseMemory() {
@@ -82,13 +87,13 @@ void Fuse::TestRunner::checkregisters() {
 	const auto& expectedState = m_expected.registerState;
 	const auto& expectedRegisters = expectedState.registers;
 
-	auto af = m_cpu.AF() == expectedRegisters[Fuse::RegisterState::AF];
+	auto af = CPU().AF() == expectedRegisters[Fuse::RegisterState::AF];
-	auto bc = m_cpu.BC() == expectedRegisters[Fuse::RegisterState::BC];
+	auto bc = CPU().BC() == expectedRegisters[Fuse::RegisterState::BC];
-	auto de = m_cpu.DE() == expectedRegisters[Fuse::RegisterState::DE];
+	auto de = CPU().DE() == expectedRegisters[Fuse::RegisterState::DE];
-	auto hl = m_cpu.HL() == expectedRegisters[Fuse::RegisterState::HL];
+	auto hl = CPU().HL() == expectedRegisters[Fuse::RegisterState::HL];
 
-	auto sp = m_cpu.SP() == expectedRegisters[Fuse::RegisterState::SP];
+	auto sp = CPU().SP() == expectedRegisters[Fuse::RegisterState::SP];
-	auto pc = m_cpu.PC() == expectedRegisters[Fuse::RegisterState::PC];
+	auto pc = CPU().PC() == expectedRegisters[Fuse::RegisterState::PC];
 
 	auto success =
 		af && bc && de && hl
@@ -100,12 +105,12 @@ void Fuse::TestRunner::checkregisters() {
 
 		if (!af) {
 			auto expectedA = expectedRegisters[Fuse::RegisterState::AF].high;
-			auto gotA = m_cpu.A();
+			auto gotA = CPU().A();
 			if (expectedA != gotA)
 				dumpDifference("A", gotA, expectedA);
 
 			auto expectedF = expectedRegisters[Fuse::RegisterState::AF].low;
-			auto gotF = m_cpu.F();
+			auto gotF = CPU().F();
 			if (expectedF != gotF) {
 				std::cerr
 					<< "**** F, Expected: "
@@ -118,31 +123,31 @@ void Fuse::TestRunner::checkregisters() {
 
 		if (!bc) {
 			auto expectedWord = expectedRegisters[Fuse::RegisterState::BC];
-			auto actualWord = m_cpu.BC();
+			auto actualWord = CPU().BC();
 			dumpDifference("B", "C", actualWord, expectedWord);
 		}
 
 		if (!de) {
 			auto expectedWord = expectedRegisters[Fuse::RegisterState::DE];
-			auto actualWord = m_cpu.DE();
+			auto actualWord = CPU().DE();
 			dumpDifference("D", "E", actualWord, expectedWord);
 		}
 
 		if (!hl) {
 			auto expectedWord = expectedRegisters[Fuse::RegisterState::HL];
-			auto actualWord = m_cpu.HL();
+			auto actualWord = CPU().HL();
 			dumpDifference("H", "L", actualWord, expectedWord);
 		}
 
 		if (!sp) {
 			auto expectedWord = expectedRegisters[Fuse::RegisterState::SP];
-			auto actualWord = m_cpu.SP();
+			auto actualWord = CPU().SP();
 			dumpDifference("SPH", "SPL", actualWord, expectedWord);
 		}
 
 		if (!pc) {
 			auto expectedWord = expectedRegisters[Fuse::RegisterState::PC];
-			auto actualWord = m_cpu.PC();
+			auto actualWord = CPU().PC();
 			dumpDifference("PCH", "PCL", actualWord, expectedWord);
 		}
 	}
@@ -177,10 +182,10 @@ void Fuse::TestRunner::checkMemory() {
 
 void Fuse::TestRunner::run() {
 
-	initialise();
+	powerOn();
 	auto allowedCycles = m_test.registerState.tstates;
 	try {
-		m_cpu.run(allowedCycles);
+		CPU().run(allowedCycles);
 		check();
 	} catch (std::logic_error& error) {
 		m_unimplemented = true;

LR35902/fusetest_LR35902/FuseTestRunner.h

@@ -16,11 +16,10 @@ namespace Fuse {
 		const Test& m_test;
 		const ExpectedTestResult& m_expected;
 
-		bool m_failed;
+		bool m_failed = false;
-		bool m_unimplemented;
+		bool m_unimplemented = false;
 
-		EightBit::Ram m_ram;
+		EightBit::Ram m_ram = 0x10000;
-		EightBit::GameBoy::LR35902 m_cpu;
 
 		void initialise();
 		void initialiseRegisters();
@@ -47,5 +46,8 @@ namespace Fuse {
 		void run();
 		bool failed() const { return m_failed; }
 		bool unimplemented() const { return m_unimplemented; }
+
+		virtual void powerOn() final;
+		virtual void powerOff() final;
 	};
 }

LR35902/inc/GameBoyBus.h

@@ -36,6 +36,9 @@ namespace EightBit {
 
 			Bus() noexcept;
 
+			virtual void powerOn() override;
+			virtual void powerOff() override;
+
 			auto& CPU() { return m_cpu; }
 			auto& VRAM() { return m_videoRam; }
 			auto& OAMRAM() { return m_oamRam; }

LR35902/src/GameBoyBus.cpp

@@ -8,6 +8,17 @@ EightBit::GameBoy::Bus::Bus() noexcept
 	WrittenByte.connect(std::bind(&GameBoy::Bus::Bus_WrittenByte, this, std::placeholders::_1));
 }
 
+void EightBit::GameBoy::Bus::powerOn() {
+	EightBit::Bus::powerOn();
+	CPU().powerOn();
+	reset();
+}
+
+void EightBit::GameBoy::Bus::powerOff() {
+	CPU().powerOff();
+	EightBit::Bus::powerOff();
+}
+
 void EightBit::GameBoy::Bus::reset() {
 	IO().reset();
 	LR35902::lower(CPU().RESET());

M6502/test/Board.cpp

@@ -13,6 +13,16 @@ Board::Board(const Configuration& configuration)
   m_disassembler(*this, m_cpu, m_symbols),
   m_profiler(m_cpu, m_disassembler, m_symbols) {}
 
+void Board::powerOn() {
+	EightBit::Bus::powerOn();
+	CPU().powerOn();
+}
+
+void Board::powerOff() {
+	CPU().powerOff();
+	EightBit::Bus::powerOff();
+}
+
 void Board::initialise() {
 
 	auto programFilename = m_configuration.getProgram();
@@ -57,8 +67,6 @@ void Board::initialise() {
 	m_pollCounter = 0;
 	m_pollInterval = m_configuration.getPollInterval();
 
-	CPU().powerOn();
-
 	poke(0x00, 0x4c);
 	CPU().pokeWord(1, m_configuration.getStartAddress());
 }
@@ -77,7 +85,7 @@ void Board::Cpu_ExecutedInstruction_StopLoop(EightBit::MOS6502& cpu) {
 	if (m_oldPC != pc) {
 		m_oldPC = pc;
 	} else {
-		CPU().powerOff();
+		powerOff();
 		auto test = peek(0x0200);
 		std::cout << std::endl << "** Test=" << std::hex << (int)test;
 	}

M6502/test/Board.h

@@ -17,9 +17,11 @@ public:
 
 	EightBit::MOS6502& CPU() { return m_cpu; }
 
-	void initialise();
+	virtual void powerOn() final;
+	virtual void powerOff() final;
 
 protected:
+	virtual void initialise() final;
 	virtual EightBit::MemoryMapping mapping(uint16_t address) final {
 		return { m_ram, 0x0000, 0xffff, EightBit::MemoryMapping::ReadWrite };
 	}

M6502/test/test.cpp

@@ -16,8 +16,7 @@ int main(int argc, char* argv[]) {
 #endif
 
 	EightBit::TestHarness<Configuration, Board> harness(configuration);
-	harness.initialise();
+	harness.run();
-	harness.runLoop();
 
 	return 0;
 }

MC6809/inc/mc6809.h

@@ -274,11 +274,11 @@ namespace EightBit {
 		auto carry() const { return CC() & CF; }
 		auto halfCarry() const { return CC() & HF; }
 
-		auto LS() const { return carry() | (zero() >> 2); }									// (C OR Z)
+		auto LS() const { return carry() || zero(); }										// (C OR Z)
 		auto HI() const { return !LS(); }													// !(C OR Z)
 		auto LT() const { return (negative() >> 3) ^ (overflow() >> 1); }					// (N XOR V)
 		auto GE() const { return !LT(); }													// !(N XOR V)
-		auto LE() const { return (zero() >> 2) | ((negative() >> 3) ^ (overflow() >> 1)); }	// (Z OR (N XOR V))
+		auto LE() const { return zero() || LT(); }											// (Z OR (N XOR V))
 		auto GT() const { return !LE(); }													// !(Z OR (N XOR V))
 
 		// Branching

MC6809/test/Board.cpp

@@ -7,11 +7,9 @@ Board::Board(const Configuration& configuration)
   m_disassembler(*this, m_cpu) {
 }
 
-void Board::initialise() {
+void Board::powerOn() {
 
-	// Load our BASIC interpreter
+	EightBit::Bus::powerOn();
-	const auto directory = m_configuration.getRomDirectory() + "\\";
-	loadHexFile(directory + "ExBasROM.hex");
 
 	// Get the CPU ready for action
 	CPU().powerOn();
@@ -26,6 +24,19 @@ void Board::initialise() {
 	ACIA().lower(ACIA().CTS());
 	ACIA().powerOn();
 	accessAcia();
+}
+
+void Board::powerOff() {
+	ACIA().powerOff();
+	CPU().powerOff();
+	EightBit::Bus::powerOff();
+}
+
+void Board::initialise() {
+
+	// Load our BASIC interpreter
+	const auto directory = m_configuration.getRomDirectory() + "\\";
+	loadHexFile(directory + "ExBasROM.hex");
 
 	// Once the reset has completed, we can wire the ACIA event handlers...
 	ACIA().Transmitting.connect(std::bind(&Board::Acia_Transmitting, this, std::placeholders::_1));
@@ -95,7 +106,7 @@ void Board::Cpu_ExecutedInstruction_Terminator(EightBit::mc6809&) {
 	assert(CPU().cycles() > 0);
 	m_totalCycleCount += CPU().cycles();
 	if (m_totalCycleCount > Configuration::TerminationCycles)
-		CPU().powerOff();
+		powerOff();
 }
 
 void Board::Cpu_ExecutedInstruction_Acia(EightBit::mc6809&) {

MC6809/test/Board.h

@@ -19,9 +19,11 @@ public:
 	auto& CPU() { return m_cpu; }
 	auto& ACIA() { return m_acia; }
 
-	void initialise();
+	virtual void powerOn() final;
+	virtual void powerOff() final;
 
 protected:
+	virtual void initialise() final;
 	virtual EightBit::MemoryMapping mapping(uint16_t address) final;
 
 private:

MC6809/test/test.cpp

@@ -13,11 +13,9 @@ int main(int argc, char* argv[]) {
 #ifdef _DEBUG
 	configuration.setDebugMode(true);
 #endif
-	//configuration.setDebugMode(true);
 
 	EightBit::TestHarness<Configuration, Board> harness(configuration);
-	harness.initialise();
+	harness.run();
-	harness.runLoop();
 
 	return 0;
 }

MC6809/unittest/Board.cpp

@@ -2,16 +2,38 @@
 #include "Board.h"
 
 Board::Board()
-: m_cpu(EightBit::mc6809(*this)) {
+: m_cpu(EightBit::mc6809(*this)),
+  m_disassembler(*this, m_cpu) {
 }
 
-void Board::initialise() {
+void Board::powerOn() {
+	EightBit::Bus::powerOn();
 	CPU().powerOn();
 	CPU().raise(CPU().NMI());
 	CPU().raise(CPU().FIRQ());
 	CPU().reset();
 }
 
+void Board::powerOff() {
+	CPU().powerOff();
+	EightBit::Bus::powerOff();
+}
+
+void Board::initialise() {
+	//CPU().ExecutingInstruction.connect(std::bind(&Board::Cpu_ExecutingInstruction_Debug, this, std::placeholders::_1));
+	//CPU().ExecutedInstruction.connect(std::bind(&Board::Cpu_ExecutedInstruction_Debug, this, std::placeholders::_1));
+}
+
 EightBit::MemoryMapping Board::mapping(uint16_t) {
 	return { m_ram, 0x0000, 0xffff, EightBit::MemoryMapping::ReadWrite };
 }
+
+void Board::Cpu_ExecutingInstruction_Debug(EightBit::mc6809&) {
+	m_disassembleAt = CPU().PC();
+	m_ignoreDisassembly = m_disassembler.ignore();
+}
+
+void Board::Cpu_ExecutedInstruction_Debug(EightBit::mc6809&) {
+	if (!m_ignoreDisassembly)
+		std::cout << m_disassembler.trace(m_disassembleAt) << "	" << std::endl;
+}

MC6809/unittest/Board.h

@@ -3,6 +3,7 @@
 #include <Ram.h>
 #include <Bus.h>
 #include <mc6809.h>
+#include <Disassembly.h>
 
 class Board : public EightBit::Bus {
 public:
@@ -10,12 +11,22 @@ public:
 
 	EightBit::mc6809& CPU() { return m_cpu; }
 
-	void initialise();
+	virtual void powerOn() final;
+	virtual void powerOff() final;
 
 protected:
+	virtual void initialise() final;
 	virtual EightBit::MemoryMapping mapping(uint16_t address) final;
 
 private:
 	EightBit::Ram m_ram = 0x10000;	// 0000 - FFFF, 64K RAM
 	EightBit::mc6809 m_cpu;
+	EightBit::Disassembly m_disassembler;
+
+	// The m_disassembleAt and m_ignoreDisassembly are used to skip pin events
+	EightBit::register16_t m_disassembleAt = 0x0000;
+	bool m_ignoreDisassembly = false;
+
+	void Cpu_ExecutingInstruction_Debug(EightBit::mc6809&);
+	void Cpu_ExecutedInstruction_Debug(EightBit::mc6809&);
 };

MC6809/unittest/mc6809_tests.cpp

@@ -9,7 +9,7 @@
 TEST_CASE("Add Accumulator B to Index Register X Unsigned", "[ABX]") {
 
 	Board board;
-	board.initialise();
+	board.powerOn();
 	auto& cpu = board.CPU();
 	cpu.step();	// Step over the reset
 
@@ -70,7 +70,7 @@ TEST_CASE("Add Accumulator B to Index Register X Unsigned", "[ABX]") {
 TEST_CASE("Add Memory Plus Carry to Accumulator", "[ADC][ADCA]") {
 
 	Board board;
-	board.initialise();
+	board.powerOn();
 	auto& cpu = board.CPU();
 	cpu.step();	// Step over the reset
 
@@ -153,7 +153,7 @@ TEST_CASE("Add Memory Plus Carry to Accumulator", "[ADC][ADCA]") {
 TEST_CASE("Add Memory to Accumulator", "[ADD][ADDA][ADDB][ADDD]") {
 
 	Board board;
-	board.initialise();
+	board.powerOn();
 	auto& cpu = board.CPU();
 	cpu.step();	// Step over the reset
 
@@ -350,7 +350,7 @@ TEST_CASE("Add Memory to Accumulator", "[ADD][ADDA][ADDB][ADDD]") {
 TEST_CASE("Logical AND Accumulator", "[AND][ANDA]") {
 
 	Board board;
-	board.initialise();
+	board.powerOn();
 	auto& cpu = board.CPU();
 	cpu.step();	// Step over the reset
 
@@ -370,7 +370,7 @@ TEST_CASE("Logical AND Accumulator", "[AND][ANDA]") {
 TEST_CASE("Shift Accumulator or Memory Byte Left", "[ASL][ASLA]") {
 
 	Board board;
-	board.initialise();
+	board.powerOn();
 	auto& cpu = board.CPU();
 	cpu.step();	// Step over the reset
 
@@ -389,7 +389,7 @@ TEST_CASE("Shift Accumulator or Memory Byte Left", "[ASL][ASLA]") {
 TEST_CASE("Shift Accumulator or Memory Byte Right", "[ASR][ASRA]") {
 
 	Board board;
-	board.initialise();
+	board.powerOn();
 	auto& cpu = board.CPU();
 	cpu.step();	// Step over the reset
 
@@ -408,7 +408,7 @@ TEST_CASE("Shift Accumulator or Memory Byte Right", "[ASR][ASRA]") {
 TEST_CASE("Bit Test", "[BIT][BITA]") {
 
 	Board board;
-	board.initialise();
+	board.powerOn();
 	auto& cpu = board.CPU();
 	cpu.step();	// Step over the reset
 
@@ -427,7 +427,7 @@ TEST_CASE("Bit Test", "[BIT][BITA]") {
 TEST_CASE("Clear Accumulator or Memory", "[CLR][CLRA]") {
 
 	Board board;
-	board.initialise();
+	board.powerOn();
 	auto& cpu = board.CPU();
 	cpu.step();	// Step over the reset
 
@@ -447,7 +447,7 @@ TEST_CASE("Clear Accumulator or Memory", "[CLR][CLRA]") {
 TEST_CASE("Compare Memory with a Register", "[CMP][CMPA][CMPB][CMPX]") {
 
 	Board board;
-	board.initialise();
+	board.powerOn();
 	auto& cpu = board.CPU();
 	cpu.step();	// Step over the reset
 
@@ -544,7 +544,7 @@ TEST_CASE("Compare Memory with a Register", "[CMP][CMPA][CMPB][CMPX]") {
 TEST_CASE("Decrement Accumulator or Memory", "[DEC][DECA]") {
 
 	Board board;
-	board.initialise();
+	board.powerOn();
 	auto& cpu = board.CPU();
 	cpu.step();	// Step over the reset
 
@@ -593,7 +593,7 @@ TEST_CASE("Decrement Accumulator or Memory", "[DEC][DECA]") {
 TEST_CASE("Increment Accumulator or Memory Location by 1", "[INC][INCA]") {
 
 	Board board;
-	board.initialise();
+	board.powerOn();
 	auto& cpu = board.CPU();
 	cpu.step();	// Step over the reset
 
@@ -640,7 +640,7 @@ TEST_CASE("Increment Accumulator or Memory Location by 1", "[INC][INCA]") {
 TEST_CASE("Subtract Memory from Accumulator with Borrow (8-bit)", "[SBC][SBCA][SBCB]") {
 
 	Board board;
-	board.initialise();
+	board.powerOn();
 	auto& cpu = board.CPU();
 	cpu.step();	// Step over the reset
 
@@ -729,7 +729,7 @@ TEST_CASE("Subtract Memory from Accumulator with Borrow (8-bit)", "[SBC][SBCA][S
 TEST_CASE("Subtract Memory from Register", "[SUB][SUBA]") {
 
 	Board board;
-	board.initialise();
+	board.powerOn();
 	auto& cpu = board.CPU();
 	cpu.step();	// Step over the reset
 
@@ -822,3 +822,166 @@ TEST_CASE("Subtract Memory from Register", "[SUB][SUBA]") {
 		REQUIRE(cpu.cycles() == 4);
     }
 }
+
+TEST_CASE(" Branch if Greater Than Zero", "[BGT]") {
+
+	Board board;
+	board.powerOn();
+	auto& cpu = board.CPU();
+	cpu.step();	// Step over the reset
+
+	board.poke(0, 0x2e);	// BGT
+	board.poke(1, 0x03);
+	board.poke(2, 0x86);	// LDA	#1
+	board.poke(3, 0x01);
+	board.poke(4, 0x12);	// NOP
+	board.poke(5, 0x86);	// LDA	#2
+	board.poke(6, 0x02);
+	board.poke(7, 0x12);	// NOP
+
+	SECTION("BGT1") {
+		cpu.A() = 0;
+ 		cpu.CC() = EightBit::mc6809::ZF;
+		cpu.step();
+		cpu.step();
+		REQUIRE(cpu.A() == 1);
+	}
+
+	cpu.reset();
+	cpu.step();
+
+	SECTION("BGT2") {
+		REQUIRE(cpu.PC() == 0);
+ 		cpu.CC() = 0;
+		cpu.step();
+		cpu.step();
+		REQUIRE(cpu.A() == 2);
+	}
+
+	cpu.reset();
+	cpu.step();
+
+	SECTION("BGT3") {
+		REQUIRE(cpu.PC() == 0);
+ 		cpu.CC() = EightBit::mc6809::NF;
+		cpu.step();
+		cpu.step();
+		REQUIRE(cpu.A() == 1);
+	}
+
+	cpu.reset();
+	cpu.step();
+
+	SECTION("BGT4") {
+		REQUIRE(cpu.PC() == 0);
+ 		cpu.CC() = EightBit::mc6809::NF | EightBit::mc6809::VF;
+		cpu.step();
+		cpu.step();
+		REQUIRE(cpu.A() == 2);
+	}
+
+	cpu.reset();
+	cpu.step();
+
+	SECTION("BGT5") {
+		REQUIRE(cpu.PC() == 0);
+ 		cpu.CC() = EightBit::mc6809::ZF | EightBit::mc6809::NF;
+		cpu.step();
+		cpu.step();
+		REQUIRE(cpu.A() == 1);
+	}
+}
+
+TEST_CASE(" Branch if Higher", "[BHI]") {
+
+	Board board;
+	board.powerOn();
+	auto& cpu = board.CPU();
+	cpu.step();	// Step over the reset
+
+	board.poke(0, 0x22);	// BHI
+	board.poke(1, 0x03);
+	board.poke(2, 0x86);	// LDA	#1
+	board.poke(3, 0x01);
+	board.poke(4, 0x12);	// NOP
+	board.poke(5, 0x86);	// LDA	#2
+	board.poke(6, 0x02);
+	board.poke(7, 0x12);	// NOP
+
+	SECTION("BHI1") {
+		cpu.A() = 0;
+ 		cpu.CC() = EightBit::mc6809::ZF;
+		cpu.step();
+		cpu.step();
+		REQUIRE(cpu.A() == 1);
+	}
+}
+
+TEST_CASE("Branch on Less than or Equal to Zero", "[BLE]") {
+
+	Board board;
+	board.powerOn();
+	auto& cpu = board.CPU();
+	cpu.step();	// Step over the reset
+
+	board.poke(0, 0x2f);	// BLE
+	board.poke(1, 0x03);
+	board.poke(2, 0x86);	// LDA	#1
+	board.poke(3, 0x01);
+	board.poke(4, 0x12);	// NOP
+	board.poke(5, 0x86);	// LDA	#2
+	board.poke(6, 0x02);
+	board.poke(7, 0x12);	// NOP
+
+	SECTION("BLE1") {
+		cpu.A() = 0;
+ 		cpu.CC() = EightBit::mc6809::ZF;
+		cpu.step();
+		cpu.step();
+		REQUIRE(cpu.A() == 2);
+	}
+
+	cpu.reset();
+	cpu.step();
+
+	SECTION("BLE2") {
+		cpu.A() = 0;
+		cpu.CC() = 0;
+		cpu.step();
+		cpu.step();
+		REQUIRE(cpu.A() == 1);
+	}
+
+	cpu.reset();
+	cpu.step();
+
+	SECTION("BLE3") {
+		cpu.A() = 0;
+		cpu.CC() = EightBit::mc6809::NF;
+		cpu.step();
+		cpu.step();
+		REQUIRE(cpu.A() == 2);
+	}
+
+	cpu.reset();
+	cpu.step();
+
+	SECTION("BLE4") {
+		cpu.A() = 0;
+		cpu.CC() = EightBit::mc6809::NF | EightBit::mc6809::VF;
+		cpu.step();
+		cpu.step();
+		REQUIRE(cpu.A() == 1);
+	}
+
+	cpu.reset();
+	cpu.step();
+
+	SECTION("BLE5") {
+		cpu.A() = 0;
+		cpu.CC() = EightBit::mc6809::ZF | EightBit::mc6809::NF;
+		cpu.step();
+		cpu.step();
+		REQUIRE(cpu.A() == 2);
+	}
+}

MC6850/inc/MC6850.h

@@ -46,7 +46,7 @@ namespace EightBit {
 		// +--------+------------------+------------------+--------------------+-----------------------+
 		//		* Leading bit = LSB = Bit 0
 		//	   ** Data bit will be zero in 7-bit plus parity modes
-		//	  *** Data bit is "don't case" in 7-bit plus parity modes
+		//	  *** Data bit is "don't care" in 7-bit plus parity modes
 
 		enum ControlRegisters {
 			CR0 =        0b1,	// Counter divide

Z80/fusetest_Z80/FuseTestRunner.cpp

@@ -10,9 +10,18 @@ Fuse::TestRunner::TestRunner(const Test& test, const ExpectedTestResult& expecte
 
 //
 
-void Fuse::TestRunner::initialise() {
+void Fuse::TestRunner::powerOn() {
+	EightBit::Bus::powerOn();
 	m_cpu.powerOn();
 	initialiseRegisters();
+}
+
+void Fuse::TestRunner::powerOff() {
+	m_cpu.powerOff();
+	EightBit::Bus::powerOff();
+}
+
+void Fuse::TestRunner::initialise() {
 	initialiseMemory();
 }
 
@@ -319,7 +328,7 @@ void Fuse::TestRunner::checkMemory() {
 
 void Fuse::TestRunner::run() {
 
-	initialise();
+	powerOn();
 	auto allowedCycles = m_test.registerState.tstates;
 	try {
 		m_cpu.run(allowedCycles);

Z80/fusetest_Z80/FuseTestRunner.h

@@ -21,7 +21,6 @@ namespace Fuse {
 		EightBit::InputOutput m_ports;
 		EightBit::Z80 m_cpu;
 
-		void initialise();
 		void initialiseRegisters();
 		void initialiseMemory();
 
@@ -36,6 +35,7 @@ namespace Fuse {
 			EightBit::register16_t actual, EightBit::register16_t expected) const;
 
 	protected:
+		virtual void initialise() final;
 		virtual EightBit::MemoryMapping mapping(uint16_t address) final {
 			return { m_ram, 0x0000, 0xffff, EightBit::MemoryMapping::ReadWrite };
 		}
@@ -46,5 +46,8 @@ namespace Fuse {
 		void run();
 		bool failed() const { return m_failed; }
 		bool unimplemented() const { return m_unimplemented; }
+
+		virtual void powerOn() final;
+		virtual void powerOff() final;
 	};
 }

Z80/test/Board.cpp

@@ -10,6 +10,19 @@ Board::Board(const Configuration& configuration)
   m_profiler(m_cpu, m_disassembler) {
 }
 
+void Board::powerOn() {
+
+	EightBit::Bus::powerOn();
+
+	CPU().powerOn();
+	CPU().reset();
+}
+
+void Board::powerOff() {
+	CPU().powerOff();
+	EightBit::Bus::powerOff();
+}
+
 void Board::initialise() {
 
 	auto romDirectory = m_configuration.getRomDirectory();
@@ -29,23 +42,18 @@ void Board::initialise() {
 		m_cpu.ExecutingInstruction.connect(std::bind(&Board::Cpu_ExecutingInstruction_Debug, this, std::placeholders::_1));
 	}
 
-	CPU().powerOn();
-	CPU().reset();
-
 	poke(0, 0xc3);	// JMP
-	poke(1, m_configuration.getStartAddress().low);
+	CPU().pokeWord(1, m_configuration.getStartAddress());
-	poke(2, m_configuration.getStartAddress().high);
-
 	poke(5, 0xc9);	// ret
 }
 
 void Board::Cpu_ExecutingInstruction_Cpm(EightBit::Z80& cpu) {
 	if (UNLIKELY(EightBit::Chip::lowered(cpu.HALT())))
-		CPU().powerOff();
+		powerOff();
 	switch (cpu.PC().word) {
 	case 0x0:	// CP/M warm start
 		if (++m_warmstartCount == 3) {
-			CPU().powerOff();
+			powerOff();
 			if (m_configuration.isProfileMode()) {
 				m_profiler.dump();
 			}

Z80/test/Board.h

@@ -18,9 +18,11 @@ public:
 
 	EightBit::Z80& CPU() { return m_cpu; }
 
-	void initialise();
+	virtual void powerOn() final;
+	virtual void powerOff() final;
 
 protected:
+	virtual void initialise() final;
 	virtual EightBit::MemoryMapping mapping(uint16_t address) final {
 		return { m_ram, 0x0000, 0xffff, EightBit::MemoryMapping::ReadWrite };
 	}

Z80/test/test.cpp

@@ -14,8 +14,7 @@ int main(int, char*[]) {
 #endif
 
 	EightBit::TestHarness<Configuration, Board> harness(configuration);
-	harness.initialise();
+	harness.run();
-	harness.runLoop();
 
 	return 0;
 }

inc/Bus.h

@@ -48,7 +48,12 @@ namespace EightBit {
 			write(value);
 		}
 
+		virtual void powerOn();
+		virtual void powerOff();
+
 	protected:
+		virtual void initialise() = 0;
+
 		virtual MemoryMapping mapping(uint16_t address) = 0;
 		uint8_t& reference(uint16_t address);
 		auto& reference(const register16_t address) { return reference(address.word); }
@@ -57,6 +62,8 @@ namespace EightBit {
 		static std::map<uint16_t, std::vector<uint8_t>> parseHexFile(std::string path);
 		void loadHexFile(std::string path);
 
+
+
 	private:
 		uint8_t m_data = Chip::Mask8;
 		register16_t m_address = Chip::Mask16;

inc/TestHarness.h

@@ -55,11 +55,13 @@ namespace EightBit {
 			return (long long)floating;
 		}
 
-		void runLoop() {
+		void run() {
 			m_startTime = now();
 			m_totalCycles = m_instructions = 0L;
 			m_startHostCycles = currentHostCycles();
 
+			m_board.powerOn();
+
 			auto& cpu = m_board.CPU();
 
 			while (LIKELY(cpu.powered())) {
@@ -71,10 +73,6 @@ namespace EightBit {
 			m_finishTime = now();
 		}
 
-		void initialise() {
-			m_board.initialise();
-		}
-
 	private:
 		BoardT m_board;
 		long long m_totalCycles = 0;

src/Bus.cpp

@@ -8,6 +8,12 @@
 #include <stdexcept>
 #include <cassert>
 
+void EightBit::Bus::powerOn() {
+	initialise();
+}
+
+void EightBit::Bus::powerOff() {}
+
 uint8_t EightBit::Bus::read() {
 	ReadingByte.fire(EventArgs::empty());
 	const auto returned = DATA() = reference();