Visualize request to stall and stall in execution phase and exception sources.

Signed-off-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>

6 files changed, 171 insertions, 4 deletions

diff --git a/qtmips_gui/coreview.cpp b/qtmips_gui/coreview.cpp
index 63f9ea6..89644ec 100644
--- a/qtmips_gui/coreview.cpp
+++ b/qtmips_gui/coreview.cpp
@@ -59,6 +59,11 @@
         NEW(Value, val, X, Y, __VA_ARGS__); \
         connect(machine->core(), SIGNAL(SIG(std::uint32_t)), val, SLOT(value_update(std::uint32_t))); \
     } while(false)
+#define NEW_MULTI(VAR, X, Y, SIG, ...) do { \
+        NEW(MultiText, VAR, X, Y, __VA_ARGS__); \
+        connect(machine->core(), &machine::Core::SIG, \
+                VAR, &coreview::MultiText::multitext_update); \
+    } while(false)
 
 CoreViewScene::CoreViewScene(machine::QtMipsMachine *machine) : QGraphicsScene() {
     setSceneRect(0, 0, SC_WIDTH, SC_HEIGHT);
@@ -99,6 +104,15 @@ CoreViewScene::CoreViewScene(machine::QtMipsMachine *machine) : QGraphicsScene()
     NEW(Multiplexer, ex.mux_regdest, 480, 370, 2, true);
     // Memory
     NEW(Junction, mm.j_addr, 570, mem_data->connector_address()->y());
+    static QMap<std::uint32_t, QString> excause_map =
+        {{machine::EXCAUSE_NONE,     "NONE"},
+         {machine::EXCAUSE_BREAK,    "BERAK"},
+         {machine::EXCAUSE_SYSCALL,  "SYSCALL"},
+         {machine::EXCAUSE_HWBREAK,  "HWBREAK"},
+         {machine::EXCAUSE_TRAP,     "TRAP"},
+         {machine::EXCAUSE_OVERFLOW, "OVERFLOW"}};
+
+    NEW_MULTI(mm.multi_excause, 602, 447, memory_excause_value, excause_map);
     // WriteBack stage
     NEW(Multiplexer, wb.mem_or_reg, 690, 252, 2, true);
     NEW(Junction, wb.j_reg_write_val, 411, 510);
@@ -328,8 +342,10 @@ CoreViewScenePipelined::CoreViewScenePipelined(machine::QtMipsMachine *machine)
     if (machine->config().hazard_unit() != machine::MachineConfig::HU_NONE) {
         NEW(LogicBlock, hazard_unit, SC_WIDTH/2, SC_HEIGHT - 15, "Hazard Unit");
         hazard_unit->setSize(SC_WIDTH - 100, 12);
+        static QMap<std::uint32_t, QString> stall_map = {{0, "NORMAL"},{1, "STALL"}};
+        NEW_MULTI(hu.multi_stall, 480, 447, execute_stall_value, stall_map);
+        NEW_MULTI(hu.multi_stall, 250, SC_HEIGHT - 15, hu_stall_value, stall_map);
     }
-
     coreview::Connection *con;
     // Fetch stage
     struct coreview::Latch::ConnectorPair lp_ft_inst = latch_if_id->new_connector(mem_program->connector_instruction()->y() - latch_if_id->y());
diff --git a/qtmips_gui/coreview.h b/qtmips_gui/coreview.h
index 4852e25..0b39e80 100644
--- a/qtmips_gui/coreview.h
+++ b/qtmips_gui/coreview.h
@@ -54,6 +54,7 @@
 #include "coreview/logicblock.h"
 #include "coreview/and.h"
 #include "coreview/value.h"
+#include "coreview/multitext.h"
 
 class CoreViewScene : public QGraphicsScene {
     Q_OBJECT
@@ -100,6 +101,7 @@ protected:
     } ex;
     struct {
         coreview::Junction *j_addr;
+        coreview::MultiText *multi_excause;
     } mm;
     struct {
         coreview::Multiplexer *mem_or_reg;
@@ -109,6 +111,7 @@ protected:
         coreview::Multiplexer *mux_alu_reg_a;
         coreview::Multiplexer *mux_alu_reg_b;
         coreview::Junction *j_alu_out;
+        coreview::MultiText *multi_stall;
     } hu;
 
     coreview::Connection *new_connection(const coreview::Connector*, const coreview::Connector*);
diff --git a/qtmips_gui/coreview/multitext.cpp b/qtmips_gui/coreview/multitext.cpp
new file mode 100644
index 0000000..d28b5be
--- /dev/null
+++ b/qtmips_gui/coreview/multitext.cpp
@@ -0,0 +1,80 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*******************************************************************************
+ * QtMips - MIPS 32-bit Architecture Subset Simulator
+ *
+ * Implemented to support following courses:
+ *
+ *   B35APO - Computer Architectures
+ *   https://cw.fel.cvut.cz/wiki/courses/b35apo
+ *
+ *   B4M35PAP - Advanced Computer Architectures
+ *   https://cw.fel.cvut.cz/wiki/courses/b4m35pap/start
+ *
+ * Copyright (c) 2017-2019 Karel Koci<cynerd@email.cz>
+ * Copyright (c) 2019      Pavel Pisa <pisa@cmp.felk.cvut.cz>
+ *
+ * Faculty of Electrical Engineering (http://www.fel.cvut.cz)
+ * Czech Technical University        (http://www.cvut.cz/)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301, USA.
+ *
+ ******************************************************************************/
+
+#include "multitext.h"
+#include <QPainter>
+#include <QFont>
+
+using namespace coreview;
+
+//////////////////////
+#define WIDTH 100
+#define HEIGHT 14
+#define ROUND 5
+#define GAP 2
+#define PENW 1
+//////////////////////
+
+MultiText::MultiText(QMap<std::uint32_t, QString> value_map) :
+                 QGraphicsObject(nullptr), text(this) {
+    QFont f;
+    f.setPointSize(6);
+    text.setFont(f);
+
+    this->value_map = value_map;
+
+    multitext_update(0);
+}
+
+QRectF MultiText::boundingRect() const {
+    return QRectF(-WIDTH/2 - PENW/2, -PENW/2, WIDTH + PENW, HEIGHT + PENW);
+}
+
+void MultiText::paint(QPainter *painter, const QStyleOptionGraphicsItem *option __attribute__((unused)), QWidget *widget __attribute__((unused))) {
+    painter->setPen(QPen(QColor(240, 240, 240)));
+    painter->setBrush(QBrush(QColor(240, 240, 240)));
+    painter->drawRoundRect(-WIDTH/2, 0, WIDTH, HEIGHT, ROUND, ROUND);
+}
+
+void MultiText::multitext_update(std::uint32_t value) {
+
+    QRectF prev_box = boundingRect();
+    this->value = value;
+    QString str = value_map.value(value);
+    text.setText(str);
+    QRectF box = text.boundingRect();
+    text.setPos(-box.width()/2, GAP);
+    update(prev_box.united(boundingRect()));
+}
diff --git a/qtmips_gui/coreview/multitext.h b/qtmips_gui/coreview/multitext.h
new file mode 100644
index 0000000..9d1f0ab
--- /dev/null
+++ b/qtmips_gui/coreview/multitext.h
@@ -0,0 +1,65 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*******************************************************************************
+ * QtMips - MIPS 32-bit Architecture Subset Simulator
+ *
+ * Implemented to support following courses:
+ *
+ *   B35APO - Computer Architectures
+ *   https://cw.fel.cvut.cz/wiki/courses/b35apo
+ *
+ *   B4M35PAP - Advanced Computer Architectures
+ *   https://cw.fel.cvut.cz/wiki/courses/b4m35pap/start
+ *
+ * Copyright (c) 2017-2019 Karel Koci<cynerd@email.cz>
+ * Copyright (c) 2019      Pavel Pisa <pisa@cmp.felk.cvut.cz>
+ *
+ * Faculty of Electrical Engineering (http://www.fel.cvut.cz)
+ * Czech Technical University        (http://www.cvut.cz/)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301, USA.
+ *
+ ******************************************************************************/
+
+#ifndef MULTITEXT_H
+#define MULTITEXT_H
+
+#include <QGraphicsObject>
+#include <QGraphicsSimpleTextItem>
+#include <QMap>
+#include <QString>
+
+namespace coreview {
+
+class MultiText : public QGraphicsObject {
+    Q_OBJECT
+public:
+    MultiText(QMap<std::uint32_t, QString> value_map);
+
+    QRectF boundingRect() const;
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
+
+public slots:
+    void multitext_update(std::uint32_t value);
+
+private:
+    QGraphicsSimpleTextItem text;
+    std::uint32_t value;
+    QMap<std::uint32_t, QString> value_map;
+};
+
+}
+
+#endif // MULTITEXT_H
diff --git a/qtmips_gui/qtmips_gui.pro b/qtmips_gui/qtmips_gui.pro
index 02511df..e9c0caf 100644
--- a/qtmips_gui/qtmips_gui.pro
+++ b/qtmips_gui/qtmips_gui.pro
@@ -55,7 +55,8 @@ SOURCES += \
     aboutdialog.cpp \
     peripheralsdock.cpp \
     terminaldock.cpp \
-    peripheralsview.cpp
+    peripheralsview.cpp \
+    coreview/multitext.cpp
 
 HEADERS += \
         mainwindow.h \
@@ -90,7 +91,8 @@ HEADERS += \
     aboutdialog.h \
     peripheralsdock.h \
     terminaldock.h \
-    peripheralsview.h
+    peripheralsview.h \
+    coreview/multitext.h
 
 FORMS += \
         NewDialog.ui \
diff --git a/qtmips_machine/core.cpp b/qtmips_machine/core.cpp
index 1b030d6..e6f0971 100644
--- a/qtmips_machine/core.cpp
+++ b/qtmips_machine/core.cpp
@@ -734,11 +734,11 @@ void CorePipelined::do_step(bool skip_break) {
     printf("PC 0x%08lx\n", (unsigned long)dt_f.inst_addr);
 #endif
 
-    dt_d.stall = stall;
     emit hu_stall_value(stall);
 
     // Now process program counter (loop connections from decode stage)
     if (!stall) {
+        dt_d.stall = false;
         dt_f = fetch(skip_break);
         if (handle_pc(dt_d)) {
             dt_f.in_delay_slot = true;
@@ -753,6 +753,7 @@ void CorePipelined::do_step(bool skip_break) {
         fetch(skip_break);
         // clear decode latch (insert nope to execute stage)
         dtDecodeInit(dt_d);
+        dt_d.stall = true;
         // emit instruction_decoded(dt_d.inst, dt_d.inst_addr, dt_d.excause);
     }
 }