// 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
+// JPM Oct./2018 Added search paths in the settings, breakpoints feature\r
//\r
\r
// FIXED:\r
#include "debugger/GPUDasmWin.h"\r
#include "debugger/DSPDasmWin.h"\r
#include "debugger/memory1browser.h"\r
-//#include "debugger/brkWin.h"\r
+#include "debugger/BreakpointsWin.h"\r
+#include "debugger/NewFnctBreakpointWin.h"\r
#include "debugger/FilesrcListWin.h"\r
#include "debugger/exceptionvectortablebrowser.h"\r
#include "debugger/allwatchbrowser.h"\r
allWatchBrowseWin = new AllWatchBrowserWindow(this);\r
LocalBrowseWin = new LocalBrowserWindow(this);\r
heapallocatorBrowseWin = new HeapAllocatorBrowserWindow(this);\r
- //brkWin = new BrkWindow(this);\r
+ BreakpointsWin = new BreakpointsWindow(this);\r
+ NewFunctionBreakpointWin = new NewFnctBreakpointWindow(this);\r
exceptionvectortableBrowseWin = new ExceptionVectorTableBrowserWindow(this);\r
CallStackBrowseWin = new CallStackBrowserWindow(this);\r
\r
traceStepOverAct->setDisabled(true);\r
connect(traceStepOverAct, SIGNAL(triggered()), this, SLOT(DebuggerTraceStepOver()));\r
\r
- // Trace into trace\r
+ // Trace into tracing\r
traceStepIntoAct = new QAction(QIcon(":/res/debug-stepinto.png"), tr("&Step Into"), this);\r
traceStepIntoAct->setShortcut(QKeySequence(tr(vjs.KBContent[KBSTEPINTO].KBSettingValue)));\r
traceStepIntoAct->setShortcutContext(Qt::ApplicationShortcut);\r
traceStepIntoAct->setDisabled(true);\r
connect(traceStepIntoAct, SIGNAL(triggered()), this, SLOT(DebuggerTraceStepInto()));\r
\r
- //newBreakpointFunctionAct = new QAction(QIcon(""), tr("&Function Breakpoint"), this);\r
- //newBreakpointFunctionAct->setShortcut(QKeySequence(tr("Ctrl+B")));\r
- //connect(newBreakpointFunctionAct, SIGNAL(triggered()), this, SLOT(NewBreakpointFunction()));\r
+ // Function breakpoint\r
+ newFunctionBreakpointAct = new QAction(QIcon(""), tr("&Function Breakpoint"), this);\r
+ newFunctionBreakpointAct->setShortcut(QKeySequence(tr(vjs.KBContent[KBFUNCTIONBREAKPOINT].KBSettingValue)));\r
+ connect(newFunctionBreakpointAct, SIGNAL(triggered()), this, SLOT(ShowNewFunctionBreakpointWin()));\r
+ BreakpointsAct = new QAction(QIcon(":/res/debug-breakpoints.png"), tr("&Breakpoints"), this);\r
+ BreakpointsAct->setShortcut(QKeySequence(tr(vjs.KBContent[KBBREAKPOINTS].KBSettingValue)));\r
+ connect(BreakpointsAct, SIGNAL(triggered()), this, SLOT(ShowBreakpointsWin()));\r
+ deleteAllBreakpointsAct = new QAction(QIcon(":/res/debug-deleteallbreakpoints.png"), tr("&Delete All Breakpoints"), this);\r
+ deleteAllBreakpointsAct->setShortcut(QKeySequence(tr(vjs.KBContent[KBDELETEALLBREAKPOINTS].KBSettingValue)));\r
+ connect(deleteAllBreakpointsAct, SIGNAL(triggered()), this, SLOT(DeleteAllBreakpoints()));\r
+ disableAllBreakpointsAct = new QAction(QIcon(":/res/debug-disableallbreakpoints.png"), tr("&Disable All Breakpoints"), this);\r
+ connect(disableAllBreakpointsAct, SIGNAL(triggered()), this, SLOT(DisableAllBreakpoints()));\r
\r
//VideoOutputAct = new QAction(tr("Output Video"), this);\r
//VideoOutputAct->setStatusTip(tr("Shows the output video window"));\r
if (vjs.softTypeDebugger)\r
{\r
debugWindowsMenu = debugMenu->addMenu(tr("&Windows"));\r
+ debugWindowsMenu->addAction(BreakpointsAct);\r
debugWindowExceptionMenu = debugWindowsMenu->addMenu(tr("&Exception"));\r
debugWindowExceptionMenu->addAction(exceptionVectorTableBrowseAct);\r
debugWindowsMenu->addSeparator();\r
debugMenu->addSeparator();\r
debugMenu->addAction(traceStepIntoAct);\r
debugMenu->addAction(traceStepOverAct);\r
-#if 0\r
debugMenu->addSeparator();\r
debugNewBreakpointMenu = debugMenu->addMenu(tr("&New Breakpoint"));\r
- debugNewBreakpointMenu->addAction(newBreakpointFunctionAct);\r
-#endif\r
+ debugNewBreakpointMenu->addAction(newFunctionBreakpointAct);\r
+ debugMenu->addAction(deleteAllBreakpointsAct);\r
+ debugMenu->addAction(disableAllBreakpointsAct);\r
//debugMenu->addSeparator();\r
//debugMenu->addAction(DasmAct);\r
}\r
debuggerbar->addSeparator();\r
debuggerbar->addAction(traceStepIntoAct);\r
debuggerbar->addAction(traceStepOverAct);\r
+ debuggerbar->addSeparator();\r
+ debuggerbar->addAction(BreakpointsAct);\r
}\r
\r
if (vjs.hardwareTypeAlpine)\r
\r
WriteLog("GUI: Resetting Jaguar...\n");\r
JaguarReset();\r
+ DeleteAllBreakpoints();\r
DebuggerResetWindows();\r
DACPauseAudioThread(false);\r
}\r
}\r
\r
cpuBrowseWin->UnholdBPM();\r
+ BreakpointsWin->RefreshContents();\r
}\r
\r
// Pause/unpause any running/non-running threads...\r
\r
\r
//\r
-void MainWin::NewBreakpointFunction(void)\r
+void MainWin::ShowBreakpointsWin(void)\r
+{\r
+ BreakpointsWin->show();\r
+ BreakpointsWin->RefreshContents();\r
+}\r
+\r
+\r
+//\r
+void MainWin::DeleteAllBreakpoints(void)\r
+{\r
+ cpuBrowseWin->ResetBPM();\r
+ m68k_brk_reset();\r
+ ShowBreakpointsWin();\r
+}\r
+\r
+\r
+//\r
+void MainWin::DisableAllBreakpoints(void)\r
+{\r
+ cpuBrowseWin->DisableBPM();\r
+ m68k_brk_disable();\r
+ ShowBreakpointsWin();\r
+}\r
+\r
+\r
+//\r
+void MainWin::ShowNewFunctionBreakpointWin(void)\r
{\r
- //brkWin->show();\r
- //brkWin->RefreshContents();\r
+ NewFunctionBreakpointWin->show();\r
+ ShowBreakpointsWin();\r
}\r
\r
\r
}\r
\r
\r
-// Restart\r
+// Restart the Jaguar executable\r
void MainWin::DebuggerRestart(void)\r
{\r
#if 1\r
m68k_set_reg(M68K_REG_SP, vjs.DRAM_size);\r
#endif\r
m68k_set_reg(M68K_REG_A6, 0);\r
-\r
+ m68k_brk_hitcounts_reset();\r
+ bpmHitCounts = 0;\r
DebuggerResetWindows();\r
DebuggerRefreshWindows();\r
#ifdef _MSC_VER\r
size = settings.value("CallStackBrowseWinSize", QSize(400, 400)).toSize();\r
CallStackBrowseWin->resize(size);\r
\r
+ // Breakpoints UI information\r
+ pos = settings.value("BreakpointsWinPos", QPoint(200, 200)).toPoint();\r
+ BreakpointsWin->move(pos);\r
+ settings.value("BreakpointsWinIsVisible", false).toBool() ? ShowBreakpointsWin() : void();\r
+ size = settings.value("BreakpointsWinSize", QSize(400, 400)).toSize();\r
+ BreakpointsWin->resize(size);\r
+ // New function breakpoint UI information\r
+ pos = settings.value("NewFunctionBreakpointWinPos", QPoint(200, 200)).toPoint();\r
+ NewFunctionBreakpointWin->move(pos);\r
+ settings.value("NewFunctionBreakpointWinIsVisible", false).toBool() ? ShowNewFunctionBreakpointWin() : void();\r
+ size = settings.value("NewFunctionBreakpointWinSize", QSize(400, 400)).toSize();\r
+ NewFunctionBreakpointWin->resize(size);\r
+\r
// Memories browser UI information\r
for (i = 0; i < vjs.nbrmemory1browserwindow; i++)\r
{\r
settings.setValue("CallStackBrowseWinPos", CallStackBrowseWin->pos());\r
settings.setValue("CallStackBrowseWinIsVisible", CallStackBrowseWin->isVisible());\r
settings.setValue("CallStackBrowseWinSize", CallStackBrowseWin->size());\r
+ settings.setValue("BreakpointsWinPos", BreakpointsWin->pos());\r
+ settings.setValue("BreakpointsWinIsVisible", BreakpointsWin->isVisible());\r
+ settings.setValue("BreakpointsWinSize", BreakpointsWin->size());\r
+ settings.setValue("NewFunctionBreakpointWinPos", NewFunctionBreakpointWin->pos());\r
+ settings.setValue("NewFunctionBreakpointWinIsVisible", NewFunctionBreakpointWin->isVisible());\r
+ settings.setValue("NewFunctionBreakpointWinSize", NewFunctionBreakpointWin->size());\r
for (i = 0; i < vjs.nbrmemory1browserwindow; i++)\r
{\r
sprintf(mem1Name, "mem1BrowseWinPos[%i]", (unsigned int)i);\r
FilesrcListWin->Reset();\r
allWatchBrowseWin->Reset();\r
heapallocatorBrowseWin->Reset();\r
+ BreakpointsWin->Reset();\r
\r
//ResetAlpineWindows();\r
}\r
LocalBrowseWin->RefreshContents();\r
CallStackBrowseWin->RefreshContents();\r
heapallocatorBrowseWin->RefreshContents();\r
+ BreakpointsWin->RefreshContents();\r
for (i = 0; i < vjs.nbrmemory1browserwindow; i++)\r
{\r
mem1BrowseWin[i]->RefreshContents(i);\r
HCoop / clinton / Virtual-Jaguar-Rx.git / blobdiff