From 9eee429aa44d05430ca0b4fa418210667bcf4032 Mon Sep 17 00:00:00 2001 From: Ryan Cohen Date: Thu, 21 Sep 2023 11:37:40 -0400 Subject: [PATCH 1/2] Add static demo of a sliderules tab --- src/mainwindow.cpp | 8 +++ src/mainwindow.h | 1 + src/sliderulestab.cpp | 149 ++++++++++++++++++++++++++++++++++++++++ src/sliderulestab.h | 22 ++++++ src/sliderulestab.ui | 154 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 334 insertions(+) create mode 100644 src/sliderulestab.cpp create mode 100644 src/sliderulestab.h create mode 100644 src/sliderulestab.ui diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index fdc7297a5..930871178 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -11,6 +11,7 @@ #include "registerwidget.h" #include "ripessettings.h" #include "savedialog.h" +#include "sliderulestab.h" #include "settingsdialog.h" #include "syscall/syscallviewer.h" #include "syscall/systemio.h" @@ -90,12 +91,19 @@ MainWindow::MainWindow(QWidget *parent) m_stackedTabs->insertWidget(IOTabID, IOTab); m_tabWidgets[IOTabID] = {IOTab, IOToolbar}; + auto *sliderulesToolbar = addToolBar("Sliderules"); + sliderulesToolbar->setVisible(false); + auto *sliderulesTab = new SliderulesTab(sliderulesToolbar, this); + m_stackedTabs->insertWidget(SliderulesTabID, sliderulesTab); + m_tabWidgets[SliderulesTabID] = {sliderulesTab, sliderulesToolbar}; + // Setup tab bar m_ui->tabbar->addFancyTab(QIcon(":/icons/binary-code.svg"), "Editor"); m_ui->tabbar->addFancyTab(QIcon(":/icons/cpu.svg"), "Processor"); m_ui->tabbar->addFancyTab(QIcon(":/icons/server.svg"), "Cache"); m_ui->tabbar->addFancyTab(QIcon(":/icons/ram-memory.svg"), "Memory"); m_ui->tabbar->addFancyTab(QIcon(":/icons/led.svg"), "I/O"); + m_ui->tabbar->addFancyTab(QIcon(":/icons/notepad.svg"), "Sliderules"); connect(m_ui->tabbar, &FancyTabBar::activeIndexChanged, this, &MainWindow::tabChanged); connect(m_ui->tabbar, &FancyTabBar::activeIndexChanged, m_stackedTabs, diff --git a/src/mainwindow.h b/src/mainwindow.h index 044d9d7cf..4deab082e 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -37,6 +37,7 @@ class MainWindow : public QMainWindow { CacheTabID, MemoryTabID, IOTabID, + SliderulesTabID, NTabsID }; diff --git a/src/sliderulestab.cpp b/src/sliderulestab.cpp new file mode 100644 index 000000000..69fa6d6f2 --- /dev/null +++ b/src/sliderulestab.cpp @@ -0,0 +1,149 @@ +#include "sliderulestab.h" +#include "ui_sliderulestab.h" + +namespace Ripes { + +QStringList HEADER_LABELS = { "Instr", "31", "30", "29", "28", "27", "26", + "25", "24", "23", "22", "21", "20", "19", "18", + "17", "16", "15", "14", "13", "12", "11", "10", + "9", "8", "7", "6", "5", "4", "3", "2", "1", "0"}; + +SliderulesTab::SliderulesTab(QToolBar *toolbar, QWidget *parent) + : RipesTab(toolbar, parent), m_ui(new Ui::SliderulesTab) { + m_ui->setupUi(this); + + m_ui->tableWidget->setColumnWidth(0, 100); + m_ui->tableWidget->setHorizontalHeaderLabels(HEADER_LABELS); + + auto *cellTemplate = new QTableWidgetItem(""); + cellTemplate->setTextAlignment(Qt::AlignCenter); + auto *cellTemplateBold = cellTemplate->clone(); + auto font = cellTemplateBold->font(); + font.setBold(true); + cellTemplateBold->setFont(font); + auto *redItem = cellTemplateBold->clone(); + redItem->setBackground(QBrush(QColor::fromRgb(224, 102, 102))); + auto *greenItem = cellTemplateBold->clone(); + greenItem->setBackground(QBrush(QColor::fromRgb(147, 196, 125))); + auto *grayItem = cellTemplate->clone(); + grayItem->setBackground(QBrush(QColor::fromRgb(239, 239, 239))); + + auto *lightRedItem = cellTemplateBold->clone(); + lightRedItem->setBackground(QBrush(QColor::fromRgb(234, 153, 153))); + auto *brightRedItem = cellTemplateBold->clone(); + brightRedItem->setBackground(QBrush(QColor::fromRgb(244, 204, 204))); + auto *lightGreenItem = cellTemplateBold->clone(); + lightGreenItem->setBackground(QBrush(QColor::fromRgb(182, 215, 168))); + auto *brightGreenItem = cellTemplateBold->clone(); + brightGreenItem->setBackground(QBrush(QColor::fromRgb(217, 234, 211))); + + auto *zeroLightRed = lightRedItem->clone(); + zeroLightRed->setText("0"); + auto *dashLightRed = lightRedItem->clone(); + dashLightRed->setText("-"); + auto *zeroBrightRed = brightRedItem->clone(); + zeroBrightRed->setText("0"); + auto *oneBrightRed = brightRedItem->clone(); + oneBrightRed->setText("1"); + auto *oneWhite = cellTemplate->clone(); + oneWhite->setText("1"); + auto *m1Green = greenItem->clone(); + m1Green->setText("m1"); + auto *m1ExtendedGreen = greenItem->clone(); + m1ExtendedGreen->setText("- m1 -"); + auto *imm1Green = greenItem->clone(); + imm1Green->setText("imm1"); + auto *zeroLightGreen = lightGreenItem->clone(); + zeroLightGreen->setText("0"); + auto *zeroBrightGreen = brightGreenItem->clone(); + zeroBrightGreen->setText("0"); + auto *oneBrightGreen = brightGreenItem->clone(); + oneBrightGreen->setText("1"); + + // add + // instruction + auto *add = redItem->clone(); + add->setText("add"); + m_ui->tableWidget->setItem(0, 0, add); + // funct7 + for (int i = 0; i < 7; ++i) { + QTableWidgetItem *item; + if (i == 1) { + item = zeroLightRed->clone(); + } else { + item = dashLightRed->clone(); + } + m_ui->tableWidget->setItem(0, i + 1, item); + } + // rs2 + auto *rs2 = grayItem->clone(); + rs2->setText("rs2"); + m_ui->tableWidget->setItem(0, 8, rs2); + m_ui->tableWidget->setSpan(0, 8, 1, 5); + // rs1 + auto *rs1 = grayItem->clone(); + rs1->setText("rs1"); + m_ui->tableWidget->setItem(0, 13, rs1); + m_ui->tableWidget->setSpan(0, 13, 1, 5); + // funct3 + for (int i = 0; i < 3; ++i) { + m_ui->tableWidget->setItem(0, i + 18, zeroLightRed->clone()); + } + // rd + auto *rd= grayItem->clone(); + rd->setText("rd"); + m_ui->tableWidget->setItem(0, 21, rd); + m_ui->tableWidget->setSpan(0, 21, 1, 5); + // opcode + m_ui->tableWidget->setItem(0, 26, zeroBrightRed->clone()); + m_ui->tableWidget->setItem(0, 27, oneBrightRed->clone()); + m_ui->tableWidget->setItem(0, 28, oneBrightRed->clone()); + m_ui->tableWidget->setItem(0, 29, zeroBrightRed->clone()); + m_ui->tableWidget->setItem(0, 30, zeroBrightRed->clone()); + // quadrant + m_ui->tableWidget->setItem(0, 31, oneWhite->clone()); + m_ui->tableWidget->setItem(0, 32, oneWhite->clone()); + + // addi + // instruction + auto *addi = greenItem->clone(); + addi->setText("addi"); + m_ui->tableWidget->setItem(1, 0, addi); + m_ui->tableWidget->setSpan(1, 0, 2, 1); + // imm + m_ui->tableWidget->setItem(1, 1, m1Green->clone()); + m_ui->tableWidget->setItem(1, 2, imm1Green->clone()); + m_ui->tableWidget->setSpan(1, 2, 1, 11); + // rs + auto *rs = grayItem->clone(); + rs->setText("rs"); + m_ui->tableWidget->setItem(1, 13, rs); + m_ui->tableWidget->setSpan(1, 13, 1, 5); + // funct3 + for (int i = 0; i < 3; ++i) { + m_ui->tableWidget->setItem(1, i + 18, zeroLightGreen->clone()); + } + // rd + m_ui->tableWidget->setItem(1, 21, rd->clone()); + m_ui->tableWidget->setSpan(1, 21, 1, 5); + // opcode + m_ui->tableWidget->setItem(1, 26, zeroBrightGreen->clone()); + m_ui->tableWidget->setItem(1, 27, zeroBrightGreen->clone()); + m_ui->tableWidget->setItem(1, 28, oneBrightGreen->clone()); + m_ui->tableWidget->setItem(1, 29, zeroBrightGreen->clone()); + m_ui->tableWidget->setItem(1, 30, zeroBrightGreen->clone()); + // quadrant + m_ui->tableWidget->setItem(1, 31, oneWhite->clone()); + m_ui->tableWidget->setItem(1, 32, oneWhite->clone()); + // addi immediate + m_ui->tableWidget->setItem(2, 1, m1ExtendedGreen->clone()); + m_ui->tableWidget->setSpan(2, 1, 1, 21); + m_ui->tableWidget->setItem(2, 22, imm1Green->clone()); + m_ui->tableWidget->setSpan(2, 22, 1, 11); +} + +SliderulesTab::~SliderulesTab() { + delete m_ui; +} + +} diff --git a/src/sliderulestab.h b/src/sliderulestab.h new file mode 100644 index 000000000..5397535fb --- /dev/null +++ b/src/sliderulestab.h @@ -0,0 +1,22 @@ +#pragma once + +#include "ripestab.h" + +namespace Ripes { + +namespace Ui { +class SliderulesTab; +} + +class SliderulesTab : public RipesTab { + Q_OBJECT + +public: + SliderulesTab(QToolBar *toolbar, QWidget *parent = nullptr); + ~SliderulesTab() override; + +private: + Ui::SliderulesTab *m_ui = nullptr; +}; + +} diff --git a/src/sliderulestab.ui b/src/sliderulestab.ui new file mode 100644 index 000000000..653eaceb0 --- /dev/null +++ b/src/sliderulestab.ui @@ -0,0 +1,154 @@ + + + Ripes::SliderulesTab + + + + 0 + 0 + 1057 + 384 + + + + + 0 + 0 + + + + Form + + + + + + + 0 + 0 + + + + QFrame::StyledPanel + + + 3 + + + 33 + + + 30 + + + 30 + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 0 + + + + + 0 + 75 + + + + Filter + + + + + 20 + 20 + 261 + 51 + + + + + + + Instruction Name + + + + + + + + 0 + 0 + + + + + + + + + + + + + From 98ecb00629bf876b8cdd16bfaf12103c7a76c697 Mon Sep 17 00:00:00 2001 From: Ryan Cohen Date: Thu, 21 Sep 2023 13:56:58 -0400 Subject: [PATCH 2/2] Add static encoding tooltip demo for VSRTL instruction labels --- src/processortab.cpp | 77 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/src/processortab.cpp b/src/processortab.cpp index a4e43ca90..c39d718c5 100644 --- a/src/processortab.cpp +++ b/src/processortab.cpp @@ -27,6 +27,82 @@ namespace Ripes { + +static QString generateTooltipTable() { + // Create HTML table of instruction encoding for use in instruction tooltip + QString tooltipTable = "" + ""; + // Table header + for (int i = 0; i < 32; ++i) { + tooltipTable += ""; + } + tooltipTable += "" + ""; + + // add instruction + auto tdStart = ""; + // funct7 + tooltipTable += tdStartRed; + tooltipTable += "-"; + tooltipTable += tdEnd; + tooltipTable += tdStartRed; + tooltipTable += "0"; + tooltipTable += tdEnd; + for (int i = 0; i < 5; ++i) { + tooltipTable += tdStartRed; + tooltipTable += "-"; + tooltipTable += tdEnd; + } + // rs2 + tooltipTable += tdStartReg; + tooltipTable += "rs2"; + tooltipTable += tdEnd; + // rs1 + tooltipTable += tdStartReg; + tooltipTable += "rs1"; + tooltipTable += tdEnd; + // funct3 + for (int i = 0; i < 3; ++i) { + tooltipTable += tdStartRed; + tooltipTable += "0"; + tooltipTable += tdEnd; + } + // rd + tooltipTable += tdStartReg; + tooltipTable += "rd"; + tooltipTable += tdEnd; + // opcode + tooltipTable += tdStartLightRed; + tooltipTable += "0"; + tooltipTable += tdEnd; + for (int i = 0; i < 2; ++i) { + tooltipTable += tdStartLightRed; + tooltipTable += "1"; + tooltipTable += tdEnd; + } + for (int i = 0; i < 2; ++i) { + tooltipTable += tdStartLightRed; + tooltipTable += "0"; + tooltipTable += tdEnd; + } + // quadrant + for (int i = 0; i < 2; ++i) { + tooltipTable += tdStart; + tooltipTable += "1"; + tooltipTable += tdEnd; + } + + tooltipTable += "" + "
"; + tooltipTable += QString::number(31 - i); + tooltipTable += "
"; + auto tdStartRed = ""; + auto tdStartLightRed = ""; + auto tdStartReg = ""; + auto tdEnd = "
"; + return tooltipTable; +} + static QString convertToSIUnits(const double l_value, int precision = 2) { QString unit; double value; @@ -491,6 +567,7 @@ void ProcessorTab::updateInstructionLabels() { instrLabel->clearForcedDefaultTextColor(); } instrLabel->setText(instrString); + instrLabel->setToolTip(generateTooltipTable()); } }