From 284f23c6eafc8adf5e1bfe19a89121b825942aad Mon Sep 17 00:00:00 2001
From: Thomas Harte <thomas.harte@gmail.com>
Date: Sun, 22 May 2022 07:16:38 -0400
Subject: [PATCH] Implement JMP.

---
 .../68000ComparativeTests.mm                  |  7 +-
 .../Implementation/68000Mk2Implementation.hpp | 83 ++++++++++++-------
 2 files changed, 56 insertions(+), 34 deletions(-)

diff --git a/OSBindings/Mac/Clock SignalTests/68000ComparativeTests.mm b/OSBindings/Mac/Clock SignalTests/68000ComparativeTests.mm
index d5d5eca3a..93f83cd5b 100644
--- a/OSBindings/Mac/Clock SignalTests/68000ComparativeTests.mm	
+++ b/OSBindings/Mac/Clock SignalTests/68000ComparativeTests.mm	
@@ -156,7 +156,7 @@ struct TestProcessor: public CPU::MC68000Mk2::BusHandler {
 
 	// To limit tests run to a subset of files and/or of tests, uncomment and fill in below.
 	_fileSet = [NSSet setWithArray:@[
-		@"divu_divs.json",
+//		@"exg.json",
 
 		// Below this line are passing tests.
 		@"abcd_sbcd.json",
@@ -169,16 +169,17 @@ struct TestProcessor: public CPU::MC68000Mk2::BusHandler {
 		@"chk.json",
 		@"cmp.json",
 		@"dbcc_scc.json",
+		@"divu_divs.json",
 		@"eor_and_or.json",
 		@"eori_andi_ori.json",
 		@"ext.json",
-		@"jsr.json",
+		@"jmp_jsr.json",
 		@"movem.json",
 		@"movep.json",
 		@"nbcd.json",
 		@"ext.json",
 		@"swap.json",
-	]];		// 19/32 = 59 % done, as far as the tests go.
+	]];		// 20/32 = 63 % done, as far as the tests go.
 //	_testSet = [NSSet setWithArray:@[@"Bcc 6000 [79]"]];
 }
 
diff --git a/Processors/68000Mk2/Implementation/68000Mk2Implementation.hpp b/Processors/68000Mk2/Implementation/68000Mk2Implementation.hpp
index 9994ca000..c4e672114 100644
--- a/Processors/68000Mk2/Implementation/68000Mk2Implementation.hpp
+++ b/Processors/68000Mk2/Implementation/68000Mk2Implementation.hpp
@@ -135,14 +135,15 @@ enum ExecutionState: int {
 
 	BSR,
 
-	JSRAddressRegisterIndirect,
-	JSRAddressRegisterIndirectWithDisplacement,
-	JSRAddressRegisterIndirectWithIndex8bitDisplacement,
-	JSRProgramCounterIndirectWithDisplacement,
-	JSRProgramCounterIndirectWithIndex8bitDisplacement,
-	JSRAbsoluteShort,
-	JSRAbsoluteLong,
-	JSR_push,
+	JSRJMPAddressRegisterIndirect,
+	JSRJMPAddressRegisterIndirectWithDisplacement,
+	JSRJMPAddressRegisterIndirectWithIndex8bitDisplacement,
+	JSRJMPProgramCounterIndirectWithDisplacement,
+	JSRJMPProgramCounterIndirectWithIndex8bitDisplacement,
+	JSRJMPAbsoluteShort,
+	JSRJMPAbsoluteLong,
+
+	JSR, JMP,
 
 	BCHG_BSET_Dn,
 	BCLR_Dn,
@@ -599,22 +600,27 @@ void Processor<BusHandler, dtack_is_implicit, permit_overrun, signal_will_perfor
 				StdCASE(BSRb,	perform_state_ = BSR);
 				StdCASE(BSRw,	perform_state_ = BSR);
 
+				Duplicate(JMP, JSR)
 				StdCASE(JSR, {
+					post_ea_state_ =
+						(instruction_.operation == InstructionSet::M68k::Operation::JSR) ?
+							JSR : JMP;
+
 					switch(instruction_.mode(0)) {
 						case Mode::AddressRegisterIndirect:
-							MoveToState(JSRAddressRegisterIndirect);
+							MoveToState(JSRJMPAddressRegisterIndirect);
 						case Mode::AddressRegisterIndirectWithDisplacement:
-							MoveToState(JSRAddressRegisterIndirectWithDisplacement);
+							MoveToState(JSRJMPAddressRegisterIndirectWithDisplacement);
 						case Mode::AddressRegisterIndirectWithIndex8bitDisplacement:
-							MoveToState(JSRAddressRegisterIndirectWithIndex8bitDisplacement);
+							MoveToState(JSRJMPAddressRegisterIndirectWithIndex8bitDisplacement);
 						case Mode::ProgramCounterIndirectWithDisplacement:
-							MoveToState(JSRProgramCounterIndirectWithDisplacement);
+							MoveToState(JSRJMPProgramCounterIndirectWithDisplacement);
 						case Mode::ProgramCounterIndirectWithIndex8bitDisplacement:
-							MoveToState(JSRProgramCounterIndirectWithIndex8bitDisplacement);
+							MoveToState(JSRJMPProgramCounterIndirectWithIndex8bitDisplacement);
 						case Mode::AbsoluteShort:
-							MoveToState(JSRAbsoluteShort);
+							MoveToState(JSRJMPAbsoluteShort);
 						case Mode::AbsoluteLong:
-							MoveToState(JSRAbsoluteLong);
+							MoveToState(JSRJMPAbsoluteLong);
 
 						default: assert(false);
 					}
@@ -858,10 +864,11 @@ void Processor<BusHandler, dtack_is_implicit, permit_overrun, signal_will_perfor
 			state_ = post_ea_state_;
 		break;
 
-		BeginState(JSRAddressRegisterIndirect):
+		BeginState(JSRJMPAddressRegisterIndirect):
 			effective_address_[0] = registers_[8 + instruction_.reg(next_operand_)].l;
 			temporary_address_.l = instruction_address_.l + 2;
-		MoveToState(JSR_push);
+			state_ = post_ea_state_;
+		break;
 
 		//
 		// AddressRegisterIndirectWithPostincrement
@@ -956,13 +963,15 @@ void Processor<BusHandler, dtack_is_implicit, permit_overrun, signal_will_perfor
 			state_ = post_ea_state_;
 		break;
 
-		BeginState(JSRAddressRegisterIndirectWithDisplacement):
+		BeginState(JSRJMPAddressRegisterIndirectWithDisplacement):
 			effective_address_[0] =
 				registers_[8 + instruction_.reg(next_operand_)].l +
 				int16_t(prefetch_.w);
 			IdleBus(1);								// n
 			temporary_address_.l = instruction_address_.l + 4;
-		MoveToState(JSR_push);
+
+			state_ = post_ea_state_;
+		break;
 
 		//
 		// ProgramCounterIndirectWithDisplacement
@@ -998,13 +1007,14 @@ void Processor<BusHandler, dtack_is_implicit, permit_overrun, signal_will_perfor
 			state_ = post_ea_state_;
 		break;
 
-		BeginState(JSRProgramCounterIndirectWithDisplacement):
+		BeginState(JSRJMPProgramCounterIndirectWithDisplacement):
 			effective_address_[0] =
 				program_counter_.l - 2 +
 				int16_t(prefetch_.w);
 			IdleBus(1);								// n
 			temporary_address_.l = instruction_address_.l + 4;
-		MoveToState(JSR_push);
+			state_ = post_ea_state_;
+		break;
 
 		//
 		// AddressRegisterIndirectWithIndex8bitDisplacement
@@ -1043,11 +1053,12 @@ void Processor<BusHandler, dtack_is_implicit, permit_overrun, signal_will_perfor
 			state_ = post_ea_state_;
 		break;
 
-		BeginState(JSRAddressRegisterIndirectWithIndex8bitDisplacement):
+		BeginState(JSRJMPAddressRegisterIndirectWithIndex8bitDisplacement):
 			effective_address_[0] = d8Xn(registers_[8 + instruction_.reg(next_operand_)].l);
 			IdleBus(3);								// n nn
 			temporary_address_.l = instruction_address_.l + 4;
-		MoveToState(JSR_push);
+			state_ = post_ea_state_;
+		break;
 
 		//
 		// ProgramCounterIndirectWithIndex8bitDisplacement
@@ -1079,11 +1090,12 @@ void Processor<BusHandler, dtack_is_implicit, permit_overrun, signal_will_perfor
 			state_ = post_ea_state_;
 		break;
 
-		BeginState(JSRProgramCounterIndirectWithIndex8bitDisplacement):
+		BeginState(JSRJMPProgramCounterIndirectWithIndex8bitDisplacement):
 			effective_address_[0] = d8Xn(program_counter_.l - 2);
 			IdleBus(3);								// n nn
 			temporary_address_.l = instruction_address_.l + 4;
-		MoveToState(JSR_push);
+			state_ = post_ea_state_;
+		break;
 
 #undef d8Xn
 
@@ -1114,11 +1126,12 @@ void Processor<BusHandler, dtack_is_implicit, permit_overrun, signal_will_perfor
 			state_ = post_ea_state_;
 		break;
 
-		BeginState(JSRAbsoluteShort):
+		BeginState(JSRJMPAbsoluteShort):
 			effective_address_[0] = int16_t(prefetch_.w);
 			IdleBus(1);								// n
 			temporary_address_.l = instruction_address_.l + 4;
-		MoveToState(JSR_push);
+			state_ = post_ea_state_;
+		break;
 
 		//
 		// AbsoluteLong
@@ -1152,11 +1165,12 @@ void Processor<BusHandler, dtack_is_implicit, permit_overrun, signal_will_perfor
 			state_ = post_ea_state_;
 		break;
 
-		BeginState(JSRAbsoluteLong):
+		BeginState(JSRJMPAbsoluteLong):
 			Prefetch();								// np
 			effective_address_[0] = prefetch_.l;
 			temporary_address_.l = instruction_address_.l + 6;
-		MoveToState(JSR_push);
+			state_ = post_ea_state_;
+		break;
 
 		//
 		// ImmediateData
@@ -1500,9 +1514,9 @@ void Processor<BusHandler, dtack_is_implicit, permit_overrun, signal_will_perfor
 		MoveToState(Decode);
 
 		//
-		// JSR [push only; address calculation elsewhere]
+		// JSR [push only; address calculation elsewhere], JMP
 		//
-		BeginState(JSR_push):
+		BeginState(JSR):
 			// Update the program counter and prefetch once.
 			program_counter_.l = effective_address_[0];
 			Prefetch();		// np
@@ -1520,6 +1534,13 @@ void Processor<BusHandler, dtack_is_implicit, permit_overrun, signal_will_perfor
 			Prefetch();
 		MoveToState(Decode);
 
+		BeginState(JMP):
+			// Update the program counter and prefetch once.
+			program_counter_.l = effective_address_[0];
+			Prefetch();		// np
+			Prefetch();		// np
+		MoveToState(Decode);
+
 		//
 		// BSET, BCHG, BCLR
 		//