From 8ad1d6b813490766a70346e7046d0ccefb0f6ff7 Mon Sep 17 00:00:00 2001
From: Thomas Harte <thomas.harte@gmail.com>
Date: Tue, 24 May 2022 12:15:35 -0400
Subject: [PATCH] Interrupt fixes: supply proper address, raise level, fetch
 from vector.

---
 .../68000Mk2/Implementation/68000Mk2Implementation.hpp   | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Processors/68000Mk2/Implementation/68000Mk2Implementation.hpp b/Processors/68000Mk2/Implementation/68000Mk2Implementation.hpp
index 3f2614ebe..c87ae3372 100644
--- a/Processors/68000Mk2/Implementation/68000Mk2Implementation.hpp
+++ b/Processors/68000Mk2/Implementation/68000Mk2Implementation.hpp
@@ -425,6 +425,7 @@ void Processor<BusHandler, dtack_is_implicit, permit_overrun, signal_will_perfor
 			captured_status_.w = status_.status();
 			status_.is_supervisor = true;
 			status_.trace_flag = 0;
+			status_.interrupt_level = captured_interrupt_level_;
 			did_update_status();
 
 			// Prepare for stack activity.
@@ -436,7 +437,7 @@ void Processor<BusHandler, dtack_is_implicit, permit_overrun, signal_will_perfor
 			Access(captured_status_);			// ns
 
 			// Do the interrupt cycle, to obtain a vector.
-			temporary_address_.l = uint32_t(captured_interrupt_level_);
+			temporary_address_.l = 0xffff'fff8 | uint32_t(captured_interrupt_level_);
 			SetupDataAccess(0, Microcycle::InterruptAcknowledge);
 			SetDataAddress(temporary_address_.l);
 			Access(temporary_value_.low);		// ni
@@ -462,7 +463,7 @@ void Processor<BusHandler, dtack_is_implicit, permit_overrun, signal_will_perfor
 			SetupDataAccess(Microcycle::Read, Microcycle::SelectWord);
 			SetDataAddress(temporary_address_.l);
 
-			temporary_address_.l <<= 2;
+			temporary_address_.l = uint32_t(temporary_value_.w << 2);
 			Access(program_counter_.high);	// nV
 
 			temporary_address_.l += 2;
@@ -2279,7 +2280,9 @@ void Processor<BusHandler, dtack_is_implicit, permit_overrun, signal_will_perfor
 #define TODOState(x)	\
 		BeginState(x): [[fallthrough]];
 
-		TODOState(BusOrAddressErrorException);
+		BeginState(BusOrAddressErrorException):
+			assert(false);
+		MoveToStateSpecific(Decode);
 
 #undef TODOState