Fix potential freeze in debugger mode

Exception catch could cause a permanent loop in the M68K step over tracing

diff --git a/docs/vj_HistoryNotes.txt b/docs/vj_HistoryNotes.txt
index 4a2a32e..d6d7654 100644 (file)
--- a/docs/vj_HistoryNotes.txt
+++ b/docs/vj_HistoryNotes.txt
@@ -35,6 +35,7 @@ Release 5 (TBA)
 22) Breakpoint list window is now refreshed after a new breakpoint is set
 23) Handle number of M68K cycles used when tracing in debugger mode
 -- The cycles are displayed in the emulator status window
 22) Breakpoint list window is now refreshed after a new breakpoint is set
 23) Handle number of M68K cycles used when tracing in debugger mode
 -- The cycles are displayed in the emulator status window

+24) Improve the DWARF source line number reporting

 
 Release 4a (15th August 2019)
 -----------------------------
 
 Release 4a (15th August 2019)
 -----------------------------

diff --git a/src/jaguar.cpp b/src/jaguar.cpp
index f517cc4..4123d4b 100644 (file)
--- a/src/jaguar.cpp
+++ b/src/jaguar.cpp
@@ -2681,7 +2681,7 @@ int JaguarStepOver(int depth)
                        break;
                }
        }
                        break;
                }
        }

-       while (!exit);
+       while (!exit && !M68KDebugHaltStatus());

 
 #ifdef _MSC_VER
 #pragma message("Warning: !!! Need to verify the Jaguar Step Over function !!!")
 
 #ifdef _MSC_VER
 #pragma message("Warning: !!! Need to verify the Jaguar Step Over function !!!")