Renamed cpu bus error -> hardware bus error.

diff --git a/cpummu30.cpp b/cpummu30.cpp
index e209848c5c23d1ba9a61e6010a3607e6536fbbd8..6d6eaf0208b7694d47ed758db71ed920325e350f 100644 (file)
--- a/cpummu30.cpp
+++ b/cpummu30.cpp
@@ -1860,6 +1860,7 @@ void mmu030_page_fault(uaecptr addr, bool read, int flags, uae_u32 fc)
        THROW(2);
 }
 
+#if HARDWARE_BUS_ERROR_EMULATION
 static void mmu030_hardware_bus_error(uaecptr addr, uae_u32 v, bool read, int size, uae_u32 fc)
 {
        int flags = size == sz_byte ? MMU030_SSW_SIZE_B : (size == sz_word ? MMU030_SSW_SIZE_W : MMU030_SSW_SIZE_L);
@@ -1868,9 +1869,10 @@ static void mmu030_hardware_bus_error(uaecptr addr, uae_u32 v, bool read, int si
        } else {
                flags |= MMU030_SSW_RW;
        }
+       hardware_bus_error = 0;
        mmu030_page_fault(addr, read, flags, fc);
-
 }
+#endif
 
 static void mmu030_add_data_read_cache(uaecptr addr, uaecptr phys, uae_u32 fc)
 {
@@ -2091,8 +2093,8 @@ void mmu030_put_long(uaecptr addr, uae_u32 val, uae_u32 fc)
        }
        cacheablecheck(addr);
        x_phys_put_long(addr,val);
-#if BUS_ERROR_EMULATION
-       if (cpu_bus_error)
+#if HARDWARE_BUS_ERROR_EMULATION
+       if (hardware_bus_error)
                mmu030_hardware_bus_error(addr, val, false, sz_long, fc);
 #endif
 }
@@ -2121,8 +2123,8 @@ void mmu030_put_word(uaecptr addr, uae_u16 val, uae_u32 fc)
        }
        cacheablecheck(addr);
        x_phys_put_word(addr,val);
-#if BUS_ERROR_EMULATION
-       if (cpu_bus_error)
+#if HARDWARE_BUS_ERROR_EMULATION
+       if (hardware_bus_error)
                mmu030_hardware_bus_error(addr, val, false, sz_word, fc);
 #endif
 }
@@ -2151,8 +2153,8 @@ void mmu030_put_byte(uaecptr addr, uae_u8 val, uae_u32 fc)
        }
        cacheablecheck(addr);
        x_phys_put_byte(addr,val);
-#if BUS_ERROR_EMULATION
-       if (cpu_bus_error)
+#if HARDWARE_BUS_ERROR_EMULATION
+       if (hardware_bus_error)
                mmu030_hardware_bus_error(addr, val, false, sz_byte, fc);
 #endif
 }
@@ -2182,8 +2184,8 @@ uae_u32 mmu030_get_long(uaecptr addr, uae_u32 fc)
        }
        cacheablecheck(addr);
        uae_u32 v = x_phys_get_long(addr);
-#if BUS_ERROR_EMULATION
-       if (cpu_bus_error)
+#if HARDWARE_BUS_ERROR_EMULATION
+       if (hardware_bus_error)
                mmu030_hardware_bus_error(addr, v, true, sz_long, fc);
 #endif
        return v;
@@ -2213,8 +2215,8 @@ uae_u16 mmu030_get_word(uaecptr addr, uae_u32 fc)
        }
        cacheablecheck(addr);
        uae_u16 v = x_phys_get_word(addr);
-#if BUS_ERROR_EMULATION
-       if (cpu_bus_error)
+#if HARDWARE_BUS_ERROR_EMULATION
+       if (hardware_bus_error)
                mmu030_hardware_bus_error(addr, v, true, sz_word, fc);
 #endif
        return v;
@@ -2244,8 +2246,8 @@ uae_u8 mmu030_get_byte(uaecptr addr, uae_u32 fc)
        }
        cacheablecheck(addr);
        uae_u8 v = x_phys_get_byte(addr);
-#if BUS_ERROR_EMULATION
-       if (cpu_bus_error)
+#if HARDWARE_BUS_ERROR_EMULATION
+       if (hardware_bus_error)
                mmu030_hardware_bus_error(addr, v, true, sz_byte, fc);
 #endif
        return v;
@@ -2263,8 +2265,8 @@ uae_u32 mmu030_get_ilong(uaecptr addr, uae_u32 fc)
 #else
                mmu030_cache_state = mmu030.mmu030_cache_state;
                v = x_phys_get_ilong(mmu030.mmu030_last_physical_address + (addr & mmu030.translation.page.mask));
-#if BUS_ERROR_EMULATION
-               if (cpu_bus_error)
+#if HARDWARE_BUS_ERROR_EMULATION
+               if (hardware_bus_error)
                        mmu030_hardware_bus_error(addr, v, true, sz_long, fc);
 #endif
                return v;
@@ -2285,8 +2287,8 @@ uae_u32 mmu030_get_ilong(uaecptr addr, uae_u32 fc)
        }
        cacheablecheck(addr);
        v = x_phys_get_ilong(addr);
-#if BUS_ERROR_EMULATION
-       if (cpu_bus_error)
+#if HARDWARE_BUS_ERROR_EMULATION
+       if (hardware_bus_error)
                mmu030_hardware_bus_error(addr, v, true, sz_long, fc);
 #endif
        return v;
@@ -2303,8 +2305,8 @@ uae_u16 mmu030_get_iword(uaecptr addr, uae_u32 fc) {
 #else
                mmu030_cache_state = mmu030.mmu030_cache_state;
                v = x_phys_get_iword(mmu030.mmu030_last_physical_address + (addr & mmu030.translation.page.mask));
-#if BUS_ERROR_EMULATION
-               if (cpu_bus_error)
+#if HARDWARE_BUS_ERROR_EMULATION
+               if (hardware_bus_error)
                        mmu030_hardware_bus_error(addr, v, true, sz_word, fc);
 #endif
                return v;
@@ -2325,8 +2327,8 @@ uae_u16 mmu030_get_iword(uaecptr addr, uae_u32 fc) {
        }
        cacheablecheck(addr);
        v = x_phys_get_iword(addr);
-#if BUS_ERROR_EMULATION
-       if (cpu_bus_error)
+#if HARDWARE_BUS_ERROR_EMULATION
+       if (hardware_bus_error)
                mmu030_hardware_bus_error(addr, v, true, sz_word, fc);
 #endif
        return v;
@@ -2356,8 +2358,8 @@ static void mmu030_put_generic_lrmw(uaecptr addr, uae_u32 val, uae_u32 fc, int s
        else
                x_phys_put_long(addr, val);
 
-#if BUS_ERROR_EMULATION
-       if (cpu_bus_error)
+#if HARDWARE_BUS_ERROR_EMULATION
+       if (hardware_bus_error)
                mmu030_hardware_bus_error(addr, val, false, size, fc);
 #endif
 }
@@ -2389,8 +2391,8 @@ void mmu030_put_generic(uaecptr addr, uae_u32 val, uae_u32 fc, int size, int fla
        else
                x_phys_put_long(addr, val);
 
-#if BUS_ERROR_EMULATION
-       if (cpu_bus_error)
+#if HARDWARE_BUS_ERROR_EMULATION
+       if (hardware_bus_error)
                mmu030_hardware_bus_error(addr, val, false, size, fc);
 #endif
 }
@@ -2418,8 +2420,8 @@ static uae_u32 mmu030_get_generic_lrmw(uaecptr addr, uae_u32 fc, int size, int f
        else
                v = x_phys_get_long(addr);
 
-#if BUS_ERROR_EMULATION
-       if (cpu_bus_error)
+#if HARDWARE_BUS_ERROR_EMULATION
+       if (hardware_bus_error)
                mmu030_hardware_bus_error(addr, v, true, size, fc);
 #endif
 
@@ -2454,8 +2456,8 @@ uae_u32 mmu030_get_generic(uaecptr addr, uae_u32 fc, int size, int flags)
        else
                v = x_phys_get_long(addr);
 
-#if BUS_ERROR_EMULATION
-       if (cpu_bus_error)
+#if HARDWARE_BUS_ERROR_EMULATION
+       if (hardware_bus_error)
                mmu030_hardware_bus_error(addr, v, true, size, fc);
 #endif
 

diff --git a/cputest.cpp b/cputest.cpp
index f2efe98b528310d39cf17e110b34cb82dc66a6db..a76f51079f0c32394507dd1396ce1a5544a25e0f 100644 (file)
--- a/cputest.cpp
+++ b/cputest.cpp
@@ -43,7 +43,7 @@ int movem_index1[256];
 int movem_index2[256];
 int movem_next[256];
 int bus_error_offset;
-int cpu_bus_error, cpu_bus_error_fake;
+int hardware_bus_error, hardware_bus_error_fake;
 
 struct mmufixup mmufixup[2];
 cpuop_func *cpufunctbl[65536];
@@ -295,16 +295,16 @@ static void check_bus_error(uaecptr addr, int write, int fc)
        if (safe_memory_start == 0xffffffff && safe_memory_end == 0xffffffff)
                return;
        if (addr >= safe_memory_start && addr < safe_memory_end) {
-               cpu_bus_error_fake = -1;
+               hardware_bus_error_fake = -1;
                if ((safe_memory_mode & 4) && !write && (fc & 2)) {
-                       cpu_bus_error |= 4;
-                       cpu_bus_error_fake |= 1;
+                       hardware_bus_error |= 4;
+                       hardware_bus_error_fake |= 1;
                } else if ((safe_memory_mode & 1) && !write && !(fc & 2)) {
-                       cpu_bus_error |= 1;
-                       cpu_bus_error_fake |= 1;
+                       hardware_bus_error |= 1;
+                       hardware_bus_error_fake |= 1;
                } else if ((safe_memory_mode & 2) && write) {
-                       cpu_bus_error |= 2;
-                       cpu_bus_error_fake |= 2;
+                       hardware_bus_error |= 2;
+                       hardware_bus_error_fake |= 2;
                }
                if (!write && (fc & 2) && feature_usp == 3) {
                        out_of_test_space = true;
@@ -360,7 +360,7 @@ void put_byte_test(uaecptr addr, uae_u32 v)
                return;
        check_bus_error(addr, 1, regs.s ? 5 : 1);
        uae_u8 *p = get_addr(addr, 1, 1);
-       if (!out_of_test_space && !noaccesshistory && !cpu_bus_error_fake) {
+       if (!out_of_test_space && !noaccesshistory && !hardware_bus_error_fake) {
                previoussame(addr, sz_byte);
                if (ahcnt_current >= MAX_ACCESSHIST) {
                        wprintf(_T(" ahist overflow!"));
@@ -385,7 +385,7 @@ void put_word_test(uaecptr addr, uae_u32 v)
                put_byte_test(addr + 1, v >> 0);
        } else {
                uae_u8 *p = get_addr(addr, 2, 1);
-               if (!out_of_test_space && !noaccesshistory && !cpu_bus_error_fake) {
+               if (!out_of_test_space && !noaccesshistory && !hardware_bus_error_fake) {
                        previoussame(addr, sz_word);
                        if (ahcnt_current >= MAX_ACCESSHIST) {
                                wprintf(_T(" ahist overflow!"));
@@ -416,7 +416,7 @@ void put_long_test(uaecptr addr, uae_u32 v)
                put_word_test(addr + 2, v >> 0);
        } else {
                uae_u8 *p = get_addr(addr, 4, 1);
-               if (!out_of_test_space && !noaccesshistory && !cpu_bus_error_fake) {
+               if (!out_of_test_space && !noaccesshistory && !hardware_bus_error_fake) {
                        previoussame(addr, sz_long);
                        if (ahcnt_current >= MAX_ACCESSHIST) {
                                wprintf(_T(" ahist overflow!"));
@@ -2653,8 +2653,8 @@ static void execute_ins(uaecptr endpc, uaecptr targetpc, struct instr *dp)
        test_memory_accessed = 0;
        testing_active = 1;
        testing_active_opcode = opc;
-       cpu_bus_error = 0;
-       cpu_bus_error_fake = 0;
+       hardware_bus_error = 0;
+       hardware_bus_error_fake = 0;
        read_buffer_prev = regs.ir;
        regs.read_buffer = regs.irc;
        regs.write_buffer = 0xf00d;
@@ -3341,8 +3341,8 @@ static void test_mnemo(const TCHAR *path, const TCHAR *mnemo, const TCHAR *ovrfi
 
                                        out_of_test_space = 0; 
                                        noaccesshistory = 0;
-                                       cpu_bus_error_fake = 0;
-                                       cpu_bus_error = 0;
+                                       hardware_bus_error_fake = 0;
+                                       hardware_bus_error = 0;
                                        ahcnt_current = 0;
                                        ahcnt_written = 0;
                                        multi_mode = 0;
@@ -3895,15 +3895,15 @@ static void test_mnemo(const TCHAR *path, const TCHAR *mnemo, const TCHAR *ovrfi
 
                                                        // if only testing read bus errors, skip tests that generated only writes and vice-versa
                                                        // skip also all tests don't generate any bus errors
-                                                       if ((cpu_bus_error == 0 && safe_memory_mode) ||
-                                                               ((cpu_bus_error & 4) && !(safe_memory_mode & 4)) ||
-                                                               ((cpu_bus_error & 1) && !(safe_memory_mode & 1)) ||
-                                                               ((cpu_bus_error & 2) && !(safe_memory_mode & 2))) {
+                                                       if ((hardware_bus_error == 0 && safe_memory_mode) ||
+                                                               ((hardware_bus_error & 4) && !(safe_memory_mode & 4)) ||
+                                                               ((hardware_bus_error & 1) && !(safe_memory_mode & 1)) ||
+                                                               ((hardware_bus_error & 2) && !(safe_memory_mode & 2))) {
                                                                skipped = 1;
                                                        }
 
                                                        // skip if feature_target_opcode_offset mode and non-prefetch bus error
-                                                       if (target_opcode_address != 0xffffffff && (cpu_bus_error & 3)) {
+                                                       if (target_opcode_address != 0xffffffff && (hardware_bus_error & 3)) {
                                                                skipped = 1;
                                                        }
 

diff --git a/debug.cpp b/debug.cpp
index 472d6702846017c6636adb91d0ea16d289d836aa..a1682c5323d9ffaf22d6b39c69c6df0d1d4e0621 100644 (file)
--- a/debug.cpp
+++ b/debug.cpp
@@ -3009,8 +3009,8 @@ static int memwatch_func (uaecptr addr, int rwi, int size, uae_u32 *valp, uae_u3
 
                if (m->bus_error) {
                        if (((m->bus_error & 1) && (rwi & 1)) || ((m->bus_error & 4) && (rwi & 4)) || ((m->bus_error & 2) && (rwi & 2))) {
-#if BUS_ERROR_EMULATION
-                               cpu_bus_error = 1;
+#if HARDWARE_BUS_ERROR_EMULATION
+                               hardware_bus_error = 1;
 #else
                                exception2(addr, (rwi & 2) == 0, size, ((rwi & 4) ? 2 : 1) | (regs.s ? 4 : 0));
 #endif

diff --git a/gencpu.cpp b/gencpu.cpp
index 2b428766a2e1e894708552f84d3cf1cf4c79aa40..e5729c876a50601519be44affc417294850a4a5b 100644 (file)
--- a/gencpu.cpp
+++ b/gencpu.cpp
@@ -595,7 +595,7 @@ static void do_instruction_buserror(void)
                return;
 
        if (bus_error_text[0]) {
-               printf("\tif(cpu_bus_error) {\n");
+               printf("\tif(hardware_bus_error) {\n");
                if (bus_error_code[0])
                        printf("%s", bus_error_code);
                printf("%s", bus_error_text);
@@ -1758,7 +1758,7 @@ static void check_bus_error(const char *name, int offset, int write, int size, c
        if ((!using_prefetch && !using_ce) || cpu_level >= 2) {
 
                fc &= 7;
-               printf("\tif(cpu_bus_error) {\n");
+               printf("\tif(hardware_bus_error) {\n");
                if (write) {
                        printf("\t\texception2_write(opcode, %sa + %d, %d, %s, %d);\n",
                                name, offset, size, writevar,
@@ -1786,7 +1786,7 @@ static void check_bus_error(const char *name, int offset, int write, int size, c
        uae_u32 extra = fc & 0xffff0000;
        fc &= 0xffff;
 
-       printf("\tif(cpu_bus_error) {\n");
+       printf("\tif(hardware_bus_error) {\n");
 
        int setapdiback = 0;
 
@@ -8515,7 +8515,7 @@ int main(int argc, char *argv[])
 
        headerfile = fopen("cputbl.h", "wb");
 
-       fprintf(headerfile, "#define BUS_ERROR_EMULATION %d\n", using_bus_error);
+       fprintf(headerfile, "#define HARDWARE_BUS_ERROR_EMULATION %d\n", using_bus_error);
 
        stblfile = fopen("cpustbl.cpp", "wb");
        generate_includes(stblfile, 0);

diff --git a/include/newcpu.h b/include/newcpu.h
index 84b48335a7f968abd4bd092f2ca74285c7d96b34..6ad514c00184575a26e9e1d748208885c560c81d 100644 (file)
--- a/include/newcpu.h
+++ b/include/newcpu.h
@@ -53,7 +53,7 @@ extern int fpp_movem_next[256];
 #endif
 
 extern int bus_error_offset;
-extern int cpu_bus_error;
+extern int hardware_bus_error;
 
 typedef uae_u32 REGPARAM3 cpuop_func (uae_u32) REGPARAM;
 typedef void REGPARAM3 cpuop_func_ce (uae_u32) REGPARAM;

diff --git a/newcpu.cpp b/newcpu.cpp
index 87aaaeec5d8effe2127cd98c7713584f4f7b3048..ac5b6ec8efe17c3c8c8f3098bf51e20963262771 100644 (file)
--- a/newcpu.cpp
+++ b/newcpu.cpp
@@ -85,7 +85,7 @@ static void exception3_read_special(uae_u32 opcode, uaecptr addr, int size, int
 int mmu_enabled, mmu_triggered;
 int cpu_cycles;
 int bus_error_offset;
-int cpu_bus_error;
+int hardware_bus_error;
 static int baseclock;
 int m68k_pc_indirect;
 bool m68k_interrupt_delay;
@@ -2622,8 +2622,8 @@ kludge_me_do:
                regs.intmask = nr - 24;
        branch_stack_push(currpc, currpc);
        regs.ir = x_get_word (m68k_getpc ()); // prefetch 1
-#if BUS_ERROR_EMULATION
-       if (cpu_bus_error) {
+#if HARDWARE_BUS_ERROR_EMULATION
+       if (hardware_bus_error) {
                if (nr == 2 || nr == 3) {
                        cpu_halt(CPU_HALT_DOUBLE_FAULT);
                        return;
@@ -2637,8 +2637,8 @@ kludge_me_do:
        regs.ipl_pin = intlev();
        ipl_fetch();
        regs.irc = x_get_word (m68k_getpc () + 2); // prefetch 2
-#if BUS_ERROR_EMULATION
-       if (cpu_bus_error) {
+#if HARDWARE_BUS_ERROR_EMULATION
+       if (hardware_bus_error) {
                if (nr == 2 || nr == 3) {
                        cpu_halt(CPU_HALT_DOUBLE_FAULT);
                        return;
@@ -7039,7 +7039,7 @@ void exception2_setup(uae_u32 opcode, uaecptr addr, bool read, int size, uae_u32
        last_notinstruction_for_exception_3 = exception_in_exception != 0;
        last_size_for_exception_3 = size;
        last_di_for_exception_3 = 1;
-       cpu_bus_error = 0;
+       hardware_bus_error = 0;
 
        if (currprefs.cpu_model == 68000 && currprefs.cpu_compatible) {
                if (generates_group1_exception(regs.ir) && !(opcode & 0x20000)) {