From 25ab47846162913a609a4ffa2987d35888ae11db Mon Sep 17 00:00:00 2001
From: Thomas Harte <thomas.harte@gmail.com>
Date: Mon, 2 May 2022 20:17:44 -0400
Subject: [PATCH] Fix immediate byte and word fetches.

---
 .../M68k/Implementation/ExecutorImplementation.hpp  | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/InstructionSets/M68k/Implementation/ExecutorImplementation.hpp b/InstructionSets/M68k/Implementation/ExecutorImplementation.hpp
index a9ff141e0..969a70fe9 100644
--- a/InstructionSets/M68k/Implementation/ExecutorImplementation.hpp
+++ b/InstructionSets/M68k/Implementation/ExecutorImplementation.hpp
@@ -111,8 +111,17 @@ typename Executor<model, BusHandler>::EffectiveAddress Executor<model, BusHandle
 			ea.requires_fetch = false;
 		break;
 		case AddressingMode::ImmediateData:
-			read(instruction.size(), program_counter_.l, ea.value);
-			program_counter_.l += (instruction.size() == DataSize::LongWord) ? 4 : 2;
+			switch(instruction.size()) {
+				case DataSize::Byte:
+					ea.value.l = read_pc<uint16_t>() & 0xff;
+				break;
+				case DataSize::Word:
+					ea.value.l = read_pc<uint16_t>();
+				break;
+				case DataSize::LongWord:
+					ea.value.l = read_pc<uint32_t>();
+				break;
+			}
 			ea.requires_fetch = false;
 		break;