Check lastwrite special case later. Previously it didn't handle situation where excep...

diff --git a/cpummu30.cpp b/cpummu30.cpp
index 3c97d026d9c07c504e66b8de2d96bb947ffe580c..111f0192852da47d80a9bf8a21f2219f5d8b56ad 100644 (file)
--- a/cpummu30.cpp
+++ b/cpummu30.cpp
@@ -2914,13 +2914,14 @@ void m68k_do_rte_mmu030 (uaecptr a7)
                                } else {
                                        mmu030_ad[idxsize].done = true;
                                }
-                               if (mmu030_state[1] & MMU030_STATEFLAG1_LASTWRITE) {
-                                       mmu030_retry = false;
-                               }
                        }
 
                }
 
+               if (mmu030_state[1] & MMU030_STATEFLAG1_LASTWRITE) {
+                       mmu030_retry = false;
+               }
+
 #if MMU030_DEBUG
                if (mmu030_idx >= MAX_MMU030_ACCESS) {
                        write_log(_T("mmu030_idx (RTE) out of bounds! %d >= %d\n"), mmu030_idx, MAX_MMU030_ACCESS);
@@ -3321,13 +3322,14 @@ void m68k_do_rte_mmu030c (uaecptr a7)
                                } else {
                                        mmu030_ad[idxsize].done = true;
                                }
-                               if (mmu030_state[1] & MMU030_STATEFLAG1_LASTWRITE) {
-                                       mmu030_retry = false;
-                                       fill_prefetch_030_ntx();
-                               }
                        }
                }
 
+               if (mmu030_state[1] & MMU030_STATEFLAG1_LASTWRITE) {
+                       mmu030_retry = false;
+                       fill_prefetch_030_ntx();
+               }
+
        } else {
                m68k_areg (regs, 7) += 32;
        }