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

Intel8080/inc/Intel8080.h

@@ -79,8 +79,7 @@ namespace EightBit {
 		}
 
 		void adjustReservedFlags() {
-			F() &= ~(Bit5 | Bit3);
-			F() |= Bit1;
+			F() = (F() | Bit1) & ~(Bit5 | Bit3);
 		}
 
 		static void adjustAuxiliaryCarryAdd(uint8_t& f, uint8_t before, uint8_t value, int calculation) {
@@ -150,9 +149,9 @@ namespace EightBit {
 
 		void dad(uint16_t value) {
 			auto& f = F();
-			uint32_t sum = HL().word + value;
-			setFlag(f, CF, sum > 0xffff);
-			HL().word = (uint16_t)sum;
+			auto sum = HL().word + value;
+			setFlag(f, CF, sum & Bit16);
+			HL().word = sum;
 		}
 
 		void sub(uint8_t& operand, uint8_t value, int carry = 0) {
@@ -275,9 +274,9 @@ namespace EightBit {
 			m_memory.reference() = data;
 		}
 
-		void lxi_b() { Processor::fetchWord(BC()); }
-		void lxi_d() { Processor::fetchWord(DE()); }
-		void lxi_h() { Processor::fetchWord(HL()); }
+		void lxi_b() { fetchWord(BC()); }
+		void lxi_d() { fetchWord(DE()); }
+		void lxi_h() { fetchWord(HL()); }
 
 		void stax_r(register16_t& destination) {
 			m_memory.ADDRESS() = destination;
@@ -351,7 +350,7 @@ namespace EightBit {
 		}
 
 		void lxi_sp() {
-			Processor::fetchWord(SP());
+			fetchWord(SP());
 		}
 
 		void inx_sp() { ++SP().word; }
@@ -527,13 +526,11 @@ namespace EightBit {
 		}
 
 		void sbi() {
-			auto value = fetchByte();
-			sbb(value);
+			sbb(fetchByte());
 		}
 
 		void sui() {
-			auto value = fetchByte();
-			sub(value);
+			sub(fetchByte());
 		}
 
 		// logical
@@ -603,35 +600,31 @@ namespace EightBit {
 		void rlc() {
 			auto& a = A();
 			auto carry = a & Bit7;
-			a <<= 1;
-			carry ? a |= Bit0 : a &= ~Bit0;
+			a = (a << 1) | (carry >> 7);
 			setFlag(F(), CF, carry);
 		}
 
 		void rrc() {
 			auto& a = A();
 			auto carry = a & Bit0;
-			a >>= 1;
-			carry ? a |= Bit7 : a &= ~Bit7;
+			a = (a >> 1) | (carry << 7);
 			setFlag(F(), CF, carry);
 		}
 
 		void ral() {
 			auto& a = A();
 			auto& f = F();
-			auto carry = a & Bit7;
-			a <<= 1;
-			a |= (f & CF);
-			setFlag(f, CF, carry);
+			const auto carry = f & CF;
+			setFlag(f, CF, a & Bit7);
+			a = (a << 1) | carry;
 		}
 
 		void rar() {
 			auto& a = A();
 			auto& f = F();
-			auto carry = a & 1;
-			a >>= 1;
-			a |= (f & CF) << 7;
-			setFlag(f, CF, carry);
+			const auto carry = f & CF;
+			setFlag(f, CF, a & Bit0);
+			a = (a >> 1) | (carry << 7);
 		}
 
 		// specials

Intel8080/test/Board.h

@@ -14,9 +14,8 @@ class Board {
 public:
 	Board(const Configuration& configuration);
 
-	EightBit::Memory& getMemory() { return m_memory; }
-	const EightBit::Intel8080& getCPU() const { return m_cpu; }
-	EightBit::Intel8080& getCPUMutable() { return m_cpu; }
+	EightBit::Memory& Memory() { return m_memory; }
+	EightBit::Intel8080& CPU() { return m_cpu; }
 
 	void initialise();
 

LR35902/src/LR35902.cpp

@@ -524,7 +524,7 @@ void EightBit::LR35902::executeOther(int x, int y, int z, int p, int q) {
 		case 1:	// 16-bit load immediate/add
 			switch (q) {
 			case 0:	// LD rp,nn
-				Processor::fetchWord(RP(p));
+				fetchWord(RP(p));
 				cycles += 3;
 				break;
 			case 1:	// ADD HL,rp

LR35902/src/LR35902.vcxproj

@@ -22,7 +22,6 @@
     <ProjectGuid>{7730ECF5-8206-4ECB-BA6B-6B5CFE50CFB2}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>LR35902</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

M6502/inc/AddressEventArgs.h

@@ -1,17 +0,0 @@
-#pragma once
-
-#include <cstdint>
-
-class AddressEventArgs
-{
-private:
-	uint16_t m_address;
-	uint8_t m_cell;
-
-public:
-	AddressEventArgs(uint16_t address, uint8_t cell)
-	: m_address(address), m_cell(cell) {}
-
-	uint16_t getAddress() const	{ return m_address;	}
-	uint8_t getCell() const		{ return m_cell;	}
-};

M6502/inc/AddressingMode.h

@@ -1,21 +0,0 @@
-#pragma once
-
-enum AddressingMode {
-	Illegal,
-	Implied,
-	Accumulator,
-	Immediate,
-	Relative,
-	XIndexed,
-	IndexedY,
-	ZeroPage,
-	ZeroPageX,
-	ZeroPageY,
-	Absolute,
-	AbsoluteX,
-	AbsoluteY,
-	AbsoluteXIndirect,
-	Indirect,
-	ZeroPageIndirect,
-	ZeroPageRelative
-};

M6502/inc/AddressingModeDumper.h

@@ -1,11 +0,0 @@
-#pragma once
-
-#include <cstdint>
-#include <functional>
-
-typedef std::function<std::string(uint16_t current)> dumper_t;
-
-struct AddressingModeDumper {
-	dumper_t byteDumper;
-	dumper_t disassemblyDumper;
-};

M6502/inc/Disassembly.h

@@ -3,62 +3,326 @@
 #include <map>
 #include <cstdint>
 
-#include <mos6502.h>
-#include <AddressingMode.h>
-
+#include "mos6502.h"
 #include "Symbols.h"
-#include "AddressingModeDumper.h"
 
-class Disassembly
-{
-public:
-	MOS6502& processor;
-	const Symbols& symbols;
+namespace EightBit {
+	class Disassembly {
+	public:
+		Disassembly(MOS6502& processor, const Symbols& symbols);
 
-	std::map<AddressingMode, AddressingModeDumper> dumpers;
+		std::string dump_Flags(uint8_t value) const;
+		std::string dump_ByteValue(uint8_t value) const;
+		std::string dump_WordValue(uint16_t value) const;
 
-	Disassembly(MOS6502& processor, const Symbols& symbols);
+		std::string disassemble(uint16_t current) const;
 
-	std::string Dump_ByteValue(uint8_t value) const;
-	std::string Dump_WordValue(uint16_t value) const;
+	private:
+		MOS6502& processor;
+		const Symbols& symbols;
 
-	std::string DumpBytes(AddressingMode mode, uint16_t current) const;
-	std::string Disassemble(uint16_t current) const;
-	std::string DumpOperand(AddressingMode mode, uint16_t current) const;
+		mutable uint16_t m_address;
 
-private:
-	uint8_t GetByte(uint16_t address) const;
-	uint16_t GetWord(uint16_t address) const;
+		std::string disassemble_Implied(const std::string& instruction) const {
+			return "\t" + instruction;
+		}
 
-	std::string Dump_Nothing(uint16_t unused) const;
-	std::string Dump_Byte(uint16_t address) const;
-	std::string Dump_DByte(uint16_t address) const;
+		std::string disassemble_Absolute(const std::string& instruction) const {
+			return AM_Absolute_dump() + "\t" + instruction + " " + AM_Absolute();
+		}
 
-	std::string ConvertAddress(uint16_t address) const;
-	std::string ConvertAddress(uint8_t address) const;
-	std::string ConvertConstant(uint16_t constant) const;
-	std::string ConvertConstant(uint8_t constant) const;
+		std::string disassemble_Indirect(const std::string& instruction) const {
+			return AM_Absolute_dump() + "\t" + instruction + " (" + AM_Absolute() + ")";
+		}
 
-	std::string Dump_A(uint16_t unused) const;
-	std::string Dump_imm(uint16_t current) const;
-	std::string Dump_abs(uint16_t current) const;
-	std::string Dump_zp(uint16_t current) const;
-	std::string Dump_zpx(uint16_t current) const;
-	std::string Dump_zpy(uint16_t current) const;
-	std::string Dump_absx(uint16_t current) const;
-	std::string Dump_absy(uint16_t current) const;
-	std::string Dump_absxind(uint16_t current) const;
-	std::string Dump_xind(uint16_t current) const;
-	std::string Dump_indy(uint16_t current) const;
-	std::string Dump_ind(uint16_t current) const;
-	std::string Dump_zpind(uint16_t current) const;
-	std::string Dump_rel(uint16_t current) const;
-	std::string Dump_zprel(uint16_t current) const;
+		std::string disassemble_Relative(const std::string& instruction, uint16_t address) const {
+			return AM_Immediate_dump() + "\t" + instruction + " $" + dump_WordValue(address);
+		}
 
-	const AddressingModeDumper& getDumper(AddressingMode mode) const {
-		auto dumper = dumpers.find(mode);
-		if (dumper == dumpers.end())
-			throw std::invalid_argument("Illegal addressing mode");
-		return dumper->second;
-	}
-};
+		std::string disassemble_AM_00(int bbb, const std::string& instruction) const {
+			return AM_00_dump(bbb) + "\t" + instruction + " " + AM_00(bbb);
+		}
+
+		std::string disassemble_AM_01(int bbb, const std::string& instruction) const {
+			return AM_01_dump(bbb) + "\t" + instruction + " " + AM_01(bbb);
+		}
+
+		std::string disassemble_AM_10(int bbb, const std::string& instruction) const {
+			return AM_10_dump(bbb) + "\t" + instruction + " " + AM_10(bbb);
+		}
+
+		std::string disassemble_AM_10_x(int bbb, const std::string& instruction) const {
+			return AM_10_x_dump(bbb) + "\t" + instruction + " " + AM_10_x(bbb);
+		}
+
+#pragma region 6502 addressing modes
+
+#pragma region References
+
+		std::string AM_Immediate_dump() const {
+			return dump_Byte(m_address + 1);
+		}
+
+		std::string AM_Immediate() const {
+			return "#" + AM_Immediate_dump();
+		}
+
+		std::string AM_Absolute_dump() const {
+			return dump_DByte(m_address + 1);
+		}
+
+		std::string AM_Absolute() const {
+			return "$" + dump_WordValue(processor.getMemory().peekWord(m_address + 1));
+		}
+
+		std::string AM_ZeroPage_dump() const {
+			return dump_Byte(m_address + 1);
+		}
+
+		std::string AM_ZeroPage() const {
+			return "$" + dump_Byte(m_address + 1);
+		}
+
+		std::string AM_ZeroPageX_dump() const {
+			return AM_ZeroPage_dump();
+		}
+
+		std::string AM_ZeroPageX() const {
+			return AM_ZeroPage() + ",X";
+		}
+
+		std::string AM_ZeroPageY_dump() const {
+			return AM_ZeroPage_dump();
+		}
+
+		std::string AM_ZeroPageY() const {
+			return AM_ZeroPage() + ",Y";
+		}
+
+		std::string AM_AbsoluteX_dump() const {
+			return AM_Absolute_dump();
+		}
+
+		std::string AM_AbsoluteX() const {
+			return AM_Absolute() + ",X";
+		}
+
+		std::string AM_AbsoluteY_dump() const {
+			return AM_Absolute_dump();
+		}
+
+		std::string AM_AbsoluteY() const {
+			return AM_Absolute() + ",Y";
+		}
+
+		std::string AM_IndexedIndirectX_dump() const {
+			return AM_ZeroPage_dump();
+		}
+
+		std::string AM_IndexedIndirectX() const {
+			return "($" + dump_Byte(m_address + 1) + ",X)";
+		}
+
+		std::string AM_IndirectIndexedY_dump() const {
+			return AM_ZeroPage_dump();
+		}
+
+		std::string AM_IndirectIndexedY() const {
+			return "($" + dump_Byte(m_address + 1) + "),Y";
+		}
+
+#pragma endregion References
+
+#pragma region 6502 addressing mode switching
+
+		std::string AM_00_dump(int bbb) const {
+			switch (bbb) {
+			case 0b000:
+				return AM_Immediate_dump();
+			case 0b001:
+				return AM_ZeroPage_dump();
+			case 0b011:
+				return AM_Absolute_dump();
+			case 0b101:
+				return AM_ZeroPageX_dump();
+			case 0b111:
+				return AM_AbsoluteX_dump();
+			case 0b010:
+			case 0b100:
+			case 0b110:
+				throw std::domain_error("Illegal addressing mode");
+			default:
+				__assume(0);
+			}
+		}
+
+		std::string AM_00(int bbb) const {
+			switch (bbb) {
+			case 0b000:
+				return AM_Immediate();
+			case 0b001:
+				return AM_ZeroPage();
+			case 0b011:
+				return AM_Absolute();
+			case 0b101:
+				return AM_ZeroPageX();
+			case 0b111:
+				return AM_AbsoluteX();
+			case 0b010:
+			case 0b100:
+			case 0b110:
+				throw std::domain_error("Illegal addressing mode");
+			default:
+				__assume(0);
+			}
+		}
+
+		std::string AM_01_dump(int bbb) const {
+			switch (bbb) {
+			case 0b000:
+				return AM_IndexedIndirectX_dump();
+			case 0b001:
+				return AM_ZeroPage_dump();
+			case 0b010:
+				return AM_Immediate_dump();
+			case 0b011:
+				return AM_Absolute_dump();
+			case 0b100:
+				return AM_IndirectIndexedY_dump();
+			case 0b101:
+				return AM_ZeroPageX_dump();
+			case 0b110:
+				return AM_AbsoluteY_dump();
+			case 0b111:
+				return AM_AbsoluteX_dump();
+			default:
+				__assume(0);
+			}
+		}
+
+		std::string AM_01(int bbb) const {
+			switch (bbb) {
+			case 0b000:
+				return AM_IndexedIndirectX();
+			case 0b001:
+				return AM_ZeroPage();
+			case 0b010:
+				return AM_Immediate();
+			case 0b011:
+				return AM_Absolute();
+			case 0b100:
+				return AM_IndirectIndexedY();
+			case 0b101:
+				return AM_ZeroPageX();
+			case 0b110:
+				return AM_AbsoluteY();
+			case 0b111:
+				return AM_AbsoluteX();
+			default:
+				__assume(0);
+			}
+		}
+
+		std::string AM_10_dump(int bbb) const {
+			switch (bbb) {
+			case 0b000:
+				return AM_Immediate_dump();
+			case 0b001:
+				return AM_ZeroPage_dump();
+			case 0b010:
+				return "";
+			case 0b011:
+				return AM_Absolute_dump();
+			case 0b101:
+				return AM_ZeroPageX_dump();
+			case 0b111:
+				return AM_AbsoluteX_dump();
+			case 0b100:
+			case 0b110:
+				throw std::domain_error("Illegal addressing mode");
+			default:
+				__assume(0);
+			}
+		}
+
+		std::string AM_10(int bbb) const {
+			switch (bbb) {
+			case 0b000:
+				return AM_Immediate();
+			case 0b001:
+				return AM_ZeroPage();
+			case 0b010:
+				return "A";
+			case 0b011:
+				return AM_Absolute();
+			case 0b101:
+				return AM_ZeroPageX();
+			case 0b111:
+				return AM_AbsoluteX();
+			case 0b100:
+			case 0b110:
+				throw std::domain_error("Illegal addressing mode");
+			default:
+				__assume(0);
+			}
+		}
+
+		std::string AM_10_x_dump(int bbb) const {
+			switch (bbb) {
+			case 0b000:
+				return AM_Immediate_dump();
+			case 0b001:
+				return AM_ZeroPage_dump();
+			case 0b010:
+				return "";
+			case 0b011:
+				return AM_Absolute_dump();
+			case 0b101:
+				return AM_ZeroPageY_dump();
+			case 0b111:
+				return AM_AbsoluteY_dump();
+			case 0b100:
+			case 0b110:
+				throw std::domain_error("Illegal addressing mode");
+			default:
+				__assume(0);
+			}
+		}
+
+		std::string AM_10_x(int bbb) const {
+			switch (bbb) {
+			case 0b000:
+				return AM_Immediate();
+			case 0b001:
+				return AM_ZeroPage();
+			case 0b010:
+				return "A";
+			case 0b011:
+				return AM_Absolute();
+			case 0b101:
+				return AM_ZeroPageY();
+			case 0b111:
+				return AM_AbsoluteY();
+			case 0b100:
+			case 0b110:
+				throw std::domain_error("Illegal addressing mode");
+			default:
+				__assume(0);
+			}
+		}
+
+#pragma endregion 6502 addressing mode switching
+
+#pragma endregion 6502 addressing modes
+
+		uint8_t getByte(uint16_t address) const;
+
+		std::string dump_Byte(uint16_t address) const;
+		std::string dump_DByte(uint16_t address) const;
+
+		std::string convertAddress(uint16_t address) const;
+		std::string convertAddress(uint8_t address) const;
+		std::string convertConstant(uint16_t constant) const;
+		std::string convertConstant(uint8_t constant) const;
+	};
+}

M6502/inc/DisassemblyEventArgs.h

@@ -2,14 +2,15 @@
 
 #include <string>
 
-class DisassemblyEventArgs
-{
-private:
-	std::string m_output;
+namespace EightBit {
+	class DisassemblyEventArgs {
+	private:
+		std::string m_output;
 
-public:
-	DisassemblyEventArgs(std::string output)
-	: m_output(output) {}
+	public:
+		DisassemblyEventArgs(std::string output)
+			: m_output(output) {}
 
-	const std::string& getOutput() const { return m_output; }
-};
+		const std::string& getOutput() const { return m_output; }
+	};
+}

M6502/inc/Memory.h

@@ -1,76 +0,0 @@
-#pragma once
-
-#include <vector>
-#include <iostream>
-#include <fstream>
-#include <algorithm>
-
-#include "Signal.h"
-#include "AddressEventArgs.h"
-
-class Memory
-{
-private:
-	std::vector<uint8_t> memory;
-	std::vector<bool> locked;
-
-public:
-	Memory(unsigned memorySize)
-	:	memory(memorySize),
-		locked(memorySize) {}
-
-	Signal<AddressEventArgs> InvalidWriteAttempt;
-	Signal<AddressEventArgs> WritingByte;
-	Signal<AddressEventArgs> ReadingByte;
-
-	void ClearMemory() {
-		std::fill(memory.begin(), memory.end(), 0);
-	}
-
-	void ClearLocking() {
-		std::fill(locked.begin(), locked.end(), false);
-	}
-
-	uint8_t GetByte(uint16_t offset) const {
-		auto content = memory[offset];
-		ReadingByte.fire(AddressEventArgs(offset, content));
-		return content;
-	}
-
-	void SetByte(uint16_t offset, uint8_t value) {
-		AddressEventArgs e(offset, value);
-		if (locked[offset]) {
-			InvalidWriteAttempt.fire(e);
-		} else {
-			memory[offset] = value;
-			WritingByte.fire(e);
-		}
-	}
-
-	void LoadRom(std::string path, uint16_t offset) {
-		auto length = LoadMemory(path, offset);
-		LockMemory(offset, length);
-	}
-
-	void LoadRam(std::string path, uint16_t offset) {
-		LoadMemory(path, offset);
-	}
-
-	void LockMemory(uint16_t offset, uint16_t length) {
-		for (auto i = 0; i < length; ++i)
-			locked[offset + i] = true;
-	}
-
-	uint16_t LoadMemory(std::string path, uint16_t offset) {
-		std::ifstream file(path, std::ios::binary | std::ios::ate);
-		auto size = (int)file.tellg();
-		file.seekg(0, std::ios::beg);
-		std::vector<char> buffer(size);
-		file.read(&buffer[0], size);
-		file.close();
-
-		std::copy(buffer.begin(), buffer.end(), memory.begin() + offset);
-
-		return (uint16_t)size;
-	}
-};

M6502/inc/ProcessorType.h

@@ -1,7 +0,0 @@
-#pragma once
-
-enum ProcessorType {
-	Cpu6502,
-	Cpu65SC02,
-	Cpu65C02
-};

M6502/inc/ProfileEventArgs.h

@@ -2,14 +2,15 @@
 
 #include <string>
 
-class ProfileEventArgs
-{
-private:
-	std::string m_output;
+namespace EightBit {
+	class ProfileEventArgs {
+	private:
+		std::string m_output;
 
-public:
-	ProfileEventArgs(std::string output)
-	: m_output(output) {}
+	public:
+		ProfileEventArgs(std::string output)
+			: m_output(output) {}
 
-	const std::string& getOutput() const { return m_output;	 }
-};
+		const std::string& getOutput() const { return m_output; }
+	};
+}

M6502/inc/ProfileLineEventArgs.h

@@ -3,16 +3,18 @@
 #include <string>
 #include <cstdint>
 
-class ProfileLineEventArgs
-{
-private:
-	std::string m_source;
-	uint64_t m_cycles;
+namespace EightBit {
+	class ProfileLineEventArgs
+	{
+	private:
+		std::string m_source;
+		uint64_t m_cycles;
 
-public:
-	ProfileLineEventArgs(std::string source, uint64_t cycles)
-	: m_source(source), m_cycles(cycles) {}
+	public:
+		ProfileLineEventArgs(std::string source, uint64_t cycles)
+			: m_source(source), m_cycles(cycles) {}
 
-	const std::string& getSource() const	{ return m_source;	}
-	uint64_t getCycles() const				{ return m_cycles;	}
-};
+		const std::string& getSource() const { return m_source; }
+		uint64_t getCycles() const { return m_cycles; }
+	};
+}

M6502/inc/ProfileScopeEventArgs.h

@@ -3,19 +3,19 @@
 #include <string>
 #include <cstdint>
 
-class ProfileScopeEventArgs
-{
-private:
-	std::string m_scope;
-	uint64_t m_cycles;
-	uint64_t m_count;
+namespace EightBit {
+	class ProfileScopeEventArgs {
+	private:
+		std::string m_scope;
+		uint64_t m_cycles;
+		uint64_t m_count;
 
-public:
-	ProfileScopeEventArgs(std::string scope, uint64_t cycles, uint64_t count)
-	: m_scope(scope), m_cycles(cycles), m_count(count) {}
-
-	const std::string& getScope() const	{ return m_scope;	}
-	uint64_t getCycles() const			{ return m_cycles;	}
-	uint64_t getCount() const			{ return m_count;	}
-};
+	public:
+		ProfileScopeEventArgs(std::string scope, uint64_t cycles, uint64_t count)
+			: m_scope(scope), m_cycles(cycles), m_count(count) {}
 
+		const std::string& getScope() const { return m_scope; }
+		uint64_t getCycles() const { return m_cycles; }
+		uint64_t getCount() const { return m_count; }
+	};
+}

M6502/inc/Profiler.h

@@ -5,58 +5,55 @@
 #include <cstdint>
 #include <functional>
 
-#include <system6502.h>
-#include <EventArgs.h>
-#include <Signal.h>
+#include "EventArgs.h"
+#include "Signal.h"
 
 #include "Disassembly.h"
 #include "Symbols.h"
 
+#include "AddressEventArgs.h"
 #include "ProfileLineEventArgs.h"
 #include "ProfileScopeEventArgs.h"
 
-class Profiler
-{
-public:
-	std::array<uint64_t, 0x100> instructionCounts;
-	std::array<uint64_t, 0x10000> addressProfiles;
-	std::array<uint64_t, 0x10000> addressCounts;
+#include "mos6502.h"
 
-	std::array<std::string, 0x10000> addressScopes;
-	std::map<std::string, uint64_t> scopeCycles;
+namespace EightBit {
+	class Profiler {
+	public:
+		std::array<uint64_t, 0x100> instructionCounts;
+		std::array<uint64_t, 0x10000> addressProfiles;
+		std::array<uint64_t, 0x10000> addressCounts;
 
-	System6502& processor;
-	const Disassembly& disassembler;
-	const Symbols& symbols;
+		std::array<std::string, 0x10000> addressScopes;
+		std::map<std::string, uint64_t> scopeCycles;
 
-	bool countInstructions;
-	bool profileAddresses;
+		MOS6502& processor;
+		const Disassembly& disassembler;
+		const Symbols& symbols;
 
-	uint64_t priorCycleCount = 0;
+		Profiler(MOS6502& processor, Disassembly& disassembler, Symbols& symbols);
 
-	Profiler(System6502& processor, Disassembly& disassembler, Symbols& symbols, bool countInstructions, bool profileAddresses);
+		Signal<EventArgs> StartingOutput;
+		Signal<EventArgs> FinishedOutput;
 
-	Signal<EventArgs> StartingOutput;
-	Signal<EventArgs> FinishedOutput;
+		Signal<EventArgs> StartingLineOutput;
+		Signal<EventArgs> FinishedLineOutput;
 
-	Signal<EventArgs> StartingLineOutput;
-	Signal<EventArgs> FinishedLineOutput;
+		Signal<ProfileLineEventArgs> EmitLine;
 
-	Signal<ProfileLineEventArgs> EmitLine;
+		Signal<EventArgs> StartingScopeOutput;
+		Signal<EventArgs> FinishedScopeOutput;
 
-	Signal<EventArgs> StartingScopeOutput;
-	Signal<EventArgs> FinishedScopeOutput;
+		Signal<ProfileScopeEventArgs> EmitScope;
 
-	Signal<ProfileScopeEventArgs> EmitScope;
+		void addInstruction(uint8_t instruction);
+		void addAddress(uint16_t address, int cycles);
 
-	void Generate();
+		void Generate();
 
-private:
-	void EmitProfileInformation();
+	private:
+		void EmitProfileInformation();
 
-	void Processor_ExecutingInstruction_ProfileAddresses(const AddressEventArgs& addressEvent);
-	void Processor_ExecutingInstruction_CountInstructions(const AddressEventArgs& addressEvent);
-	void Processor_ExecutedInstruction_ProfileAddresses(const AddressEventArgs& addressEvent);
-
-	void BuildAddressScopes();
-};
+		void BuildAddressScopes();
+	};
+}

M6502/inc/StatusFlags.h

@@ -1,82 +0,0 @@
-#pragma once
-
-#include <string>
-#include <cstdint>
-
-struct StatusFlags {
-
-	bool negative;
-	bool overflow;
-	bool reserved;
-	bool brk;
-	bool decimal;
-	bool interrupt;
-	bool zero;
-	bool carry;
-
-	enum StatusBits {
-		Negative = 0x80,    // N
-		Overflow = 0x40,    // V
-		Reserved = 0x20,    // ignored
-		Break = 0x10,       // B
-		Decimal = 0x08,     // D (use BCD for arithmetic)
-		Interrupt = 0x04,   // I (IRQ disable)
-		Zero = 0x02,        // Z
-		Carry = 0x01,       // C
-	};
-
-	StatusFlags(uint8_t value) {
-		negative = (value & StatusBits::Negative) != 0;
-		overflow = (value & StatusBits::Overflow) != 0;
-		reserved = (value & StatusBits::Reserved) != 0;
-		brk = (value & StatusBits::Break) != 0;
-		decimal = (value & StatusBits::Decimal) != 0;
-		interrupt = (value & StatusBits::Interrupt) != 0;
-		zero = (value & StatusBits::Zero) != 0;
-		carry = (value & StatusBits::Carry) != 0;
-	}
-
-	operator uint8_t() const {
-
-		uint8_t flags = 0;
-
-		if (negative)
-			flags |= StatusBits::Negative;
-
-		if (overflow)
-			flags |= StatusBits::Overflow;
-
-		if (reserved)
-			flags |= StatusBits::Reserved;
-
-		if (brk)
-			flags |= StatusBits::Break;
-
-		if (decimal)
-			flags |= StatusBits::Decimal;
-
-		if (interrupt)
-			flags |= StatusBits::Interrupt;
-
-		if (zero)
-			flags |= StatusBits::Zero;
-
-		if (carry)
-			flags |= StatusBits::Carry;
-
-		return flags;
-	}
-
-	operator std::string() const {
-		std::string returned;
-		returned += negative ? "N" : "-";
-		returned += overflow ? "O" : "-";
-		returned += reserved ? "R" : "-";
-		returned += brk ? "B" : "-";
-		returned += decimal ? "D" : "-";
-		returned += interrupt ? "I" : "-";
-		returned += zero ? "Z" : "-";
-		returned += carry ? "C" : "-";
-		return returned;
-	}
-};

M6502/inc/Symbols.h

@@ -5,32 +5,33 @@
 #include <vector>
 #include <string>
 
-class Symbols
-{
-public:
-	Symbols(std::string path);
+namespace EightBit {
+	class Symbols {
+	public:
+		Symbols(std::string path);
 
-	const std::map<uint16_t, std::string>& getLabels() const { return labels; }
-	const std::map<uint16_t, std::string>& getConstants() const { return constants; }
-	const std::map<std::string, uint16_t>& getScopes() const { return scopes; }
-	const std::map<std::string, uint64_t>& getAddresses() const { return addresses; }
+		const std::map<uint16_t, std::string>& getLabels() const { return labels; }
+		const std::map<uint16_t, std::string>& getConstants() const { return constants; }
+		const std::map<std::string, uint16_t>& getScopes() const { return scopes; }
+		const std::map<std::string, uint64_t>& getAddresses() const { return addresses; }
 
-private:
-	void AssignScopes();
-	void AssignSymbols();
+	private:
+		void AssignScopes();
+		void AssignSymbols();
 
-	void Parse(std::string path);
+		void Parse(std::string path);
 
-	std::map<uint16_t, std::string> labels;
-	std::map<uint16_t, std::string> constants;
-	std::map<std::string, uint16_t> scopes;
-	std::map<std::string, uint64_t> addresses;
+		std::map<uint16_t, std::string> labels;
+		std::map<uint16_t, std::string> constants;
+		std::map<std::string, uint16_t> scopes;
+		std::map<std::string, uint64_t> addresses;
 
-	struct kv_pair_t {
-		std::map<std::string, std::string> element;
+		struct kv_pair_t {
+			std::map<std::string, std::string> element;
+		};
+
+		std::vector<std::string> split(const std::string& input, const std::vector<std::string>& delimiters);
+
+		std::map<std::string, std::map<std::string, kv_pair_t>> parsed;
 	};
-
-	std::vector<std::string> split(const std::string& input, const std::vector<std::string>& delimiters);
-
-	std::map<std::string, std::map<std::string, kv_pair_t>> parsed;
-};
+}

M6502/inc/mos6502.h

@@ -5,460 +5,434 @@
 #include <array>
 #include <functional>
 
-#include "ProcessorType.h"
-#include "StatusFlags.h"
-#include "AddressingMode.h"
+#include "Memory.h"
+#include "Processor.h"
+#include "Signal.h"
 
-class MOS6502 {
-public:
-	typedef std::function<void()> instruction_t;
+namespace EightBit {
+	class MOS6502 : public Processor {
+	public:
+		struct opcode_decoded_t {
 
-	struct Instruction {
-		instruction_t vector = nullptr;
-		uint64_t count = 0;
-		AddressingMode mode = AddressingMode::Illegal;
-		std::string display = "";
+			int aaa;
+			int bbb;
+			int cc;
+
+			opcode_decoded_t() {
+				aaa = bbb = cc = 0;
+			}
+
+			opcode_decoded_t(uint8_t opcode) {
+				aaa = (opcode & 0b11100000) >> 5;	// 0 - 7
+				bbb = (opcode & 0b00011100) >> 2;	// 0 - 7
+				cc = (opcode & 0b00000011);			// 0 - 3
+			}
+		};
+
+		enum StatusBits {
+			NF = Bit7,	// Negative
+			VF = Bit6,  // Overflow
+			RF = Bit5,  // reserved
+			BF = Bit4,  // Brk
+			DF = Bit3,	// D (use BCD for arithmetic)
+			IF = Bit2,	// I (IRQ disable)
+			ZF = Bit1,	// Zero
+			CF = Bit0,	// Carry
+		};
+
+		enum BusDirection {
+			Read,
+			Write
+		};
+
+		MOS6502(Memory& memory);
+		virtual ~MOS6502();
+
+		Signal<MOS6502> ExecutingInstruction;
+		Signal<MOS6502> ExecutedInstruction;
+
+		uint8_t& X() { return x; }
+		uint8_t& Y() { return y; }
+		uint8_t& A() { return a; }
+		uint8_t& S() { return s; }
+		uint8_t& P() { return p; }
+
+		virtual void initialise();
+
+		virtual int step();
+
+		virtual void reset();
+
+		virtual void triggerIRQ();
+		virtual void triggerNMI();
+
+		void getWord(register16_t& output);
+		void getWord(uint16_t offset, register16_t& output);
+
+		uint8_t getByte() { return m_memory.read(); }
+		uint8_t getByte(uint16_t offset) { return m_memory.read(offset); }
+
+		void setByte(uint8_t value) { m_memory.write(value); }
+		void setByte(uint16_t offset, uint8_t value) { m_memory.write(offset, value); }
+
+	protected:
+		virtual void interrupt(uint16_t vector);
+
+		virtual int execute(uint8_t cell);
+
+	private:
+		register16_t& MEMPTR() { return m_memptr; }
+
+		void adjustZero(uint8_t datum) { clearFlag(P(), ZF, datum); }
+		void adjustNegative(uint8_t datum) { setFlag(P(), NF, datum & NF); }
+		
+		void adjustNZ(uint8_t datum) {
+			adjustZero(datum);
+			adjustNegative(datum);
+		}
+
+		void pushByte(uint8_t value);
+		uint8_t popByte();
+		void pushWord(register16_t value);
+		void popWord(register16_t& output);
+
+		uint8_t fetchByte();
+		void fetchWord(register16_t& output);
+
+#pragma region 6502 addressing modes
+
+#pragma region Addresses
+
+		void Address_Absolute() {
+			fetchWord(MEMPTR());
+		}
+
+		void Address_ZeroPage() {
+			MEMPTR().low = fetchByte();
+			MEMPTR().high = 0;
+		}
+
+		void Address_ZeroPageIndirect() {
+			Address_ZeroPage();
+			m_memory.ADDRESS() = MEMPTR();
+			getWord(MEMPTR());
+		}
+
+		void Address_Indirect() {
+			Address_Absolute();
+			m_memory.ADDRESS() = MEMPTR();
+			getWord(MEMPTR());
+		}
+
+		void Address_ZeroPageX() {
+			Address_ZeroPage();
+			MEMPTR().low += X();
+		}
+
+		void Address_ZeroPageY() {
+			Address_ZeroPage();
+			MEMPTR().low += Y();
+		}
+
+		void Address_AbsoluteX() {
+			Address_Absolute();
+			MEMPTR().word += X();
+		}
+
+		void Address_AbsoluteY() {
+			Address_Absolute();
+			MEMPTR().word += Y();
+		}
+
+		void Address_IndexedIndirectX() {
+			Address_ZeroPageX();
+			m_memory.ADDRESS() = MEMPTR();
+			getWord(MEMPTR());
+		}
+
+		void Address_IndirectIndexedY() {
+			Address_ZeroPageIndirect();
+			MEMPTR().word += Y();
+		}
+
+#pragma endregion Addresses
+
+#pragma region References
+
+		uint8_t& AM_A() {
+			m_busRW = false;
+			return A();
+		}
+
+		uint8_t& AM_Immediate() {
+			m_busRW = false;
+			fetchByte();
+			return m_memory.reference();
+		}
+
+		uint8_t& AM_Absolute() {
+			m_busRW = true;
+			Address_Absolute();
+			m_memory.ADDRESS() = MEMPTR();
+			return m_memory.reference();
+		}
+
+		uint8_t& AM_ZeroPage() {
+			m_busRW = true;
+			Address_ZeroPage();
+			m_memory.ADDRESS() = MEMPTR();
+			return m_memory.reference();
+		}
+
+		uint8_t& AM_AbsoluteX(BusDirection direction = BusDirection::Read) {
+			m_busRW = true;
+			Address_AbsoluteX();
+			m_memory.ADDRESS() = MEMPTR();
+			if ((direction == BusDirection::Read) && (m_memory.ADDRESS().low == Mask8))
+				++cycles;
+			return m_memory.reference();
+		}
+
+		uint8_t& AM_AbsoluteY(BusDirection direction = BusDirection::Read) {
+			m_busRW = true;
+			Address_AbsoluteY();
+			m_memory.ADDRESS() = MEMPTR();
+			if ((direction == BusDirection::Read) && (m_memory.ADDRESS().low == Mask8))
+				++cycles;
+			return m_memory.reference();
+		}
+
+		uint8_t& AM_ZeroPageX() {
+			m_busRW = true;
+			Address_ZeroPageX();
+			m_memory.ADDRESS() = MEMPTR();
+			return m_memory.reference();
+		}
+
+		uint8_t& AM_ZeroPageY() {
+			m_busRW = true;
+			Address_ZeroPageY();
+			m_memory.ADDRESS() = MEMPTR();
+			return m_memory.reference();
+		}
+
+		uint8_t& AM_IndexedIndirectX() {
+			m_busRW = true;
+			Address_IndexedIndirectX();
+			m_memory.ADDRESS() = MEMPTR();
+			return m_memory.reference();
+		}
+
+		uint8_t& AM_IndirectIndexedY(BusDirection direction = BusDirection::Read) {
+			m_busRW = true;
+			Address_IndirectIndexedY();
+			m_memory.ADDRESS() = MEMPTR();
+			if ((direction == BusDirection::Read) && (m_memory.ADDRESS().low == Mask8))
+				++cycles;
+			return m_memory.reference();
+		}
+
+#pragma endregion References
+
+#pragma region 6502 addressing mode switching
+
+		uint8_t& AM_00(int bbb, BusDirection direction = BusDirection::Read) {
+			switch (bbb) {
+			case 0b000:
+				return AM_Immediate();
+			case 0b001:
+				return AM_ZeroPage();
+			case 0b011:
+				return AM_Absolute();
+			case 0b101:
+				return AM_ZeroPageX();
+			case 0b111:
+				return AM_AbsoluteX(direction);
+			case 0b010:
+			case 0b100:
+			case 0b110:
+				throw std::domain_error("Illegal addressing mode");
+			default:
+				__assume(0);
+			}
+		}
+
+		uint8_t& AM_01(int bbb, BusDirection direction = BusDirection::Read) {
+			switch (bbb) {
+			case 0b000:
+				return AM_IndexedIndirectX();
+			case 0b001:
+				return AM_ZeroPage();
+			case 0b010:
+				return AM_Immediate();
+			case 0b011:
+				return AM_Absolute();
+			case 0b100:
+				return AM_IndirectIndexedY(direction);
+			case 0b101:
+				return AM_ZeroPageX();
+			case 0b110:
+				return AM_AbsoluteY(direction);
+			case 0b111:
+				return AM_AbsoluteX(direction);
+			default:
+				__assume(0);
+			}
+		}
+
+		uint8_t& AM_10(int bbb, BusDirection direction = BusDirection::Read) {
+			switch (bbb) {
+			case 0b000:
+				return AM_Immediate();
+			case 0b001:
+				return AM_ZeroPage();
+			case 0b010:
+				return AM_A();
+			case 0b011:
+				return AM_Absolute();
+			case 0b101:
+				return AM_ZeroPageX();
+			case 0b111:
+				return AM_AbsoluteX(direction);
+			case 0b100:
+			case 0b110:
+				throw std::domain_error("Illegal addressing mode");
+			default:
+				__assume(0);
+			}
+		}
+
+		uint8_t& AM_10_x(int bbb, BusDirection direction = BusDirection::Read) {
+			switch (bbb) {
+			case 0b000:
+				return AM_Immediate();
+			case 0b001:
+				return AM_ZeroPage();
+			case 0b010:
+				return AM_A();
+			case 0b011:
+				return AM_Absolute();
+			case 0b101:
+				return AM_ZeroPageY();
+			case 0b111:
+				return AM_AbsoluteY(direction);
+			case 0b100:
+			case 0b110:
+				throw std::domain_error("Illegal addressing mode");
+			default:
+				__assume(0);
+			}
+		}
+
+#pragma endregion 6502 addressing mode switching
+
+#pragma endregion 6502 addressing modes
+
+		void firePendingBusEvents(BusDirection direction) {
+			if (m_busRW) {
+				switch (direction) {
+				case BusDirection::Read:
+					m_memory.fireReadBusEvent();
+					break;
+				case BusDirection::Write:
+					m_memory.fireWriteBusEvent();
+					break;
+				}
+			}
+		}
+
+		void ASL(int bbb) {
+			auto& reference = AM_10(bbb, BusDirection::Write);
+			firePendingBusEvents(BusDirection::Read);
+			ASL(reference);
+			firePendingBusEvents(BusDirection::Write);
+		}
+
+		void ROL(int bbb) {
+			auto& reference = AM_10(bbb, BusDirection::Write);
+			firePendingBusEvents(BusDirection::Read);
+			ROL(reference);
+			firePendingBusEvents(BusDirection::Write);
+		}
+
+		void LSR(int bbb) {
+			auto& reference = AM_10(bbb, BusDirection::Write);
+			firePendingBusEvents(BusDirection::Read);
+			LSR(reference);
+			firePendingBusEvents(BusDirection::Write);
+		}
+
+		void ROR(int bbb) {
+			auto& reference = AM_10(bbb, BusDirection::Write);
+			firePendingBusEvents(BusDirection::Read);
+			ROR(reference);
+			firePendingBusEvents(BusDirection::Write);
+		}
+
+		void DEC(int bbb) {
+			auto& reference = AM_10(bbb, BusDirection::Write);
+			firePendingBusEvents(BusDirection::Read);
+			adjustNZ(--reference);
+			firePendingBusEvents(BusDirection::Write);
+		}
+
+		void INC(int bbb) {
+			auto& reference = AM_10(bbb, BusDirection::Write);
+			firePendingBusEvents(BusDirection::Read);
+			adjustNZ(++reference);
+			firePendingBusEvents(BusDirection::Write);
+		}
+
+		void ROR(uint8_t& output);
+
+		void LSR(uint8_t& output);
+
+		void BIT(uint8_t data);
+
+		void ROL(uint8_t& output);
+
+		void ASL(uint8_t& output);
+
+		void SBC(uint8_t data);
+		void SBC_b(uint8_t data);
+		void SBC_d(uint8_t data);
+
+		void CMP(uint8_t first, uint8_t second);
+
+		void ADC(uint8_t data);
+		void ADC_b(uint8_t data);
+		void ADC_d(uint8_t data);
+
+		void Branch(int8_t displacement);
+
+		void Branch(bool flag);
+
+		void PHP();
+		void PLP();
+
+		void JSR_abs();
+		void RTI();
+		void RTS();
+		void JMP_abs();
+		void JMP_ind();
+		void BRK();
+
+		const uint16_t PageOne = 0x100;
+		const uint16_t IRQvector = 0xfffe;
+		const uint16_t RSTvector = 0xfffc;
+		const uint16_t NMIvector = 0xfffa;
+
+		uint8_t x;		// index register X
+		uint8_t y;		// index register Y
+		uint8_t a;		// accumulator
+		uint8_t s;		// stack pointer
+		uint8_t p;		// processor status
+
+		register16_t m_memptr;
+
+		std::array<int, 0x100> m_timings;
+		std::array<opcode_decoded_t, 0x100> m_decodedOpcodes;
+
+		bool m_busRW;
 	};
-
-	MOS6502(ProcessorType level);
-
-	ProcessorType getLevel() const	{ return level;		}
-	uint64_t getCycles() const		{ return cycles;	}
-
-	bool getProceed() const		{ return proceed;	}
-	void setProceed(bool value)	{ proceed = value;	}
-
-	uint16_t getPC() const { return pc; }
-	uint8_t getX() const { return x; }
-	uint8_t getY() const { return y; }
-	uint8_t getA() const { return a; }
-	uint8_t getS() const { return s; }
-
-	const StatusFlags& getP() const { return p; }
-
-	const Instruction& getInstruction(uint8_t code) const {
-		return instructions[code];
-	}
-
-	virtual void Initialise();
-
-	virtual void Start(uint16_t address);
-	virtual void Run();
-	virtual void Step();
-
-	virtual void Reset();
-
-	virtual void TriggerIRQ();
-	virtual void TriggerNMI();
-
-	uint16_t GetWord(uint16_t offset) const;
-
-	virtual uint8_t GetByte(uint16_t offset) const = 0;
-	virtual void SetByte(uint16_t offset, uint8_t value) = 0;
-
-protected:
-	virtual void Interrupt(uint16_t vector);
-
-	virtual void Execute(uint8_t cell);
-
-	void ___();
-
-	void ResetRegisters();
-
-private:
-	static Instruction INS(instruction_t method, uint64_t cycles, AddressingMode addressing, std::string display);
-
-	static uint8_t LowNybble(uint8_t value);
-	static uint8_t HighNybble(uint8_t value);
-	static uint8_t PromoteNybble(uint8_t value);
-	static uint8_t DemoteNybble(uint8_t value);
-	static uint8_t LowByte(uint16_t value);
-	static uint8_t HighByte(uint16_t value);
-	static uint16_t MakeWord(uint8_t low, uint8_t high);
-
-	void Install6502Instructions();
-	void Install65sc02Instructions();
-	void Install65c02Instructions();
-
-	void InstallInstructionSet(std::array<Instruction, 0x100> basis);
-	void OverlayInstructionSet(std::array<Instruction, 0x100> overlay);
-	void OverlayInstructionSet(std::array<Instruction, 0x100> overlay, bool includeIllegal);
-
-	bool UpdateZeroFlag(uint8_t datum);
-	bool UpdateNegativeFlag(int8_t datum);
-	void UpdateZeroNegativeFlags(uint8_t datum);
-
-	void PushByte(uint8_t value);
-	uint8_t PopByte();
-	void PushWord(uint16_t value);
-	uint16_t PopWord();
-
-	uint8_t FetchByte();
-	uint16_t FetchWord();
-
-	uint16_t Address_ZeroPage();
-	uint16_t Address_ZeroPageX();
-	uint16_t Address_ZeroPageY();
-	uint16_t Address_IndexedIndirectX();
-	uint16_t Address_IndexedIndirectY_Read();
-	uint16_t Address_IndexedIndirectY_Write();
-	uint16_t Address_Absolute();
-	uint16_t Address_AbsoluteXIndirect();
-	uint16_t Address_AbsoluteX_Read();
-	uint16_t Address_AbsoluteX_Write();
-	uint16_t Address_AbsoluteY_Read();
-	uint16_t Address_AbsoluteY_Write();
-	uint16_t Address_ZeroPageIndirect();
-
-	uint8_t ReadByte_Immediate();
-	int8_t ReadByte_ImmediateDisplacement();
-	uint8_t ReadByte_ZeroPage();
-	uint8_t ReadByte_ZeroPageX();
-	uint8_t ReadByte_ZeroPageY();
-	uint8_t ReadByte_Absolute();
-	uint8_t ReadByte_AbsoluteX();
-	uint8_t ReadByte_AbsoluteY();
-	uint8_t ReadByte_IndexedIndirectX();
-	uint8_t ReadByte_IndirectIndexedY();
-	uint8_t ReadByte_ZeroPageIndirect();
-
-	void WriteByte_ZeroPage(uint8_t value);
-	void WriteByte_Absolute(uint8_t value);
-	void WriteByte_AbsoluteX(uint8_t value);
-	void WriteByte_AbsoluteY(uint8_t value);
-	void WriteByte_ZeroPageX(uint8_t value);
-	void WriteByte_ZeroPageY(uint8_t value);
-	void WriteByte_IndirectIndexedY(uint8_t value);
-	void WriteByte_IndexedIndirectX(uint8_t value);
-	void WriteByte_ZeroPageIndirect(uint8_t value);
-
-	void DEC(uint16_t offset);
-
-	uint8_t ROR(uint8_t data);
-	void ROR(uint16_t offset);
-
-	uint8_t LSR(uint8_t data);
-	void LSR(uint16_t offset);
-
-	void BIT_immediate(uint8_t data);
-	void BIT(uint8_t data);
-
-	void TSB(uint16_t address);
-	void TRB(uint16_t address);
-
-	void INC(uint16_t offset);
-
-	void ROL(uint16_t offset);
-	uint8_t ROL(uint8_t data);
-
-	void ASL(uint16_t offset);
-	uint8_t ASL(uint8_t data);
-
-	void ORA(uint8_t data);
-
-	void AND(uint8_t data);
-
-	void SBC(uint8_t data);
-	void SBC_b(uint8_t data);
-	void SBC_d(uint8_t data);
-
-	void EOR(uint8_t data);
-
-	void CPX(uint8_t data);
-	void CPY(uint8_t data);
-	void CMP(uint8_t data);
-	void CMP(uint8_t first, uint8_t second);
-
-	void LDA(uint8_t data);
-	void LDY(uint8_t data);
-	void LDX(uint8_t data);
-
-	void ADC(uint8_t data);
-	void ADC_b(uint8_t data);
-	void ADC_d(uint8_t data);
-
-	void RMB(uint16_t address, uint8_t flag);
-	void SMB(uint16_t address, uint8_t flag);
-
-	void Branch(int8_t displacement);
-	void Branch();
-	void Branch(bool flag);
-	void BitBranch_Clear(uint8_t check);
-	void BitBranch_Set(uint8_t check);
-
-	void NOP_imp();
-	void NOP2_imp();
-	void NOP3_imp();
-
-	void ORA_xind();
-	void ORA_zp();
-	void ORA_imm();
-	void ORA_abs();
-	void ORA_absx();
-	void ORA_absy();
-	void ORA_zpx();
-	void ORA_indy();
-	void ORA_zpind();
-
-	void AND_zpx();
-	void AND_indy();
-	void AND_zp();
-	void AND_absx();
-	void AND_absy();
-	void AND_imm();
-	void AND_xind();
-	void AND_abs();
-	void AND_zpind();
-
-	void EOR_absx();
-	void EOR_absy();
-	void EOR_zpx();
-	void EOR_indy();
-	void EOR_abs();
-	void EOR_imm();
-	void EOR_zp();
-	void EOR_xind();
-	void EOR_zpind();
-
-	void LDA_absx();
-	void LDA_absy();
-	void LDA_zpx();
-	void LDA_indy();
-	void LDA_abs();
-	void LDA_imm();
-	void LDA_zp();
-	void LDA_xind();
-	void LDA_zpind();
-
-	void LDX_imm();
-	void LDX_zp();
-	void LDX_abs();
-	void LDX_zpy();
-	void LDX_absy();
-
-	void LDY_imm();
-	void LDY_zp();
-	void LDY_abs();
-	void LDY_zpx();
-	void LDY_absx();
-
-	void CMP_absx();
-	void CMP_absy();
-	void CMP_zpx();
-	void CMP_indy();
-	void CMP_abs();
-	void CMP_imm();
-	void CMP_zp();
-	void CMP_xind();
-	void CMP_zpind();
-
-	void CPX_abs();
-	void CPX_zp();
-	void CPX_imm();
-
-	void CPY_imm();
-	void CPY_zp();
-	void CPY_abs();
-
-	void ADC_zp();
-	void ADC_xind();
-	void ADC_imm();
-	void ADC_abs();
-	void ADC_zpx();
-	void ADC_indy();
-	void ADC_absx();
-	void ADC_absy();
-	void ADC_zpind();
-
-	void SBC_xind();
-	void SBC_zp();
-	void SBC_imm();
-	void SBC_abs();
-	void SBC_zpx();
-	void SBC_indy();
-	void SBC_absx();
-	void SBC_absy();
-	void SBC_zpind();
-
-	void BIT_imm();
-	void BIT_zp();
-	void BIT_zpx();
-	void BIT_abs();
-	void BIT_absx();
-
-	void DEC_a();
-	void DEC_absx();
-	void DEC_zpx();
-	void DEC_abs();
-	void DEC_zp();
-
-	void DEX_imp();
-	void DEY_imp();
-
-	void INC_a();
-	void INC_zp();
-	void INC_absx();
-	void INC_zpx();
-	void INC_abs();
-
-	void INX_imp();
-	void INY_imp();
-
-	void STX_zpy();
-	void STX_abs();
-	void STX_zp();
-
-	void STY_zpx();
-	void STY_abs();
-	void STY_zp();
-
-	void STA_absx();
-	void STA_absy();
-	void STA_zpx();
-	void STA_indy();
-	void STA_abs();
-	void STA_zp();
-	void STA_xind();
-	void STA_zpind();
-
-	void STZ_zp();
-	void STZ_zpx();
-	void STZ_abs();
-	void STZ_absx();
-
-	void TSX_imp();
-	void TAX_imp();
-	void TAY_imp();
-	void TXS_imp();
-	void TYA_imp();
-	void TXA_imp();
-
-	void PHP_imp();
-	void PLP_imp();
-	void PLA_imp();
-	void PHA_imp();
-	void PHX_imp();
-	void PHY_imp();
-	void PLX_imp();
-	void PLY_imp();
-
-	void ASL_a();
-	void ASL_zp();
-	void ASL_abs();
-	void ASL_absx();
-	void ASL_zpx();
-
-	void LSR_absx();
-	void LSR_zpx();
-	void LSR_abs();
-	void LSR_a();
-	void LSR_zp();
-
-	void ROL_absx();
-	void ROL_zpx();
-	void ROL_abs();
-	void ROL_a();
-	void ROL_zp();
-
-	void ROR_absx();
-	void ROR_zpx();
-	void ROR_abs();
-	void ROR_a();
-	void ROR_zp();
-
-	void TSB_zp();
-	void TSB_abs();
-
-	void TRB_zp();
-	void TRB_abs();
-
-	void RMB0_zp();
-	void RMB1_zp();
-	void RMB2_zp();
-	void RMB3_zp();
-	void RMB4_zp();
-	void RMB5_zp();
-	void RMB6_zp();
-	void RMB7_zp();
-
-	void SMB0_zp();
-	void SMB1_zp();
-	void SMB2_zp();
-	void SMB3_zp();
-	void SMB4_zp();
-	void SMB5_zp();
-	void SMB6_zp();
-	void SMB7_zp();
-
-	void JSR_abs();
-	void RTI_imp();
-	void RTS_imp();
-	void JMP_abs();
-	void JMP_ind();
-	void JMP_absxind();
-	void BRK_imp();
-
-	void WAI_imp();
-	void STP_imp();
-
-	void SED_imp();
-	void CLD_imp();
-	void CLV_imp();
-	void SEI_imp();
-	void CLI_imp();
-	void CLC_imp();
-	void SEC_imp();
-
-	void BMI_rel();
-	void BPL_rel();
-	void BVC_rel();
-	void BVS_rel();
-	void BCC_rel();
-	void BCS_rel();
-	void BNE_rel();
-	void BEQ_rel();
-	void BRA_rel();
-
-	void BBR0_zprel();
-	void BBR1_zprel();
-	void BBR2_zprel();
-	void BBR3_zprel();
-	void BBR4_zprel();
-	void BBR5_zprel();
-	void BBR6_zprel();
-	void BBR7_zprel();
-
-	void BBS0_zprel();
-	void BBS1_zprel();
-	void BBS2_zprel();
-	void BBS3_zprel();
-	void BBS4_zprel();
-	void BBS5_zprel();
-	void BBS6_zprel();
-	void BBS7_zprel();
-
-	const uint16_t PageOne = 0x100;
-	const uint16_t IRQvector = 0xfffe;
-	const uint16_t RSTvector = 0xfffc;
-	const uint16_t NMIvector = 0xfffa;
-
-	uint16_t pc;	// program counter
-	uint8_t x;		// index register X
-	uint8_t y;		// index register Y
-	uint8_t a;		// accumulator
-	uint8_t s;		// stack pointer
-
-	StatusFlags p = 0;	// processor status
-
-	uint64_t cycles;
-
-	bool proceed = true;
-
-	std::array<Instruction, 0x100> instructions;
-
-	ProcessorType level;
-
-	std::array<Instruction, 0x100> overlay6502;
-	std::array<Instruction, 0x100> overlay65sc02;
-	std::array<Instruction, 0x100> overlay65c02;
-};
+}

M6502/inc/system6502.h

@@ -1,69 +0,0 @@
-#pragma once
-
-#include <cstdint>
-#include <string>
-#include <vector>
-#include <ctime>
-#include <chrono>
-#include <functional>
-
-#include "mos6502.h"
-#include "EventArgs.h"
-#include "AddressEventArgs.h"
-#include "Signal.h"
-#include "Memory.h"
-
-class System6502 : public MOS6502
-{
-public:
-	const double Mega = 1000000;
-	const double Milli = 0.001;
-	const unsigned MemorySize = 0x10000;
-
-	uint64_t getHeldCycles() const { return heldCycles; }
-
-public:
-	System6502(ProcessorType level, double speed, clock_t pollInterval);
-
-	Memory& getMemory() {
-		return memory;
-	}
-
-	virtual void Initialise();
-	virtual void Run();
-
-	Signal<EventArgs> Starting;
-	Signal<EventArgs> Finished;
-	Signal<EventArgs> Polling;
-	Signal<AddressEventArgs> ExecutingInstruction;
-	Signal<AddressEventArgs> ExecutedInstruction;
-
-	virtual uint8_t GetByte(uint16_t offset) const;
-	virtual void SetByte(uint16_t offset, uint8_t value);
-
-protected:
-	virtual void Execute(uint8_t cell);
-
-private:
-	void CheckPoll();
-
-	void System6502_Starting();
-	void System6502_Finished();
-
-	void Throttle();
-
-	double speed;  // Speed in MHz, e.g. 2.0 == 2Mhz, 1.79 = 1.79Mhz
-
-	double cyclesPerSecond;
-	double cyclesPerMillisecond;
-	uint64_t cyclesPerInterval;
-	uint64_t intervalCycles;
-
-	uint64_t heldCycles = 0;
-
-	bool running;
-
-	Memory memory;
-
-	std::chrono::high_resolution_clock::time_point startTime;
-};

M6502/src/AddressingMode.cpp

@@ -1,23 +0,0 @@
-namespace Processor
-{
-	public enum AddressingMode
-	{
-		Illegal,
-		Implied,
-		Accumulator,
-		Immediate,
-		Relative,
-		XIndexed,
-		IndexedY,
-		ZeroPage,
-		ZeroPageX,
-		ZeroPageY,
-		Absolute,
-		AbsoluteX,
-		AbsoluteY,
-		AbsoluteXIndirect,
-		Indirect,
-		ZeroPageIndirect,
-		ZeroPageRelative
-	}
-}

M6502/src/Disassembly.cpp

@@ -7,226 +7,365 @@
 
 using namespace std::placeholders;
 
-Disassembly::Disassembly(MOS6502& targetProcessor, const Symbols& targetSymbols)
+EightBit::Disassembly::Disassembly(MOS6502& targetProcessor, const Symbols& targetSymbols)
 :	processor(targetProcessor),
-	symbols(targetSymbols)
-{
-	dumpers = {
-		{ AddressingMode::Illegal,				{ std::bind(&Disassembly::Dump_Nothing, this, std::placeholders::_1),	std::bind(&Disassembly::Dump_Nothing, this, std::placeholders::_1)	} },
-		{ AddressingMode::Implied,				{ std::bind(&Disassembly::Dump_Nothing, this, std::placeholders::_1),	std::bind(&Disassembly::Dump_Nothing, this, std::placeholders::_1)	} },
-		{ AddressingMode::Accumulator,			{ std::bind(&Disassembly::Dump_Nothing, this, std::placeholders::_1),	std::bind(&Disassembly::Dump_A, this, std::placeholders::_1)		} },
-		{ AddressingMode::Immediate,			{ std::bind(&Disassembly::Dump_Byte, this, std::placeholders::_1),		std::bind(&Disassembly::Dump_imm, this, std::placeholders::_1)		} },
-		{ AddressingMode::Relative,				{ std::bind(&Disassembly::Dump_Byte, this, std::placeholders::_1),		std::bind(&Disassembly::Dump_rel, this, std::placeholders::_1)		} },
-		{ AddressingMode::XIndexed,				{ std::bind(&Disassembly::Dump_Byte, this, std::placeholders::_1),		std::bind(&Disassembly::Dump_xind, this, std::placeholders::_1)		} },
-		{ AddressingMode::IndexedY,				{ std::bind(&Disassembly::Dump_Byte, this, std::placeholders::_1),		std::bind(&Disassembly::Dump_indy, this, std::placeholders::_1)		} },
-		{ AddressingMode::ZeroPageIndirect,		{ std::bind(&Disassembly::Dump_Byte, this, std::placeholders::_1),		std::bind(&Disassembly::Dump_zpind, this, std::placeholders::_1)	} },
-		{ AddressingMode::ZeroPage,				{ std::bind(&Disassembly::Dump_Byte, this, std::placeholders::_1),		std::bind(&Disassembly::Dump_zp, this, std::placeholders::_1)		} },
-		{ AddressingMode::ZeroPageX,			{ std::bind(&Disassembly::Dump_Byte, this, std::placeholders::_1),		std::bind(&Disassembly::Dump_zpx, this, std::placeholders::_1)		} },
-		{ AddressingMode::ZeroPageY,			{ std::bind(&Disassembly::Dump_Byte, this, std::placeholders::_1),		std::bind(&Disassembly::Dump_zpy, this, std::placeholders::_1)		} },
-		{ AddressingMode::Absolute,				{ std::bind(&Disassembly::Dump_DByte, this, std::placeholders::_1),		std::bind(&Disassembly::Dump_abs, this, std::placeholders::_1)		} },
-		{ AddressingMode::AbsoluteX,			{ std::bind(&Disassembly::Dump_DByte, this, std::placeholders::_1),		std::bind(&Disassembly::Dump_absx, this, std::placeholders::_1)		} },
-		{ AddressingMode::AbsoluteY,			{ std::bind(&Disassembly::Dump_DByte, this, std::placeholders::_1),		std::bind(&Disassembly::Dump_absy, this, std::placeholders::_1)		} },
-		{ AddressingMode::AbsoluteXIndirect,	{ std::bind(&Disassembly::Dump_DByte, this, std::placeholders::_1),		std::bind(&Disassembly::Dump_absxind, this, std::placeholders::_1)	} },
-		{ AddressingMode::Indirect,				{ std::bind(&Disassembly::Dump_DByte, this, std::placeholders::_1),		std::bind(&Disassembly::Dump_ind, this, std::placeholders::_1)		} },
-		{ AddressingMode::ZeroPageRelative,		{ std::bind(&Disassembly::Dump_DByte, this, std::placeholders::_1),		std::bind(&Disassembly::Dump_zprel, this, std::placeholders::_1)	} },
-	};
+	symbols(targetSymbols) {
 }
 
-std::string Disassembly::Dump_ByteValue(uint8_t value) const {
+std::string EightBit::Disassembly::dump_Flags(uint8_t value) const {
+	std::string returned;
+	returned += (value & MOS6502::NF) ? "N" : "-";
+	returned += (value & MOS6502::VF) ? "O" : "-";
+	returned += (value & MOS6502::RF) ? "R" : "-";
+	returned += (value & MOS6502::BF) ? "B" : "-";
+	returned += (value & MOS6502::DF) ? "D" : "-";
+	returned += (value & MOS6502::IF) ? "I" : "-";
+	returned += (value & MOS6502::ZF) ? "Z" : "-";
+	returned += (value & MOS6502::CF) ? "C" : "-";
+	return returned;
+}
+
+std::string EightBit::Disassembly::dump_ByteValue(uint8_t value) const {
 	std::ostringstream output;
 	output << std::hex << std::setw(2) << std::setfill('0') << (int)value;
 	return output.str();
 }
 
-std::string Disassembly::Dump_WordValue(uint16_t value) const {
+std::string EightBit::Disassembly::dump_WordValue(uint16_t value) const {
 	std::ostringstream output;
 	output << std::hex << std::setw(4) << std::setfill('0') << (int)value;
 	return output.str();
 }
 
-std::string Disassembly::DumpBytes(AddressingMode mode, uint16_t current) const {
-	return getDumper(mode).byteDumper(current);
-}
+std::string EightBit::Disassembly::disassemble(uint16_t current) const {
 
-std::string Disassembly::Disassemble(uint16_t current) const {
+	m_address = current;
 
 	std::ostringstream output;
 
-	auto content = processor.GetByte(current);
-	const auto& instruction = processor.getInstruction(content);
+	auto memory = processor.getMemory();
 
-	auto mode = instruction.mode;
-	auto mnemomic = instruction.display;
+	auto cell = memory.peek(current);
 
-	auto operand = DumpOperand(mode, current + 1);
+	output << dump_ByteValue(cell);
 
-	auto label = symbols.getLabels().find(current);
-	if (label != symbols.getLabels().end())
-		output << label->second << ": ";
-	output << mnemomic << " " << operand;
+	auto byte = memory.peek(current + 1);
+	uint16_t relative = processor.PC().word + 2 + (int8_t)byte;
+
+	auto aaa = (cell & 0b11100000) >> 5;
+	auto bbb = (cell & 0b00011100) >> 2;
+	auto cc = (cell & 0b00000011);
+
+	switch (cc) {
+	case 0b00:
+		switch (aaa) {
+		case 0b000:
+			switch (bbb) {
+			case 0b000:	// BRK
+				output << disassemble_Implied("BRK");
+				break;
+			case 0b010:	// PHP
+				output << disassemble_Implied("PHP");
+				break;
+			case 0b100:	// BPL
+				output << disassemble_Relative("BPL", relative);
+				break;
+			case 0b110:	// CLC
+				output << disassemble_Implied("CLC");
+				break;
+			default:
+				throw std::domain_error("Illegal instruction");
+			}
+			break;
+		case 0b001:
+			switch (bbb) {
+			case 0b000:	// JSR
+				output << disassemble_Absolute("JSR");
+				break;
+			case 0b010:	// PLP
+				output << disassemble_Implied("PLP");
+				break;
+			case 0b100:	// BMI
+				output << disassemble_Relative("BMI", relative);
+				break;
+			case 0b110:	// SEC
+				output << disassemble_Implied("SEC");
+				break;
+			default:	// BIT
+				output << disassemble_AM_00(bbb, "BIT");
+				break;
+			}
+			break;
+		case 0b010:
+			switch (bbb) {
+			case 0b000:	// RTI
+				output << disassemble_Implied("RTI");
+				break;
+			case 0b010:	// PHA
+				output << disassemble_Implied("PHA");
+				break;
+			case 0b011:	// JMP
+				output << disassemble_Absolute("JMP");
+				break;
+			case 0b100:	// BVC
+				output << disassemble_Relative("BVC", relative);
+				break;
+			case 0b110:	// CLI
+				output << disassemble_Implied("CLI");
+				break;
+			default:
+				throw std::domain_error("Illegal addressing mode");
+			}
+			break;
+		case 0b011:
+			switch (bbb) {
+			case 0b000:	// RTS
+				output << disassemble_Implied("RTS");
+				break;
+			case 0b010:	// PLA
+				output << disassemble_Implied("PLA");
+				break;
+			case 0b011:	// JMP (abs)
+				output << disassemble_Indirect("JMP");
+				break;
+			case 0b100:	// BVS
+				output << disassemble_Relative("BVS", relative);
+				break;
+			case 0b110:	// SEI
+				output << disassemble_Implied("SEI");
+				break;
+			default:
+				throw std::domain_error("Illegal addressing mode");
+			}
+			break;
+		case 0b100:
+			switch (bbb) {
+			case 0b010:	// DEY
+				output << disassemble_Implied("DEY");
+				break;
+			case 0b100:	// BCC
+				output << disassemble_Relative("BCC", relative);
+				break;
+			case 0b110:	// TYA
+				output << disassemble_Implied("TYA");
+				break;
+			default:	// STY
+				output << disassemble_AM_00(bbb, "STY");
+				break;
+			}
+			break;
+		case 0b101:
+			switch (bbb) {
+			case 0b010:	// TAY
+				output << disassemble_Implied("TAY");
+				break;
+			case 0b100:	// BCS
+				output << disassemble_Relative("BCS", relative);
+				break;
+			case 0b110:	// CLV
+				output << disassemble_Implied("CLV");
+				break;
+			default:	// LDY
+				output << disassemble_AM_00(bbb, "LDY");
+				break;
+			}
+			break;
+		case 0b110:
+			switch (bbb) {
+			case 0b010:	// INY
+				output << disassemble_Implied("INY");
+				break;
+			case 0b100:	// BNE
+				output << disassemble_Relative("BNE", relative);
+				break;
+			case 0b110:	// CLD
+				output << disassemble_Implied("CLD");
+				break;
+			default:	// CPY
+				output << disassemble_AM_00(bbb, "CPY");
+				break;
+			}
+			break;
+		case 0b111:
+			switch (bbb) {
+			case 0b010:	// INX
+				output << disassemble_Implied("INX");
+				break;
+			case 0b100:	// BEQ
+				output << disassemble_Relative("BEQ", relative);
+				break;
+			case 0b110:	// SED
+				output << disassemble_Implied("SED");
+				break;
+			default:	// CPX
+				output << disassemble_AM_00(bbb, "CPX");
+				break;
+			}
+			break;
+		}
+		break;
+	case 0b01:
+		switch (aaa) {
+		case 0b000:		// ORA
+			output << disassemble_AM_01(bbb, "ORA");
+			break;
+		case 0b001:		// AND
+			output << disassemble_AM_01(bbb, "AND");
+			break;
+		case 0b010:		// EOR
+			output << disassemble_AM_01(bbb, "EOR");
+			break;
+		case 0b011:		// ADC
+			output << disassemble_AM_01(bbb, "ADC");
+			break;
+		case 0b100:		// STA
+			output << disassemble_AM_01(bbb, "STA");
+			break;
+		case 0b101:		// LDA
+			output << disassemble_AM_01(bbb, "LDA");
+			break;
+		case 0b110:		// CMP
+			output << disassemble_AM_01(bbb, "CMP");
+			break;
+		case 0b111:		// SBC
+			output << disassemble_AM_01(bbb, "SBC");
+			break;
+		default:
+			__assume(0);
+		}
+		break;
+	case 0b10:
+		switch (aaa) {
+		case 0b000:		// ASL
+			output << disassemble_AM_10(bbb, "ASL");
+			break;
+		case 0b001:		// ROL
+			output << disassemble_AM_10(bbb, "ROL");
+			break;
+		case 0b010:		// LSR
+			output << disassemble_AM_10(bbb, "LSR");
+			break;
+		case 0b011:		// ROR
+			output << disassemble_AM_10(bbb, "ROR");
+			break;
+		case 0b100:
+			switch (bbb) {
+			case 0b010:	// TXA
+				output << disassemble_Implied("TXA");
+				break;
+			case 0b110:	// TXS
+				output << disassemble_Implied("TXS");
+				break;
+			default:	// STX
+				output << disassemble_AM_10_x(bbb, "STX");
+				break;
+			}
+			break;
+		case 0b101:
+			switch (bbb) {
+			case 0b010:	// TAX
+				output << disassemble_Implied("TAX");
+				break;
+			case 0b110:	// TSX
+				output << disassemble_Implied("TSX");
+				break;
+			default:	// LDX
+				output << disassemble_AM_10_x(bbb, "LDX");
+				break;
+			}
+			break;
+		case 0b110:
+			switch (bbb) {
+			case 0b010:	// DEX
+				output << disassemble_Implied("DEX");
+				break;
+			default:	// DEC
+				output << disassemble_AM_10(bbb, "DEC");
+				break;
+			}
+			break;
+		case 0b111:
+			switch (bbb) {
+			case 0b010:	// NOP
+				output << disassemble_Implied("NOP");
+				break;
+			default:	// INC
+				output << disassemble_AM_10(bbb, "INC");
+				break;
+			}
+			break;
+		default:
+			__assume(0);
+		}
+		break;
+	case 0b11:
+		throw std::domain_error("Illegal instruction group");
+	default:
+		__assume(0);
+	}
+
+	//const auto& instruction = processor.getInstruction(content);
+
+	//auto mode = instruction.mode;
+	//auto mnemomic = instruction.display;
+
+	//auto operand = DumpOperand(mode, current + 1);
+
+	//auto label = symbols.getLabels().find(current);
+	//if (label != symbols.getLabels().end())
+	//	output << label->second << ": ";
+	//output << mnemomic << " " << operand;
 
 	return output.str();
 }
 
-std::string Disassembly::DumpOperand(AddressingMode mode, uint16_t current) const {
-	return getDumper(mode).disassemblyDumper(current);
+////
+
+uint8_t EightBit::Disassembly::getByte(uint16_t address) const {
+	return processor.getMemory().peek(address);
 }
 
 ////
 
-uint8_t Disassembly::GetByte(uint16_t address) const {
-	return processor.GetByte(address);
+std::string EightBit::Disassembly::dump_Byte(uint16_t address) const {
+	return dump_ByteValue(getByte(address));
 }
 
-uint16_t Disassembly::GetWord(uint16_t address) const {
-	return processor.GetWord(address);
+std::string EightBit::Disassembly::dump_DByte(uint16_t address) const {
+	return dump_Byte(address) + dump_Byte(address + 1);
 }
 
 ////
 
-std::string Disassembly::Dump_Nothing(uint16_t) const {
-	return "";
-}
-
-std::string Disassembly::Dump_Byte(uint16_t address) const {
-	return Dump_ByteValue(GetByte(address));
-}
-
-std::string Disassembly::Dump_DByte(uint16_t address) const {
-	return Dump_Byte(address) + Dump_Byte(address + 1);
-}
-
-////
-
-std::string Disassembly::ConvertAddress(uint16_t address) const {
+std::string EightBit::Disassembly::convertAddress(uint16_t address) const {
 	auto label = symbols.getLabels().find(address);
 	if (label != symbols.getLabels().end())
 		return label->second;
 	std::ostringstream output;
-	output << "$" << Dump_WordValue(address);
+	output << "$" << dump_WordValue(address);
 	return output.str();
 }
 
-std::string Disassembly::ConvertAddress(uint8_t address) const {
+std::string EightBit::Disassembly::convertAddress(uint8_t address) const {
 	auto label = symbols.getLabels().find(address);
 	if (label != symbols.getLabels().end())
 		return label->second;
 	std::ostringstream output;
-	output << "$" << Dump_ByteValue(address);
+	output << "$" << dump_ByteValue(address);
 	return output.str();
 }
 
-std::string Disassembly::ConvertConstant(uint16_t constant) const {
+std::string EightBit::Disassembly::convertConstant(uint16_t constant) const {
 	auto label = symbols.getConstants().find(constant);
 	if (label != symbols.getConstants().end())
 		return label->second;
-	return Dump_DByte(constant);
+	return dump_DByte(constant);
 }
 
-std::string Disassembly::ConvertConstant(uint8_t constant) const {
+std::string EightBit::Disassembly::convertConstant(uint8_t constant) const {
 	auto label = symbols.getConstants().find(constant);
 	if (label != symbols.getConstants().end())
 		return label->second;
-	return Dump_ByteValue(constant);
-}
-
-////
-
-std::string Disassembly::Dump_A(uint16_t) const {
-	return "A";
-}
-
-std::string Disassembly::Dump_imm(uint16_t current) const {
-	std::ostringstream output;
-	auto immediate = GetByte(current);
-	output << "#" << ConvertConstant(immediate);
-	return output.str();
-}
-
-std::string Disassembly::Dump_abs(uint16_t current) const {
-	auto address = GetWord(current);
-	return ConvertAddress(address);
-}
-
-std::string Disassembly::Dump_zp(uint16_t current) const {
-	auto zp = GetByte(current);
-	return ConvertAddress(zp);
-}
-
-std::string Disassembly::Dump_zpx(uint16_t current) const {
-	std::ostringstream output;
-	auto zp = GetByte(current);
-	output << ConvertAddress(zp) << ",X";
-	return output.str();
-}
-
-std::string Disassembly::Dump_zpy(uint16_t current) const {
-	std::ostringstream output;
-	auto zp = GetByte(current);
-	output << ConvertAddress(zp) << ",Y";
-	return output.str();
-}
-
-std::string Disassembly::Dump_absx(uint16_t current) const {
-	std::ostringstream output;
-	auto address = GetWord(current);
-	output << ConvertAddress(address) << ",X";
-	return output.str();
-}
-
-std::string Disassembly::Dump_absy(uint16_t current) const {
-	std::ostringstream output;
-	auto address = GetWord(current);
-	output << ConvertAddress(address) << ",Y";
-	return output.str();
-}
-
-std::string Disassembly::Dump_absxind(uint16_t current) const {
-	std::ostringstream output;
-	auto address = GetWord(current);
-	output << "(" << ConvertAddress(address) << ",X)";
-	return output.str();
-}
-
-std::string Disassembly::Dump_xind(uint16_t current) const {
-	std::ostringstream output;
-	auto zp = GetByte(current);
-	output << "(" << ConvertAddress(zp) << ",X)";
-	return output.str();
-}
-
-std::string Disassembly::Dump_indy(uint16_t current) const {
-	std::ostringstream output;
-	auto zp = GetByte(current);
-	output << "(" << ConvertAddress(zp) << "),Y";
-	return output.str();
-}
-
-std::string Disassembly::Dump_ind(uint16_t current) const {
-	std::ostringstream output;
-	auto address = GetWord(current);
-	output << "(" << ConvertAddress(address) << ")";
-	return output.str();
-}
-
-std::string Disassembly::Dump_zpind(uint16_t current) const {
-	std::ostringstream output;
-	auto zp = GetByte(current);
-	output << "(" << ConvertAddress(zp) << ")";
-	return output.str();
-}
-
-std::string Disassembly::Dump_rel(uint16_t current) const {
-	uint16_t relative = 1 + current + (int8_t)GetByte(current);
-	return ConvertAddress(relative);
-}
-
-std::string Disassembly::Dump_zprel(uint16_t current) const {
-	std::ostringstream output;
-	auto zp = GetByte(current);
-	int8_t displacement = GetByte(current + 1);
-	uint16_t address = 1 + current + displacement;
-	output << ConvertAddress(zp) << "," << ConvertAddress(address);
-	return output.str();
+	return dump_ByteValue(constant);
 }
  

M6502/src/M6502.vcxproj

@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>15.0</VCProjectVersion>
+    <ProjectGuid>{D8726A1B-BBFE-47EF-9860-26B90140BA66}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>M6502</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <IncludePath>..\inc;..\..\inc;C:\local\boost_1_64_0;$(IncludePath)</IncludePath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <IncludePath>..\inc;..\..\inc;C:\local\boost_1_64_0;$(IncludePath)</IncludePath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <IncludePath>..\inc;..\..\inc;C:\local\boost_1_64_0;$(IncludePath)</IncludePath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <IncludePath>..\inc;..\..\inc;C:\local\boost_1_64_0;$(IncludePath)</IncludePath>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <EnableEnhancedInstructionSet>AdvancedVectorExtensions</EnableEnhancedInstructionSet>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="..\inc\Disassembly.h" />
+    <ClInclude Include="..\inc\DisassemblyEventArgs.h" />
+    <ClInclude Include="..\inc\mos6502.h" />
+    <ClInclude Include="..\inc\ProfileEventArgs.h" />
+    <ClInclude Include="..\inc\ProfileLineEventArgs.h" />
+    <ClInclude Include="..\inc\Profiler.h" />
+    <ClInclude Include="..\inc\ProfileScopeEventArgs.h" />
+    <ClInclude Include="..\inc\Symbols.h" />
+    <ClInclude Include="stdafx.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="Disassembly.cpp" />
+    <ClCompile Include="mos6502.cpp" />
+    <ClCompile Include="Profiler.cpp" />
+    <ClCompile Include="stdafx.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="Symbols.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

M6502/src/M6502.vcxproj.filters

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="stdafx.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\inc\Disassembly.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\inc\DisassemblyEventArgs.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\inc\mos6502.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\inc\ProfileEventArgs.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\inc\ProfileLineEventArgs.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\inc\Profiler.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\inc\ProfileScopeEventArgs.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\inc\Symbols.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="stdafx.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Disassembly.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="mos6502.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Profiler.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Symbols.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>

M6502/src/ProcessorType.cpp

@@ -1,9 +0,0 @@
-namespace Processor
-{
-    public enum ProcessorType
-    {
-        Cpu6502,
-        Cpu65SC02,
-        Cpu65C02
-    }
-}

M6502/src/Profiler.cpp

@@ -1,44 +1,35 @@
 #include "stdafx.h"
 #include "Profiler.h"
 
-Profiler::Profiler(System6502& targetProcessor, Disassembly& disassemblerTarget, Symbols& symbolsTarget, bool instructions, bool addresses)
-:	processor(targetProcessor),
-	disassembler(disassemblerTarget),
-	symbols(symbolsTarget),
-	countInstructions(instructions),
-	profileAddresses(addresses)
-{
+EightBit::Profiler::Profiler(MOS6502& targetProcessor, Disassembly& disassemblerTarget, Symbols& symbolsTarget)
+: processor(targetProcessor),
+  disassembler(disassemblerTarget),
+  symbols(symbolsTarget) {
+
 	instructionCounts.fill(0);
 	addressProfiles.fill(0);
 	addressCounts.fill(0);
 
-	if (profileAddresses)
-		processor.ExecutingInstruction.connect(std::bind(&Profiler::Processor_ExecutingInstruction_ProfileAddresses, this, std::placeholders::_1));
-	if (countInstructions)
-		processor.ExecutingInstruction.connect(std::bind(&Profiler::Processor_ExecutingInstruction_CountInstructions, this, std::placeholders::_1));
-	if (profileAddresses)
-		processor.ExecutedInstruction.connect(std::bind(&Profiler::Processor_ExecutedInstruction_ProfileAddresses, this, std::placeholders::_1));
-
 	BuildAddressScopes();
 }
 
-void Profiler::Generate() {
+void EightBit::Profiler::Generate() {
 	StartingOutput.fire(EventArgs());
 	EmitProfileInformation();
 	StartingOutput.fire(EventArgs());
 }
 
-void Profiler::EmitProfileInformation() {
+void EightBit::Profiler::EmitProfileInformation() {
 
 	{
 		StartingLineOutput.fire(EventArgs());
 		// For each memory address
-		for (uint16_t address = 0; address < 0x10000; ++address) {
+		for (int address = 0; address < 0x10000; ++address) {
 			// If there are any cycles associated
 			auto cycles = addressProfiles[address];
 			if (cycles > 0) {
 				// Dump a profile/disassembly line
-				auto source = disassembler.Disassemble(address);
+				auto source = disassembler.disassemble(address);
 				EmitLine.fire(ProfileLineEventArgs(source, cycles));
 			}
 		}
@@ -58,22 +49,16 @@ void Profiler::EmitProfileInformation() {
 	}
 }
 
-void Profiler::Processor_ExecutingInstruction_ProfileAddresses(const AddressEventArgs& addressEvent) {
-	assert(profileAddresses);
-	priorCycleCount = processor.getCycles();
-	addressCounts[addressEvent.getAddress()]++;
+void EightBit::Profiler::addInstruction(uint8_t instruction) {
+	++instructionCounts[instruction];
 }
 
-void Profiler::Processor_ExecutingInstruction_CountInstructions(const AddressEventArgs& addressEvent) {
-	assert(countInstructions);
-	++instructionCounts[addressEvent.getCell()];
-}
+void EightBit::Profiler::addAddress(uint16_t address, int cycles) {
 
-void Profiler::Processor_ExecutedInstruction_ProfileAddresses(const AddressEventArgs& addressEvent) {
-	assert(profileAddresses);
-	auto cycles = processor.getCycles() - priorCycleCount;
-	addressProfiles[addressEvent.getAddress()] += cycles;
-	auto addressScope = addressScopes[addressEvent.getAddress()];
+	addressCounts[address]++;
+
+	addressProfiles[address] += cycles;
+	auto addressScope = addressScopes[address];
 	if (!addressScope.empty()) {
 		if (scopeCycles.find(addressScope) == scopeCycles.end())
 			scopeCycles[addressScope] = 0;
@@ -81,7 +66,7 @@ void Profiler::Processor_ExecutedInstruction_ProfileAddresses(const AddressEvent
 	}
 }
 
-void Profiler::BuildAddressScopes() {
+void EightBit::Profiler::BuildAddressScopes() {
 	for (auto& label : symbols.getLabels()) {
 		auto address = label.first;
 		auto key = label.second;

M6502/src/Symbols.cpp

@@ -10,7 +10,7 @@
 #include <boost/algorithm/string/regex.hpp>
 #include <boost/regex.hpp>
 
-Symbols::Symbols(std::string path) {
+EightBit::Symbols::Symbols(std::string path) {
 	if (!path.empty()) {
 		Parse(path);
 		AssignSymbols();
@@ -18,7 +18,7 @@ Symbols::Symbols(std::string path) {
 	}
 }
 
-void Symbols::AssignScopes() {
+void EightBit::Symbols::AssignScopes() {
 	auto parsedScopes = parsed["scope"];
 	for(auto& parsedScopeElement : parsedScopes) {
 		auto& parsedScope = parsedScopeElement.second.element;
@@ -29,7 +29,7 @@ void Symbols::AssignScopes() {
 	}
 }
 
-void Symbols::AssignSymbols() {
+void EightBit::Symbols::AssignSymbols() {
 	auto symbols = parsed["sym"];
 	for(auto& symbolElement : symbols) {
 		auto& symbol = symbolElement.second.element;
@@ -47,7 +47,7 @@ void Symbols::AssignSymbols() {
 	}
 }
 
-void Symbols::Parse(std::string path) {
+void EightBit::Symbols::Parse(std::string path) {
 	std::string line;
 	std::ifstream reader(path);
 	while (std::getline(reader, line)) {
@@ -73,7 +73,7 @@ void Symbols::Parse(std::string path) {
 	}
 }
 
-std::vector<std::string> Symbols::split(const std::string& input, const std::vector<std::string>& delimiters) {
+std::vector<std::string> EightBit::Symbols::split(const std::string& input, const std::vector<std::string>& delimiters) {
 	std::vector<std::string> tokens;
 	boost::algorithm::split_regex(
 		tokens,

M6502/src/stdafx.cpp

@@ -0,0 +1 @@
+#include "stdafx.h"

M6502/src/stdafx.h

@@ -0,0 +1,19 @@
+#pragma once
+
+#include <cstdint>
+#include <functional>
+#include <stdexcept>
+
+#include <string>
+#include <array>
+#include <map>
+#include <vector>
+
+#include <sstream>
+#include <iomanip>
+#include <fstream>
+
+#include <boost/algorithm/string.hpp>
+#include <boost/algorithm/string/join.hpp>
+#include <boost/algorithm/string/regex.hpp>
+#include <boost/regex.hpp>

M6502/src/system6502.cpp

@@ -1,91 +0,0 @@
-#include "stdafx.h"
-#include "system6502.h"
-
-#include <thread>
-#include <functional>
-
-System6502::System6502(ProcessorType level, double processorSpeed, clock_t pollInterval)
-:	MOS6502(level),
-	memory(MemorySize)
-{
-	speed = processorSpeed;
-
-	cyclesPerSecond = speed * Mega;     // speed is in MHz
-	cyclesPerMillisecond = cyclesPerSecond * Milli;
-	cyclesPerInterval = (uint64_t)(cyclesPerMillisecond * pollInterval);
-
-	Starting.connect(std::bind(&System6502::System6502_Starting, this));
-	Finished.connect(std::bind(&System6502::System6502_Finished, this));
-}
-
-void System6502::Initialise() {
-	__super::Initialise();
-	memory.ClearLocking();
-	memory.ClearMemory();
-	intervalCycles = 0;
-}
-
-void System6502::Run() {
-	Starting.fire(EventArgs());
-	__super::Run();
-	Finished.fire(EventArgs());
-}
-
-uint8_t System6502::GetByte(uint16_t offset) const {
-	return memory.GetByte(offset);
-}
-
-void System6502::SetByte(uint16_t offset, uint8_t value) {
-	memory.SetByte(offset, value);
-}
-
-void System6502::Execute(uint8_t cell) {
-
-	auto oldCycles = getCycles();
-
-	CheckPoll();
-
-	// XXXX Fetch byte has already incremented PC.
-	auto executingAddress = (uint16_t)(getPC() - 1);
-
-	AddressEventArgs e(executingAddress, cell);
-	ExecutingInstruction.fire(e);
-	__super::Execute(cell);
-	ExecutedInstruction.fire(e);
-
-	auto deltaCycles = getCycles() - oldCycles;
-	intervalCycles += deltaCycles;
-}
-
-void System6502::CheckPoll() {
-	if (intervalCycles >= cyclesPerInterval) {
-		intervalCycles -= cyclesPerInterval;
-		Throttle();
-		Polling.fire(EventArgs());
-	}
-}
-
-void System6502::System6502_Starting() {
-	startTime = std::chrono::high_resolution_clock::now();
-	running = true;
-}
-
-void System6502::System6502_Finished() {
-	running = false;
-}
-
-void System6502::Throttle() {
-	auto now = std::chrono::high_resolution_clock::now();
-	auto elapsed = now - startTime;
-	auto timerCurrent = std::chrono::duration_cast<std::chrono::milliseconds>(elapsed).count();
-
-	auto cyclesAllowed = timerCurrent * cyclesPerMillisecond;
-	auto cyclesMismatch = getCycles() - cyclesAllowed;
-	if (cyclesMismatch > 0.0) {
-		auto delay = cyclesMismatch / cyclesPerMillisecond;
-		if (delay > 0) {
-			heldCycles += (uint64_t)cyclesMismatch;
-			std::this_thread::sleep_for(std::chrono::milliseconds((long long)delay));
-		}
-	}
-}

M6502/test_M6502/Board.cpp

@@ -0,0 +1,139 @@
+#include "stdafx.h"
+#include "Board.h"
+#include "Disassembly.h"
+
+#include <iostream>
+#include <sstream>
+#include <iomanip>
+#include <assert.h>
+
+Board::Board(const Configuration& configuration)
+: m_configuration(configuration),
+  m_memory(0xffff),
+  m_cpu(EightBit::MOS6502(m_memory)),
+  m_symbols(""),
+  m_disassembler(m_cpu, m_symbols),
+  m_profiler(m_cpu, m_disassembler, m_symbols),
+  m_oldPC(0xffff),
+  m_stopped(false) {
+}
+
+void Board::initialise() {
+
+	m_memory.clear();
+
+	auto programFilename = m_configuration.getProgram();
+	auto programPath = m_configuration.getRomDirectory() + "\\" + m_configuration.getProgram();
+	auto loadAddress = m_configuration.getLoadAddress();
+
+	switch (m_configuration.getLoadMethod()) {
+	case Configuration::LoadMethod::Ram:
+		m_memory.loadRam(programPath, loadAddress);
+		break;
+	case Configuration::LoadMethod::Rom:
+		m_memory.loadRom(programPath, loadAddress);
+		break;
+	}
+
+	if (m_configuration.isProfileMode()) {
+		m_cpu.ExecutingInstruction.connect(std::bind(&Board::Cpu_ExecutingInstruction_Profile, this, std::placeholders::_1));
+	}
+
+	if (m_configuration.isDebugMode()) {
+		m_cpu.ExecutingInstruction.connect(std::bind(&Board::Cpu_ExecutingInstruction_Debug, this, std::placeholders::_1));
+	}
+
+	switch (m_configuration.getStopCondition()) {
+	case Configuration::StopCondition::Loop:
+		m_cpu.ExecutedInstruction.connect(std::bind(&Board::Cpu_ExecutedInstruction_StopLoop, this, std::placeholders::_1));
+		break;
+	case Configuration::StopCondition::Halt:
+		break;
+	default:
+		throw std::domain_error("Unknown stop condition");
+	}
+
+	if (m_configuration.allowInput()) {
+		m_memory.ReadByte.connect(std::bind(&Board::Memory_ReadByte_Input, this, std::placeholders::_1));
+		m_cpu.ExecutedInstruction.connect(std::bind(&Board::Cpu_ExecutedInstruction_Poll, this, std::placeholders::_1));
+	}
+
+	if (m_configuration.allowOutput())
+		m_memory.WrittenByte.connect(std::bind(&Board::Memory_WrittenByte_Output, this, std::placeholders::_1));
+
+	m_pollCounter = 0;
+	m_pollInterval = m_configuration.getPollInterval();
+
+	m_cpu.initialise();
+	m_cpu.PC().word = m_configuration.getStartAddress();
+}
+
+void Board::Cpu_ExecutingInstruction_Profile(const EightBit::MOS6502& cpu) {
+
+	const auto pc = m_cpu.PC();
+
+	//m_profiler.addAddress(pc.word, m_cpu.);
+	//m_profiler.addInstruction(m_memory.peek(pc.word));
+}
+
+void Board::Cpu_ExecutedInstruction_StopLoop(const EightBit::MOS6502& cpu) {
+
+	auto pc = m_cpu.PC().word;
+	if (m_oldPC == pc) {
+		m_cpu.halt();
+		auto test = m_memory.peek(0x0200);
+		std::cout << std::endl << "** Test=" << std::hex << (int)test;
+	} else {
+		m_oldPC = pc;
+	}
+}
+
+void Board::Cpu_ExecutingInstruction_Debug(const EightBit::MOS6502& cpu) {
+
+	auto address = m_cpu.PC().word;
+	auto cell = m_memory.peek(address);
+
+	std::cout << std::hex;
+	std::cout << "PC=" << std::setw(4) << std::setfill('0') << address << ":";
+	std::cout << "P=" << m_disassembler.dump_Flags(m_cpu.P()) << ", ";
+	std::cout << std::setw(2) << std::setfill('0');
+	std::cout << "A=" << (int)m_cpu.A() << ", ";
+	std::cout << "X=" << (int)m_cpu.X() << ", ";
+	std::cout << "Y=" << (int)m_cpu.Y() << ", ";
+	std::cout << "S=" << (int)m_cpu.S() << "\t";
+
+	std::cout << m_disassembler.disassemble(address);
+
+	std::cout << "\n";
+}
+
+void Board::Memory_ReadByte_Input(const EightBit::AddressEventArgs& e) {
+	auto address = e.getAddress();
+	if (address == m_configuration.getInputAddress()) {
+		auto cell = e.getCell();
+		if (cell != 0) {
+			assert(address == m_memory.ADDRESS().word);
+			m_memory.reference() = 0;
+		}
+	}
+}
+
+void Board::Memory_WrittenByte_Output(const EightBit::AddressEventArgs& e) {
+	if (e.getAddress() == m_configuration.getOutputAddress()) {
+		_putch(e.getCell());
+	}
+}
+
+void Board::Cpu_ExecutedInstruction_Poll(const EightBit::MOS6502& cpu) {
+	if (++m_pollCounter == m_pollInterval) {
+		m_pollCounter = 0;
+		pollKeyboard();
+	}
+}
+
+void Board::pollKeyboard() {
+	if (_kbhit()) {
+		m_memory.ADDRESS().word = m_configuration.getInputAddress();
+		m_memory.reference() = _getch();
+	}
+}

M6502/test_M6502/Board.h

@@ -0,0 +1,46 @@
+#pragma once
+
+#include <string>
+
+#include "Memory.h"
+#include "Configuration.h"
+#include "Profiler.h"
+#include "EventArgs.h"
+#include "Disassembly.h"
+#include "mos6502.h"
+#include "Symbols.h"
+
+class Board {
+public:
+	Board(const Configuration& configuration);
+
+	EightBit::Memory& Memory() { return m_memory; }
+	EightBit::MOS6502& CPU() { return m_cpu; }
+
+	void initialise();
+
+private:
+	const Configuration& m_configuration;
+	EightBit::Memory m_memory;
+	EightBit::MOS6502 m_cpu;
+	EightBit::Symbols m_symbols;
+	EightBit::Disassembly m_disassembler;
+	EightBit::Profiler m_profiler;
+
+	uint16_t m_oldPC;
+	bool m_stopped;
+	uint64_t m_pollCounter;
+	uint64_t m_pollInterval;
+
+	void pollKeyboard();
+
+	void Cpu_ExecutingInstruction_Debug(const EightBit::MOS6502& cpu);
+	void Cpu_ExecutingInstruction_Profile(const EightBit::MOS6502& cpu);
+
+	void Cpu_ExecutedInstruction_StopLoop(const EightBit::MOS6502& cpu);
+
+	void Memory_ReadByte_Input(const EightBit::AddressEventArgs& e);
+	void Memory_WrittenByte_Output(const EightBit::AddressEventArgs& e);
+
+	void Cpu_ExecutedInstruction_Poll(const EightBit::MOS6502& cpu);
+};

M6502/test_M6502/Configuration.cpp

@@ -0,0 +1,18 @@
+#include "stdafx.h"
+#include "Configuration.h"
+
+Configuration::Configuration()
+: m_debugMode(false),
+  m_profileMode(false),
+  m_loadAddress(0x400),
+  m_startAddress(0x400),
+  m_allowInput(false),
+  m_inputAddress(0xbff0),
+  m_allowOutput(false),
+  m_outputAddress(0xbff0),
+  m_pollInterval(2000000 / 50), // 2Mhz, 50 times a second;
+  m_stopCondition(StopCondition::Loop),
+  m_romDirectory("roms"),
+  m_program("6502_functional_test.bin"),
+  m_loadMethod(LoadMethod::Ram) {
+}

M6502/test_M6502/Configuration.h

@@ -0,0 +1,58 @@
+#pragma once
+
+#include <cstdint>
+#include <string>
+
+class Configuration {
+public:
+	enum StopCondition {
+		Halt,
+		Loop
+	};
+
+	enum LoadMethod {
+		Ram,
+		Rom
+	};
+
+	Configuration();
+
+	bool isDebugMode() const { return m_debugMode; }
+	void setDebugMode(bool value) { m_debugMode = value; }
+
+	bool isProfileMode() const { return m_profileMode; }
+	void setProfileMode(bool value) { m_profileMode = value; }
+
+	uint16_t getLoadAddress() const { return m_loadAddress; }
+	uint16_t getStartAddress() const { return m_startAddress; }
+
+	bool allowInput() const { return m_allowInput; }
+	uint16_t getInputAddress() const { return m_inputAddress; }
+
+	bool allowOutput() const { return m_allowOutput; }
+	uint16_t getOutputAddress() const { return m_outputAddress; }
+
+	uint64_t getPollInterval() const { return m_pollInterval; }
+
+	StopCondition getStopCondition() const { return m_stopCondition; }
+
+	std::string getRomDirectory() const { return m_romDirectory; }
+	std::string getProgram() const { return m_program; }
+
+	LoadMethod getLoadMethod() const { return m_loadMethod; }
+
+private:
+	bool m_debugMode;
+	bool m_profileMode;
+	uint16_t m_loadAddress;
+	uint16_t m_startAddress;
+	bool m_allowInput;
+	uint16_t m_inputAddress;
+	bool m_allowOutput;
+	uint16_t m_outputAddress;
+	uint64_t m_pollInterval;
+	StopCondition m_stopCondition;
+	std::string m_romDirectory;
+	std::string m_program;
+	LoadMethod m_loadMethod;
+};

M6502/test_M6502/roms/.gitattributes

@@ -0,0 +1,22 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# Custom for Visual Studio
+*.cs     diff=csharp
+*.sln    merge=union
+*.csproj merge=union
+*.vbproj merge=union
+*.fsproj merge=union
+*.dbproj merge=union
+
+# Standard to msysgit
+*.doc	 diff=astextplain
+*.DOC	 diff=astextplain
+*.docx diff=astextplain
+*.DOCX diff=astextplain
+*.dot  diff=astextplain
+*.DOT  diff=astextplain
+*.pdf  diff=astextplain
+*.PDF	 diff=astextplain
+*.rtf	 diff=astextplain
+*.RTF	 diff=astextplain

M6502/test_M6502/roms/.gitignore

@@ -0,0 +1,215 @@
+#################
+## Eclipse
+#################
+
+*.pydevproject
+.project
+.metadata
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.classpath
+.settings/
+.loadpath
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# CDT-specific
+.cproject
+
+# PDT-specific
+.buildpath
+
+
+#################
+## Visual Studio
+#################
+
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# User-specific files
+*.suo
+*.user
+*.sln.docstates
+
+# Build results
+
+[Dd]ebug/
+[Rr]elease/
+x64/
+build/
+[Bb]in/
+[Oo]bj/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+*_i.c
+*_p.c
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.log
+*.scc
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opensdf
+*.sdf
+*.cachefile
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# NCrunch
+*.ncrunch*
+.*crunch*.local.xml
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.Publish.xml
+*.pubxml
+
+# NuGet Packages Directory
+## TODO: If you have NuGet Package Restore enabled, uncomment the next line
+#packages/
+
+# Windows Azure Build Output
+csx
+*.build.csdef
+
+# Windows Store app package directory
+AppPackages/
+
+# Others
+sql/
+*.Cache
+ClientBin/
+[Ss]tyle[Cc]op.*
+~$*
+*~
+*.dbmdl
+*.[Pp]ublish.xml
+*.pfx
+*.publishsettings
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file to a newer
+# Visual Studio version. Backup files are not needed, because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+App_Data/*.mdf
+App_Data/*.ldf
+
+#############
+## Windows detritus
+#############
+
+# Windows image file caches
+Thumbs.db
+ehthumbs.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Mac crap
+.DS_Store
+
+
+#############
+## Python
+#############
+
+*.py[co]
+
+# Packages
+*.egg
+*.egg-info
+dist/
+build/
+eggs/
+parts/
+var/
+sdist/
+develop-eggs/
+.installed.cfg
+
+# Installer logs
+pip-log.txt
+
+# Unit test / coverage reports
+.coverage
+.tox
+
+#Translations
+*.mo
+
+#Mr Developer
+.mr.developer.cfg

M6502/test_M6502/roms/6502_decimal_test.a65

@@ -0,0 +1,355 @@
+; Verify decimal mode behavior
+; Written by Bruce Clark.  This code is public domain.
+; see http://www.6502.org/tutorials/decimal_mode.html
+;
+; Returns:
+;   ERROR = 0 if the test passed
+;   ERROR = 1 if the test failed
+;   modify the code at the DONE label for desired program end
+;
+; This routine requires 17 bytes of RAM -- 1 byte each for:
+;   AR, CF, DA, DNVZC, ERROR, HA, HNVZC, N1, N1H, N1L, N2, N2L, NF, VF, and ZF
+; and 2 bytes for N2H
+;
+; Variables:
+;   N1 and N2 are the two numbers to be added or subtracted
+;   N1H, N1L, N2H, and N2L are the upper 4 bits and lower 4 bits of N1 and N2
+;   DA and DNVZC are the actual accumulator and flag results in decimal mode
+;   HA and HNVZC are the accumulator and flag results when N1 and N2 are
+;     added or subtracted using binary arithmetic
+;   AR, NF, VF, ZF, and CF are the predicted decimal mode accumulator and
+;     flag results, calculated using binary arithmetic
+;
+; This program takes approximately 1 minute at 1 MHz (a few seconds more on
+; a 65C02 than a 6502 or 65816)
+;
+
+; Configuration:
+cputype = 0         ; 0 = 6502, 1 = 65C02, 2 = 65C816
+vld_bcd = 0         ; 0 = allow invalid bcd, 1 = valid bcd only
+chk_a   = 1         ; check accumulator
+chk_n   = 0         ; check sign (negative) flag
+chk_v   = 0         ; check overflow flag
+chk_z   = 0         ; check zero flag
+chk_c   = 1         ; check carry flag
+
+end_of_test macro
+                db  $db     ;execute 65C02 stop instruction
+            endm
+
+        bss
+        org 0
+; operands - register Y = carry in
+N1      ds  1
+N2      ds  1
+; binary result
+HA      ds  1
+HNVZC   ds  1
+                    ;04
+; decimal result
+DA      ds  1
+DNVZC   ds  1
+; predicted results
+AR      ds  1
+NF      ds  1
+                    ;08
+VF      ds  1
+ZF      ds  1
+CF      ds  1
+ERROR   ds  1
+                    ;0C
+; workspace
+N1L     ds  1
+N1H     ds  1
+N2L     ds  1
+N2H     ds  2
+
+        code
+        org $200
+TEST    ldy #1    ; initialize Y (used to loop through carry flag values)
+        sty ERROR ; store 1 in ERROR until the test passes
+        lda #0    ; initialize N1 and N2
+        sta N1
+        sta N2
+LOOP1   lda N2    ; N2L = N2 & $0F
+        and #$0F  ; [1] see text
+        if  vld_bcd = 1
+            cmp #$0a
+            bcs NEXT2
+        endif
+        sta N2L
+        lda N2    ; N2H = N2 & $F0
+        and #$F0  ; [2] see text
+        if  vld_bcd = 1
+            cmp #$a0
+            bcs NEXT2
+        endif
+        sta N2H
+        ora #$0F  ; N2H+1 = (N2 & $F0) + $0F
+        sta N2H+1
+LOOP2   lda N1    ; N1L = N1 & $0F
+        and #$0F  ; [3] see text
+        if  vld_bcd = 1
+            cmp #$0a
+            bcs NEXT1
+        endif
+        sta N1L
+        lda N1    ; N1H = N1 & $F0
+        and #$F0  ; [4] see text
+        if  vld_bcd = 1
+            cmp #$a0
+            bcs NEXT1
+        endif
+        sta N1H
+        jsr ADD
+        jsr A6502
+        jsr COMPARE
+        bne DONE
+        jsr SUB
+        jsr S6502
+        jsr COMPARE
+        bne DONE
+NEXT1   inc N1    ; [5] see text
+        bne LOOP2 ; loop through all 256 values of N1
+NEXT2   inc N2    ; [6] see text
+        bne LOOP1 ; loop through all 256 values of N2
+        dey
+        bpl LOOP1 ; loop through both values of the carry flag
+        lda #0    ; test passed, so store 0 in ERROR
+        sta ERROR
+DONE    
+        end_of_test
+           
+; Calculate the actual decimal mode accumulator and flags, the accumulator
+; and flag results when N1 is added to N2 using binary arithmetic, the
+; predicted accumulator result, the predicted carry flag, and the predicted
+; V flag   
+;          
+ADD     sed       ; decimal mode
+        cpy #1    ; set carry if Y = 1, clear carry if Y = 0
+        lda N1
+        adc N2
+        sta DA    ; actual accumulator result in decimal mode
+        php
+        pla
+        sta DNVZC ; actual flags result in decimal mode
+        cld       ; binary mode
+        cpy #1    ; set carry if Y = 1, clear carry if Y = 0
+        lda N1
+        adc N2
+        sta HA    ; accumulator result of N1+N2 using binary arithmetic
+           
+        php
+        pla
+        sta HNVZC ; flags result of N1+N2 using binary arithmetic
+        cpy #1
+        lda N1L
+        adc N2L
+        cmp #$0A
+        ldx #0
+        bcc A1
+        inx
+        adc #5    ; add 6 (carry is set)
+        and #$0F
+        sec
+A1      ora N1H
+;          
+; if N1L + N2L <  $0A, then add N2 & $F0
+; if N1L + N2L >= $0A, then add (N2 & $F0) + $0F + 1 (carry is set)
+;          
+        adc N2H,x
+        php
+        bcs A2
+        cmp #$A0
+        bcc A3
+A2      adc #$5F  ; add $60 (carry is set)
+        sec
+A3      sta AR    ; predicted accumulator result
+        php
+        pla
+        sta CF    ; predicted carry result
+        pla
+;          
+; note that all 8 bits of the P register are stored in VF
+;          
+        sta VF    ; predicted V flags
+        rts
+           
+; Calculate the actual decimal mode accumulator and flags, and the
+; accumulator and flag results when N2 is subtracted from N1 using binary
+; arithmetic
+;          
+SUB     sed       ; decimal mode
+        cpy #1    ; set carry if Y = 1, clear carry if Y = 0
+        lda N1
+        sbc N2
+        sta DA    ; actual accumulator result in decimal mode
+        php
+        pla
+        sta DNVZC ; actual flags result in decimal mode
+        cld       ; binary mode
+        cpy #1    ; set carry if Y = 1, clear carry if Y = 0
+        lda N1
+        sbc N2
+        sta HA    ; accumulator result of N1-N2 using binary arithmetic
+           
+        php
+        pla
+        sta HNVZC ; flags result of N1-N2 using binary arithmetic
+        rts
+           
+        if cputype != 1
+; Calculate the predicted SBC accumulator result for the 6502 and 65816
+;          
+SUB1        cpy #1    ; set carry if Y = 1, clear carry if Y = 0
+            lda N1L
+            sbc N2L
+            ldx #0
+            bcs S11
+            inx
+            sbc #5    ; subtract 6 (carry is clear)
+            and #$0F
+            clc
+S11         ora N1H
+;          
+; if N1L - N2L >= 0, then subtract N2 & $F0
+; if N1L - N2L <  0, then subtract (N2 & $F0) + $0F + 1 (carry is clear)
+;          
+            sbc N2H,x
+            bcs S12
+            sbc #$5F  ; subtract $60 (carry is clear)
+S12         sta AR
+            rts
+        endif
+           
+        if cputype = 1
+; Calculate the predicted SBC accumulator result for the 6502 and 65C02
+;
+SUB2        cpy #1    ; set carry if Y = 1, clear carry if Y = 0
+            lda N1L
+            sbc N2L
+            ldx #0
+            bcs S21
+            inx
+            and #$0F
+            clc
+S21         ora N1H
+;          
+; if N1L - N2L >= 0, then subtract N2 & $F0
+; if N1L - N2L <  0, then subtract (N2 & $F0) + $0F + 1 (carry is clear)
+;          
+            sbc N2H,x
+            bcs S22
+            sbc #$5F   ; subtract $60 (carry is clear)
+S22         cpx #0
+            beq S23
+            sbc #6
+S23         sta AR     ; predicted accumulator result
+            rts
+        endif
+           
+; Compare accumulator actual results to predicted results
+;          
+; Return:  
+;   Z flag = 1 (BEQ branch) if same
+;   Z flag = 0 (BNE branch) if different
+;          
+COMPARE 
+        if chk_a = 1
+            lda DA
+            cmp AR
+            bne C1
+        endif
+        if chk_n = 1
+            lda DNVZC ; [7] see text
+            eor NF
+            and #$80  ; mask off N flag
+            bne C1
+        endif
+        if chk_v = 1
+            lda DNVZC ; [8] see text
+            eor VF
+            and #$40  ; mask off V flag
+            bne C1    ; [9] see text
+        endif
+        if chk_z = 1
+            lda DNVZC
+            eor ZF    ; mask off Z flag
+            and #2
+            bne C1    ; [10] see text
+        endif
+        if chk_c = 1
+            lda DNVZC
+            eor CF
+            and #1    ; mask off C flag
+        endif
+C1      rts
+           
+; These routines store the predicted values for ADC and SBC for the 6502,
+; 65C02, and 65816 in AR, CF, NF, VF, and ZF
+
+        if cputype = 0
+
+A6502       lda VF      ; 6502
+;          
+; since all 8 bits of the P register were stored in VF, bit 7 of VF contains
+; the N flag for NF
+;          
+            sta NF
+            lda HNVZC
+            sta ZF
+            rts
+           
+S6502       jsr SUB1
+            lda HNVZC
+            sta NF
+            sta VF
+            sta ZF
+            sta CF
+            rts
+
+        endif
+        if  cputype = 1
+
+A6502       lda AR      ; 65C02
+            php
+            pla
+            sta NF
+            sta ZF
+            rts
+           
+S6502       jsr SUB2
+            lda AR
+            php
+            pla
+            sta NF
+            sta ZF
+            lda HNVZC
+            sta VF
+            sta CF
+            rts
+
+        endif
+        if  cputype = 2   
+
+A6502       lda AR      ; 65C816
+            php
+            pla
+            sta NF
+            sta ZF
+            rts
+           
+S6502       jsr SUB1
+            lda AR
+            php
+            pla
+            sta NF
+            sta ZF
+            lda HNVZC
+            sta VF
+            sta CF
+            rts
+
+        endif
+
+        end TEST

M6502/test_M6502/roms/license.txt

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

M6502/test_M6502/roms/readme.txt

@@ -0,0 +1,25 @@
+This is a set of functional tests for the 6502/65C02 type processors.
+
+The 6502_functional_test.a65 is an assembler sourcecode to test all valid
+opcodes and addressing modes of the original NMOS 6502 cpu.
+
+The 65C02_extended_opcodes_test.a65c tests all additional opcodes of the
+65C02 processor including undefined opcodes.
+
+The 6502_interrupt_test.a65 is a simple test to check the interrupt system
+of both processors. A feedback register is required to inject IRQ and NMI
+requests.
+
+Detailed information about how to configure, assemble and run the tests is
+included in each source file.
+
+The tests have primarily been written to test my own ATMega16 6502 emulator
+project. You can find it here: http://2m5.de/6502_Emu/index.htm
+
+A discussion about the tests can be found here:
+http://forum.6502.org/viewtopic.php?f=2&t=2241
+
+Good luck debugging your emulator, simulator, fpga core, discrete
+logic implementation or whatever you have!
+
+

M6502/test_M6502/roms/report.i65

@@ -0,0 +1,179 @@
+;**** report 6502 funtional test errors to standard I/O ****
+;
+;this include file is part of the 6502 functional tests
+;it is used when you configure report = 1 in the tests
+;
+;to adopt the standard output vectors of your test environment
+;you must modify the rchar and rget subroutines in this include
+;
+;I/O hardware may have to be initialized in report_init
+
+;print message macro - \1 = message location
+rprt    macro
+        ldx #0
+        lda \1
+loop\?
+        jsr rchar
+        inx
+        lda \1,x
+        bne loop\?
+        endm
+
+;initialize I/O as required (example: configure & enable ACIA)
+report_init
+        ;nothing to initialize
+        rprt rmsg_start
+        rts
+        
+;show stack (with saved registers), zeropage and absolute memory workspace
+;after an error was trapped in the test program
+report_error
+;save registers
+        php
+        pha
+        txa
+        pha
+        tya
+        pha
+        cld
+;show stack with index to registers at error
+        rprt rmsg_stack
+        tsx
+        inx
+        lda #1      ;address high
+        jsr rhex
+        txa         ;address low
+        jsr rhex
+rstack  jsr rspace
+        lda $100,x  ;stack data
+        jsr rhex
+        inx
+        bne rstack
+        jsr rcrlf   ;new line
+;show zero page workspace
+        lda #0
+        jsr rhex
+        lda #zpt
+        tax
+        jsr rhex
+rzp     jsr rspace
+        lda 0,x
+        jsr rhex
+        inx
+        cpx #zp_bss
+        bne rzp
+        jsr rcrlf
+;show absolute workspace
+        lda #hi(data_segment)
+        jsr rhex
+        lda #lo(data_segment)
+        jsr rhex
+        ldx #0
+rabs    jsr rspace
+        lda data_segment,x
+        jsr rhex
+        inx
+        cpx #(data_bss-data_segment)
+        bne rabs
+;ask to continue
+        rprt rmsg_cont
+rerr1   jsr rget
+        cmp #'C'
+        bne rerr1        
+;restore registers
+        pla
+        tay
+        pla
+        tax
+        pla 
+        plp
+        rts   
+
+;show test has ended, ask to repeat
+report_success
+    if rep_int = 1
+        rprt rmsg_priority
+        lda data_segment    ;show interrupt sequence
+        jsr rhex
+        jsr rspace
+        lda data_segment+1
+        jsr rhex
+        jsr rspace
+        lda data_segment+2
+        jsr rhex
+    endif
+        rprt rmsg_success
+rsuc1   jsr rget
+        cmp #'R'
+        bne rsuc1        
+        rts
+
+;input subroutine
+;get a character from standard input 
+;adjust according to the needs in your test environment
+rget                ;get character in A
+;rget1
+;        lda $bff1   ;wait RDRF
+;        and #8
+;        beq rget1
+;not a real ACIA - so RDRF is not checked
+        lda $bff0   ;read acia rx reg
+;the load can be replaced by a call to a kernal routine
+;        jsr $ffcf   ;example: CHRIN for a C64
+        cmp #'a'    ;lower case
+        bcc rget1
+        and #$5f    ;convert to upper case
+rget1   rts
+
+;output subroutines
+rcrlf   lda #10
+        jsr rchar
+        lda #13
+        bne rchar
+
+rspace  lda #' '
+        bne rchar
+        
+rhex    pha         ;report hex byte in A
+        lsr a       ;high nibble first
+        lsr a
+        lsr a
+        lsr a
+        jsr rnib
+        pla         ;now low nibble
+        and #$f
+
+rnib    clc         ;report nibble in A
+        adc #'0'    ;make printable 0-9
+        cmp #'9'+1
+        bcc rchar
+        adc #6      ;make printable A-F
+
+;send a character to standard output 
+;adjust according to the needs in your test environment
+;register X needs to be preserved!
+rchar               ;report character in A
+;        pha         ;wait TDRF
+;rchar1  lda $bff1
+;        and #$10
+;        beq rchar1
+;        pla
+;not a real ACIA - so TDRF is not checked
+        sta $bff0   ;write acia tx reg
+;the store can be replaced by a call to a kernal routine
+;        jsr $ffd2   ;example: CHROUT for a C64
+        rts
+
+rmsg_start
+        db  10,13,"Started testing",10,13,0
+rmsg_stack
+        db  10,13,"regs Y  X  A  PS PCLPCH",10,13,0
+rmsg_cont
+        db  10,13,"press C to continue",10,13,0
+rmsg_success
+        db  10,13,"All tests completed, press R to repeat",10,13,0
+    if rep_int = 1
+rmsg_priority
+        db  10,13,"interrupt sequence (NMI IRQ BRK) ",0
+    endif
+   

M6502/test_M6502/stdafx.cpp

@@ -0,0 +1,8 @@
+// stdafx.cpp : source file that includes just the standard includes
+// test_M6502.pch will be the pre-compiled header
+// stdafx.obj will contain the pre-compiled type information
+
+#include "stdafx.h"
+
+// TODO: reference any additional headers you need in STDAFX.H
+// and not in this file

M6502/test_M6502/stdafx.h

@@ -0,0 +1,12 @@
+#pragma once
+
+#include <string>
+
+#include <sstream>
+#include <iomanip>
+#include <iostream>
+
+#include <assert.h>
+
+// Windows!!
+#include <conio.h>

M6502/test_M6502/test.cpp

@@ -0,0 +1,22 @@
+#include "stdafx.h"
+#include "TestHarness.h"
+#include "Configuration.h"
+#include "Board.h"
+
+#include <iostream>
+
+int main(int argc, char* argv[]) {
+
+	Configuration configuration;
+
+#ifdef _DEBUG
+	configuration.setDebugMode(true);
+	configuration.setProfileMode(true);
+#endif
+
+	EightBit::TestHarness<Configuration, Board> harness(configuration);
+	harness.initialise();
+	harness.runLoop();
+
+	return 0;
+}

M6502/test_M6502/test_M6502.vcxproj

@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>15.0</VCProjectVersion>
+    <ProjectGuid>{EF6F5840-328E-465A-A78A-E807BC9AEB4C}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>test_M6502</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <IncludePath>..\inc;..\..\inc;C:\local\boost_1_64_0;$(IncludePath)</IncludePath>
+    <LibraryPath>C:\local\boost_1_64_0\lib64-msvc-14.0;$(LibraryPath)</LibraryPath>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <IncludePath>..\inc;..\..\inc;C:\local\boost_1_64_0;$(IncludePath)</IncludePath>
+    <LibraryPath>C:\local\boost_1_64_0\lib32-msvc-14.0;$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <IncludePath>..\inc;..\..\inc;C:\local\boost_1_64_0;$(IncludePath)</IncludePath>
+    <LibraryPath>C:\local\boost_1_64_0\lib64-msvc-14.0;$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <IncludePath>..\inc;..\..\inc;C:\local\boost_1_64_0;$(IncludePath)</IncludePath>
+    <LibraryPath>C:\local\boost_1_64_0\lib32-msvc-14.0;$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <EnableEnhancedInstructionSet>AdvancedVectorExtensions</EnableEnhancedInstructionSet>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <StackReserveSize>10000000</StackReserveSize>
+      <Profile>true</Profile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <StackReserveSize>10000000</StackReserveSize>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <Profile>true</Profile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="Board.h" />
+    <ClInclude Include="Configuration.h" />
+    <ClInclude Include="stdafx.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="Board.cpp" />
+    <ClCompile Include="Configuration.cpp" />
+    <ClCompile Include="stdafx.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="test.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\EightBit.vcxproj">
+      <Project>{a9c24bd9-0cb4-4c84-b09b-46b815f9da47}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\src\M6502.vcxproj">
+      <Project>{d8726a1b-bbfe-47ef-9860-26b90140ba66}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

M6502/test_M6502/test_M6502.vcxproj.filters

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="stdafx.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Board.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Configuration.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="stdafx.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="test.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Board.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Configuration.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>

README.md

@@ -3,3 +3,6 @@
 Assortment of eight-bit processor emulators:
 
 * Intel 8080
+* Zilog Z80
+* Sharp LR35902 (Not working)
+* Mos Technology 6502

Z80/fusetest_Z80/FuseTestRunner.cpp

@@ -263,7 +263,7 @@ void Fuse::TestRunner::checkregisters() {
 				<< "**** R, Expected: "
 				<< EightBit::Disassembler::hex((uint8_t)expectedState.r)
 				<< ", Got: "
-				<< EightBit::Disassembler::hex(m_cpu.REFRESH())
+				<< EightBit::Disassembler::hex((uint8_t)m_cpu.REFRESH())
 				<< std::endl;
 		}
 

Z80/fusetest_Z80/fusetest_Z80.vcxproj

@@ -24,7 +24,6 @@
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>fuse_test_Z80</RootNamespace>
     <ProjectName>fusetest_Z80</ProjectName>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

Z80/inc/Z80.h

@@ -9,6 +9,47 @@
 namespace EightBit {
 	class Z80 : public IntelProcessor {
 	public:
+		struct refresh_t {
+
+			bool high : 1;
+			uint8_t variable : 7;
+
+			refresh_t(uint8_t value)
+			: high((value & Bit7) != 0),
+			  variable(value & Mask7)
+			{ }
+
+			operator uint8_t() const {
+				return (high << 7) | variable;
+			}
+
+			refresh_t& operator++() {
+				++variable;
+				return *this;
+			}
+		};
+
+		struct opcode_decoded_t {
+
+			int x;
+			int y;
+			int z;
+			int p;
+			int q;
+
+			opcode_decoded_t() {
+				x = y = z = p = q = 0;
+			}
+
+			opcode_decoded_t(uint8_t opcode) {
+				x = (opcode & 0b11000000) >> 6;	// 0 - 3
+				y = (opcode & 0b00111000) >> 3;	// 0 - 7
+				z = (opcode & 0b00000111);		// 0 - 7
+				p = (y & 0b110) >> 1;			// 0 - 3
+				q = (y & 1);					// 0 - 1
+			}
+		};
+
 		enum StatusBits {
 			SF = Bit7,
 			ZF = Bit6,
@@ -63,7 +104,7 @@ namespace EightBit {
 		uint8_t& IYH() { return IY().high; }
 		uint8_t& IYL() { return IY().low; }
 
-		uint8_t& REFRESH() { return m_refresh; }
+		refresh_t& REFRESH() { return m_refresh; }
 		uint8_t& IV() { return iv; }
 		int& IM() { return m_interruptMode; }
 		bool& IFF1() { return m_iff1; }
@@ -96,7 +137,8 @@ namespace EightBit {
 		register16_t m_ix;
 		register16_t m_iy;
 
-		uint8_t m_refresh;
+		refresh_t m_refresh;
+
 		uint8_t iv;
 		int m_interruptMode;
 		bool m_iff1;
@@ -112,21 +154,19 @@ namespace EightBit {
 		int8_t m_displacement;
 		bool m_displaced;
 
+		std::array<opcode_decoded_t, 0x100> m_decodedOpcodes;
+
 		int fetchExecute() {
 			M1() = true;
 			return execute(fetchByte());
 		}
 
-		void incrementRefresh() {
-			REFRESH() = (REFRESH() & Bit7) | (REFRESH() + 1) & Mask7;
-		}
-
 		uint8_t& DISPLACED() {
 			m_memory.ADDRESS().word = MEMPTR().word = (m_prefixDD ? IX() : IY()).word + m_displacement;
 			return m_memory.reference();
 		}
 
-		uint8_t& R(int r) {
+		uint8_t& R(int r, uint8_t& a) {
 			switch (r) {
 			case 0:
 				return B();
@@ -141,19 +181,21 @@ namespace EightBit {
 			case 5:
 				return HL2().low;
 			case 6:
-				if (m_displaced) {
-					m_displacement = fetchByte();
-					return DISPLACED();
+				if (!m_displaced) {
+					m_memory.ADDRESS() = HL();
+					return m_memory.reference();
 				}
-				m_memory.ADDRESS() = HL();
-				return m_memory.reference();
+				m_displacement = fetchByte();
+				return DISPLACED();
 			case 7:
-				return A();
+				return a;
+			default:
+				__assume(0);
 			}
 			throw std::logic_error("Unhandled registry mechanism");
 		}
 
-		uint8_t& R2(int r) {
+		uint8_t& R2(int r, uint8_t& a) {
 			switch (r) {
 			case 0:
 				return B();
@@ -171,12 +213,16 @@ namespace EightBit {
 				m_memory.ADDRESS() = HL();
 				return m_memory.reference();
 			case 7:
-				return A();
+				return a;
+			default:
+				__assume(0);
 			}
 			throw std::logic_error("Unhandled registry mechanism");
 		}
 
 		register16_t& RP(int rp) {
+			__assume(rp < 4);
+			__assume(rp >= 0);
 			switch (rp) {
 			case 3:
 				return SP();
@@ -188,16 +234,17 @@ namespace EightBit {
 		}
 
 		register16_t& HL2() {
-			if (m_displaced) {
-				if (m_prefixDD)
-					return IX();
-				else if (m_prefixFD)
-					return IY();
-			}
-			return HL();
+			if (!m_displaced)
+				return HL();
+			if (m_prefixDD)
+				return IX();
+			// Must be FD prefix
+			return IY();
 		}
 
 		register16_t& RP2(int rp) {
+			__assume(rp < 4);
+			__assume(rp >= 0);
 			switch (rp) {
 			case 3:
 				return AF();
@@ -208,21 +255,6 @@ namespace EightBit {
 			}
 		}
 
-		void addViaMemptr(register16_t& hl, register16_t operand) {
-			MEMPTR().word = hl.word + 1;
-			add(hl, operand);
-		}
-
-		void sbcViaMemptr(register16_t& hl, register16_t operand) {
-			MEMPTR().word = hl.word + 1;
-			sbc(hl, operand);
-		}
-
-		void adcViaMemptr(register16_t& hl, register16_t operand) {
-			MEMPTR().word = hl.word + 1;
-			adc(hl, operand);
-		}
-
 		static void adjustHalfCarryAdd(uint8_t& f, uint8_t before, uint8_t value, int calculation) {
 			setFlag(f, HC, calculateHalfCarryAdd(before, value, calculation));
 		}
@@ -249,98 +281,96 @@ namespace EightBit {
 			setFlag(f, VF, overflow);
 		}
 
-		void executeCB(int x, int y, int z, int p, int q);
+		static void subtract(uint8_t& f, uint8_t& operand, uint8_t value, int carry = 0);
+
+		void executeCB(int x, int y, int z);
 		void executeED(int x, int y, int z, int p, int q);
 		void executeOther(int x, int y, int z, int p, int q);
 
-		void postIncrement(uint8_t& f, uint8_t value);
-		void postDecrement(uint8_t& f, uint8_t value);
+		static void postIncrement(uint8_t& f, uint8_t value);
+		static void postDecrement(uint8_t& f, uint8_t value);
 
 		void retn();
 		void reti();
 
-		bool jrConditionalFlag(int flag);
-		bool returnConditionalFlag(int flag);
-		bool jumpConditionalFlag(int flag);
-		bool callConditionalFlag(int flag);
+		bool jrConditionalFlag(uint8_t& f, int flag);
+		bool returnConditionalFlag(uint8_t& f, int flag);
+		bool jumpConditionalFlag(uint8_t& f, int flag);
+		bool callConditionalFlag(uint8_t& f, int flag);
 
-		void sbc(register16_t& operand, register16_t value);
-		void adc(register16_t& operand, register16_t value);
+		void sbc(uint8_t& f, register16_t& operand, register16_t value);
+		void adc(uint8_t& f, register16_t& operand, register16_t value);
+		void add(uint8_t& f, register16_t& operand, register16_t value);
 
-		void add(register16_t& operand, register16_t value);
+		static void add(uint8_t& f, uint8_t& operand, uint8_t value, int carry = 0);
+		static void adc(uint8_t& f, uint8_t& operand, uint8_t value);
+		static void sub(uint8_t& f, uint8_t& operand, uint8_t value, int carry = 0);
+		static void sbc(uint8_t& f, uint8_t& operand, uint8_t value);
+		static void andr(uint8_t& f, uint8_t& operand, uint8_t value);
+		static void xorr(uint8_t& f, uint8_t& operand, uint8_t value);
+		static void orr(uint8_t& f, uint8_t& operand, uint8_t value);
+		static void compare(uint8_t& f, uint8_t check, uint8_t value);
 
-		void add(uint8_t& operand, uint8_t value, int carry = 0);
-		void adc(uint8_t& operand, uint8_t value);
-		void sub(uint8_t& operand, uint8_t value, int carry = 0);
-		void sbc(uint8_t& operand, uint8_t value);
-		void andr(uint8_t& operand, uint8_t value);
-		void xorr(uint8_t& operand, uint8_t value);
-		void orr(uint8_t& operand, uint8_t value);
-		void compare(uint8_t value);
+		static uint8_t& rlc(uint8_t& f, uint8_t& operand);
+		static uint8_t& rrc(uint8_t& f, uint8_t& operand);
+		static uint8_t& rl(uint8_t& f, uint8_t& operand);
+		static uint8_t& rr(uint8_t& f, uint8_t& operand);
+		static uint8_t& sla(uint8_t& f, uint8_t& operand);
+		static uint8_t& sra(uint8_t& f, uint8_t& operand);
+		static uint8_t& sll(uint8_t& f, uint8_t& operand);
+		static uint8_t& srl(uint8_t& f, uint8_t& operand);
 
-		uint8_t& rlc(uint8_t& operand);
-		uint8_t& rrc(uint8_t& operand);
-		uint8_t& rl(uint8_t& operand);
-		uint8_t& rr(uint8_t& operand);
-		uint8_t& sla(uint8_t& operand);
-		uint8_t& sra(uint8_t& operand);
-		uint8_t& sll(uint8_t& operand);
-		uint8_t& srl(uint8_t& operand);
+		static uint8_t& bit(uint8_t& f, int n, uint8_t& operand);
+		static uint8_t& res(int n, uint8_t& operand);
+		static uint8_t& set(int nit, uint8_t& operand);
 
-		uint8_t& bit(int n, uint8_t& operand);
-		uint8_t& res(int n, uint8_t& operand);
-		uint8_t& set(int nit, uint8_t& operand);
+		static void daa(uint8_t& a, uint8_t& f);
 
-		void daa();
-
-		void scf();
-		void ccf();
-		void cpl();
+		static void scf(uint8_t a, uint8_t& f);
+		static void ccf(uint8_t a, uint8_t& f);
+		static void cpl(uint8_t& a, uint8_t& f);
 
 		void xhtl(register16_t& operand);
-		void xhtl();
 
-		void blockCompare();
+		void blockCompare(uint8_t a, uint8_t& f);
 
-		void cpi();
-		bool cpir();
+		void cpi(uint8_t a, uint8_t& f);
+		bool cpir(uint8_t a, uint8_t& f);
 
-		void cpd();
-		bool cpdr();
+		void cpd(uint8_t a, uint8_t& f);
+		bool cpdr(uint8_t a, uint8_t& f);
 
-		void blockLoad(register16_t source, register16_t destination);
+		void blockLoad(uint8_t a, uint8_t& f, register16_t source, register16_t destination);
 
-		void ldi();
-		bool ldir();
+		void ldi(uint8_t a, uint8_t& f);
+		bool ldir(uint8_t a, uint8_t& f);
 
-		void ldd();
-		bool lddr();
+		void ldd(uint8_t a, uint8_t& f);
+		bool lddr(uint8_t a, uint8_t& f);
 
-		void ini();
-		bool inir();
+		void ini(uint8_t& f);
+		bool inir(uint8_t& f);
 
-		void ind();
-		bool indr();
+		void ind(uint8_t& f);
+		bool indr(uint8_t& f);
 
-		void blockOut();
+		void blockOut(uint8_t& f);
 
-		void outi();
-		bool otir();
+		void outi(uint8_t& f);
+		bool otir(uint8_t& f);
 
-		void outd();
-		bool otdr();
+		void outd(uint8_t& f);
+		bool otdr(uint8_t& f);
 
-		void neg();
+		static void neg(uint8_t& a, uint8_t& f);
 
-		void rrd();
-		void rld();
+		void rrd(uint8_t& a, uint8_t& f);
+		void rld(uint8_t& a, uint8_t& f);
 
-		void writePort() {
-			m_ports.write(m_memory.ADDRESS().low, m_memory.DATA());
-		}
+		void writePort(uint8_t port, uint8_t a);
+		void writePort();
 
-		void readPort() {
-			m_memory.placeDATA(m_ports.read(m_memory.ADDRESS().low));
-		}
+		void readPort(uint8_t port, uint8_t& a);
+		void readPort();
 	};
 }

Z80/src/Disassembler.cpp

@@ -31,7 +31,7 @@ std::string EightBit::Disassembler::state(Z80& cpu) {
 	auto l = cpu.L();
 
 	auto i = cpu.IV();
-	auto r = cpu.REFRESH();
+	uint8_t r = cpu.REFRESH();
 
 	auto im = cpu.IM();
 

Z80/src/Z80.vcxproj

@@ -23,7 +23,6 @@
     <ProjectGuid>{01974F81-2750-45AF-B845-2C903A54A334}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>Z80</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

Z80/src/stdafx.h

@@ -19,24 +19,3 @@
 #include <bitset>
 
 #include <boost/format.hpp>
-
-//#include <SDL.h>
-//#include <SDL_mixer.h>
-//
-//#if SDL_BYTEORDER == SDL_LIL_ENDIAN
-//#define HOST_LITTLE_ENDIAN
-//#endif
-//
-//#if SDL_BYTEORDER == SDL_BIG_ENDIAN
-//#define HOST_BIG_ENDIAN
-//#endif
-//
-//#define RUN_TESTS
-////#define RUN_CPM
-////#define RUN_INVADERS
-//
-//#ifdef _MSC_VER
-//#pragma comment(lib, "SDL2.lib")
-//#pragma comment(lib, "SDL2main.lib")
-//#pragma comment(lib, "SDL2_mixer.lib")
-//#endif

Z80/test/Board.h

@@ -14,9 +14,8 @@ class Board {
 public:
 	Board(const Configuration& configuration);
 
-	EightBit::Memory& getMemory() { return m_memory; }
-	const EightBit::Z80& getCPU() const { return m_cpu; }
-	EightBit::Z80& getCPUMutable() { return m_cpu; }
+	EightBit::Memory& Memory() { return m_memory; }
+	EightBit::Z80& CPU() { return m_cpu; }
 
 	void initialise();
 

Z80/test/test_Z80.vcxproj

@@ -84,6 +84,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <IncludePath>..\inc;..\..\inc;C:\local\boost_1_64_0;$(IncludePath)</IncludePath>
     <LibraryPath>C:\local\boost_1_64_0\lib64-msvc-14.0;$(LibraryPath)</LibraryPath>
+    <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>

inc/AddressEventArgs.h

@@ -0,0 +1,18 @@
+#pragma once
+
+#include <cstdint>
+
+namespace EightBit {
+	class AddressEventArgs {
+	private:
+		uint16_t m_address;
+		uint8_t m_cell;
+
+	public:
+		AddressEventArgs(uint16_t address, uint8_t cell)
+		: m_address(address), m_cell(cell) {}
+
+		uint16_t getAddress() const { return m_address; }
+		uint8_t getCell() const { return m_cell; }
+	};
+}

inc/IntelProcessor.h

@@ -13,6 +13,8 @@ namespace EightBit {
 
 		virtual void initialise();
 
+		register16_t& SP() { return sp; }
+
 		virtual register16_t& AF() = 0;
 		uint8_t& A() { return AF().high; }
 		uint8_t& F() { return AF().low; }
@@ -32,19 +34,6 @@ namespace EightBit {
 	protected:
 		IntelProcessor(Memory& memory);
 
-		static void clearFlag(uint8_t& f, int flag) { f &= ~flag; }
-		static void setFlag(uint8_t& f, int flag) { f |= flag; }
-
-		static void setFlag(uint8_t& f, int flag, int condition) { setFlag(f, flag, condition != 0); }
-		static void setFlag(uint8_t& f, int flag, uint32_t condition) { setFlag(f, flag, condition != 0); }
-		static void setFlag(uint8_t& f, int flag, bool condition) { condition ? setFlag(f, flag) : clearFlag(f, flag); }
-
-		static void clearFlag(uint8_t& f, int flag, int condition) { clearFlag(f, flag, condition != 0); }
-		static void clearFlag(uint8_t& f, int flag, uint32_t condition) { clearFlag(f, flag, condition != 0); }
-		static void clearFlag(uint8_t& f, int flag, bool condition) { condition ? clearFlag(f, flag) : setFlag(f, flag); }
-
-		//
-
 		template<class T> static void adjustSign(uint8_t& f, uint8_t value) {
 			setFlag(f, T::SF, value & T::SF);
 		}
@@ -54,7 +43,7 @@ namespace EightBit {
 		}
 
 		template<class T> static void adjustParity(uint8_t& f, uint8_t value) {
-			static const uint8_t lookup[0x10] = { 0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4 };
+			static const int lookup[0x10] = { 0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4 };
 			auto set = lookup[highNibble(value)] + lookup[lowNibble(value)];
 			clearFlag(f, T::PF, set % 2);
 		}
@@ -87,27 +76,40 @@ namespace EightBit {
 		//
 
 		static int buildHalfCarryIndex(uint8_t before, uint8_t value, int calculation) {
+			__assume(calculation < 0x1ffff);
 			return ((before & 0x88) >> 1) | ((value & 0x88) >> 2) | ((calculation & 0x88) >> 3);
 		}
 
 		static bool calculateHalfCarryAdd(uint8_t before, uint8_t value, int calculation) {
+			__assume(calculation < 0x1ffff);
 			static std::array<bool, 8> m_halfCarryTableAdd = { { false, false, true, false, true, false, true, true } };
 			auto index = buildHalfCarryIndex(before, value, calculation);
 			return m_halfCarryTableAdd[index & Mask3];
 		}
 
 		static bool calculateHalfCarrySub(uint8_t before, uint8_t value, int calculation) {
+			__assume(calculation < 0x1ffff);
 			std::array<bool, 8> m_halfCarryTableSub = { { false, true, true, true, false, false, false, true } };
 			auto index = buildHalfCarryIndex(before, value, calculation);
 			return m_halfCarryTableSub[index & Mask3];
 		}
 
+		uint8_t fetchByte() {
+			m_memory.ADDRESS().word = PC().word++;
+			return m_memory.reference();
+		}
+
+		void fetchWord(register16_t& output) {
+			output.low = fetchByte();
+			output.high = fetchByte();
+		}
+
 		void push(uint8_t value) {
 			m_memory.ADDRESS().word = --SP().word;
 			m_memory.reference() = value;
 		}
 
-		void pushWord(register16_t value) {
+		void pushWord(const register16_t& value) {
 			push(value.high);
 			push(value.low);
 		}
@@ -123,7 +125,7 @@ namespace EightBit {
 		}
 
 		void fetchWord() {
-			Processor::fetchWord(MEMPTR());
+			fetchWord(MEMPTR());
 		}
 
 		//
@@ -202,5 +204,6 @@ namespace EightBit {
 
 	private:
 		register16_t m_memptr;
+		register16_t sp;
 	};
 }

inc/Memory.h

@@ -4,6 +4,9 @@
 #include <cstdint>
 #include <string>
 
+#include "Signal.h"
+#include "AddressEventArgs.h"
+
 #if defined(_M_X64) || defined(_M_IX86 )
 #	define HOST_LITTLE_ENDIAN
 #else
@@ -29,26 +32,23 @@ namespace EightBit {
 	class Memory {
 	public:
 
-		static uint8_t highByte(uint16_t value) {
-			return value >> 8;
-		}
-
-		static uint8_t lowByte(uint16_t value) {
-			return value & 0xff;
-		}
-
 		Memory(uint16_t addressMask);
+		virtual ~Memory();
 
-		virtual register16_t& ADDRESS() { return m_address; }
-		virtual uint8_t& DATA() { return *m_data; }
+		// Only fired with read/write methods
+		Signal<AddressEventArgs> WrittenByte;
+		Signal<AddressEventArgs> ReadByte;
 
-		virtual uint8_t& placeDATA(uint8_t value) {
+		register16_t& ADDRESS() { return m_address; }
+		uint8_t& DATA() { return *m_data; }
+
+		uint8_t& placeDATA(uint8_t value) {
 			m_temporary = value;
 			m_data = &m_temporary;
 			return DATA();
 		}
 
-		virtual uint8_t& referenceDATA(uint8_t& value) {
+		uint8_t& referenceDATA(uint8_t& value) {
 			m_data = &value;
 			return DATA();
 		}
@@ -61,10 +61,39 @@ namespace EightBit {
 			return m_locked[effective] ? placeDATA(m_bus[effective]) : referenceDATA(m_bus[effective]);
 		}
 
-		virtual uint16_t effectiveAddress(uint16_t address) const {
+		virtual int effectiveAddress(int address) const {
 			return address & m_addressMask;
 		}
 
+		void fireReadBusEvent() {
+			ReadByte.fire(AddressEventArgs(ADDRESS().word, DATA()));
+		}
+
+		uint8_t read() {
+			auto content = reference();
+			fireReadBusEvent();
+			return content;
+		}
+
+		uint8_t read(uint16_t offset) {
+			ADDRESS().word = offset;
+			return read();
+		}
+
+		void fireWriteBusEvent() {
+			WrittenByte.fire(AddressEventArgs(ADDRESS().word, DATA()));
+		}
+
+		void write(uint8_t value) {
+			reference() = value;
+			fireWriteBusEvent();
+		}
+
+		void write(uint16_t offset, uint8_t value) {
+			ADDRESS().word = offset;
+			write(value);
+		}
+
 		void clear();
 		void loadRom(const std::string& path, uint16_t offset);
 		void loadRam(const std::string& path, uint16_t offset);

inc/Processor.h

@@ -38,16 +38,15 @@ namespace EightBit {
 			Bit0 = 0x1,
 		};
 
-		static uint8_t highNibble(uint8_t value) { return value >> 4; }
-		static uint8_t lowNibble(uint8_t value) { return value & Mask4; }
+		static int highNibble(int value) { return value >> 4; }
+		static int lowNibble(int value) { return value & Mask4; }
 
-		static uint8_t promoteNibble(uint8_t value) { return value << 4; }
-		static uint8_t demoteNibble(uint8_t value) { return highNibble(value); }
+		static int promoteNibble(int value) { return value << 4; }
+		static int demoteNibble(int value) { return highNibble(value); }
 
 		const Memory& getMemory() const { return m_memory; }
 
 		register16_t& PC() { return pc; }
-		register16_t& SP() { return sp; }
 
 		bool isHalted() const { return m_halted; }
 		void halt() { --PC().word;  m_halted = true; }
@@ -57,24 +56,24 @@ namespace EightBit {
 		void reset();
 
 	protected:
+		static void clearFlag(uint8_t& f, int flag) { f &= ~flag; }
+		static void setFlag(uint8_t& f, int flag) { f |= flag; }
+
+		static void setFlag(uint8_t& f, int flag, int condition) { setFlag(f, flag, condition != 0); }
+		static void setFlag(uint8_t& f, int flag, uint32_t condition) { setFlag(f, flag, condition != 0); }
+		static void setFlag(uint8_t& f, int flag, bool condition) { condition ? setFlag(f, flag) : clearFlag(f, flag); }
+
+		static void clearFlag(uint8_t& f, int flag, int condition) { clearFlag(f, flag, condition != 0); }
+		static void clearFlag(uint8_t& f, int flag, uint32_t condition) { clearFlag(f, flag, condition != 0); }
+		static void clearFlag(uint8_t& f, int flag, bool condition) { condition ? clearFlag(f, flag) : setFlag(f, flag); }
+
 		Processor(Memory& memory);
 
 		Memory& m_memory;
 		int cycles;
 
-		uint8_t fetchByte() {
-			m_memory.ADDRESS().word = PC().word++;
-			return m_memory.reference();
-		}
-
-		void fetchWord(register16_t& output) {
-			output.low = fetchByte();
-			output.high = fetchByte();
-		}
-
 	private:
 		register16_t pc;
-		register16_t sp;
 		bool m_halted;
 	};
 }

inc/TestHarness.h

@@ -1,46 +1,66 @@
 #pragma once
 
 #include <chrono>
+#include <intrin.h>
+#include <iostream>
 
 namespace EightBit {
 	template<class ConfigurationT, class BoardT> class TestHarness {
 	public:
 		TestHarness(const ConfigurationT& configuration)
-		: m_configuration(configuration),
-		  m_board(configuration) {
+		: m_board(configuration),
+		  m_totalCycles(0),
+		  m_instructions(0),
+		  m_startHostCycles(0),
+		  m_finishHostCycles(0) {
 		}
 
 		~TestHarness() {
-			std::cout << std::endl;
+			std::cout << std::dec << std::endl;
 			std::cout.imbue(std::locale(""));
 
-			std::cout << "Cycles = " << m_totalCycles << std::endl;
+			std::cout << "Guest cycles = " << m_totalCycles << std::endl;
 			std::cout << "Seconds = " << getElapsedSeconds() << std::endl;
 
-			std::cout << getCyclesPerSecond() << " cycles/second" << std::endl;
+			std::cout << getCyclesPerSecond() << " MHz" << std::endl;
+			std::cout << getInstructionsPerSecond() << " instructions per second" << std::endl;
+
+			auto elapsedHostCycles = m_finishHostCycles - m_startHostCycles;
+			std::cout << "Host cycles = " << elapsedHostCycles << std::endl;
+
+			auto efficiency = elapsedHostCycles / m_totalCycles;
+			std::cout << "Efficiency = " << efficiency << std::endl;
 		}
 
 		std::chrono::steady_clock::duration getElapsedTime() const {
 			return m_finishTime - m_startTime;
 		}
 
-		long long getElapsedSeconds() const {
-			return std::chrono::duration_cast<std::chrono::seconds>(getElapsedTime()).count();
+		double getElapsedSeconds() const {
+			return std::chrono::duration_cast<std::chrono::duration<double>>(getElapsedTime()).count();
 		}
 
-		long long getCyclesPerSecond() const {
-			return m_totalCycles / getElapsedSeconds();
+		double getCyclesPerSecond() const {
+			return (m_totalCycles / 1000000 ) / getElapsedSeconds();
+		}
+
+		long long getInstructionsPerSecond() {
+			auto floating = m_instructions / getElapsedSeconds();
+			return (long long)floating;
 		}
 
 		void runLoop() {
 			m_startTime = now();
-			m_totalCycles = 0UL;
+			m_totalCycles = m_instructions = 0L;
+			m_startHostCycles = currentHostCycles();
 
-			auto& cpu = m_board.getCPUMutable();
+			auto& cpu = m_board.CPU();
 			while (!cpu.isHalted()) {
 				m_totalCycles += cpu.step();
+				++m_instructions;
 			}
 
+			m_finishHostCycles = currentHostCycles();
 			m_finishTime = now();
 		}
 
@@ -49,14 +69,20 @@ namespace EightBit {
 		}
 
 	private:
-		const ConfigurationT& m_configuration;
 		BoardT m_board;
 		long long m_totalCycles;
+		long long m_instructions;
 		std::chrono::steady_clock::time_point m_startTime;
 		std::chrono::steady_clock::time_point m_finishTime;
+		unsigned __int64 m_startHostCycles;
+		unsigned __int64 m_finishHostCycles;
 
-		std::chrono::steady_clock::time_point now() {
+		static std::chrono::steady_clock::time_point now() {
 			return std::chrono::steady_clock::now();
 		}
+
+		static unsigned __int64 currentHostCycles() {
+			return __rdtsc();
+		}
 	};
 }

src/EightBit.vcxproj

@@ -138,6 +138,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClInclude Include="..\inc\AddressEventArgs.h" />
     <ClInclude Include="..\inc\EventArgs.h" />
     <ClInclude Include="..\inc\IntelProcessor.h" />
     <ClInclude Include="..\inc\Memory.h" />

src/EightBit.vcxproj.filters

@@ -32,6 +32,9 @@
     <ClInclude Include="..\inc\TestHarness.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\inc\AddressEventArgs.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="stdafx.cpp">

src/IntelProcessor.cpp

@@ -4,9 +4,11 @@
 EightBit::IntelProcessor::IntelProcessor(Memory& memory)
 : Processor(memory) {
 	MEMPTR().word = 0;
+	SP().word = 0xffff;
 }
 
 void EightBit::IntelProcessor::initialise() {
 	Processor::initialise();
 	MEMPTR().word = 0;
+	SP().word = 0xffff;
 }

src/Memory.cpp

@@ -14,6 +14,9 @@ EightBit::Memory::Memory(uint16_t addressMask)
 	m_data = &(m_bus[m_address.word]);
 }
 
+EightBit::Memory::~Memory() {
+}
+
 uint8_t EightBit::Memory::peek(uint16_t address) const {
 	return m_bus[address];
 }

src/Processor.cpp

@@ -5,7 +5,6 @@ EightBit::Processor::Processor(Memory& memory)
 : m_memory(memory),
   cycles(0),
   m_halted(false) {
-	SP().word = 0xffff;
 	PC().word = 0;
 }
 
@@ -14,6 +13,5 @@ void EightBit::Processor::reset() {
 }
 
 void EightBit::Processor::initialise() {
-	SP().word = 0xffff;
 	reset();
 }