From 7d755204719d9c9e799b4838f9c42dbc333e693f Mon Sep 17 00:00:00 2001
From: Toni Wilen <twilen@winuae.net>
Date: Sun, 19 Feb 2023 17:56:52 +0200
Subject: [PATCH] CPU statesave update

---
 include/newcpu.h |  1 +
 newcpu.cpp       | 45 +++++++++++++++++++++++++++++++++++++--------
 2 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/include/newcpu.h b/include/newcpu.h
index 4fd8b7b9..ad77f062 100644
--- a/include/newcpu.h
+++ b/include/newcpu.h
@@ -277,6 +277,7 @@ struct cputracememory
 	uae_u32 addr;
 	uae_u32 data;
 	int mode;
+	uae_u32 flags;
 };
 
 struct cputracestruct
diff --git a/newcpu.cpp b/newcpu.cpp
index 02bbadf5..7524b9cd 100644
--- a/newcpu.cpp
+++ b/newcpu.cpp
@@ -356,6 +356,7 @@ static void set_trace (uaecptr addr, int accessmode, int size)
 	ctm->addr = addr;
 	ctm->data = 0xdeadf00d;
 	ctm->mode = accessmode | (size << 4);
+	ctm->flags = 1;
 	cputrace.cyclecounter_pre = -1;
 	if (accessmode == 1)
 		cputrace.writecounter++;
@@ -382,6 +383,7 @@ static void add_trace (uaecptr addr, uae_u32 val, int accessmode, int size)
 		else
 			cputrace.readcounter++;
 	}
+	ctm->flags = 0;
 	debug_trace ();
 	cputrace.cyclecounter_pre = cputrace.cyclecounter_post = 0;
 }
@@ -446,14 +448,33 @@ static bool get_trace (uaecptr addr, int accessmode, int size, uae_u32 *data)
 			else
 				cputrace.readcounter--;
 			if (cputrace.writecounter == 0 && cputrace.readcounter == 0) {
-				if (cputrace.cyclecounter_post) {
-					int c = cputrace.cyclecounter_post;
-					cputrace.cyclecounter_post = 0;
-					x_do_cycles (c);
-				} else if (cputrace.cyclecounter_pre) {
-					check_trace ();
+				if (ctm->flags & 4) {
+					if (cputrace.cyclecounter_post) {
+						int c = cputrace.cyclecounter_post;
+						cputrace.cyclecounter_post = 0;
+						x_do_cycles(c);
+						check_trace();
+						*data = ctm->data;
+						if ((ctm->flags & 1) && !(ctm->flags & 2)) {
+							return true; // argh, need to rerun the memory access..
+						}
+					}
+					// if cyclecounter_pre > 0, it gets handled during memory access rerun
+					check_trace();
 					*data = ctm->data;
-					return true; // argh, need to rerun the memory access..
+					if ((ctm->flags & 1) && !(ctm->flags & 2)) {
+						return true; // argh, need to rerun the memory access..
+					}
+				} else {
+					if (cputrace.cyclecounter_post) {
+						int c = cputrace.cyclecounter_post;
+						cputrace.cyclecounter_post = 0;
+						x_do_cycles(c);
+					} else if (cputrace.cyclecounter_pre) {
+						check_trace();
+						*data = ctm->data;
+						return true; // argh, need to rerun the memory access..
+					}
 				}
 			}
 			check_trace ();
@@ -753,6 +774,7 @@ static void cputracefunc_x_do_cycles_post(int cycles, uae_u32 v)
 	}
 	struct cputracememory *ctm = &cputrace.ctm[cputrace.memoryoffset - 1];
 	ctm->data = v;
+	ctm->flags = 0;
 	cputrace.cyclecounter_post = cycles;
 	cputrace.cyclecounter_pre = 0;
 	while (cycles >= CYCLE_UNIT) {
@@ -7078,7 +7100,7 @@ uae_u8 *save_cpu_trace(size_t *len, uae_u8 *dstptr)
 		save_u32 (cputrace.ctm[i].addr);
 		save_u32 (cputrace.ctm[i].data);
 		save_u32 (cputrace.ctm[i].mode);
-		write_log (_T("CPUT%d: %08x %08x %08x\n"), i, cputrace.ctm[i].addr, cputrace.ctm[i].data, cputrace.ctm[i].mode);
+		write_log (_T("CPUT%d: %08x %08x %08x %08x\n"), i, cputrace.ctm[i].addr, cputrace.ctm[i].data, cputrace.ctm[i].mode, cputrace.ctm[i].flags);
 	}
 	save_u32 ((uae_u32)cputrace.startcycles);
 
@@ -7112,6 +7134,10 @@ uae_u8 *save_cpu_trace(size_t *len, uae_u8 *dstptr)
 
 	save_u32(cputrace.startcycles >> 32);
 
+	for (int i = 0; i < cputrace.memoryoffset; i++) {
+		save_u32(cputrace.ctm[i].flags | 4);
+	}
+
 	*len = dst - dstbak;
 	cputrace.needendcycles = 1;
 	return dstbak;
@@ -7208,6 +7234,9 @@ uae_u8 *restore_cpu_trace(uae_u8 *src)
 
 		if (v & 128) {
 			cputrace.startcycles |= ((uae_u64)restore_u32()) << 32;
+			for (int i = 0; i < cputrace.memoryoffset; i++) {
+				cputrace.ctm[i].flags = restore_u32();
+			}
 		}
 	}
 
-- 
2.47.3