From cd5f3c90c28eaea123c12a660d8f53a21e5833e9 Mon Sep 17 00:00:00 2001
From: Thomas Harte <thomas.harte@gmail.com>
Date: Wed, 1 Jun 2022 15:27:09 -0400
Subject: [PATCH] Ensure proper resumption after a forced exit in
 `will_perform`.

---
 .../68000Mk2/Implementation/68000Mk2Implementation.hpp       | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Processors/68000Mk2/Implementation/68000Mk2Implementation.hpp b/Processors/68000Mk2/Implementation/68000Mk2Implementation.hpp
index 3b4cde002..1b390a1e1 100644
--- a/Processors/68000Mk2/Implementation/68000Mk2Implementation.hpp
+++ b/Processors/68000Mk2/Implementation/68000Mk2Implementation.hpp
@@ -592,6 +592,11 @@ void Processor<BusHandler, dtack_is_implicit, permit_overrun, signal_will_perfor
 
 			// Signal the bus handler if requested.
 			if constexpr (signal_will_perform) {
+				// Set the state to Decode, so that if the callee pulls any shenanigans in order
+				// to force an exit here, the interpreter can resume without skipping a beat.
+				//
+				// signal_will_perform is overtly a debugging/testing feature.
+				state_ = Decode;
 				bus_handler_.will_perform(instruction_address_.l, opcode_);
 			}