From 5db6a937cb438b0ba8e8b197fca684c1e36a527e Mon Sep 17 00:00:00 2001
From: Thomas Harte <thomas.harte@gmail.com>
Date: Wed, 25 May 2022 11:47:21 -0400
Subject: [PATCH] Have TRAP and TRAPV push the next instruction address to the
 stack.

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

diff --git a/Processors/68000Mk2/Implementation/68000Mk2Implementation.hpp b/Processors/68000Mk2/Implementation/68000Mk2Implementation.hpp
index 418c39aca..277737e7d 100644
--- a/Processors/68000Mk2/Implementation/68000Mk2Implementation.hpp
+++ b/Processors/68000Mk2/Implementation/68000Mk2Implementation.hpp
@@ -2425,6 +2425,7 @@ void Processor<BusHandler, dtack_is_implicit, permit_overrun, signal_will_perfor
 		// or that of the instruction after?
 		BeginState(TRAP):
 			IdleBus(2);
+			instruction_address_.l += 2;	// Push the address of the instruction after the trap.
 			exception_vector_ = (opcode_ & 15) + InstructionSet::M68k::Exception::TrapBase;
 		MoveToStateSpecific(StandardException);
 
@@ -2433,6 +2434,7 @@ void Processor<BusHandler, dtack_is_implicit, permit_overrun, signal_will_perfor
 			if(!status_.overflow_flag) {
 				MoveToStateSpecific(Decode);
 			}
+			instruction_address_.l += 2;	// Push the address of the instruction after the trap.
 			exception_vector_ = InstructionSet::M68k::Exception::TRAPV;
 		MoveToStateSpecific(StandardException);