Fix tester branch PC check.

diff --git a/cputest/main.c b/cputest/main.c
index 4431325170c5a6560064dfcc24c74ffb1027b072..b88b721fe4fd979d0221a459f3210e29a8829a85 100644 (file)
--- a/cputest/main.c
+++ b/cputest/main.c
@@ -2276,7 +2276,7 @@ static uae_u8 *validate_test(uae_u8 *p, short ignore_errors, short ignore_sr, st
                        }
                        if (exc == 0 && cpuexc == 4) {
                                // successful complete generates exception 4 with matching PC
-                               if (lregs->pc + opcodeendsizeextra != tregs->pc && dooutput) {
+                               if (lregs->pc + opcodeendsizeextra != tregs->pc && lregs->pc != tregs->pc && dooutput) {
                                        sprintf(outbp, "PC: expected %08x but got %08x\n", lregs->pc, tregs->pc);
                                        outbp += strlen(outbp);
                                        if (tregs->pc == opcode_memory_addr) {

diff --git a/cputest/readme.txt b/cputest/readme.txt
index c3208b7dfedcc700f8d8ead8756dad1461561f15..b7b9a71f403db445175f66e10f820297bbc2f065 100644 (file)
--- a/cputest/readme.txt
+++ b/cputest/readme.txt
@@ -131,6 +131,10 @@ If mismatch is detected, opcode word(s), instruction disassembly, registers befo
 
 Change log:
 
+17.05.2020
+
+- Rewritten disassembler to use indirect and validated opword reads, now it is safe to use when testing bus errors.
+
 09.05.2020
 
 - dat format changed, now it is possible to continue running test if previous test reported error.