Merge branch 'master' into 65816StackAgain

Machines/Apple/AppleIIgs/Video.cpp

@@ -285,7 +285,7 @@ void Video::output_row(int row, int start, int end) {
 
 				// Post an interrupt if requested.
 				if(line_control_ & 0x40) {
-					set_interrupts(0x20);
+					interrupts_.add(0x20);
 				}
 
 				// Set up appropriately for fill mode (or not).
@@ -498,19 +498,19 @@ uint8_t Video::get_new_video() {
 }
 
 void Video::clear_interrupts(uint8_t mask) {
-	set_interrupts(interrupts_ & ~(mask & 0x60));
+	interrupts_.clear(mask);
 }
 
 void Video::set_interrupt_register(uint8_t mask) {
-	set_interrupts(interrupts_ | (mask & 0x6));
+	interrupts_.set_control(mask);
 }
 
 uint8_t Video::get_interrupt_register() {
-	return interrupts_;
+	return interrupts_.status();
 }
 
 bool Video::get_interrupt_line() {
-	return (interrupts_&0x80) || (megaii_interrupt_mask_&megaii_interrupt_state_);
+	return interrupts_.active() || (megaii_interrupt_mask_ & megaii_interrupt_state_);
 }
 
 void Video::set_megaii_interrupts_enabled(uint8_t mask) {
@@ -526,13 +526,7 @@ void Video::clear_megaii_interrupts() {
 }
 
 void Video::notify_clock_tick() {
-	set_interrupts(interrupts_ | 0x40);
+	interrupts_.add(0x40);
-}
-
-void Video::set_interrupts(uint8_t new_value) {
-	interrupts_ = new_value & 0x7f;
-	if((interrupts_ >> 4) & interrupts_ & 0x6)
-		interrupts_ |= 0x80;
 }
 
 void Video::set_border_colour(uint8_t colour) {

Machines/Apple/AppleIIgs/Video.hpp

@@ -123,8 +123,56 @@ class Video: public Apple::II::VideoSwitches<Cycles> {
 		void advance(Cycles);
 
 		uint8_t new_video_ = 0x01;
-		uint8_t interrupts_ = 0x00;
+
-		void set_interrupts(uint8_t);
+		class Interrupts {
+			public:
+				void add(uint8_t value) {
+					// Taken literally, status accumulates regardless of being enabled,
+					// potentially to be polled, it simply doesn't trigger an interrupt.
+					value_ |= value;
+					test();
+				}
+
+				void clear(uint8_t value) {
+					// Zeroes in bits 5 or 6 clear the respective interrupts.
+					value_ &= value | ~0x60;
+					test();
+				}
+
+				void set_control(uint8_t value) {
+					// Ones in bits 1 or 2 enable the respective interrupts.
+					value_ = (value_ & ~0x6) | (value & 0x6);
+					test();
+				}
+
+				uint8_t status() const {
+					return value_;
+				}
+
+				bool active() const {
+					return value_ & 0x80;
+				}
+
+			private:
+				void test() {
+					value_ &= 0x7f;
+					if((value_ >> 4) & value_ & 0x6) {
+						value_ |= 0x80;
+					}
+				}
+
+				// Overall meaning of value is as per the VGC interrupt register, i.e.
+				//
+				//	b7: interrupt status;
+				//	b6: 1-second interrupt status;
+				//	b5: scan-line interrupt status;
+				//	b4: reserved;
+				//	b3: reserved;
+				//	b2: 1-second interrupt enable;
+				//	b1: scan-line interrupt enable;
+				//	b0: reserved.
+				uint8_t value_ = 0x00;
+		} interrupts_;
 
 		int cycles_into_frame_ = 0;
 		const uint8_t *ram_ = nullptr;

OSBindings/Mac/Clock SignalTests/65816ComparativeTests.mm

@@ -14,20 +14,27 @@
 #include <vector>
 #include <unordered_map>
 
+#include "6502Selector.hpp"
+
 namespace {
 
 struct StopException {};
 
-struct BusHandler: public CPU::MOS6502Esque::BusHandler<uint32_t> {
+template <CPU::MOS6502Esque::Type type>
-	// Use a map to store RAM contents, in order to preserve initialised state.
+struct BusHandler: public CPU::MOS6502Esque::BusHandlerT<type> {
-	std::unordered_map<uint32_t, uint8_t> ram;
+	using AddressType = typename CPU::MOS6502Esque::BusHandlerT<type>::AddressType;
-	std::unordered_map<uint32_t, uint8_t> inventions;
 
-	Cycles perform_bus_operation(CPU::MOS6502Esque::BusOperation operation, uint32_t address, uint8_t *value) {
+	// Use a map to store RAM contents, in order to preserve initialised state.
+	std::unordered_map<AddressType, uint8_t> ram;
+	std::unordered_map<AddressType, uint8_t> inventions;
+
+	Cycles perform_bus_operation(CPU::MOS6502Esque::BusOperation operation, AddressType address, uint8_t *value) {
 		// Record the basics of the operation.
 		auto &cycle = cycles.emplace_back();
 		cycle.operation = operation;
-		cycle.extended_bus = processor.get_extended_bus_output();
+		if constexpr (has_extended_bus_output(type)) {
+			cycle.extended_bus = processor.get_extended_bus_output();
+		}
 
 		// Perform the operation, and fill in the cycle's value.
 		using BusOperation = CPU::MOS6502Esque::BusOperation;
@@ -92,25 +99,27 @@ struct BusHandler: public CPU::MOS6502Esque::BusHandler<uint32_t> {
 		allow_pc_repetition = opcode == 0x54 || opcode == 0x44;
 
 		using Register = CPU::MOS6502Esque::Register;
-		const uint32_t pc =
+		const auto pc =
-			processor.value_of(Register::ProgramCounter) |
+			AddressType(
-			(processor.value_of(Register::ProgramBank) << 16);
+				processor.value_of(Register::ProgramCounter) |
+				(processor.value_of(Register::ProgramBank) << 16)
+			);
 		inventions[pc] = ram[pc] = opcode;
 	}
 
 	int pc_overshoot = 0;
-	std::optional<uint32_t> initial_pc;
+	std::optional<AddressType> initial_pc;
 	bool allow_pc_repetition = false;
 
 	struct Cycle {
 		CPU::MOS6502Esque::BusOperation operation;
-		std::optional<uint32_t> address;
+		std::optional<AddressType> address;
 		std::optional<uint8_t> value;
-		int extended_bus;
+		int extended_bus = 0;
 	};
 	std::vector<Cycle> cycles;
 
-	CPU::WDC65816::Processor<BusHandler, false> processor;
+	CPU::MOS6502Esque::Processor<type, BusHandler<type>, false> processor;
 
 	BusHandler() : processor(*this) {
 		// Never run the official reset procedure.
@@ -118,7 +127,7 @@ struct BusHandler: public CPU::MOS6502Esque::BusHandler<uint32_t> {
 	}
 };
 
-template <typename Processor> void print_registers(FILE *file, const Processor &processor, int pc_offset) {
+template <bool has_emulation, typename Processor> void print_registers(FILE *file, const Processor &processor, int pc_offset) {
 	using Register = CPU::MOS6502Esque::Register;
 	fprintf(file, "\"pc\": %d, ", (processor.value_of(Register::ProgramCounter) + pc_offset) & 65535);
 	fprintf(file, "\"s\": %d, ", processor.value_of(Register::StackPointer));
@@ -126,13 +135,16 @@ template <typename Processor> void print_registers(FILE *file, const Processor &
 	fprintf(file, "\"a\": %d, ", processor.value_of(Register::A));
 	fprintf(file, "\"x\": %d, ", processor.value_of(Register::X));
 	fprintf(file, "\"y\": %d, ", processor.value_of(Register::Y));
-	fprintf(file, "\"dbr\": %d, ", processor.value_of(Register::DataBank));
+	if constexpr (has_emulation) {
-	fprintf(file, "\"d\": %d, ", processor.value_of(Register::Direct));
+		fprintf(file, "\"dbr\": %d, ", processor.value_of(Register::DataBank));
-	fprintf(file, "\"pbr\": %d, ", processor.value_of(Register::ProgramBank));
+		fprintf(file, "\"d\": %d, ", processor.value_of(Register::Direct));
-	fprintf(file, "\"e\": %d, ", processor.value_of(Register::EmulationFlag));
+		fprintf(file, "\"pbr\": %d, ", processor.value_of(Register::ProgramBank));
+		fprintf(file, "\"e\": %d, ", processor.value_of(Register::EmulationFlag));
+	}
 }
 
-void print_ram(FILE *file, const std::unordered_map<uint32_t, uint8_t> &data) {
+template <typename IntT>
+void print_ram(FILE *file, const std::unordered_map<IntT, uint8_t> &data) {
 	fprintf(file, "\"ram\": [");
 	bool is_first = true;
 	for(const auto &pair: data) {
@@ -143,22 +155,18 @@ void print_ram(FILE *file, const std::unordered_map<uint32_t, uint8_t> &data) {
 	fprintf(file, "]");
 }
 
-}
 
 // MARK: - New test generator.
 
-@interface TestGenerator : NSObject
-@end
 
-@implementation TestGenerator
+template <CPU::MOS6502Esque::Type type> void generate() {
-
+	BusHandler<type> handler;
-- (void)generate {
+	constexpr bool has_emulation = has(type, CPU::MOS6502Esque::Register::EmulationFlag);
-	BusHandler handler;
 
 	NSString *const tempDir = NSTemporaryDirectory();
 	NSLog(@"Outputting to %@", tempDir);
 
-	for(int operation = 0; operation < 512; operation++) {
+	for(int operation = 0; operation < (has_emulation ? 512 : 256); operation++) {
 		// Make tests repeatable, at least for any given instance of
 		// the runtime.
 		srand(65816 + operation);
@@ -166,7 +174,10 @@ void print_ram(FILE *file, const std::unordered_map<uint32_t, uint8_t> &data) {
 		const bool is_emulated = operation & 256;
 		const uint8_t opcode = operation & 255;
 
-		NSString *const targetName = [NSString stringWithFormat:@"%@%02x.%c.json", tempDir, opcode, is_emulated ? 'e' : 'n'];
+		NSString *const targetName =
+			has_emulation ?
+				[NSString stringWithFormat:@"%@%02x.%c.json", tempDir, opcode, is_emulated ? 'e' : 'n'] :
+				[NSString stringWithFormat:@"%@%02x.json", tempDir, opcode];
 		FILE *const target = fopen(targetName.UTF8String, "wt");
 
 		bool is_first_test = true;
@@ -186,21 +197,28 @@ void print_ram(FILE *file, const std::unordered_map<uint32_t, uint8_t> &data) {
 			handler.processor.set_value_of(Register::Y, rand() >> 8);
 			handler.processor.set_value_of(Register::ProgramCounter, rand() >> 8);
 			handler.processor.set_value_of(Register::StackPointer, rand() >> 8);
-			handler.processor.set_value_of(Register::DataBank, rand() >> 8);
-			handler.processor.set_value_of(Register::ProgramBank, rand() >> 8);
-			handler.processor.set_value_of(Register::Direct, rand() >> 8);
 
-			// ... except for emulation mode, which is a given.
+			if(has_emulation) {
-			// And is set last to ensure proper internal state is applied.
+				handler.processor.set_value_of(Register::DataBank, rand() >> 8);
-			handler.processor.set_value_of(Register::EmulationFlag, is_emulated);
+				handler.processor.set_value_of(Register::ProgramBank, rand() >> 8);
+				handler.processor.set_value_of(Register::Direct, rand() >> 8);
+
+				// ... except for emulation mode, which is a given.
+				// And is set last to ensure proper internal state is applied.
+				handler.processor.set_value_of(Register::EmulationFlag, is_emulated);
+			}
 
 			// Establish the opcode.
 			handler.setup(opcode);
 
 			// Dump initial state.
-			fprintf(target, "{ \"name\": \"%02x %c %d\", ", opcode, is_emulated ? 'e' : 'n', test + 1);
+			if(has_emulation) {
+				fprintf(target, "{ \"name\": \"%02x %c %d\", ", opcode, is_emulated ? 'e' : 'n', test + 1);
+			} else {
+				fprintf(target, "{ \"name\": \"%02x %d\", ", opcode, test + 1);
+			}
 			fprintf(target, "\"initial\": {");
-			print_registers(target, handler.processor, 0);
+			print_registers<has_emulation>(target, handler.processor, 0);
 
 			// Run to the second opcode fetch.
 			try {
@@ -212,7 +230,7 @@ void print_ram(FILE *file, const std::unordered_map<uint32_t, uint8_t> &data) {
 
 			// Dump final state.
 			fprintf(target, "}, \"final\": {");
-			print_registers(target, handler.processor, handler.pc_overshoot);
+			print_registers<has_emulation>(target, handler.processor, handler.pc_overshoot);
 			print_ram(target, handler.ram);
 			fprintf(target, "}, ");
 
@@ -247,12 +265,6 @@ void print_ram(FILE *file, const std::unordered_map<uint32_t, uint8_t> &data) {
 						assert(false);
 				}
 
-				using ExtendedBusOutput = CPU::WDC65816::ExtendedBusOutput;
-				const bool emulation = cycle.extended_bus & ExtendedBusOutput::Emulation;
-				const bool memory_size = cycle.extended_bus & ExtendedBusOutput::MemorySize;
-				const bool index_size = cycle.extended_bus & ExtendedBusOutput::IndexSize;
-				const bool memory_lock = cycle.extended_bus & ExtendedBusOutput::MemoryLock;
-
 				fprintf(target, "[");
 				if(cycle.address) {
 					fprintf(target, "%d, ", *cycle.address);
@@ -264,16 +276,31 @@ void print_ram(FILE *file, const std::unordered_map<uint32_t, uint8_t> &data) {
 				} else {
 					fprintf(target, "null, ");
 				}
-				fprintf(target, "\"%c%c%c%c%c%c%c%c\"]",
+
-					vda ? 'd' : '-',
+				if(has_emulation) {
-					vpa ? 'p' : '-',
+					using ExtendedBusOutput = CPU::WDC65816::ExtendedBusOutput;
-					vpb ? 'v' : '-',
+					const bool emulation = cycle.extended_bus & ExtendedBusOutput::Emulation;
-					wait ? '-' : (read ? 'r' : 'w'),
+					const bool memory_size = cycle.extended_bus & ExtendedBusOutput::MemorySize;
-					wait ? '-' : (emulation ? 'e' : '-'),
+					const bool index_size = cycle.extended_bus & ExtendedBusOutput::IndexSize;
-					wait ? '-' : (memory_size ? 'm' : '-'),
+					const bool memory_lock = cycle.extended_bus & ExtendedBusOutput::MemoryLock;
-					wait ? '-' : (index_size ? 'x' : '-'),
+
-					wait ? '-' : (memory_lock ? 'l' : '-')
+					fprintf(target, "\"%c%c%c%c%c%c%c%c\"]",
-				);
+						vda ? 'd' : '-',
+						vpa ? 'p' : '-',
+						vpb ? 'v' : '-',
+						wait ? '-' : (read ? 'r' : 'w'),
+						wait ? '-' : (emulation ? 'e' : '-'),
+						wait ? '-' : (memory_size ? 'm' : '-'),
+						wait ? '-' : (index_size ? 'x' : '-'),
+						wait ? '-' : (memory_lock ? 'l' : '-')
+					);
+				} else {
+					if(read) {
+						fprintf(target, "\"read\"]");
+					} else {
+						fprintf(target, "\"write\"]");
+					}
+				}
 			}
 
 			// Terminate object.
@@ -285,7 +312,7 @@ void print_ram(FILE *file, const std::unordered_map<uint32_t, uint8_t> &data) {
 	}
 }
 
-@end
+}
 
 // MARK: - Existing test evaluator.
 
@@ -296,7 +323,7 @@ void print_ram(FILE *file, const std::unordered_map<uint32_t, uint8_t> &data) {
 
 // A generator for tests; not intended to be a permanent fixture.
 //- (void)testGenerate {
-//	[[[TestGenerator alloc] init] generate];
+//	generate<CPU::MOS6502Esque::Type::TWDC65816>();
 //}
 
 @end

Processors/6502/6502.hpp

@@ -124,6 +124,12 @@ class ProcessorBase: public ProcessorStorage {
 			@returns @c true if the 6502 is jammed; @c false otherwise.
 		*/
 		inline bool is_jammed() const;
+
+		/*!
+			FOR TESTING PURPOSES ONLY: forces the processor into a state where
+			the next thing it intends to do is fetch a new opcode.
+		*/
+		inline void restart_operation_fetch();
 };
 
 /*!

Processors/6502/Implementation/6502Implementation.hpp

@@ -728,3 +728,8 @@ void ProcessorBase::set_value_of(Register r, uint16_t value) {
 		default: break;
 	}
 }
+
+void ProcessorBase::restart_operation_fetch() {
+	scheduled_program_counter_ = nullptr;
+	next_bus_operation_ = BusOperation::None;
+}

Processors/6502Esque/6502Selector.hpp

@@ -9,6 +9,7 @@
 #ifndef _502Selector_h
 #define _502Selector_h
 
+#include "6502Esque.hpp"
 #include "../6502/6502.hpp"
 #include "../65816/65816.hpp"
 
@@ -45,6 +46,32 @@ template <typename BusHandler, bool uses_ready_line> class Processor<Type::TWDC6
 template <Type processor_type> class BusHandlerT: public BusHandler<uint16_t> {};
 template <> class BusHandlerT<Type::TWDC65816>: public BusHandler<uint32_t> {};
 
+/*
+	Query for implemented registers.
+*/
+constexpr bool has(Type processor_type, Register r) {
+	switch(r) {
+		case Register::LastOperationAddress:
+		case Register::ProgramCounter:
+		case Register::StackPointer:
+		case Register::Flags:
+		case Register::A:
+		case Register::X:
+		case Register::Y:
+			return true;
+
+		case Register::EmulationFlag:
+		case Register::DataBank:
+		case Register::ProgramBank:
+		case Register::Direct:
+			return processor_type == Type::TWDC65816;
+	}
+}
+
+constexpr bool has_extended_bus_output(Type processor_type) {
+	return processor_type == Type::TWDC65816;
+}
+
 }
 
 #endif /* _502Selector_h */

Processors/65816/Implementation/65816Base.cpp

@@ -30,7 +30,10 @@ uint16_t ProcessorBase::value_of(Register r) const {
 void ProcessorBase::set_value_of(Register r, uint16_t value) {
 	switch (r) {
 		case Register::ProgramCounter:	registers_.pc = value;									break;
-		case Register::StackPointer:	registers_.s.full = value;								break;
+		case Register::StackPointer:
+			registers_.s.full = value;
+			if(registers_.emulation_flag) registers_.s.halves.high = 1;
+		break;
 		case Register::Flags:			set_flags(uint8_t(value));								break;
 		case Register::A:				registers_.a.full = value;								break;
 		case Register::X:				registers_.x.full = value & registers_.x_mask;			break;