aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarel Kočí <cynerd@email.cz>2018-01-15 13:07:00 +0100
committerKarel Kočí <cynerd@email.cz>2018-01-15 13:08:03 +0100
commit2144cf7fdb4ad656be21af4fb92f0b87d27e6a38 (patch)
tree2bd274f09dd2b246e6235c56085e152a458c6e50
parent9a3b0dccb3dcb958b6a5c0cd72e8684887b4c4bf (diff)
downloadqtmips-2144cf7fdb4ad656be21af4fb92f0b87d27e6a38.tar.gz
qtmips-2144cf7fdb4ad656be21af4fb92f0b87d27e6a38.tar.bz2
qtmips-2144cf7fdb4ad656be21af4fb92f0b87d27e6a38.zip
Drop current cache docks
This was just place holder and in future this will be implemented the same way as for example registersdock is.
-rw-r--r--qtmips_gui/CacheContent.ui30
-rw-r--r--qtmips_gui/CacheStatistics.ui20
-rw-r--r--qtmips_gui/cachecontent.cpp10
-rw-r--r--qtmips_gui/cachecontent.h16
-rw-r--r--qtmips_gui/cachestatistics.cpp10
-rw-r--r--qtmips_gui/cachestatistics.h18
-rw-r--r--qtmips_gui/mainwindow.cpp10
-rw-r--r--qtmips_gui/mainwindow.h8
-rw-r--r--qtmips_gui/qtmips_gui.pro8
9 files changed, 2 insertions, 128 deletions
diff --git a/qtmips_gui/CacheContent.ui b/qtmips_gui/CacheContent.ui
deleted file mode 100644
index 372dee1..0000000
--- a/qtmips_gui/CacheContent.ui
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>CacheContent</class>
- <widget class="QDockWidget" name="CacheContent">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>400</width>
- <height>300</height>
- </rect>
- </property>
- <property name="windowTitle">
- <string>Cache content</string>
- </property>
- <widget class="QWidget" name="dockWidgetContents">
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
- <widget class="QLabel" name="label">
- <property name="text">
- <string>TODO</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/qtmips_gui/CacheStatistics.ui b/qtmips_gui/CacheStatistics.ui
deleted file mode 100644
index 5bb8b72..0000000
--- a/qtmips_gui/CacheStatistics.ui
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>CacheStatistics</class>
- <widget class="QDockWidget" name="CacheStatistics">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>400</width>
- <height>300</height>
- </rect>
- </property>
- <property name="windowTitle">
- <string>Cache statistics</string>
- </property>
- <widget class="QWidget" name="dockWidgetContents"/>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/qtmips_gui/cachecontent.cpp b/qtmips_gui/cachecontent.cpp
deleted file mode 100644
index 1dd4693..0000000
--- a/qtmips_gui/cachecontent.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "cachecontent.h"
-
-CacheContentDock::CacheContentDock(QWidget *parent) : QDockWidget(parent) {
- ui = new Ui::CacheContent();
- ui->setupUi(this);
-}
-
-CacheContentDock::~CacheContentDock() {
- delete ui;
-}
diff --git a/qtmips_gui/cachecontent.h b/qtmips_gui/cachecontent.h
deleted file mode 100644
index 3b028b5..0000000
--- a/qtmips_gui/cachecontent.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef CACHECONTENT_H
-#define CACHECONTENT_H
-
-#include <QDockWidget>
-#include "ui_CacheContent.h"
-
-class CacheContentDock : public QDockWidget {
-public:
- CacheContentDock(QWidget *parent);
- ~CacheContentDock();
-
-private:
- Ui::CacheContent *ui;
-};
-
-#endif // CACHECONTENT_H
diff --git a/qtmips_gui/cachestatistics.cpp b/qtmips_gui/cachestatistics.cpp
deleted file mode 100644
index dd78a8c..0000000
--- a/qtmips_gui/cachestatistics.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "cachestatistics.h"
-
-CacheStatisticsDock::CacheStatisticsDock(QWidget *parent) : QDockWidget(parent) {
- ui = new Ui::CacheStatistics();
- ui->setupUi(this);
-}
-
-CacheStatisticsDock::~CacheStatisticsDock() {
- delete ui;
-}
diff --git a/qtmips_gui/cachestatistics.h b/qtmips_gui/cachestatistics.h
deleted file mode 100644
index a92d125..0000000
--- a/qtmips_gui/cachestatistics.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef CACHESTATISTICS_H
-#define CACHESTATISTICS_H
-
-#include <QDockWidget>
-#include "ui_CacheStatistics.h"
-
-class CacheStatisticsDock : public QDockWidget {
- Q_OBJECT
-public:
- CacheStatisticsDock(QWidget *parent);
- ~CacheStatisticsDock();
-
-private:
- Ui::CacheStatistics *ui;
-
-};
-
-#endif // CACHESTATISTICS_H
diff --git a/qtmips_gui/mainwindow.cpp b/qtmips_gui/mainwindow.cpp
index 20cd1d9..c064509 100644
--- a/qtmips_gui/mainwindow.cpp
+++ b/qtmips_gui/mainwindow.cpp
@@ -20,10 +20,6 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) {
program->hide();
memory = new MemoryDock(this);
memory->hide();
- cache_content = new CacheContentDock(this);
- cache_content->hide();
- cache_statictics = new CacheStatisticsDock(this);
- cache_statictics->hide();
// Execution speed actions
speed_group = new QActionGroup(this);
@@ -40,8 +36,6 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) {
connect(ui->actionRegisters, SIGNAL(triggered(bool)), this, SLOT(show_registers()));
connect(ui->actionProgram_memory, SIGNAL(triggered(bool)), this, SLOT(show_program()));
connect(ui->actionMemory, SIGNAL(triggered(bool)), this, SLOT(show_memory()));
- connect(ui->actionCache, SIGNAL(triggered(bool)), this, SLOT(show_cache_content()));
- connect(ui->actionCache_statistics, SIGNAL(triggered(bool)), this, SLOT(show_cache_statictics()));
connect(ui->ips1, SIGNAL(toggled(bool)), this, SLOT(set_speed()));
connect(ui->ips5, SIGNAL(toggled(bool)), this, SLOT(set_speed()));
connect(ui->ips10, SIGNAL(toggled(bool)), this, SLOT(set_speed()));
@@ -60,8 +54,6 @@ MainWindow::~MainWindow() {
if (coreview != nullptr)
delete coreview;
delete ndialog;
- delete cache_content;
- delete cache_statictics;
delete registers;
delete program;
delete memory;
@@ -145,8 +137,6 @@ void MainWindow::machine_reload() {
SHOW_HANDLER(registers)
SHOW_HANDLER(program)
SHOW_HANDLER(memory)
-SHOW_HANDLER(cache_content)
-SHOW_HANDLER(cache_statictics)
#undef SHOW_HANDLER
void MainWindow::set_speed() {
diff --git a/qtmips_gui/mainwindow.h b/qtmips_gui/mainwindow.h
index 1389f21..999c966 100644
--- a/qtmips_gui/mainwindow.h
+++ b/qtmips_gui/mainwindow.h
@@ -6,8 +6,6 @@
#include "ui_MainWindow.h"
#include "newdialog.h"
#include "coreview.h"
-#include "cachecontent.h"
-#include "cachestatistics.h"
#include "registersdock.h"
#include "programdock.h"
#include "memorydock.h"
@@ -34,8 +32,6 @@ public slots:
void show_registers();
void show_program();
void show_memory();
- void show_cache_content();
- void show_cache_statictics();
// Actions - execution speed
void set_speed();
// Machine signals
@@ -57,9 +53,7 @@ private:
RegistersDock *registers;
ProgramDock *program;
MemoryDock *memory;
- // TODO implement cahce docks
- CacheContentDock *cache_content;
- CacheStatisticsDock *cache_statictics;
+ // TODO implement cache docks
QActionGroup *speed_group;
diff --git a/qtmips_gui/qtmips_gui.pro b/qtmips_gui/qtmips_gui.pro
index 719a7b9..5283ced 100644
--- a/qtmips_gui/qtmips_gui.pro
+++ b/qtmips_gui/qtmips_gui.pro
@@ -21,8 +21,6 @@ SOURCES += \
programdock.cpp \
memorydock.cpp \
memoryview.cpp \
- cachestatistics.cpp \
- cachecontent.cpp \
coreview/programcounter.cpp \
coreview/multiplexer.cpp \
coreview/connection.cpp \
@@ -43,8 +41,6 @@ HEADERS += \
programdock.h \
memorydock.h \
memoryview.h \
- cachestatistics.h \
- cachecontent.h \
coreview/programcounter.h \
coreview/multiplexer.h \
coreview/connection.h \
@@ -59,9 +55,7 @@ HEADERS += \
FORMS += \
NewDialog.ui \
- MainWindow.ui \
- CacheContent.ui \
- CacheStatistics.ui
+ MainWindow.ui
RESOURCES += \
icons.qrc