From c5039a471959b27739fb26e42d3579635b8fb362 Mon Sep 17 00:00:00 2001
From: Thomas Harte <thomas.harte@gmail.com>
Date: Fri, 28 Jun 2019 15:05:46 -0400
Subject: [PATCH] Imports ANDI, ORI and EORI to SR tests.

Hence corrects supervisor/user privileges for SR/CCR.
---
 .../Mac/Clock SignalTests/68000Tests.mm       | 85 +++++++++++++++++++
 .../68000/Implementation/68000Storage.cpp     |  2 +-
 2 files changed, 86 insertions(+), 1 deletion(-)

diff --git a/OSBindings/Mac/Clock SignalTests/68000Tests.mm b/OSBindings/Mac/Clock SignalTests/68000Tests.mm
index 0bb68ee92..35e1735bc 100644
--- a/OSBindings/Mac/Clock SignalTests/68000Tests.mm	
+++ b/OSBindings/Mac/Clock SignalTests/68000Tests.mm	
@@ -1092,6 +1092,35 @@ class CPU::MC68000::ProcessorStorageTests {
 	XCTAssertEqual(20, _machine->get_cycle_count());
 }
 
+// MARK: ANDI SR
+
+- (void)testANDISR_supervisor {
+	_machine->set_program({
+		0x027c, 0x0700		// ANDI.W #$700, SR
+	});
+	_machine->set_initial_stack_pointer(300);
+
+	_machine->run_for_instructions(1);
+
+	const auto state = _machine->get_processor_state();
+	XCTAssertEqual(state.program_counter, 0x1004 + 4);
+	XCTAssertEqual(20, _machine->get_cycle_count());
+}
+
+- (void)testANDISR_user {
+	_machine->set_program({
+		0x46fc, 0x0000,		// MOVE 0, SR
+		0x027c, 0x0700		// ANDI.W #$700, SR
+	});
+
+	_machine->run_for_instructions(2);
+
+	const auto state = _machine->get_processor_state();
+	XCTAssertNotEqual(state.program_counter, 0x1008 + 4);
+//	XCTAssertEqual(34, _machine->get_cycle_count());
+}
+
+
 // MARK: ASL
 
 - (void)testASLb_Dn_2 {
@@ -2661,6 +2690,34 @@ class CPU::MC68000::ProcessorStorageTests {
 	XCTAssertEqual(20, _machine->get_cycle_count());
 }
 
+// MARK: EORI to SR
+
+- (void)testEORISR_supervisor {
+	_machine->set_program({
+		0x0a7c, 0x0700		// EORI.W #$700, SR
+	});
+	_machine->set_initial_stack_pointer(300);
+
+	_machine->run_for_instructions(1);
+
+	const auto state = _machine->get_processor_state();
+	XCTAssertEqual(state.program_counter, 0x1004 + 4);
+	XCTAssertEqual(20, _machine->get_cycle_count());
+}
+
+- (void)testEORISR_user {
+	_machine->set_program({
+		0x46fc, 0x0000,		// MOVE 0, SR
+		0x0a7c, 0x0700		// EORI.W #$700, SR
+	});
+
+	_machine->run_for_instructions(2);
+
+	const auto state = _machine->get_processor_state();
+	XCTAssertNotEqual(state.program_counter, 0x1008 + 4);
+//	XCTAssertEqual(34, _machine->get_cycle_count());
+}
+
 // MARK: EXG
 
 - (void)testEXG_D1D2 {
@@ -4416,6 +4473,34 @@ class CPU::MC68000::ProcessorStorageTests {
 	XCTAssertEqual(20, _machine->get_cycle_count());
 }
 
+// MARK: ORI to SR
+
+- (void)testORISR_supervisor {
+	_machine->set_program({
+		0x007c, 0x0700		// ORI.W #$700, SR
+	});
+	_machine->set_initial_stack_pointer(300);
+
+	_machine->run_for_instructions(1);
+
+	const auto state = _machine->get_processor_state();
+	XCTAssertEqual(state.program_counter, 0x1004 + 4);
+	XCTAssertEqual(20, _machine->get_cycle_count());
+}
+
+- (void)testORISR_user {
+	_machine->set_program({
+		0x46fc, 0x0000,		// MOVE 0, SR
+		0x007c, 0x0700		// ORI.W #$700, SR
+	});
+
+	_machine->run_for_instructions(2);
+
+	const auto state = _machine->get_processor_state();
+	XCTAssertNotEqual(state.program_counter, 0x1008 + 4);
+//	XCTAssertEqual(34, _machine->get_cycle_count());
+}
+
 // MARK: PEA
 
 - (void)testPEA_A1 {
diff --git a/Processors/68000/Implementation/68000Storage.cpp b/Processors/68000/Implementation/68000Storage.cpp
index 008920131..9524ee894 100644
--- a/Processors/68000/Implementation/68000Storage.cpp
+++ b/Processors/68000/Implementation/68000Storage.cpp
@@ -978,7 +978,7 @@ struct ProcessorStorageConstructor {
 
 						case Decoder::EORI_ORI_ANDI_SR: {
 							// The source used here is always the high word of the prefetch queue.
-							program.requires_supervisor = !(instruction & 0x40);
+							program.requires_supervisor = !!(instruction & 0x40);
 							op(Action::None, seq("np nn nn"));
 							op(Action::PerformOperation, seq("np np"));
 						} break;