From: Toni Wilen <twilen@winuae.net>
Date: Sun, 9 Feb 2020 11:49:11 +0000 (+0200)
Subject: TAS unexplained delay when read causes bus error.
X-Git-Tag: 4400~135
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=e6f90d05b26e7b1d88246bd0e0d904cb64788b8e;p=francis%2Fwinuae.git

TAS unexplained delay when read causes bus error.
---

diff --git a/gencpu.cpp b/gencpu.cpp
index 3bafb2e7..53915029 100644
--- a/gencpu.cpp
+++ b/gencpu.cpp
@@ -686,6 +686,7 @@ static void add_mmu040_movem (int movem)
 
 static char bus_error_text[200];
 static int bus_error_specials;
+static int bus_error_cycles;
 // 1 = first access, 2 = long second access only
 static char bus_error_code[1000], bus_error_code2[1000];
 
@@ -2009,6 +2010,15 @@ static void check_bus_error(const char *name, int offset, int write, int size, c
 
 	} else {
 
+		if (bus_error_cycles > 0) {
+			if (using_prefetch) {
+				out("%s(%d);\n", do_cycles, bus_error_cycles);
+			} else {
+				out("count_cycles += % d * CYCLE_UNIT / 2;\n", bus_error_cycles);
+			}
+			bus_error_cycles = 0;
+		}
+
 		if (exception_pc_offset) {
 			incpc("%d", exception_pc_offset);
 		}
@@ -4431,6 +4441,7 @@ static void resetvars (void)
 	m68k_pc_total = 0;
 	branch_inst = 0;
 	set_fpulimit = 0;
+	bus_error_cycles = 0;
 
 	ir2irc = 0;
 	mmufixupcnt = 0;
@@ -8071,11 +8082,13 @@ bccl_not68020:
 		break;
 	case i_TAS:
 		if (cpu_level == 0) {
+			bus_error_cycles = 2;
 			genamode(curi, curi->smode, "srcreg", curi->size, "src", 1, 0, GF_LRMW);
 			genflags(flag_logical, curi->size, "src", "", "");
 			if (!isreg(curi->smode)) {
 				addcycles000(2);
 			}
+			out("uae_u8 old_src = src;\n");
 			out("src |= 0x80;\n");
 			if (isreg(curi->smode) || !using_ce) {
 				genastore_tas("src", curi->smode, "srcreg", curi->size, "src");