aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--qtmips_gui/MainWindow.ui12
-rw-r--r--qtmips_gui/mainwindow.cpp52
-rw-r--r--qtmips_gui/mainwindow.h2
3 files changed, 51 insertions, 15 deletions
diff --git a/qtmips_gui/MainWindow.ui b/qtmips_gui/MainWindow.ui
index 13d02fc..9e00c9a 100644
--- a/qtmips_gui/MainWindow.ui
+++ b/qtmips_gui/MainWindow.ui
@@ -77,6 +77,7 @@
<addaction name="actionTerminal"/>
<addaction name="actionLcdDisplay"/>
<addaction name="actionCop0State"/>
+ <addaction name="actionCore_View_show"/>
</widget>
<widget class="QMenu" name="menuMachine">
<property name="title">
@@ -410,6 +411,17 @@
<string>Show Symbol</string>
</property>
</action>
+ <action name="actionCore_View_show">
+ <property name="checkable">
+ <bool>true</bool>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ <property name="text">
+ <string>Core View</string>
+ </property>
+ </action>
</widget>
<layoutdefault spacing="6" margin="11"/>
<resources>
diff --git a/qtmips_gui/mainwindow.cpp b/qtmips_gui/mainwindow.cpp
index 4b2b7fd..597b286 100644
--- a/qtmips_gui/mainwindow.cpp
+++ b/qtmips_gui/mainwindow.cpp
@@ -48,6 +48,7 @@
MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) {
machine = nullptr;
corescene = nullptr;
+ coreview_shown = true;
settings = new QSettings("CTU", "QtMips");
ui = new Ui::MainWindow();
@@ -104,6 +105,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) {
connect(ui->actionTerminal, SIGNAL(triggered(bool)), this, SLOT(show_terminal()));
connect(ui->actionLcdDisplay, SIGNAL(triggered(bool)), this, SLOT(show_lcd_display()));
connect(ui->actionCop0State, SIGNAL(triggered(bool)), this, SLOT(show_cop0dock()));
+ connect(ui->actionCore_View_show, SIGNAL(triggered(bool)), this, SLOT(show_hide_coreview(bool)));
connect(ui->actionAbout, SIGNAL(triggered(bool)), this, SLOT(about_qtmips()));
connect(ui->actionAboutQt, SIGNAL(triggered(bool)), this, SLOT(about_qt()));
connect(ui->ips1, SIGNAL(toggled(bool)), this, SLOT(set_speed()));
@@ -144,6 +146,37 @@ void MainWindow::start() {
ndialog->show();
}
+void MainWindow::show_hide_coreview(bool show) {
+ coreview_shown = show;
+ if (!show && (corescene == nullptr))
+ return;
+ if (((machine == nullptr) || !show) && (corescene != nullptr)) {
+ delete corescene;
+ corescene = nullptr;
+ if (coreview != nullptr)
+ coreview->setScene(corescene);
+ return;
+ }
+ if (show && (corescene != nullptr))
+ return;
+
+ if (machine->config().pipelined()) {
+ corescene = new CoreViewScenePipelined(machine);
+ } else {
+ corescene = new CoreViewSceneSimple(machine);
+ }
+ // Connect scene signals to actions
+ connect(corescene, SIGNAL(request_registers()), this, SLOT(show_registers()));
+ connect(corescene, SIGNAL(request_program_memory()), this, SLOT(show_program()));
+ connect(corescene, SIGNAL(request_data_memory()), this, SLOT(show_memory()));
+ connect(corescene, SIGNAL(request_jump_to_program_counter(std::uint32_t)), program, SIGNAL(jump_to_pc(std::uint32_t)));
+ connect(corescene, SIGNAL(request_cache_program()), this, SLOT(show_cache_program()));
+ connect(corescene, SIGNAL(request_cache_data()), this, SLOT(show_cache_data()));
+ connect(corescene, SIGNAL(request_peripherals()), this, SLOT(show_peripherals()));
+ connect(corescene, SIGNAL(request_terminal()), this, SLOT(show_terminal()));
+ coreview->setScene(corescene);
+}
+
void MainWindow::create_core(const machine::MachineConfig &config, bool load_executable) {
// Create machine
machine::QtMipsMachine *new_machine = new machine::QtMipsMachine(&config, true, load_executable);
@@ -160,12 +193,8 @@ void MainWindow::create_core(const machine::MachineConfig &config, bool load_exe
// Create machine view
if (corescene != nullptr)
delete corescene;
- if (config.pipelined()) {
- corescene = new CoreViewScenePipelined(machine);
- } else {
- corescene = new CoreViewSceneSimple(machine);
- }
- coreview->setScene(corescene);
+ corescene = nullptr;
+ show_hide_coreview(coreview_shown);
set_speed(); // Update machine speed to current settings
@@ -194,15 +223,6 @@ void MainWindow::create_core(const machine::MachineConfig &config, bool load_exe
connect(machine, SIGNAL(status_change(machine::QtMipsMachine::Status)), this, SLOT(machine_status(machine::QtMipsMachine::Status)));
connect(machine, SIGNAL(program_exit()), this, SLOT(machine_exit()));
connect(machine, SIGNAL(program_trap(machine::QtMipsException&)), this, SLOT(machine_trap(machine::QtMipsException&)));
- // Connect scene signals to actions
- connect(corescene, SIGNAL(request_registers()), this, SLOT(show_registers()));
- connect(corescene, SIGNAL(request_program_memory()), this, SLOT(show_program()));
- connect(corescene, SIGNAL(request_data_memory()), this, SLOT(show_memory()));
- connect(corescene, SIGNAL(request_jump_to_program_counter(std::uint32_t)), program, SIGNAL(jump_to_pc(std::uint32_t)));
- connect(corescene, SIGNAL(request_cache_program()), this, SLOT(show_cache_program()));
- connect(corescene, SIGNAL(request_cache_data()), this, SLOT(show_cache_data()));
- connect(corescene, SIGNAL(request_peripherals()), this, SLOT(show_peripherals()));
- connect(corescene, SIGNAL(request_terminal()), this, SLOT(show_terminal()));
// Connect signal from break to machine pause
connect(machine->core(), SIGNAL(stop_on_exception_reached()), machine, SLOT(pause()));
@@ -353,6 +373,8 @@ void MainWindow::closeEvent(QCloseEvent *event __attribute__((unused))) {
}
void MainWindow::show_dockwidget(QDockWidget *dw, Qt::DockWidgetArea area) {
+ if (dw == nullptr)
+ return;
if (dw->isHidden()) {
dw->show();
addDockWidget(area, dw);
diff --git a/qtmips_gui/mainwindow.h b/qtmips_gui/mainwindow.h
index 788c118..0762e8b 100644
--- a/qtmips_gui/mainwindow.h
+++ b/qtmips_gui/mainwindow.h
@@ -79,6 +79,7 @@ public slots:
void show_terminal();
void show_lcd_display();
void show_cop0dock();
+ void show_hide_coreview(bool show);
void show_symbol_dialog();
// Actions - help menu
void about_qtmips();
@@ -109,6 +110,7 @@ private:
TerminalDock *terminal;
LcdDisplayDock *lcd_display;
Cop0Dock *cop0dock;
+ bool coreview_shown;
QActionGroup *speed_group;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 10:02:50 +0000