cputester fixes, branch/jump bus error test

diff --git a/cputest.cpp b/cputest.cpp
index c636dc2a52fb971f2650d0124d71e5f7bc79b255..251e326eb93412e981c2d1238003dfaceb8f4b88 100644 (file)
--- a/cputest.cpp
+++ b/cputest.cpp
@@ -1039,7 +1039,7 @@ void m68k_do_jsr_ce(uaecptr oldpc, uaecptr dest)
        m68k_setpci(dest);
 }
 
-static int SPCFLAG_TRACE, SPCFLAG_DOTRACE;
+static int flag_SPCFLAG_TRACE, flag_SPCFLAG_DOTRACE;
 
 uae_u32 get_disp_ea_test(uae_u32 base, uae_u32 dp)
 {
@@ -1052,8 +1052,8 @@ uae_u32 get_disp_ea_test(uae_u32 base, uae_u32 dp)
 
 static void activate_trace(void)
 {
-       SPCFLAG_TRACE = 0;
-       SPCFLAG_DOTRACE = 1;
+       flag_SPCFLAG_TRACE = 0;
+       flag_SPCFLAG_DOTRACE = 1;
 }
 
 static void do_trace(void)
@@ -1153,11 +1153,11 @@ void MakeFromSR_x(int t0trace)
        }
 
        if (regs.t1 || regs.t0) {
-               SPCFLAG_TRACE = 1;
+               flag_SPCFLAG_TRACE = 1;
        } else {
                /* Keep SPCFLAG_DOTRACE, we still want a trace exception for
                SR-modifying instructions (including STOP).  */
-               SPCFLAG_TRACE = 0;
+               flag_SPCFLAG_TRACE = 0;
        }
        // STOP SR-modification does not generate T0
        // If this SR modification set Tx bit, no trace until next instruction.
@@ -1206,8 +1206,8 @@ void m68k_setstopped(int stoptype)
 void check_t0_trace(void)
 {
        if (regs.t0 && !regs.t1 && currprefs.cpu_model >= 68020) {
-               SPCFLAG_TRACE = 0;
-               SPCFLAG_DOTRACE = 1;
+               flag_SPCFLAG_TRACE = 0;
+               flag_SPCFLAG_DOTRACE = 1;
        }
 }
 
@@ -1231,8 +1231,8 @@ static void doexcstack2(void)
        if (test_exception_opcode >= 0) {
                opcode = test_exception_opcode;
        }
-       if (SPCFLAG_DOTRACE && test_exception == 9) {
-               SPCFLAG_DOTRACE = 0;
+       if (flag_SPCFLAG_DOTRACE && test_exception == 9) {
+               flag_SPCFLAG_DOTRACE = 0;
        }
 
        int sv = regs.s;
@@ -1243,7 +1243,7 @@ static void doexcstack2(void)
                        uae_u16 mode = (sv ? 4 : 0) | test_exception_3_fc;
                        mode |= test_exception_3_w ? 0 : 16;
                        Exception_build_68000_address_error_stack_frame(mode, opcode, test_exception_addr, regs.pc);
-                       SPCFLAG_DOTRACE = 0;
+                       flag_SPCFLAG_DOTRACE = 0;
                } else {
                        m68k_areg(regs, 7) -= 4;
                        x_put_long(m68k_areg(regs, 7), regs.pc);
@@ -1261,9 +1261,9 @@ static void doexcstack2(void)
                        ssw |= (test_exception_opcode & 0x80000) ? 0x0800 : 0x0000; // RM
                        regs.mmu_fault_addr = test_exception_addr;
                        Exception_build_stack_frame(regs.instruction_pc, regs.pc, ssw, test_exception, 0x08);
-                       SPCFLAG_DOTRACE = 0;
+                       flag_SPCFLAG_DOTRACE = 0;
                } else {
-                       Exception_build_stack_frame_common(regs.instruction_pc, regs.pc, 0, test_exception);
+                       Exception_build_stack_frame_common(regs.instruction_pc, regs.pc, 0, test_exception, test_exception);
                }
        } else if (cpu_lvl == 2 || cpu_lvl == 3) {
                if (test_exception == 3) {
@@ -1272,7 +1272,7 @@ static void doexcstack2(void)
                        regs.mmu_fault_addr = test_exception_addr;
                        Exception_build_stack_frame(regs.instruction_pc, regs.pc, ssw, test_exception, 0x0b);
                } else {
-                       Exception_build_stack_frame_common(regs.instruction_pc, regs.pc, 0, test_exception);
+                       Exception_build_stack_frame_common(regs.instruction_pc, regs.pc, 0, test_exception, test_exception);
                }
        } else {
                if (test_exception == 3) {
@@ -1280,7 +1280,7 @@ static void doexcstack2(void)
                                test_exception_addr &= ~1;
                        Exception_build_stack_frame(test_exception_addr, regs.pc, 0, test_exception, 0x02);
                } else {
-                       Exception_build_stack_frame_common(regs.instruction_pc, regs.pc, 0, test_exception);
+                       Exception_build_stack_frame_common(regs.instruction_pc, regs.pc, 0, test_exception, test_exception);
                }
        }
        exception_stack_frame_size = test_memory_end + EXTRA_RESERVED_SPACE - m68k_areg(regs, 7);
@@ -4329,8 +4329,8 @@ static void execute_ins(uaecptr endpc, uaecptr targetpc, struct instr *dp, bool
                printf("");
 
        // execute instruction
-       SPCFLAG_TRACE = 0;
-       SPCFLAG_DOTRACE = 0;
+       flag_SPCFLAG_TRACE = 0;
+       flag_SPCFLAG_DOTRACE = 0;
        trace_store_pc = 0xffffffff;
        mmufixup[0].reg = -1;
        mmufixup[1].reg = -1;
@@ -4413,7 +4413,7 @@ static void execute_ins(uaecptr endpc, uaecptr targetpc, struct instr *dp, bool
                        abort();
                }
 
-               if (SPCFLAG_TRACE) {
+               if (flag_SPCFLAG_TRACE) {
                        do_trace();
                }
 
@@ -4497,14 +4497,14 @@ static void execute_ins(uaecptr endpc, uaecptr targetpc, struct instr *dp, bool
                if (((regs.pc == endpc && feature_interrupts < 2) || (regs.pc == targetpc && feature_interrupts < 2)) && !cpu_stopped) {
                        // Trace is only added as an exception if there was no other exceptions
                        // Trace stacked with other exception is handled later
-                       if (SPCFLAG_DOTRACE && !test_exception && trace_store_pc == 0xffffffffff) {
+                       if (flag_SPCFLAG_DOTRACE && !test_exception && trace_store_pc == 0xffffffffff) {
                                Exception(9);
                                break;
                        }
                }
 
                if (feature_interrupts >= 1) {
-                       if (SPCFLAG_DOTRACE) {
+                       if (flag_SPCFLAG_DOTRACE) {
                                if (trace_store_pc != 0xffffffff) {
                                        wprintf(_T(" Full trace in interrupt mode!?\n"));
                                        abort();
@@ -4518,7 +4518,7 @@ static void execute_ins(uaecptr endpc, uaecptr targetpc, struct instr *dp, bool
                                }
                                trace_store_pc = regs.pc;
                                trace_store_sr = regs.sr;
-                               SPCFLAG_DOTRACE = 0;
+                               flag_SPCFLAG_DOTRACE = 0;
                                // pending interrupt always triggers during trace processing
                                regs.ipl[0] = regs.ipl_pin;
                        }
@@ -4547,7 +4547,7 @@ static void execute_ins(uaecptr endpc, uaecptr targetpc, struct instr *dp, bool
 
                if (!feature_loop_mode_jit && !feature_loop_mode_68010) {
                        // trace after NOP
-                       if (SPCFLAG_DOTRACE) {
+                       if (flag_SPCFLAG_DOTRACE) {
                                if (feature_interrupts == 3) {
                                        Exception(9);
                                        break;
@@ -4557,7 +4557,7 @@ static void execute_ins(uaecptr endpc, uaecptr targetpc, struct instr *dp, bool
                                if (trace_store_pc == 0xffffffff) {
                                        trace_store_pc = regs.pc;
                                        trace_store_sr = regs.sr;
-                                       SPCFLAG_DOTRACE = 0;
+                                       flag_SPCFLAG_DOTRACE = 0;
                                }
                        }
                        if (currprefs.cpu_model >= 68020) {
@@ -5484,6 +5484,9 @@ static void test_mnemo(const TCHAR *path, const TCHAR *mnemo, const TCHAR *ovrfi
 
                                                // create destination addressing mode
                                                if (dp->duse && fpuopsize < 0) {
+                                                       if (safe_memory_mode & 4) {
+                                                               target_ea[1] = target_ea[0];
+                                                       }
                                                        int o = create_ea(&opc, pc, dp->dmode, dp->dreg, dp, &isconstant_dst, 1, fpuopcode, opcodesize, &dstea, &dstregused, &dstfpuregused, &dsteaflags);
                                                        if (o < 0) {
                                                                memcpy(opcode_memory, oldcodebytes, sizeof(oldcodebytes));
@@ -6285,7 +6288,7 @@ static void test_mnemo(const TCHAR *path, const TCHAR *mnemo, const TCHAR *ovrfi
                                                                                skipped = 1;
                                                                        }
                                                                }
-                                                               if (SPCFLAG_DOTRACE || test_exception == 9) {
+                                                               if (flag_SPCFLAG_DOTRACE || test_exception == 9) {
                                                                        t_cnt++;
                                                                }
                                                        } else if (!skipped) {
@@ -6326,13 +6329,13 @@ static void test_mnemo(const TCHAR *path, const TCHAR *mnemo, const TCHAR *ovrfi
                                                        }
                                                        noaccesshistory--;
 
-                                                       if (SPCFLAG_DOTRACE && test_exception_extra) {
+                                                       if (flag_SPCFLAG_DOTRACE && test_exception_extra) {
                                                                wprintf(_T(" Trace and stored trace at the same time!\n"));
                                                                abort();
                                                        }
 
                                                        // did we have trace also active?
-                                                       if (SPCFLAG_DOTRACE) {
+                                                       if (flag_SPCFLAG_DOTRACE) {
                                                                test_exception_extra = 0;
                                                                if (regs.t1 || regs.t0) {
                                                                        if ((cpu_lvl < 4 && (test_exception == 5 || test_exception == 6 || test_exception == 7 || (test_exception >= 32 && test_exception <= 47)))
@@ -7134,7 +7137,7 @@ static int test(struct ini_data *ini, const TCHAR *sections, const TCHAR *testna
                if (_totupper(vs[0]) == 'W')
                        safe_memory_mode |= 2;
                if (_totupper(vs[0]) == 'P')
-                       safe_memory_mode |= 4;
+                       safe_memory_mode |= 1 | 2 | 4;
                xfree(vs);
        }
        if (safe_memory_start == 0xffffffff || safe_memory_end == 0xffffffff) {
@@ -7363,23 +7366,25 @@ static int test(struct ini_data *ini, const TCHAR *sections, const TCHAR *testna
 
        TCHAR *cc = NULL;
        if (ini_getstringx(ini, sections, _T("feature_condition_codes"), &cc)) {
-               feature_condition_codes = 0;
-               TCHAR *p = cc;
-               while (p && *p) {
-                       TCHAR *pp = _tcschr(p, ',');
-                       if (pp) {
-                               *pp++ = 0;
-                       }
-                       TCHAR cctext[256];
-                       _tcscpy(cctext, p);
-                       my_trim(cctext);
-                       for (int i = 0; ccnames[i]; i++) {
-                               if (!_tcsicmp(ccnames[i], cctext)) {
-                                       feature_condition_codes |= 1 << i;
-                                       break;
+               if (cc[0]) {
+                       feature_condition_codes = 0;
+                       TCHAR *p = cc;
+                       while (p && *p) {
+                               TCHAR *pp = _tcschr(p, ',');
+                               if (pp) {
+                                       *pp++ = 0;
+                               }
+                               TCHAR cctext[256];
+                               _tcscpy(cctext, p);
+                               my_trim(cctext);
+                               for (int i = 0; ccnames[i]; i++) {
+                                       if (!_tcsicmp(ccnames[i], cctext)) {
+                                               feature_condition_codes |= 1 << i;
+                                               break;
+                                       }
                                }
+                               p = pp;
                        }
-                       p = pp;
                }
                xfree(cc);
        }

diff --git a/cputest/cputestgen.ini b/cputest/cputestgen.ini
index a5b1034115b95533ea2dc9e9b625ea57ab9c2011..aefb841228748607f07d33e1afc234881d6e14a1 100644 (file)
--- a/cputest/cputestgen.ini
+++ b/cputest/cputestgen.ini
@@ -370,6 +370,20 @@ opcode_memory_start=0x87ffa0
 feature_undefined_ccr=1
 mode=all
 
+; branch/jump prefetch bus error (requires extra hardware)
+[test=BEBR]
+enabled=1
+cpu=68000-68010
+feature_safe_memory_start=0x880000
+feature_safe_memory_size=0x80000
+feature_safe_memory_mode=P
+feature_target_src_ea=0x87fffe,0x880000
+test_memory_start=0x860000
+test_memory_size=0x100000
+opcode_memory_start=0x87ffa0
+feature_undefined_ccr=1
+mode=dbcc,bcc,jmp,jsr,bsr,rts,rtr,rtd,rte
+
 ; source EA read bus error (requires extra hardware)
 [test=BESRC]
 enabled=0

diff --git a/cputest/main.c b/cputest/main.c
index b7c4f166f14d76738107de0bae5c40ae20260e5f..8dbbd990b56d29b502876ed9987555edfca2cf0f 100644 (file)
--- a/cputest/main.c
+++ b/cputest/main.c
@@ -813,7 +813,7 @@ static uae_u8 *load_file(const char *path, const char *file, uae_u8 *p, int *siz
                        exit(0);
                }
        } else {
-               if (prealloc_test_data_size < size) {
+               if (prealloc && prealloc_test_data_size < size) {
                        printf("Preallocated memory space is too small %d < %d\n", prealloc_test_data_size, size);
                        exit(0);
                }