From dc8103ea82a0a34a6f2193f7c0fb9e963604c077 Mon Sep 17 00:00:00 2001
From: Thomas Harte <thomas.harte@gmail.com>
Date: Thu, 16 Jun 2022 15:10:19 -0400
Subject: [PATCH] Fix return address following a STOP.

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

diff --git a/Processors/68000Mk2/Implementation/68000Mk2Implementation.hpp b/Processors/68000Mk2/Implementation/68000Mk2Implementation.hpp
index 9eef84cee..83c1db06a 100644
--- a/Processors/68000Mk2/Implementation/68000Mk2Implementation.hpp
+++ b/Processors/68000Mk2/Implementation/68000Mk2Implementation.hpp
@@ -382,6 +382,13 @@ void Processor<BusHandler, dtack_is_implicit, permit_overrun, signal_will_perfor
 			// Apply the suffix status.
 			status_.set_status(prefetch_.w);
 			did_update_status();
+
+			// Ensure that after this STOP exits, the eventual RTE returns to
+			// after the STOP rather than to it. Unlike most instructions, STOP
+			// has not prefetched the next instruction, so the program counter
+			// is at the actual return point, not beyond it.
+			instruction_address_.l = program_counter_.l;
+
 			[[fallthrough]];
 
 		BeginState(WaitForInterrupt):