Linux build fixes

[clinton/Virtual-Jaguar-Rx.git] / src / gui / mainwin.cpp

diff --git a/src/gui/mainwin.cpp b/src/gui/mainwin.cpp
index ede2dc8..66897b4 100644 (file)
--- a/src/gui/mainwin.cpp
+++ b/src/gui/mainwin.cpp
@@ -24,6 +24,7 @@
 // JPM  11/18/2018  Fix crash with non-debugger mode\r
 // JPM  April/2019  Added ELF sections check, added a save memory dump\r
 // JPM   Aug./2019  Update texts descriptions, set cartridge view menu for debugger mode only, added a HW registers browser and source level tracing\r
+// JPM  Marc./2020  Added the step over for source level tracing\r
 //\r
 \r
 // FIXED:\r
@@ -92,7 +93,7 @@
 //#include "debugger/VideoWin.h"\r
 //#include "debugger/DasmWin.h"\r
 #include "debugger/SourcesWin.h"\r
-#include "debugger/m68KDasmWin.h"\r
+#include "debugger/m68kDasmWin.h"\r
 #include "debugger/GPUDasmWin.h"\r
 #include "debugger/DSPDasmWin.h"\r
 #include "debugger/memory1browser.h"\r
@@ -1634,7 +1635,10 @@ void MainWin::DebuggerTraceStepOver(void)
 {\r
        if (SourcesWin->isVisible() && SourcesWin->GetTraceStatus())\r
        {\r
-\r
+               while (!SourcesWin->CheckChangeLine())\r
+               {\r
+                       JaguarStepOver(0);\r
+               }\r
        }\r
        else\r
        {\r
@@ -2250,7 +2254,7 @@ void MainWin::WriteSettings(void)
        // Write settings from the Debugger mode\r
        settings.beginGroup("debugger");\r
        settings.setValue("DisplayHWLabels", vjs.displayHWlabels);\r
-       settings.setValue("NbrDisasmLines", vjs.nbrdisasmlines);\r
+       settings.setValue("NbrDisasmLines", (qulonglong) vjs.nbrdisasmlines);\r
        settings.setValue("DisasmOpcodes", vjs.disasmopcodes);\r
        settings.setValue("displayFullSourceFilename", vjs.displayFullSourceFilename);\r
        settings.setValue("ELFSectionsCheck", vjs.ELFSectionsCheck);\r