Added a single IRQ test case, discovering that I'm two cycles short. Whoops!

OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj

@@ -35,7 +35,7 @@
 		4B73C71A1D036BD90074D992 /* Vic20Document.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B73C7191D036BD90074D992 /* Vic20Document.swift */; };
 		4B73C71D1D036C030074D992 /* Vic20Document.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4B73C71B1D036C030074D992 /* Vic20Document.xib */; };
 		4B886FF21D03B517004291C3 /* Vic20.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B886FF01D03B517004291C3 /* Vic20.cpp */; };
-		4B92EACA1B7C112B00246143 /* TimingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B92EAC91B7C112B00246143 /* TimingTests.swift */; };
+		4B92EACA1B7C112B00246143 /* 6502TimingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B92EAC91B7C112B00246143 /* 6502TimingTests.swift */; };
 		4BB298EE1B587D8400A49093 /* 6502_functional_test.bin in Resources */ = {isa = PBXBuildFile; fileRef = 4BB297E01B587D8300A49093 /* 6502_functional_test.bin */; };
 		4BB298EF1B587D8400A49093 /* AllSuiteA.bin in Resources */ = {isa = PBXBuildFile; fileRef = 4BB297E11B587D8300A49093 /* AllSuiteA.bin */; };
 		4BB298F01B587D8400A49093 /* TestMachine.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4BB297E31B587D8300A49093 /* TestMachine.mm */; };
@@ -323,6 +323,7 @@
 		4BC91B831D1F160E00884B76 /* CommodoreTAP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BC91B811D1F160E00884B76 /* CommodoreTAP.cpp */; };
 		4BC9DF451D044FCA00F44158 /* ROMImages in Resources */ = {isa = PBXBuildFile; fileRef = 4BC9DF441D044FCA00F44158 /* ROMImages */; };
 		4BC9DF4F1D04691600F44158 /* 6560.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BC9DF4D1D04691600F44158 /* 6560.cpp */; };
+		4BC9E1EE1D23449A003FCEE4 /* 6502InterruptTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BC9E1ED1D23449A003FCEE4 /* 6502InterruptTests.swift */; };
 		4BD5F1951D13528900631CD1 /* CSBestEffortUpdater.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BD5F1941D13528900631CD1 /* CSBestEffortUpdater.m */; };
 /* End PBXBuildFile section */
 
@@ -397,7 +398,7 @@
 		4B73C71C1D036C030074D992 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = "Clock Signal/Base.lproj/Vic20Document.xib"; sourceTree = SOURCE_ROOT; };
 		4B886FF01D03B517004291C3 /* Vic20.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Vic20.cpp; path = "Vic-20/Vic20.cpp"; sourceTree = "<group>"; };
 		4B886FF11D03B517004291C3 /* Vic20.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Vic20.hpp; path = "Vic-20/Vic20.hpp"; sourceTree = "<group>"; };
-		4B92EAC91B7C112B00246143 /* TimingTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TimingTests.swift; sourceTree = "<group>"; };
+		4B92EAC91B7C112B00246143 /* 6502TimingTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = 6502TimingTests.swift; sourceTree = "<group>"; };
 		4BB297DF1B587D8200A49093 /* Clock SignalTests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Clock SignalTests-Bridging-Header.h"; sourceTree = "<group>"; };
 		4BB297E01B587D8300A49093 /* 6502_functional_test.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; path = 6502_functional_test.bin; sourceTree = "<group>"; };
 		4BB297E11B587D8300A49093 /* AllSuiteA.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; path = AllSuiteA.bin; sourceTree = "<group>"; };
@@ -708,6 +709,7 @@
 		4BC9DF441D044FCA00F44158 /* ROMImages */ = {isa = PBXFileReference; lastKnownFileType = folder; name = ROMImages; path = ../../../../ROMImages; sourceTree = "<group>"; };
 		4BC9DF4D1D04691600F44158 /* 6560.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = 6560.cpp; sourceTree = "<group>"; };
 		4BC9DF4E1D04691600F44158 /* 6560.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = 6560.hpp; sourceTree = "<group>"; };
+		4BC9E1ED1D23449A003FCEE4 /* 6502InterruptTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = 6502InterruptTests.swift; sourceTree = "<group>"; };
 		4BCA98C21D065CA20062F44C /* 6522.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = 6522.hpp; sourceTree = "<group>"; };
 		4BD5F1931D13528900631CD1 /* CSBestEffortUpdater.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CSBestEffortUpdater.h; path = Updater/CSBestEffortUpdater.h; sourceTree = "<group>"; };
 		4BD5F1941D13528900631CD1 /* CSBestEffortUpdater.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CSBestEffortUpdater.m; path = Updater/CSBestEffortUpdater.m; sourceTree = "<group>"; };
@@ -1253,9 +1255,10 @@
 				4B1E85801D176468001EF87D /* 6532Tests.swift */,
 				4BB73EB61B587A5100552FC2 /* AllSuiteATests.swift */,
 				4B1414611B58888700E04248 /* KlausDormannTests.swift */,
-				4B92EAC91B7C112B00246143 /* TimingTests.swift */,
+				4B92EAC91B7C112B00246143 /* 6502TimingTests.swift */,
 				4B14145F1B58885000E04248 /* WolfgangLorenzTests.swift */,
 				4B1414631B588A1100E04248 /* Test Binaries */,
+				4BC9E1ED1D23449A003FCEE4 /* 6502InterruptTests.swift */,
 			);
 			path = "Clock SignalTests";
 			sourceTree = "<group>";
@@ -1814,7 +1817,8 @@
 				4B14145E1B5887AA00E04248 /* CPU6502AllRAM.cpp in Sources */,
 				4B14145D1B5887A600E04248 /* CPU6502.cpp in Sources */,
 				4B1E85811D176468001EF87D /* 6532Tests.swift in Sources */,
-				4B92EACA1B7C112B00246143 /* TimingTests.swift in Sources */,
+				4BC9E1EE1D23449A003FCEE4 /* 6502InterruptTests.swift in Sources */,
+				4B92EACA1B7C112B00246143 /* 6502TimingTests.swift in Sources */,
 				4BB73EB71B587A5100552FC2 /* AllSuiteATests.swift in Sources */,
 				4BC751B21D157E61006C31D9 /* 6522Tests.swift in Sources */,
 				4B1414621B58888700E04248 /* KlausDormannTests.swift in Sources */,

OSBindings/Mac/Clock SignalTests/6502InterruptTests.swift

@@ -0,0 +1,48 @@
+//
+//  6502InterruptTests.swift
+//  Clock Signal
+//
+//  Created by Thomas Harte on 28/06/2016.
+//  Copyright © 2016 Thomas Harte. All rights reserved.
+//
+
+import XCTest
+
+class MOS6502InterruptTests: XCTestCase {
+
+	var machine: CSTestMachine! = nil
+	override func setUp() {
+		super.setUp()
+
+		// create a machine full of NOPs
+		machine = CSTestMachine()
+		for c in 0...65535 {
+			machine.setValue(0xea, forAddress: UInt16(c))
+		}
+
+		// set the IRQ vector to be 0x1234
+		machine.setValue(0x34, forAddress: 0xfffe)
+		machine.setValue(0x12, forAddress: 0xffff)
+
+		// add a CLI
+		machine.setValue(0x58, forAddress: 0x4000)
+
+		// pick things off at 0x4000
+		machine.setValue(0x4000, forRegister: CSTestMachineRegister.ProgramCounter)
+	}
+
+    func testIRQLine() {
+		// run for four cycles; check that no interrupt has occurred
+		machine.runForNumberOfCycles(6)
+		XCTAssert(machine.valueForRegister(.ProgramCounter) == 0x4003, "No interrupt should have occurred with line low")
+
+		// enable the interrupt line, check that it was too late
+		machine.irqLine = true
+		machine.runForNumberOfCycles(2)
+		XCTAssert(machine.valueForRegister(.ProgramCounter) == 0x4004, "No interrupt should have occurred from interrupt raised between instructions")
+
+		// run for a further 7 cycles, confirm that the IRQ vector was jumped to
+		machine.runForNumberOfCycles(7)
+		XCTAssert(machine.valueForRegister(.ProgramCounter) == 0x1234, "Interrupt routine should just have begun")
+    }
+}

OSBindings/Mac/Clock SignalTests/6502TimingTests.swift

@@ -9,7 +9,7 @@
 import Foundation
 import XCTest
 
-class TimingTests: XCTestCase, CSTestMachineJamHandler {
+class MOS6502TimingTests: XCTestCase, CSTestMachineJamHandler {
 
 	private var endTime: UInt32 = 0
 

OSBindings/Mac/Clock SignalTests/KlausDormannTests.swift

@@ -46,12 +46,7 @@ class KlausDormannTests: XCTestCase {
 
 					if newPC == oldPC {
 						let error = errorForTrapAddress(oldPC)
-
+						XCTAssert(error == nil, "Failed with error \(error)")
-						if let error = error {
-							NSException(name: "Failed test", reason: error, userInfo: nil).raise()
-						} else {
-							return
-						}
 					}
 				}
 			}

OSBindings/Mac/Clock SignalTests/TestMachine.h

@@ -41,5 +41,7 @@ extern const uint8_t CSTestMachineJamOpcode;
 @property (nonatomic, readonly) BOOL isJammed;
 @property (nonatomic, readonly) uint32_t timestamp;
 @property (nonatomic, weak) id <CSTestMachineJamHandler> jamHandler;
+@property (nonatomic, assign) BOOL irqLine;
+@property (nonatomic, assign) BOOL nmiLine;
 
 @end

OSBindings/Mac/Clock SignalTests/TestMachine.mm

@@ -99,4 +99,14 @@ class MachineJamHandler: public CPU6502::AllRAMProcessor::JamHandler {
 	return _processor.get_timestamp();
 }
 
+- (void)setIrqLine:(BOOL)irqLine {
+	_irqLine = irqLine;
+	_processor.set_irq_line(irqLine);
+}
+
+- (void)setNmiLine:(BOOL)nmiLine {
+	_nmiLine = nmiLine;
+	_processor.set_nmi_line(nmiLine);
+}
+
 @end

Processors/6502/CPU6502.hpp

@@ -493,6 +493,8 @@ template <class T> class Processor {
 		*/
 		inline const MicroOp *get_irq_program() {
 			static const MicroOp reset[] = {
+				CycleFetchOperand,
+				CycleFetchOperand,
 				CyclePushPCH,
 				CyclePushPCL,
 				OperationSetOperandFromFlags,
@@ -511,6 +513,8 @@ template <class T> class Processor {
 		*/
 		inline const MicroOp *get_nmi_program() {
 			static const MicroOp reset[] = {
+				CycleFetchOperand,
+				CycleFetchOperand,
 				CyclePushPCH,
 				CyclePushPCL,
 				OperationSetOperandFromFlags,