From: Toni Wilen <twilen@winuae.net>
Date: Fri, 10 Apr 2026 16:51:07 +0000 (+0300)
Subject: Statefile 6.0.x workaround -> 6.0.0-6.0.3
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=281135d45f3849c60e08065cb1abdea039f1018a;p=francis%2Fwinuae.git

Statefile 6.0.x workaround -> 6.0.0-6.0.3
---

diff --git a/newcpu.cpp b/newcpu.cpp
index 2501a571..46a0fb87 100644
--- a/newcpu.cpp
+++ b/newcpu.cpp
@@ -483,9 +483,10 @@ static bool get_trace(uaecptr addr, int accessmode, int size, uae_u32 *data)
 			}
 			check_trace();
 
-			// Partially fix 6.0.x statefiles where 68000 word read value was stored as a zero.
+			// Partially fix 6.0.0-6.0.3 statefiles where 68000 word read value was stored as a zero.
 			// This can be only fixed when it was 68000 instruction prefetch.
-			if ((get_statefile_version() & 0xffffff00) == 0x00060000) {
+			int statefile_version = get_statefile_version();
+			if (statefile_version >= 0x00060000 && statefile_version <= 0x00060003) {
 				if (!ctm->data && accessmode == 2 && currprefs.cpu_model <= 68010 && currprefs.cpu_cycle_exact && addr > regs.pc && addr < regs.pc + 20) {
 					return true;
 				}