Skip test if (pefetch) bus error was not generated by instruction under test.

diff --git a/cputest.cpp b/cputest.cpp
index 6a583432be6950c4dcca0ce2db622db64201bde2..81d1b349eb180c030f1e02b694970b1fd2745a03 100644 (file)
--- a/cputest.cpp
+++ b/cputest.cpp
@@ -4101,6 +4101,13 @@ static void test_mnemo(const TCHAR *path, const TCHAR *mnemo, const TCHAR *ovrfi
                                                                skipped = 1;
                                                        }
 
+                                                       // if testing bus errors: skip test if instruction under test didn't generate it
+                                                       // (it could have been following nop/illegal used for aligning instruction before
+                                                       // bus error boundary)
+                                                       if (hardware_bus_error && safe_memory_mode && regs.instruction_pc != startpc) {
+                                                               skipped = 1;
+                                                       }
+
                                                        // skip if feature_target_opcode_offset mode and non-prefetch bus error
                                                        if (target_opcode_address != 0xffffffff && (hardware_bus_error & 3)) {
                                                                skipped = 1;