From f18eac2ac2e5760a4cb81784ad2f23f91b6643d6 Mon Sep 17 00:00:00 2001 From: bd Date: Fri, 18 Apr 2025 23:33:12 -0400 Subject: Ensure program is cleared upon load. --- gui/messages.h | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 gui/messages.h (limited to 'gui/messages.h') diff --git a/gui/messages.h b/gui/messages.h new file mode 100644 index 0000000..84b8318 --- /dev/null +++ b/gui/messages.h @@ -0,0 +1,33 @@ +#ifndef MESSAGES_H +#define MESSAGES_H +#include +#include + +/** + * Humorous computer speak. + */ +#define RANDOM_MESSAGE(v) (v[std::rand() % v.size()]) + +const std::vector waiting = { + "WAITING FOR USER", "FRIENDS MISSING", "BORED", "SLEEPING"}; +const std::vector bad_file = { + "BAD FILE", "TRY AGAIN", "SEEKING NEW READING MATERIAL"}; +const std::vector load_file = { + "FILE LOADED", "FINISHED READING DATA. EAGERLY WAITING"}; + +/** + * @return a random waiting message + */ +std::string get_waiting() { return RANDOM_MESSAGE(waiting); } + +/** + * @return a complaint about a bad file name + */ +std::string get_bad_file() { return RANDOM_MESSAGE(bad_file); } + +/** + * @return confirmation of file upload + */ +std::string get_load_file() { return RANDOM_MESSAGE(load_file); } + +#endif // MESSAGES_H -- cgit v1.2.3 From da25748edb6997629ffb380683c8c736f24033a8 Mon Sep 17 00:00:00 2001 From: bd Date: Sat, 19 Apr 2025 02:23:03 -0400 Subject: Add custom QWidget to keep track of up to 4 user cache ways --- gui/CMakeLists.txt | 2 +- gui/dynamicwaysentry.cc | 80 ++++++++++++++++++++++++++++++++++ gui/dynamicwaysentry.h | 28 ++++++++++++ gui/gui.cc | 15 ++++--- gui/gui.h | 25 +++++++++-- gui/gui.ui | 109 +++++++++++++++++++++++++++++++++++++---------- gui/messages.h | 4 +- gui/resources/styles.qss | 3 +- 8 files changed, 229 insertions(+), 37 deletions(-) create mode 100644 gui/dynamicwaysentry.cc create mode 100644 gui/dynamicwaysentry.h (limited to 'gui/messages.h') diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt index 0d73527..2c48beb 100644 --- a/gui/CMakeLists.txt +++ b/gui/CMakeLists.txt @@ -21,7 +21,7 @@ file(GLOB SRCS qt_add_resources(GUI_RESOURCES "resources.qrc") add_executable(risc_vector ${SRCS} ${GUI_RESOURCES}) -target_include_directories(${PROJECT_NAME} PRIVATE ${PROJECT_SOURCE_DIR}/inc) +target_include_directories(${PROJECT_NAME} PRIVATE ${PROJECT_SOURCE_DIR}/inc ${PROJECT_SOURCE_DIR}/gui) target_link_libraries(${PROJECT_NAME} PRIVATE ${PROJECT_NAME}_lib ram_lib Qt6::Widgets) set_target_properties(risc_vector PROPERTIES diff --git a/gui/dynamicwaysentry.cc b/gui/dynamicwaysentry.cc new file mode 100644 index 0000000..f35c9ef --- /dev/null +++ b/gui/dynamicwaysentry.cc @@ -0,0 +1,80 @@ +#include "dynamicwaysentry.h" +#include +#include +#include +#include +#include +#include + +DynamicWaysEntry::DynamicWaysEntry(QWidget *parent) : QWidget(parent) +{ + this->l = new QVBoxLayout(this); + this->l->setAlignment(Qt::AlignTop); + this->l->setSpacing(6); + this->l->setContentsMargins(0, 0, 0, 0); + this->setLayout(l); + this->add_field(); +} + +QStringList DynamicWaysEntry::get_entries() const { return this->entries; } + +int DynamicWaysEntry::parse_valid_way(QString t) +{ + bool s; + int i; + i = t.toInt(&s); + return (s && i >= 0 && 5 > i) ? i : -1; +} + +void DynamicWaysEntry::on_number_enter(const QString &t) +{ + int i; + QLineEdit *sender_field; + + sender_field = qobject_cast(sender()); + i = fields.indexOf(sender_field); + entries[i] = t; + + if (i == this->fields.size() - 1 && !t.isEmpty() && + (this->parse_valid_way(t) > 0) && fields.size() < 4) + add_field(); + + // TODO, unlink, don't trash everything after + if (t.isEmpty()) { + while (this->fields.size() > i + 1) { + remove_last_field(); + } + while (entries.size() > fields.size()) { + entries.removeLast(); + } + } +} + +void DynamicWaysEntry::add_field() +{ + QLineEdit *f; + + f = new QLineEdit(this); + f->setPlaceholderText("# ways (a power of 2)"); + + this->l->addWidget(f);; + this->fields.append(f); + this->entries.append(QString()); + connect( + f, &QLineEdit::textChanged, this, &DynamicWaysEntry::on_number_enter); +} + +void DynamicWaysEntry::remove_last_field() +{ + QLineEdit *f; + + if (this->fields.isEmpty()) + return; + + f = this->fields.takeLast(); + this->l->removeWidget(f); + f->deleteLater(); + + if (!this->entries.isEmpty()) + entries.removeLast(); +} diff --git a/gui/dynamicwaysentry.h b/gui/dynamicwaysentry.h new file mode 100644 index 0000000..be42696 --- /dev/null +++ b/gui/dynamicwaysentry.h @@ -0,0 +1,28 @@ +#include +#include +#include +#include +#include + +class DynamicWaysEntry : public QWidget +{ + public: + DynamicWaysEntry(QWidget *parent = nullptr); + QStringList get_entries() const; + /** + * Parses a string from this entry field, if it is valid. + * @param a string + * @param -1 if the string is not suitable as a way, an integer compatible + * with the cache constructor otherwise. + */ + int parse_valid_way(QString t); + private slots: + void on_number_enter(const QString &t); + + private: + QVBoxLayout *l; + QVector fields; + QStringList entries; + void add_field(); + void remove_last_field(); +}; diff --git a/gui/gui.cc b/gui/gui.cc index 699ab48..0ba4867 100644 --- a/gui/gui.cc +++ b/gui/gui.cc @@ -6,7 +6,8 @@ GUI::GUI(QWidget *parent) : QMainWindow(parent), ui(new Ui::GUI) { ui->setupUi(this); - this->status_label = new QLabel(this->make_status(get_waiting), this); + this->status_label = new QLabel("", this); + this->set_status(get_waiting); QLabel *risc_vector = new QLabel("RISC V[ECTOR], CS535 UMASS AMHERST", this); status_label->setMinimumWidth(1200); @@ -250,7 +251,7 @@ void GUI::on_upload_intructions_btn_clicked() "Binary Files (*.bin *.rv);;All Files (*.*)"); QFile file(filePath); if (filePath.isEmpty() || !file.open(QIODevice::ReadOnly)) { - this->status_label->setText(this->make_status(get_bad_file)); + this->set_status(get_bad_file); return; } @@ -267,7 +268,7 @@ void GUI::on_upload_intructions_btn_clicked() } } - this->status_label->setText(this->make_status(get_load_file)); + this->set_status(get_load_file); file.close(); } @@ -283,10 +284,10 @@ void GUI::on_enable_pipeline_checkbox_checkStateChanged( { if (arg1 == Qt::CheckState::Checked) { qDebug() << "enable pipeline checkbox checked."; - is_pipelined = true; + this->is_pipelined = true; } else { qDebug() << "enable pipeline checkbox unchecked."; - is_pipelined = false; + this->is_pipelined = false; } } @@ -303,7 +304,7 @@ void GUI::on_save_program_state_btn_clicked() qDebug() << "save program state button is clicked."; } -QString GUI::make_status(const std::function &func) +void GUI::set_status(const std::function &func) { - return "CPU SAYS: \"" + QString::fromStdString(func()) + "\""; + this->status_label->setText("CPU SAYS: \"" + QString::fromStdString(func()) + "\""); } diff --git a/gui/gui.h b/gui/gui.h index 85f965a..09fe0d9 100644 --- a/gui/gui.h +++ b/gui/gui.h @@ -24,10 +24,18 @@ class GUI : public QMainWindow Q_OBJECT public: + /** + * Constructor. + * @return A newly allocated GUI object. + */ GUI(QWidget *parent = nullptr); ~GUI(); - bool is_pipelined = false; - std::vector ways; + + /** + * Uses `func' to set the current status. + * @param a function which returns a string. + */ + void set_status(const std::function &func); signals: void sendRefreshDram(); @@ -82,11 +90,21 @@ class GUI : public QMainWindow */ std::vector p; + /** + * The current cache configurations. + */ + std::vector c; + + /** + * If this stage is pipelined or not. + */ + bool is_pipelined = false; + QThread workerThread; Worker *worker; - QVector step_values = {1, 5, 10, 50, 250, 1000, 10000}; + QVector step_values = {1, 5, 20, 50, 250, 1000, 10000}; const std::map mnemonicNameMap = { {Mnemonic::ADD, "ADD"}, {Mnemonic::SUB, "SUB"}, @@ -115,6 +133,5 @@ class GUI : public QMainWindow return (it != mnemonicNameMap.end()) ? it->second : "Unknown"; } - QString make_status(const std::function &func); }; #endif // GUI_H diff --git a/gui/gui.ui b/gui/gui.ui index a2cd6cb..a5a51f1 100644 --- a/gui/gui.ui +++ b/gui/gui.ui @@ -133,6 +133,85 @@ + + + + + + QLayout::SizeConstraint::SetMinimumSize + + + + + + 16777215 + 16777215 + + + + C1 2^ + + + + + + + + 16777215 + 16777215 + + + + C2 2^ + + + + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + C3 2^ + + + + + + + + 16777215 + 16777215 + + + + C4 2^ + + + + + + + + + + 0 + 0 + + + + + + @@ -142,9 +221,6 @@ - - - @@ -533,18 +609,6 @@ - - - - - true - - - - Run - - - @@ -598,19 +662,20 @@ - - - - GroupBox - - - + + + DynamicWaysEntry + QWidget +
dynamicwaysentry.h
+ 1 + + diff --git a/gui/messages.h b/gui/messages.h index 84b8318..8f852f7 100644 --- a/gui/messages.h +++ b/gui/messages.h @@ -1,7 +1,7 @@ #ifndef MESSAGES_H #define MESSAGES_H -#include #include +#include /** * Humorous computer speak. @@ -16,7 +16,7 @@ const std::vector load_file = { "FILE LOADED", "FINISHED READING DATA. EAGERLY WAITING"}; /** - * @return a random waiting message + * @return an unsolicited waiting message */ std::string get_waiting() { return RANDOM_MESSAGE(waiting); } diff --git a/gui/resources/styles.qss b/gui/resources/styles.qss index 7b5944d..9b63249 100644 --- a/gui/resources/styles.qss +++ b/gui/resources/styles.qss @@ -10,6 +10,7 @@ QWidget { } QGroupBox { + text-decoration: underline "#00cc00"; font-size: 17pt; background-color: "#000004"; border: 4px solid ; @@ -29,7 +30,7 @@ QLabel { /* text entry */ QLineEdit { - font-size: 15pt; + font-size: 18pt; border-radius: 0px; padding: 0 4px; selection-background-color: "#00cc00"; -- cgit v1.2.3 From 327ba8b631436cf21866c05c6c7cae239fe54a5c Mon Sep 17 00:00:00 2001 From: bd Date: Sat, 19 Apr 2025 02:45:38 -0400 Subject: Small UI cleanups --- gui/gui.cc | 9 ++-- gui/gui.ui | 127 ++++++++++++++++++++++++++++++++++++--------------------- gui/messages.h | 13 +++--- 3 files changed, 94 insertions(+), 55 deletions(-) (limited to 'gui/messages.h') diff --git a/gui/gui.cc b/gui/gui.cc index 0ba4867..a36920b 100644 --- a/gui/gui.cc +++ b/gui/gui.cc @@ -251,7 +251,7 @@ void GUI::on_upload_intructions_btn_clicked() "Binary Files (*.bin *.rv);;All Files (*.*)"); QFile file(filePath); if (filePath.isEmpty() || !file.open(QIODevice::ReadOnly)) { - this->set_status(get_bad_file); + this->set_status(get_no_instructions); return; } @@ -268,7 +268,10 @@ void GUI::on_upload_intructions_btn_clicked() } } - this->set_status(get_load_file); + if (this->p.empty()) + this->set_status(get_no_instructions); + else + this->set_status(get_load_file); file.close(); } @@ -306,5 +309,5 @@ void GUI::on_save_program_state_btn_clicked() void GUI::set_status(const std::function &func) { - this->status_label->setText("CPU SAYS: \"" + QString::fromStdString(func()) + "\""); + this->status_label->setText("COMPUTER SAYS: \"" + QString::fromStdString(func()) + "\""); } diff --git a/gui/gui.ui b/gui/gui.ui index a5a51f1..b9ad041 100644 --- a/gui/gui.ui +++ b/gui/gui.ui @@ -135,6 +135,16 @@ + + QLayout::SizeConstraint::SetMinimumSize + + + + + Qt::Orientation::Vertical + + + @@ -306,6 +316,20 @@ + + + + Qt::Orientation::Horizontal + + + + + + + Initialize! + + + @@ -326,36 +350,6 @@ - - - - - - - true - - - - Program State - - - - - - - Qt::Orientation::Horizontal - - - - - - - Clock Cycles - - - - - @@ -610,25 +604,66 @@ - - - 0 - - - 6 - - - 1 - + + + + + 0 + + + 6 + + + 1 + + + Qt::Orientation::Horizontal + + + QSlider::TickPosition::NoTicks + + + 1 + + + + + + + Qt::Orientation::Vertical + + + + + + + + + + true + + + + Program State + + + + + + + Clock Cycles + + + + + + + + + Qt::Orientation::Horizontal - - QSlider::TickPosition::NoTicks - - - 1 - diff --git a/gui/messages.h b/gui/messages.h index 8f852f7..2af8e6b 100644 --- a/gui/messages.h +++ b/gui/messages.h @@ -10,10 +10,11 @@ const std::vector waiting = { "WAITING FOR USER", "FRIENDS MISSING", "BORED", "SLEEPING"}; -const std::vector bad_file = { - "BAD FILE", "TRY AGAIN", "SEEKING NEW READING MATERIAL"}; const std::vector load_file = { "FILE LOADED", "FINISHED READING DATA. EAGERLY WAITING"}; +const std::vector no_instructions = { + "NO PROGRAM PROVIDED", "RISC V[ECTOR]: INSTRUCTIONS NOT INCLUDED", + "NOTHING TO DO, GIVING UP"}; /** * @return an unsolicited waiting message @@ -21,13 +22,13 @@ const std::vector load_file = { std::string get_waiting() { return RANDOM_MESSAGE(waiting); } /** - * @return a complaint about a bad file name + * @return confirmation of file upload */ -std::string get_bad_file() { return RANDOM_MESSAGE(bad_file); } +std::string get_load_file() { return RANDOM_MESSAGE(load_file); } /** - * @return confirmation of file upload + * @return a friendly reminder that the simulation is not configured yet */ -std::string get_load_file() { return RANDOM_MESSAGE(load_file); } +std::string get_no_instructions() { return RANDOM_MESSAGE(no_instructions); } #endif // MESSAGES_H -- cgit v1.2.3 From bb3d940fb4ce0dd3efc56b934a7b4ea8ffab4b13 Mon Sep 17 00:00:00 2001 From: bd Date: Sat, 19 Apr 2025 03:37:43 -0400 Subject: GUI validate program --- gui/dynamicwaysentry.h | 6 ++++++ gui/gui.cc | 54 +++++++++++++++++++++++++++++++++++++++++++++++--- gui/gui.h | 27 +++++++++++++++++-------- gui/messages.h | 19 +++++++++++++++++- gui/worker.cc | 27 +++++++++++++++++++++++++ gui/worker.h | 1 + inc/pipe_spec.h | 10 ++++++++++ 7 files changed, 132 insertions(+), 12 deletions(-) (limited to 'gui/messages.h') diff --git a/gui/dynamicwaysentry.h b/gui/dynamicwaysentry.h index be42696..de001ee 100644 --- a/gui/dynamicwaysentry.h +++ b/gui/dynamicwaysentry.h @@ -1,3 +1,7 @@ +#ifndef DYNAMICWAYSENTRY_H +#define DYNAMICWAYSENTRY_H + + #include #include #include @@ -26,3 +30,5 @@ class DynamicWaysEntry : public QWidget void add_field(); void remove_last_field(); }; + +#endif // DYNAMICWAYSENTRY_H diff --git a/gui/gui.cc b/gui/gui.cc index a36920b..3a1027a 100644 --- a/gui/gui.cc +++ b/gui/gui.cc @@ -1,5 +1,6 @@ #include "gui.h" #include "./ui_gui.h" +#include "dynamicwaysentry.h" #include "messages.h" GUI::GUI(QWidget *parent) : QMainWindow(parent), ui(new Ui::GUI) @@ -43,6 +44,11 @@ GUI::GUI(QWidget *parent) : QMainWindow(parent), ui(new Ui::GUI) connect( worker, &Worker::register_storage, this, &GUI::onWorkerShowRegisters); + // Configure pipeline + connect( + this, &GUI::sendConfigure, worker, &Worker::configure, + Qt::QueuedConnection); + // // Refresh DRAM from worker thread // connect(this, &GUI::sendRefreshDram, worker, &Worker::refreshDram, // Qt::QueuedConnection); @@ -56,7 +62,7 @@ GUI::GUI(QWidget *parent) : QMainWindow(parent), ui(new Ui::GUI) this, &GUI::sendRefreshRegisters, worker, &Worker::refreshRegisters, Qt::QueuedConnection); - // Advance controller by somes steps + // Advance controller by some steps connect( this, &GUI::sendRunSteps, worker, &Worker::runSteps, Qt::QueuedConnection); @@ -269,7 +275,7 @@ void GUI::on_upload_intructions_btn_clicked() } if (this->p.empty()) - this->set_status(get_no_instructions); + this->set_status(get_no_instructions); else this->set_status(get_load_file); @@ -297,6 +303,8 @@ void GUI::on_enable_pipeline_checkbox_checkStateChanged( void GUI::on_step_btn_clicked() { qDebug() << "Run step button clicked."; + if (!this->ready) + return this->on_config_clicked(); int steps = step_values[ui->step_slider->value()]; emit sendRunSteps(steps); } @@ -307,7 +315,47 @@ void GUI::on_save_program_state_btn_clicked() qDebug() << "save program state button is clicked."; } +void GUI::on_config_clicked() +{ + std::vector ways; + QStringList entries; + signed int i; + DynamicWaysEntry *dwe = ui->cache_way_selector; + + for (const QString &s : dwe->get_entries()) { + + if (s.isEmpty()) + continue; + + i = dwe->parse_valid_way(s); + if (i != -1) { + ways.push_back((unsigned int)i); + } else { + this->set_status(get_bad_cache); + return; + } + } + + if (this->p.empty()) { + this->set_status(get_no_instructions); + return; + } + + this->ready = true; + + // say something snarky + if (!is_pipelined) + this->set_status(get_no_pipeline); + else if (ways.size() == 0) + this->set_status(get_no_cache); + else + this->set_status(get_initialize); + + emit sendConfigure(ways, is_pipelined); +} + void GUI::set_status(const std::function &func) { - this->status_label->setText("COMPUTER SAYS: \"" + QString::fromStdString(func()) + "\""); + this->status_label->setText( + "COMPUTER SAYS: \"" + QString::fromStdString(func()) + "\""); } diff --git a/gui/gui.h b/gui/gui.h index 09fe0d9..97f131a 100644 --- a/gui/gui.h +++ b/gui/gui.h @@ -5,8 +5,8 @@ #include #include #include +#include #include -#include #include #include #include @@ -42,6 +42,7 @@ class GUI : public QMainWindow void sendRefreshCache(); void sendRefreshRegisters(); void sendRunSteps(int steps); + void sendConfigure(std::vector ways, bool is_pipelined); private slots: void onWorkerClockCycles(int value, int pc); @@ -77,9 +78,22 @@ class GUI : public QMainWindow void on_save_program_state_btn_clicked(); + /** + * Validates that the user has provided a valid program and cache. + * If so, `this->ready' is set and the user options are passed to the + * worker. + * If not, rudely complains. + */ + void on_config_clicked(); + private: Ui::GUI *ui; + /** + * Indicates if the program has been initialized. + */ + bool ready; + /** * The message displayed on the status bar. */ @@ -91,21 +105,19 @@ class GUI : public QMainWindow std::vector p; /** - * The current cache configurations. + * If this stage is pipelined or not. */ - std::vector c; + bool is_pipelined = false; /** - * If this stage is pipelined or not. + * The possible step slider values. */ - bool is_pipelined = false; + QVector step_values = {1, 5, 20, 50, 250, 1000, 10000}; QThread workerThread; Worker *worker; - QVector step_values = {1, 5, 20, 50, 250, 1000, 10000}; - const std::map mnemonicNameMap = { {Mnemonic::ADD, "ADD"}, {Mnemonic::SUB, "SUB"}, {Mnemonic::MUL, "MUL"}, {Mnemonic::QUOT, "QUOT"}, @@ -132,6 +144,5 @@ class GUI : public QMainWindow auto it = mnemonicNameMap.find(mnemonic); return (it != mnemonicNameMap.end()) ? it->second : "Unknown"; } - }; #endif // GUI_H diff --git a/gui/messages.h b/gui/messages.h index 2af8e6b..c2a86b9 100644 --- a/gui/messages.h +++ b/gui/messages.h @@ -13,8 +13,17 @@ const std::vector waiting = { const std::vector load_file = { "FILE LOADED", "FINISHED READING DATA. EAGERLY WAITING"}; const std::vector no_instructions = { - "NO PROGRAM PROVIDED", "RISC V[ECTOR]: INSTRUCTIONS NOT INCLUDED", + "NO PROGRAM PROVIDED", "INSTRUCTIONS NOT INCLUDED", "NOTHING TO DO, GIVING UP"}; +const std::vector bad_cache = { + "INVALID NUMBER OF WAYS", "WAYS CANNOT BE BELOW 0 OR ABOVE 5"}; +const std::vector no_pipeline = { + "PIPELINE--HUMANS PROBABLY WORKED HARD ON THAT", + "I WOULD PREFER YOU LEAVE THE PIPE ON", "SLOW MODE ENABLED", + "SIMULATION READY"}; +const std::vector no_cache = { + "NO CACHE HAS NO WAY TO GO", "SLOW MODE ENABLED", "SIMULATION READY"}; +const std::vector initialize = {"SIMULATION READY"}; /** * @return an unsolicited waiting message @@ -30,5 +39,13 @@ std::string get_load_file() { return RANDOM_MESSAGE(load_file); } * @return a friendly reminder that the simulation is not configured yet */ std::string get_no_instructions() { return RANDOM_MESSAGE(no_instructions); } +std::string get_bad_cache() { return RANDOM_MESSAGE(bad_cache); } + +/** + * @return unsolicited complaints for successful initialization + */ +std::string get_no_pipeline() { return RANDOM_MESSAGE(no_pipeline); } +std::string get_no_cache() { return RANDOM_MESSAGE(no_cache); } +std::string get_initialize() { return RANDOM_MESSAGE(initialize); } #endif // MESSAGES_H diff --git a/gui/worker.cc b/gui/worker.cc index 1d87fd3..558552f 100644 --- a/gui/worker.cc +++ b/gui/worker.cc @@ -10,6 +10,33 @@ Worker::~Worker() delete this->ct; } +void Worker::configure(std::vector ways, bool is_pipelined) +{ + // this->d = new Dram(DRAM_DELAY); + // setWays(ways); + // setSize(size); + // this->cache_enabled = is_cache_enabled; + // if (!is_cache_enabled || ways.size() == 0) { + // this->ct = new Controller(wb_stage, this->d, is_pipelined); + // } else { + // // 0th index cache has largest delay + // for (int i = 0; i < ways.size(); i++) { + // if (i == 0) { + // Cache *cache = + // new Cache(this->d, size[i], ways[i], ways.size()); + // this->c.push_back(cache); + // } else { + // Cache *cache = new Cache( + // this->c[i - 1], size[i], ways[i], ways.size() - i); + // this->c.push_back(cache); + // } + // } + // this->ct = + // new Controller(wb_stage, this->c.at(ways.size() - 1), is_pipelined); + // } + emit clock_cycles(this->ct->get_clock_cycle(), this->ct->get_pc()); +} + void Worker::refreshDram() { qDebug() << "Refreshing Dram"; diff --git a/gui/worker.h b/gui/worker.h index 53e4851..df7d9cc 100644 --- a/gui/worker.h +++ b/gui/worker.h @@ -31,6 +31,7 @@ public slots: void refreshCache(); void refreshRegisters(); void runSteps(int steps); + void configure(std::vector ways, bool is_pipelined); signals: void clock_cycles(int value, int pc); diff --git a/inc/pipe_spec.h b/inc/pipe_spec.h index d211b72..4f5bc46 100644 --- a/inc/pipe_spec.h +++ b/inc/pipe_spec.h @@ -48,6 +48,16 @@ */ #define MAX_INT 2147483647 +/** + * The delay on DRAM objects. + */ +#define DRAM_DELAY 10 + +/** + * The (base) on cache objects. + */ +#define CACHE_DELAY 1 + /** * Return the N least-significant bits from integer K using a bit mask * @param the integer to be parsed -- cgit v1.2.3 From 5ad39ec769fa09b9ac4dcc8f66232ef51384a3c6 Mon Sep 17 00:00:00 2001 From: bd Date: Sat, 19 Apr 2025 12:18:14 -0400 Subject: Safely delete old controller object when re-initializing --- gui/gui.cc | 25 +++++-------- gui/gui.h | 5 +-- gui/gui.ui | 93 ++++++++++++++++++++---------------------------- gui/messages.h | 12 +++++-- gui/resources/styles.qss | 9 +++-- gui/worker.cc | 42 +++++++++------------- gui/worker.h | 10 +++--- 7 files changed, 84 insertions(+), 112 deletions(-) (limited to 'gui/messages.h') diff --git a/gui/gui.cc b/gui/gui.cc index dc77fc9..6cb9ada 100644 --- a/gui/gui.cc +++ b/gui/gui.cc @@ -18,9 +18,6 @@ GUI::GUI(QWidget *parent) : QMainWindow(parent), ui(new Ui::GUI) worker = new Worker(); worker->moveToThread(&workerThread); - // Connect worker thread lifecycle - // connect(&workerThread, &QThread::started, worker, &Worker::doWork); - // display clock cycles and PC connect(worker, &Worker::clock_cycles, this, &GUI::onWorkerClockCycles); @@ -49,19 +46,6 @@ GUI::GUI(QWidget *parent) : QMainWindow(parent), ui(new Ui::GUI) this, &GUI::sendConfigure, worker, &Worker::configure, Qt::QueuedConnection); - // // Refresh DRAM from worker thread - // connect(this, &GUI::sendRefreshDram, worker, &Worker::refreshDram, - // Qt::QueuedConnection); - - // // Refresh Cache from worker thread - // connect(this, &GUI::sendRefreshCache, worker, &Worker::refreshCache, - // Qt::QueuedConnection); - - // Refresh Registers from worker thread - connect( - this, &GUI::sendRefreshRegisters, worker, &Worker::refreshRegisters, - Qt::QueuedConnection); - // Advance controller by some steps connect( this, &GUI::sendRunSteps, worker, &Worker::runSteps, @@ -303,10 +287,17 @@ void GUI::on_enable_pipeline_checkbox_checkStateChanged( void GUI::on_step_btn_clicked() { qDebug() << "Run step button clicked."; + // try to configure first + if (!this->ready) + this->on_config_clicked(); + // try again if (!this->ready) - return this->on_config_clicked(); + return; + + this->set_status(get_running); int steps = step_values[ui->step_slider->value()]; emit sendRunSteps(steps); + this->set_status(get_waiting); } void GUI::on_save_program_state_btn_clicked() diff --git a/gui/gui.h b/gui/gui.h index cbd482b..4c47874 100644 --- a/gui/gui.h +++ b/gui/gui.h @@ -38,9 +38,6 @@ class GUI : public QMainWindow void set_status(const std::function &func); signals: - void sendRefreshDram(); - void sendRefreshCache(); - void sendRefreshRegisters(); void sendRunSteps(int steps); void sendConfigure( std::vector ways, @@ -110,7 +107,7 @@ class GUI : public QMainWindow /** * If this stage is pipelined or not. */ - bool is_pipelined = false; + bool is_pipelined = true; /** * The possible step slider values. diff --git a/gui/gui.ui b/gui/gui.ui index b9ad041..acd9c53 100644 --- a/gui/gui.ui +++ b/gui/gui.ui @@ -604,60 +604,23 @@ - - - - - 0 - - - 6 - - - 1 - - - Qt::Orientation::Horizontal - - - QSlider::TickPosition::NoTicks - - - 1 - - - - - - - Qt::Orientation::Vertical - - - - - - - - - - true - - - - Program State - - - - - - - Clock Cycles - - - - - - + + + + true + + + + Program State + + + + + + + Clock Cycles + + @@ -666,6 +629,28 @@ + + + + 0 + + + 6 + + + 1 + + + Qt::Orientation::Horizontal + + + QSlider::TickPosition::NoTicks + + + 1 + + + diff --git a/gui/messages.h b/gui/messages.h index c2a86b9..2b31037 100644 --- a/gui/messages.h +++ b/gui/messages.h @@ -9,14 +9,19 @@ #define RANDOM_MESSAGE(v) (v[std::rand() % v.size()]) const std::vector waiting = { - "WAITING FOR USER", "FRIENDS MISSING", "BORED", "SLEEPING"}; + "WAITING FOR USER", "BORED", "SLEEPING", "TIRED", "IDLE", "EXCITED"}; +const std::vector running = { + "CALCULATING", "COMPUTING", + "EXTERMINATE" + "WORKING", + "BUSY"}; const std::vector load_file = { "FILE LOADED", "FINISHED READING DATA. EAGERLY WAITING"}; const std::vector no_instructions = { "NO PROGRAM PROVIDED", "INSTRUCTIONS NOT INCLUDED", "NOTHING TO DO, GIVING UP"}; const std::vector bad_cache = { - "INVALID NUMBER OF WAYS", "WAYS CANNOT BE BELOW 0 OR ABOVE 5"}; + "WAYS CANNOT BE BELOW 0 OR ABOVE 5"}; const std::vector no_pipeline = { "PIPELINE--HUMANS PROBABLY WORKED HARD ON THAT", "I WOULD PREFER YOU LEAVE THE PIPE ON", "SLOW MODE ENABLED", @@ -26,9 +31,10 @@ const std::vector no_cache = { const std::vector initialize = {"SIMULATION READY"}; /** - * @return an unsolicited waiting message + * @return an unsolicited status messages */ std::string get_waiting() { return RANDOM_MESSAGE(waiting); } +std::string get_running() { return RANDOM_MESSAGE(running); } /** * @return confirmation of file upload diff --git a/gui/resources/styles.qss b/gui/resources/styles.qss index 9b63249..59d36ca 100644 --- a/gui/resources/styles.qss +++ b/gui/resources/styles.qss @@ -2,7 +2,8 @@ font-family: "BigBlueTermPlusNerdFontMono", "monospace"; font-size: 20pt; color: "#00cc00"; - background-color: "#000004"; + background-color: "#000200"; + border: 0px solid "#000200"; } /* main window */ @@ -12,7 +13,6 @@ QWidget { QGroupBox { text-decoration: underline "#00cc00"; font-size: 17pt; - background-color: "#000004"; border: 4px solid ; border-radius: 0px; margin-top: 1ex; /* leave space at the top for the title */ @@ -38,11 +38,10 @@ QLineEdit { QTextEdit, QListView { font-size: 10pt; - background-color: "#000004"; } QPushButton { - color: "#000004"; + color: "#000200"; background-color: "#00cc00"; border-radius: 0px; padding: 1px; @@ -51,7 +50,7 @@ QPushButton { QPushButton:pressed { color: "#00cc00"; - background-color: "#000004"; + background-color: "#000200"; } QPushButton:flat { diff --git a/gui/worker.cc b/gui/worker.cc index cd79821..88248e8 100644 --- a/gui/worker.cc +++ b/gui/worker.cc @@ -18,21 +18,23 @@ void Worker::configure( { Dram *d; Storage *s; + Stage *old; int i; + this->ct_mutex.lock(); if (ways.size() != 0) { // will ensure the largest cache is only half of DRAM this->size_inc = (MEM_LINE_SPEC / ways.size()) / 2; } d = new Dram(DRAM_DELAY); - s = (Storage *)d; + s = static_cast(d); this->s.push_front(s); d->load(program); for (i = ways.size(); i > 0; --i) { - s = (Storage *)new Cache( - s, this->size_inc * (i), ways.at(i - 1), CACHE_DELAY + i); + s = static_cast(new Cache( + s, this->size_inc * (i), ways.at(i - 1), CACHE_DELAY + i)); this->s.push_front(s); } @@ -41,37 +43,26 @@ void Worker::configure( this->ex_stage = new EX(id_stage); this->mm_stage = new MM(ex_stage); this->wb_stage = new WB(mm_stage); - this->ct = - new Controller(wb_stage, s, is_pipelined); - emit clock_cycles(this->ct->get_clock_cycle(), this->ct->get_pc()); -} - -void Worker::refreshDram() -{ - qDebug() << "Refreshing Dram"; - emit dram_storage(this->s.back()->view(0, 255)); -} - -void Worker::refreshCache() -{ - qDebug() << "Refreshing Cache"; - if(this->s.size() > 0) { - emit cache_storage(this->s.at(0)->view(0, 1 << this->size_inc)); - } -} + old = static_cast(this->ct); + this->ct = new Controller(wb_stage, s, is_pipelined); + if (old) + delete old; + this->ct_mutex.unlock(); -void Worker::refreshRegisters() -{ - qDebug() << "Refreshing Registers"; - emit register_storage(this->ct->get_gprs()); + emit clock_cycles(this->ct->get_clock_cycle(), this->ct->get_pc()); } void Worker::runSteps(int steps) { + this->ct_mutex.lock(); qDebug() << "Running for " << steps << "steps"; this->ct->run_for(steps); + // TODO move these to separate functions emit dram_storage(this->s.back()->view(0, 255)); + if (this->s.size() > 1) { + emit cache_storage(this->s.at(0)->view(0, 1 << this->size_inc)); + } emit register_storage(this->ct->get_gprs()); emit clock_cycles(this->ct->get_clock_cycle(), this->ct->get_pc()); emit if_info(this->if_stage->stage_info()); @@ -79,4 +70,5 @@ void Worker::runSteps(int steps) emit ex_info(this->ex_stage->stage_info()); emit mm_info(this->mm_stage->stage_info()); emit wb_info(this->wb_stage->stage_info()); + this->ct_mutex.unlock(); } diff --git a/gui/worker.h b/gui/worker.h index acfffcf..20a9838 100644 --- a/gui/worker.h +++ b/gui/worker.h @@ -12,6 +12,7 @@ #include #include #include +#include #include class Worker : public QObject @@ -28,7 +29,10 @@ class Worker : public QObject EX *ex_stage; MM *mm_stage; WB *wb_stage; - Controller *ct; + + Controller *ct = nullptr; + QMutex ct_mutex; + /** * The size each progressive cache level increases by. */ @@ -37,11 +41,9 @@ class Worker : public QObject public: explicit Worker(QObject *parent = nullptr); ~Worker(); + QMutex& get_ct_mutex() { return ct_mutex; } public slots: - void refreshDram(); - void refreshCache(); - void refreshRegisters(); void runSteps(int steps); void configure( std::vector ways, -- cgit v1.2.3 From e4a2ceefd77a8d53ebb9fb225a0fa6d9ee8d5d91 Mon Sep 17 00:00:00 2001 From: bd Date: Sat, 19 Apr 2025 12:36:03 -0400 Subject: Modify scrollbar css --- gui/messages.h | 16 +++++----------- gui/resources/styles.qss | 36 ++++++++++++++++++++++++------------ 2 files changed, 29 insertions(+), 23 deletions(-) (limited to 'gui/messages.h') diff --git a/gui/messages.h b/gui/messages.h index 2b31037..adae777 100644 --- a/gui/messages.h +++ b/gui/messages.h @@ -9,25 +9,19 @@ #define RANDOM_MESSAGE(v) (v[std::rand() % v.size()]) const std::vector waiting = { - "WAITING FOR USER", "BORED", "SLEEPING", "TIRED", "IDLE", "EXCITED"}; + "WAITING FOR USER", "READY", "BORED", "SLEEPING"}; const std::vector running = { - "CALCULATING", "COMPUTING", - "EXTERMINATE" - "WORKING", - "BUSY"}; -const std::vector load_file = { - "FILE LOADED", "FINISHED READING DATA. EAGERLY WAITING"}; + "COMPUTING", "WORKING", "BUSY"}; +const std::vector load_file = {"FILE LOADED"}; const std::vector no_instructions = { "NO PROGRAM PROVIDED", "INSTRUCTIONS NOT INCLUDED", "NOTHING TO DO, GIVING UP"}; const std::vector bad_cache = { "WAYS CANNOT BE BELOW 0 OR ABOVE 5"}; const std::vector no_pipeline = { - "PIPELINE--HUMANS PROBABLY WORKED HARD ON THAT", - "I WOULD PREFER YOU LEAVE THE PIPE ON", "SLOW MODE ENABLED", - "SIMULATION READY"}; + "SIMULATION READY: NO PIPE :(", "SIMULATION READY"}; const std::vector no_cache = { - "NO CACHE HAS NO WAY TO GO", "SLOW MODE ENABLED", "SIMULATION READY"}; + "SIMULATION READY: NO WAYS", "SIMULATION READY"}; const std::vector initialize = {"SIMULATION READY"}; /** diff --git a/gui/resources/styles.qss b/gui/resources/styles.qss index 59d36ca..9562b69 100644 --- a/gui/resources/styles.qss +++ b/gui/resources/styles.qss @@ -107,25 +107,37 @@ QSlider::handle:horizontal { } QScrollBar:horizontal { - border: 2px solid "#00cc00"; - height: 4px; - margin: 0px 20px 0 20px; + border: 4px solid "#00cc00"; } + QScrollBar::handle:horizontal { - min-width: 20px; + height: 16px; + background-color: "#00cc00"; } + QScrollBar::add-line:horizontal { - border: 2px solid "#00cc00"; - width: 4px; - subcontrol-position: right; - subcontrol-origin: margin; + border: 4px solid "#00cc00"; } QScrollBar::sub-line:horizontal { - border: 2px solid "#00cc00"; - width: 4px; - subcontrol-position: left; - subcontrol-origin: margin; + border: 4px solid "#00cc00"; +} + +QScrollBar:vertical { + border: 4px solid "#00cc00"; +} + +QScrollBar::handle:vertical { + width: 16px; + background-color: "#00cc00"; +} + +QScrollBar::add-line:vertical { + border: 4px solid "#00cc00"; +} + +QScrollBar::sub-line:vertical { + border: 4px solid "#00cc00"; } /* Local Variables: */ -- cgit v1.2.3 From 9fe7235d7c06677f152e20b9deac85e633f429a6 Mon Sep 17 00:00:00 2001 From: bd Date: Mon, 21 Apr 2025 13:41:45 -0400 Subject: Add some expression --- gui/gui.cc | 52 ++++++++++++++++++++++++++++++++++------------- gui/gui.h | 14 +++++++++---- gui/messages.h | 14 +++++-------- gui/resources.qrc | 4 ++++ gui/resources/angry.png | Bin 0 -> 319 bytes gui/resources/busy.png | Bin 0 -> 329 bytes gui/resources/happy.png | Bin 0 -> 322 bytes gui/resources/idle.png | Bin 0 -> 322 bytes gui/resources/styles.qss | 22 ++++++++++++++++++++ 9 files changed, 79 insertions(+), 27 deletions(-) create mode 100644 gui/resources/angry.png create mode 100644 gui/resources/busy.png create mode 100644 gui/resources/happy.png create mode 100644 gui/resources/idle.png (limited to 'gui/messages.h') diff --git a/gui/gui.cc b/gui/gui.cc index 3440916..2744a06 100644 --- a/gui/gui.cc +++ b/gui/gui.cc @@ -19,16 +19,29 @@ #include "./ui_gui.h" #include "dynamicwaysentry.h" #include "messages.h" +#include +#include GUI::GUI(QWidget *parent) : QMainWindow(parent), ui(new Ui::GUI) { ui->setupUi(this); + /* setup the status bar */ + ui->statusBar->setFixedHeight(20); + + this->avatar = new QLabel(this); this->status_label = new QLabel("", this); - this->set_status(get_waiting); QLabel *risc_vector = new QLabel("RISC V[ECTOR], CS535 UMASS AMHERST", this); - status_label->setMinimumWidth(1200); + + avatar->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + avatar->setObjectName("avatar_label"); + status_label->setObjectName("msg_label"); + risc_vector->setObjectName("info_label"); + ui->statusBar->setSizeGripEnabled(false); + + this->set_status(get_waiting, "idle.png"); + ui->statusBar->addWidget(avatar); ui->statusBar->addWidget(status_label); ui->statusBar->addPermanentWidget(risc_vector); @@ -252,7 +265,7 @@ void GUI::on_upload_intructions_btn_clicked() "Binary Files (*.bin *.rv);;All Files (*.*)"); QFile file(filePath); if (filePath.isEmpty() || !file.open(QIODevice::ReadOnly)) { - this->set_status(get_no_instructions); + this->set_status(get_no_instructions, "angry"); return; } @@ -270,9 +283,9 @@ void GUI::on_upload_intructions_btn_clicked() } if (this->p.empty()) - this->set_status(get_no_instructions); + this->set_status(get_no_instructions, "angry"); else - this->set_status(get_load_file); + this->set_status(get_load_file, "happy"); file.close(); } @@ -305,10 +318,10 @@ void GUI::on_step_btn_clicked() if (!this->ready) return; - this->set_status(get_running); + this->set_status(get_running, "busy"); int steps = step_values[ui->step_slider->value()]; emit sendRunSteps(steps); - this->set_status(get_waiting); + this->set_status(get_waiting, "idle"); } void GUI::on_save_program_state_btn_clicked() @@ -333,13 +346,13 @@ void GUI::on_config_clicked() if (i != -1) { ways.push_back((unsigned int)i); } else { - this->set_status(get_bad_cache); + this->set_status(get_bad_cache, "angry"); return; } } if (this->p.empty()) { - this->set_status(get_no_instructions); + this->set_status(get_no_instructions, "angry"); return; } @@ -347,17 +360,28 @@ void GUI::on_config_clicked() // say something snarky if (!is_pipelined) - this->set_status(get_no_pipeline); + this->set_status(get_no_pipeline, "angry"); else if (ways.size() == 0) - this->set_status(get_no_cache); + this->set_status(get_no_cache, "angry"); else - this->set_status(get_initialize); + this->set_status(get_initialize, "happy"); emit sendConfigure(ways, this->p, is_pipelined); } -void GUI::set_status(const std::function &func) +void GUI::set_status( + const std::function &func, const QString &img) { this->status_label->setText( - "COMPUTER SAYS: \"" + QString::fromStdString(func()) + "\""); + "-> \"" + QString::fromStdString(func()) + "\""); + + QString img_path = ":resources/" + img; + QPixmap pixmap(img_path); + + if (!pixmap) { + return; + } + + this->avatar->setPixmap(pixmap); + this->avatar->show(); } diff --git a/gui/gui.h b/gui/gui.h index 7c5b440..7efde1f 100644 --- a/gui/gui.h +++ b/gui/gui.h @@ -51,15 +51,16 @@ class GUI : public QMainWindow /** * Uses `func' to set the current status. * @param a function which returns a string. + * @param a path to the desired avatar */ - void set_status(const std::function &func); + void set_status( + const std::function &func, + const QString &img = "idle.png"); signals: void sendRunSteps(int steps); void sendConfigure( - std::vector ways, - vector program, - bool is_pipelined); + std::vector ways, vector program, bool is_pipelined); private slots: void on_worker_refresh_gui(int value, int pc); @@ -116,6 +117,11 @@ class GUI : public QMainWindow */ QLabel *status_label; + /** + * The robot image displayed on the status bar. + */ + QLabel *avatar; + /** * The currently loaded program. */ diff --git a/gui/messages.h b/gui/messages.h index adae777..03c0ab3 100644 --- a/gui/messages.h +++ b/gui/messages.h @@ -9,19 +9,15 @@ #define RANDOM_MESSAGE(v) (v[std::rand() % v.size()]) const std::vector waiting = { - "WAITING FOR USER", "READY", "BORED", "SLEEPING"}; -const std::vector running = { - "COMPUTING", "WORKING", "BUSY"}; + "WAITING FOR USER", "IDLE", "BORED", "SLEEPING"}; +const std::vector running = {"COMPUTING", "WORKING", "BUSY"}; const std::vector load_file = {"FILE LOADED"}; const std::vector no_instructions = { - "NO PROGRAM PROVIDED", "INSTRUCTIONS NOT INCLUDED", - "NOTHING TO DO, GIVING UP"}; + "NO PROGRAM PROVIDED", "NOTHING TO DO, GIVING UP"}; const std::vector bad_cache = { "WAYS CANNOT BE BELOW 0 OR ABOVE 5"}; -const std::vector no_pipeline = { - "SIMULATION READY: NO PIPE :(", "SIMULATION READY"}; -const std::vector no_cache = { - "SIMULATION READY: NO WAYS", "SIMULATION READY"}; +const std::vector no_pipeline = {"SIMULATION READY: NO PIPE"}; +const std::vector no_cache = {"SIMULATION READY: NO CACHE"}; const std::vector initialize = {"SIMULATION READY"}; /** diff --git a/gui/resources.qrc b/gui/resources.qrc index 59fb36f..569cc22 100644 --- a/gui/resources.qrc +++ b/gui/resources.qrc @@ -2,6 +2,10 @@ resources/styles.qss + resources/idle.png + resources/angry.png + resources/happy.png + resources/busy.png resources/BigBlueTermPlusNerdFontMono-Regular.ttf diff --git a/gui/resources/angry.png b/gui/resources/angry.png new file mode 100644 index 0000000..3299eb4 Binary files /dev/null and b/gui/resources/angry.png differ diff --git a/gui/resources/busy.png b/gui/resources/busy.png new file mode 100644 index 0000000..df1b36a Binary files /dev/null and b/gui/resources/busy.png differ diff --git a/gui/resources/happy.png b/gui/resources/happy.png new file mode 100644 index 0000000..6168e89 Binary files /dev/null and b/gui/resources/happy.png differ diff --git a/gui/resources/idle.png b/gui/resources/idle.png new file mode 100644 index 0000000..f894716 Binary files /dev/null and b/gui/resources/idle.png differ diff --git a/gui/resources/styles.qss b/gui/resources/styles.qss index 9562b69..dbaa623 100644 --- a/gui/resources/styles.qss +++ b/gui/resources/styles.qss @@ -6,6 +6,28 @@ border: 0px solid "#000200"; } +QStatusBar { + font-size: 12pt; + color: "#000200"; + background-color: "#00cc00"; +} + +QLabel#msg_label { + font-size: 12pt; + color: "#000200"; + background-color: "#00cc00"; +} + +QLabel#info_label { + font-size: 12pt; + color: "#000200"; + background-color: "#00cc00"; +} + +QLabel#avatar_label { + background-color: "#00cc00"; +} + /* main window */ QWidget { } -- cgit v1.2.3 From 7528ad6291e6521127cf0e2a503be97095246bb0 Mon Sep 17 00:00:00 2001 From: bd Date: Mon, 21 Apr 2025 14:04:25 -0400 Subject: Add some new messages --- gui/messages.h | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) (limited to 'gui/messages.h') diff --git a/gui/messages.h b/gui/messages.h index 03c0ab3..f0cc504 100644 --- a/gui/messages.h +++ b/gui/messages.h @@ -9,16 +9,23 @@ #define RANDOM_MESSAGE(v) (v[std::rand() % v.size()]) const std::vector waiting = { - "WAITING FOR USER", "IDLE", "BORED", "SLEEPING"}; -const std::vector running = {"COMPUTING", "WORKING", "BUSY"}; -const std::vector load_file = {"FILE LOADED"}; + "WAITING FOR USER", "IDLE", "BORED", "SLEEPING", + "TAKING A BREAK", "IDLING", "DAYDREAMING", "WAITING FOR INPUT"}; +const std::vector running = { + "COMPUTING", "WORKING", "BUSY", "RUNNING"}; +const std::vector load_file = { + "FILE LOADED", "FILE PARSED", "FILE READ", "READING... DONE"}; const std::vector no_instructions = { - "NO PROGRAM PROVIDED", "NOTHING TO DO, GIVING UP"}; + "NO PROGRAM PROVIDED", "NOTHING TO DO, GIVING UP", "INSTRUCTIONS MISSING", + "404 INSTRUCTIONS NOT FOUND"}; const std::vector bad_cache = { - "WAYS CANNOT BE BELOW 0 OR ABOVE 5"}; -const std::vector no_pipeline = {"SIMULATION READY: NO PIPE"}; -const std::vector no_cache = {"SIMULATION READY: NO CACHE"}; -const std::vector initialize = {"SIMULATION READY"}; + "WAYS CANNOT BE BELOW 0 OR ABOVE 4"}; +const std::vector no_pipeline = { + "SIMULATION READY: NO PIPE", "PIPE OFF, SIMULATION READY"}; +const std::vector no_cache = { + "SIMULATION READY: NO CACHE", "CACHE OFF, SIMULATION READY"}; +const std::vector initialize = { + "SIMULATION READY", "ALL MODULES LOADED, SIMULATION READY"}; /** * @return an unsolicited status messages -- cgit v1.2.3 From 7cad6f05ebed25557fe6a31bfdf6290c72506868 Mon Sep 17 00:00:00 2001 From: bd Date: Mon, 21 Apr 2025 15:58:12 -0400 Subject: Add copyright to messages.h --- gui/messages.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'gui/messages.h') diff --git a/gui/messages.h b/gui/messages.h index f0cc504..461c461 100644 --- a/gui/messages.h +++ b/gui/messages.h @@ -1,3 +1,20 @@ +// Simulator for the RISC-V[ECTOR] mini-ISA +// Copyright (C) 2025 Siddarth Suresh +// Copyright (C) 2025 bdunahu + +// 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 3 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, see . + #ifndef MESSAGES_H #define MESSAGES_H #include -- cgit v1.2.3