Minor fixes.

diff --git a/cpummu30.cpp b/cpummu30.cpp
index 1a984aac962c322f7b641a1c410b7a978ce9d214..976b9e67370762c071bdeafb96a15603a1952909 100644 (file)
--- a/cpummu30.cpp
+++ b/cpummu30.cpp
@@ -2815,11 +2815,11 @@ void m68k_do_rte_mmu030 (uaecptr a7)
 #if MMU030_DEBUG
                        if (mmu030_state[1] & MMU030_STATEFLAG1_MOVEM1) {
                                if (mmu030_state[1] & MMU030_STATEFLAG1_MOVEM2) {
-                                       write_log(_T("68030 MMU MOVEM %04x retry but MMU030_STATEFLAG1_MOVEM2 was already set!?\n"));
+                                       write_log(_T("68030 MMU MOVEM %04x retry but MMU030_STATEFLAG1_MOVEM2 was already set!?\n"), mmu030_opcode);
                                }
                        }
                        if (mmu030_ad[idxsize].done) {
-                               write_log(_T("68030 MMU ins %04x retry but it was already marked as done!?\n"));
+                               write_log(_T("68030 MMU ins %04x retry but it was already marked as done!?\n"), mmu030_opcode);
                        }
 #endif
 
@@ -3226,11 +3226,11 @@ void m68k_do_rte_mmu030c (uaecptr a7)
 #if MMU030_DEBUG
                        if (mmu030_state[1] & MMU030_STATEFLAG1_MOVEM1) {
                                if (mmu030_state[1] & MMU030_STATEFLAG1_MOVEM2) {
-                                       write_log(_T("68030 MMU MOVEM %04x retry but MMU030_STATEFLAG1_MOVEM2 was already set!?\n"));
+                                       write_log(_T("68030 MMU MOVEM %04x retry but MMU030_STATEFLAG1_MOVEM2 was already set!?\n"), mmu030_opcode);
                                }
                        } else {
                                if (mmu030_ad[idxsize].done) {
-                                       write_log(_T("68030 MMU ins %04x retry but it was already marked as done!?\n"));
+                                       write_log(_T("68030 MMU ins %04x retry but it was already marked as done!?\n"), mmu030_opcode);
                                }
                        }
 #endif

diff --git a/newcpu.cpp b/newcpu.cpp
index cc0cbf52a3e7a9074f885f869224cdbaac133e85..65c98fea7fa1bb975504afbe792098f9c07cdacc 100644 (file)
--- a/newcpu.cpp
+++ b/newcpu.cpp
@@ -9893,7 +9893,7 @@ static uae_u32 read_dcache030_debug(uaecptr addr, uae_u32 size, uae_u32 fc, bool
        return out;
 }
 
-static bool read_dache030_2(uaecptr addr, uae_u32 size, uae_u32 *valp)
+static bool read_dcache030_2(uaecptr addr, uae_u32 size, uae_u32 *valp)
 {
        // data cache enabled?
        if (!(regs.cacr & 0x100))
@@ -9971,12 +9971,12 @@ static bool read_dache030_2(uaecptr addr, uae_u32 size, uae_u32 *valp)
        return true;
 }
 
-uae_u32 read_dcache030 (uaecptr addr, uae_u32 size, uae_u32 fc)
+static uae_u32 read_dcache030 (uaecptr addr, uae_u32 size, uae_u32 fc)
 {
        uae_u32 val;
        regs.fc030 = fc;
 
-       if (!read_dache030_2(addr, size, &val)) {
+       if (!read_dcache030_2(addr, size, &val)) {
                // read from memory, data cache is disabled or inhibited.
                if (size == 2)
                        return dcache_lget(addr);
@@ -9994,7 +9994,7 @@ uae_u32 read_dcache030_retry(uaecptr addr, uae_u32 fc, int size, int flags)
        uae_u32 val;
        regs.fc030 = fc;
 
-       if (!read_dache030_2(addr, size, &val)) {
+       if (!read_dcache030_2(addr, size, &val)) {
                return mmu030_get_generic(addr, fc, size, flags);
        }
        return val;