Added memory browser, fixed documentation, M68000 exception explanations.

[virtualjaguar] / src / gui / mainwin.cpp

diff --git a/src/gui/mainwin.cpp b/src/gui/mainwin.cpp
index e7a6ba8c7d505d18177331f07de3b7263c6aea44..b9c07243955367481a916c417680fde52932010f 100644 (file)
--- a/src/gui/mainwin.cpp
+++ b/src/gui/mainwin.cpp
@@ -43,6 +43,7 @@
 #include "configdialog.h"
 #include "generaltab.h"
 #include "version.h"
+#include "debug/memorybrowser.h"
 
 #include "dac.h"
 #include "jaguar.h"
@@ -96,6 +97,7 @@ MainWin::MainWin(bool autoRun): running(true), powerButtonOn(false),
        aboutWin = new AboutWindow(this);
        helpWin = new HelpWindow(this);
        filePickWin = new FilePickerWindow(this);
+       memBrowseWin = new MemoryBrowserWindow(this);
 
     videoWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
     setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
@@ -193,10 +195,16 @@ MainWin::MainWin(bool autoRun): running(true), powerButtonOn(false),
        useCDAct->setCheckable(true);
        connect(useCDAct, SIGNAL(triggered()), this, SLOT(ToggleCDUsage()));
 
-       frameAdvanceAct = new QAction(QIcon(":/res/generic.png"), tr("&Frame Advance"), this);
+       frameAdvanceAct = new QAction(QIcon(":/res/frame-advance.png"), tr("&Frame Advance"), this);
        frameAdvanceAct->setShortcut(QKeySequence(tr("F7")));
        connect(frameAdvanceAct, SIGNAL(triggered()), this, SLOT(FrameAdvance()));
 
+       // Debugger Actions
+       memBrowseAct = new QAction(QIcon(":/res/generic.png"), tr("Memory Browser"), this);
+       memBrowseAct->setStatusTip(tr("Shows the Jaguar memory browser window"));
+//     memBrowseAct->setCheckable(true);
+       connect(memBrowseAct, SIGNAL(triggered()), this, SLOT(ShowMemoryBrowserWin()));
+
        // Misc. connections...
        connect(filePickWin, SIGNAL(RequestLoad(QString)), this, SLOT(LoadSoftware(QString)));
        connect(filePickWin, SIGNAL(FilePickerHiding()), this, SLOT(Unpause()));
@@ -212,6 +220,12 @@ MainWin::MainWin(bool autoRun): running(true), powerButtonOn(false),
        fileMenu->addAction(configAct);
        fileMenu->addAction(quitAppAct);
 
+       if (vjs.hardwareTypeAlpine)
+       {
+               debugMenu = menuBar()->addMenu(tr("&Debug"));
+               debugMenu->addAction(memBrowseAct);
+       }
+
        helpMenu = menuBar()->addMenu(tr("&Help"));
        helpMenu->addAction(helpAct);
        helpMenu->addAction(aboutAct);
@@ -231,6 +245,12 @@ MainWin::MainWin(bool autoRun): running(true), powerButtonOn(false),
        toolbar->addSeparator();
        toolbar->addAction(blurAct);
 
+       if (vjs.hardwareTypeAlpine)
+       {
+               debugbar = addToolBar(tr("&Debug"));
+               debugbar->addAction(memBrowseAct);
+       }
+
        //      Create status bar
        statusBar()->showMessage(tr("Ready"));
 
@@ -455,12 +475,14 @@ void MainWin::Configure(void)
        QString before = vjs.ROMPath;
        QString alpineBefore = vjs.alpineROMPath;
        QString absBefore = vjs.absROMPath;
-       bool audioBefore = vjs.audioEnabled;
+//     bool audioBefore = vjs.audioEnabled;
+       bool audioBefore = vjs.DSPEnabled;
        dlg.UpdateVJSettings();
        QString after = vjs.ROMPath;
        QString alpineAfter = vjs.alpineROMPath;
        QString absAfter = vjs.absROMPath;
-       bool audioAfter = vjs.audioEnabled;
+//     bool audioAfter = vjs.audioEnabled;
+       bool audioAfter = vjs.DSPEnabled;
 
        bool allowOld = allowUnknownSoftware;
        //ick.
@@ -497,7 +519,8 @@ void MainWin::Configure(void)
                }
        }
 
-       // If the "Enable audio" checkbox changed, then we have to re-init the DAC...
+       // If the "Enable DSP" checkbox changed, then we have to re-init the DAC,
+       // since it's running in the host audio IRQ...
        if (audioBefore != audioAfter)
        {
                DACDone();
@@ -756,6 +779,13 @@ void MainWin::FrameAdvance(void)
 }
 
 
+void MainWin::ShowMemoryBrowserWin(void)
+{
+       memBrowseWin->show();
+       memBrowseWin->RefreshContents();
+}
+
+
 void MainWin::ResizeMainWindow(void)
 {
        videoWidget->setFixedSize(zoomLevel * 320, zoomLevel * (vjs.hardwareTypeNTSC ? 240 : 256));