// JPM 11/04/2017 Added the local window\r
// JPM 08/31/2018 Added the call stack window\r
// JPM Sept./2018 Added the new Models and BIOS handler, a screenshot feature and source code files browsing\r
+// JPM 10/10/2018 Added search paths in the settings\r
//\r
\r
// FIXED:\r
#include "joystick.h"\r
#include "m68000/m68kinterface.h"\r
\r
+#include "debugger/DBGManager.h"\r
//#include "debugger/VideoWin.h"\r
//#include "debugger/DasmWin.h"\r
#include "debugger/m68KDasmWin.h"\r
// Otherwise, run the Jaguar simulation\r
HandleGamepads();\r
JaguarExecuteNew();\r
- if (!vjs.softTypeDebugger)\r
+ //if (!vjs.softTypeDebugger)\r
videoWidget->HandleMouseHiding();\r
\r
static uint32_t refresh = 0;\r
if (!powerButtonOn)\r
{\r
// Restore the mouse pointer, if hidden:\r
- if (!vjs.softTypeDebugger)\r
+ //if (!vjs.softTypeDebugger)\r
{\r
videoWidget->CheckAndRestoreMouseCursor();\r
}\r
}\r
else\r
{\r
- // Prevent the Alpine mode to crash in case of software without a start address\r
- if (vjs.hardwareTypeAlpine && !jaguarRunAddress)\r
+ // Prevent the launch in case of software without a start address and without BIOS presence\r
+ if (!vjs.useJaguarBIOS && !jaguarRunAddress)\r
{\r
ToggleRunState();\r
}\r
// Read settings from the Debugger mode\r
settings.beginGroup("debugger");\r
strcpy(vjs.debuggerROMPath, settings.value("DefaultROM", "").toString().toUtf8().data());\r
+ strcpy(vjs.sourcefilesearchPaths, settings.value("SourceFileSearchPaths", "").toString().toUtf8().data());\r
vjs.nbrdisasmlines = settings.value("NbrDisasmLines", 32).toUInt();\r
vjs.disasmopcodes = settings.value("DisasmOpcodes", true).toBool();\r
vjs.displayHWlabels = settings.value("DisplayHWLabels", true).toBool();\r
\r
// Write important settings to the log file\r
WriteLog("MainWin: Paths\n");\r
- WriteLog(" EEPROMPath = \"%s\"\n", vjs.EEPROMPath);\r
- WriteLog(" ROMPath = \"%s\"\n", vjs.ROMPath);\r
- WriteLog(" AlpineROMPath = \"%s\"\n", vjs.alpineROMPath);\r
- WriteLog("DebuggerROMPath = \"%s\"\n", vjs.debuggerROMPath);\r
- WriteLog(" absROMPath = \"%s\"\n", vjs.absROMPath);\r
- WriteLog("ScreenshotsPath = \"%s\"\n", vjs.screenshotPath);\r
- WriteLog(" Pipelined DSP = %s\n", (vjs.usePipelinedDSP ? "ON" : "off"));\r
+ WriteLog(" EEPROMPath = \"%s\"\n", vjs.EEPROMPath);\r
+ WriteLog(" ROMPath = \"%s\"\n", vjs.ROMPath);\r
+ WriteLog(" AlpineROMPath = \"%s\"\n", vjs.alpineROMPath);\r
+ WriteLog(" DebuggerROMPath = \"%s\"\n", vjs.debuggerROMPath);\r
+ WriteLog(" absROMPath = \"%s\"\n", vjs.absROMPath);\r
+ WriteLog(" ScreenshotsPath = \"%s\"\n", vjs.screenshotPath);\r
+ WriteLog("SourceFileSearchPaths = \"%s\"\n", vjs.sourcefilesearchPaths);\r
+ WriteLog("MainWin: Misc.\n");\r
+ WriteLog(" Pipelined DSP = %s\n", (vjs.usePipelinedDSP ? "ON" : "off"));\r
\r
#if 0\r
// Keybindings in order of U, D, L, R, C, B, A, Op, Pa, 0-9, #, *\r
WriteLog("Read setting = Done\n");\r
\r
ReadProfiles(&settings);\r
+ DBGManager_SourceFileSearchPathsSet(vjs.sourcefilesearchPaths);\r
}\r
\r
\r
settings.setValue("displayFullSourceFilename", vjs.displayFullSourceFilename);\r
settings.setValue("NbrMemory1BrowserWindow", (unsigned int)vjs.nbrmemory1browserwindow);\r
settings.setValue("DefaultROM", vjs.debuggerROMPath);\r
+ settings.setValue("SourceFileSearchPaths", vjs.sourcefilesearchPaths);\r
settings.endGroup();\r
\r
// Write settings from the Keybindings\r
#endif\r
\r
WriteProfiles(&settings);\r
+ DBGManager_SourceFileSearchPathsSet(vjs.sourcefilesearchPaths);\r
}\r
\r
\r