68030 MMU configuration exception was incorrectly followed by f-line exception

diff --git a/cpummu30.cpp b/cpummu30.cpp
index 05a20caf95690fa37cc6136b9a72c42cd4b0e507..5eba3697f7817d17dab93a26f4a14739b4307969 100644 (file)
--- a/cpummu30.cpp
+++ b/cpummu30.cpp
@@ -333,7 +333,7 @@ static bool mmu_op30_invea(uae_u32 opcode)
        return false;
 }
 
-bool mmu_op30_pmove (uaecptr pc, uae_u32 opcode, uae_u16 next, uaecptr extra)
+int mmu_op30_pmove(uaecptr pc, uae_u32 opcode, uae_u16 next, uaecptr extra)
 {
        int preg = (next >> 10) & 31;
        int rw = (next >> 9) & 1;
@@ -341,13 +341,13 @@ bool mmu_op30_pmove (uaecptr pc, uae_u32 opcode, uae_u16 next, uaecptr extra)
        int unused = (next & 0xff);
    
        if (mmu_op30_invea(opcode))
-               return true;
+               return 1;
        // unused low 8 bits must be zeroed
        if (unused)
-               return true;
+               return 1;
        // read and fd set?
        if (rw && fd)
-               return true;
+               return 1;
 
 #if MMU030_OP_DBG_MSG
     switch (preg) {
@@ -393,7 +393,7 @@ bool mmu_op30_pmove (uaecptr pc, uae_u32 opcode, uae_u16 next, uaecptr extra)
             else {
                 tc_030 = x_get_long (extra);
                 if (mmu030_decode_tc(tc_030, true))
-                                       return true;
+                                       return -1;
             }
             break;
         case 0x12: // SRP
@@ -404,7 +404,7 @@ bool mmu_op30_pmove (uaecptr pc, uae_u32 opcode, uae_u16 next, uaecptr extra)
                 srp_030 = (uae_u64)x_get_long (extra) << 32;
                 srp_030 |= x_get_long (extra + 4);
                 if (mmu030_decode_rp(srp_030))
-                                       return true;
+                                       return -1;
             }
             break;
         case 0x13: // CRP
@@ -415,13 +415,13 @@ bool mmu_op30_pmove (uaecptr pc, uae_u32 opcode, uae_u16 next, uaecptr extra)
                 crp_030 = (uae_u64)x_get_long (extra) << 32;
                 crp_030 |= x_get_long (extra + 4);
                 if (mmu030_decode_rp(crp_030))
-                                       return true;
+                                       return -1;
             }
             break;
         case 0x18: // MMUSR
                        if (fd) {
                                // FD must be always zero when MMUSR read or write
-                               return true;
+                               return 1;
                        }
             if (rw)
                 x_put_word (extra, mmusr_030);
@@ -446,14 +446,14 @@ bool mmu_op30_pmove (uaecptr pc, uae_u32 opcode, uae_u16 next, uaecptr extra)
             break;
         default:
             write_log (_T("Bad PMOVE at %08x\n"),m68k_getpc());
-            return true;
+            return 1;
        }
     
     if (!fd && !rw && preg != 0x18) {
         mmu030_flush_atc_all();
     }
        tt_enabled = (tt0_030 & TT_ENABLE) || (tt1_030 & TT_ENABLE);
-       return false;
+       return 0;
 }
 
 bool mmu_op30_ptest (uaecptr pc, uae_u32 opcode, uae_u16 next, uaecptr extra)

diff --git a/include/cpummu030.h b/include/cpummu030.h
index 417aa60a94c7c641231a67cd0bb2bac519efbb07..baf6de9d54e80c56fde391075686f0a34c3e57ae 100644 (file)
--- a/include/cpummu030.h
+++ b/include/cpummu030.h
@@ -53,9 +53,9 @@ extern struct mmu030_access mmu030_ad[MAX_MMU030_ACCESS + 1];
 
 void mmu030_page_fault(uaecptr addr, bool read, int flags, uae_u32 fc);
 
-bool mmu_op30_pmove (uaecptr pc, uae_u32 opcode, uae_u16 next, uaecptr extra);
-bool mmu_op30_ptest (uaecptr pc, uae_u32 opcode, uae_u16 next, uaecptr extra);
-bool mmu_op30_pflush (uaecptr pc, uae_u32 opcode, uae_u16 next, uaecptr extra);
+int mmu_op30_pmove(uaecptr pc, uae_u32 opcode, uae_u16 next, uaecptr extra);
+bool mmu_op30_ptest(uaecptr pc, uae_u32 opcode, uae_u16 next, uaecptr extra);
+bool mmu_op30_pflush(uaecptr pc, uae_u32 opcode, uae_u16 next, uaecptr extra);
 
 typedef struct {
     uae_u32 addr_base;

diff --git a/newcpu.cpp b/newcpu.cpp
index 12b604b29bfb0d28923faec870b72101a50c0e2e..3e74ce3fb2240ef7851e936f46df1b8a58d7cada 100644 (file)
--- a/newcpu.cpp
+++ b/newcpu.cpp
@@ -4063,10 +4063,10 @@ static bool mmu_op30fake_pflush (uaecptr pc, uae_u32 opcode, uae_u16 next, uaecp
 }
 
 // 68030 (68851) MMU instructions only
-bool mmu_op30 (uaecptr pc, uae_u32 opcode, uae_u16 extra, uaecptr extraa)
+bool mmu_op30(uaecptr pc, uae_u32 opcode, uae_u16 extra, uaecptr extraa)
 {
        int type = extra >> 13;
-       bool fline = false;
+       int fline = 0;
 
        switch (type)
        {
@@ -4074,28 +4074,28 @@ bool mmu_op30 (uaecptr pc, uae_u32 opcode, uae_u16 extra, uaecptr extraa)
        case 2:
        case 3:
                if (currprefs.mmu_model)
-                       fline = mmu_op30_pmove (pc, opcode, extra, extraa); 
+                       fline = mmu_op30_pmove(pc, opcode, extra, extraa); 
                else
-                       fline = mmu_op30fake_pmove (pc, opcode, extra, extraa);
+                       fline = mmu_op30fake_pmove(pc, opcode, extra, extraa);
        break;
        case 1:
                if (currprefs.mmu_model)
-                       fline = mmu_op30_pflush (pc, opcode, extra, extraa); 
+                       fline = mmu_op30_pflush(pc, opcode, extra, extraa); 
                else
-                       fline = mmu_op30fake_pflush (pc, opcode, extra, extraa);
+                       fline = mmu_op30fake_pflush(pc, opcode, extra, extraa);
        break;
        case 4:
                if (currprefs.mmu_model)
-                       fline = mmu_op30_ptest (pc, opcode, extra, extraa);
+                       fline = mmu_op30_ptest(pc, opcode, extra, extraa);
                else
-                       fline = mmu_op30fake_ptest (pc, opcode, extra, extraa);
+                       fline = mmu_op30fake_ptest(pc, opcode, extra, extraa);
        break;
        }
-       if (fline) {
+       if (fline > 0) {
                m68k_setpc(pc);
                op_illg(opcode);
        }
-       return fline;   
+       return fline != 0;      
 }
 
 /* check if an address matches a ttr */