diff --git a/src/frontends/qriscv/application.cc b/src/frontends/qriscv/application.cc index 0164ddd..b7d0a17 100644 --- a/src/frontends/qriscv/application.cc +++ b/src/frontends/qriscv/application.cc @@ -14,9 +14,9 @@ #include "uriscv/error.h" Application::Application(int &argc, char **argv) - : QApplication(argc, argv), settings("umps3", "umps"), config(NULL) { - setApplicationName("uRISCV"); - setWindowIcon(QIcon(":/icons/umps3-48.svg")); + : QApplication(argc, argv), settings("uriscv"), config(NULL) { + setApplicationName("µRISC-V"); + setWindowIcon(QIcon(":/icons/uriscv-48.svg")); dbgSession.reset(new DebugSession); diff --git a/src/frontends/qriscv/data/CMakeLists.txt b/src/frontends/qriscv/data/CMakeLists.txt index 93fd7a0..2b53f89 100644 --- a/src/frontends/qriscv/data/CMakeLists.txt +++ b/src/frontends/qriscv/data/CMakeLists.txt @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -set(ID org.virtualsquare.umps3) +set(ID org.virtualsquare.uriscv) add_subdirectory(icons) diff --git a/src/frontends/qriscv/data/icons/16x16/org.virtualsquare.umps3.svg b/src/frontends/qriscv/data/icons/16x16/org.virtualsquare.uriscv.svg similarity index 99% rename from src/frontends/qriscv/data/icons/16x16/org.virtualsquare.umps3.svg rename to src/frontends/qriscv/data/icons/16x16/org.virtualsquare.uriscv.svg index 9932c25..5214bb2 100644 --- a/src/frontends/qriscv/data/icons/16x16/org.virtualsquare.umps3.svg +++ b/src/frontends/qriscv/data/icons/16x16/org.virtualsquare.uriscv.svg @@ -11,7 +11,7 @@ height="16" version="1.1" id="svg22" - sodipodi:docname="umps3.svg" + sodipodi:docname="riscv.svg" inkscape:version="0.92.4 5da689c313, 2019-01-14"> diff --git a/src/frontends/qriscv/data/icons/22x22/org.virtualsquare.umps3.svg b/src/frontends/qriscv/data/icons/22x22/org.virtualsquare.uriscv.svg similarity index 99% rename from src/frontends/qriscv/data/icons/22x22/org.virtualsquare.umps3.svg rename to src/frontends/qriscv/data/icons/22x22/org.virtualsquare.uriscv.svg index 8381def..e0c23fa 100644 --- a/src/frontends/qriscv/data/icons/22x22/org.virtualsquare.umps3.svg +++ b/src/frontends/qriscv/data/icons/22x22/org.virtualsquare.uriscv.svg @@ -11,7 +11,7 @@ height="22" version="1" id="svg46" - sodipodi:docname="umps3.svg" + sodipodi:docname="uriscv.svg" inkscape:version="0.92.4 5da689c313, 2019-01-14"> diff --git a/src/frontends/qriscv/data/icons/24x24/org.virtualsquare.umps3.svg b/src/frontends/qriscv/data/icons/24x24/org.virtualsquare.uriscv.svg similarity index 99% rename from src/frontends/qriscv/data/icons/24x24/org.virtualsquare.umps3.svg rename to src/frontends/qriscv/data/icons/24x24/org.virtualsquare.uriscv.svg index 2e40981..037fcf6 100644 --- a/src/frontends/qriscv/data/icons/24x24/org.virtualsquare.umps3.svg +++ b/src/frontends/qriscv/data/icons/24x24/org.virtualsquare.uriscv.svg @@ -11,7 +11,7 @@ height="24" version="1" id="svg44" - sodipodi:docname="umps3.svg" + sodipodi:docname="uriscv.svg" inkscape:version="0.92.4 5da689c313, 2019-01-14"> diff --git a/src/frontends/qriscv/data/icons/32x32/org.virtualsquare.umps3.svg b/src/frontends/qriscv/data/icons/32x32/org.virtualsquare.uriscv.svg similarity index 99% rename from src/frontends/qriscv/data/icons/32x32/org.virtualsquare.umps3.svg rename to src/frontends/qriscv/data/icons/32x32/org.virtualsquare.uriscv.svg index 836ab7f..e531851 100644 --- a/src/frontends/qriscv/data/icons/32x32/org.virtualsquare.umps3.svg +++ b/src/frontends/qriscv/data/icons/32x32/org.virtualsquare.uriscv.svg @@ -11,7 +11,7 @@ height="32" version="1" id="svg44" - sodipodi:docname="umps3.svg" + sodipodi:docname="uriscv.svg" inkscape:version="0.92.4 5da689c313, 2019-01-14"> diff --git a/src/frontends/qriscv/data/icons/48x48/org.virtualsquare.umps3.svg b/src/frontends/qriscv/data/icons/48x48/org.virtualsquare.uriscv.svg similarity index 99% rename from src/frontends/qriscv/data/icons/48x48/org.virtualsquare.umps3.svg rename to src/frontends/qriscv/data/icons/48x48/org.virtualsquare.uriscv.svg index bb62569..ab7e81e 100644 --- a/src/frontends/qriscv/data/icons/48x48/org.virtualsquare.umps3.svg +++ b/src/frontends/qriscv/data/icons/48x48/org.virtualsquare.uriscv.svg @@ -11,7 +11,7 @@ height="48" version="1" id="svg48" - sodipodi:docname="umps3.svg" + sodipodi:docname="uriscv.svg" inkscape:version="0.92.4 5da689c313, 2019-01-14"> diff --git a/src/frontends/qriscv/data/icons/64x64/org.virtualsquare.umps3.svg b/src/frontends/qriscv/data/icons/64x64/org.virtualsquare.uriscv.svg similarity index 99% rename from src/frontends/qriscv/data/icons/64x64/org.virtualsquare.umps3.svg rename to src/frontends/qriscv/data/icons/64x64/org.virtualsquare.uriscv.svg index d59b13a..c54fac8 100644 --- a/src/frontends/qriscv/data/icons/64x64/org.virtualsquare.umps3.svg +++ b/src/frontends/qriscv/data/icons/64x64/org.virtualsquare.uriscv.svg @@ -11,7 +11,7 @@ height="64" version="1" id="svg44" - sodipodi:docname="umps3.svg" + sodipodi:docname="uriscv.svg" inkscape:version="0.92.4 5da689c313, 2019-01-14"> diff --git a/src/frontends/qriscv/data/org.virtualsquare.umps3.desktop b/src/frontends/qriscv/data/org.virtualsquare.uriscv.desktop similarity index 60% rename from src/frontends/qriscv/data/org.virtualsquare.umps3.desktop rename to src/frontends/qriscv/data/org.virtualsquare.uriscv.desktop index 2a34b73..28c3321 100644 --- a/src/frontends/qriscv/data/org.virtualsquare.umps3.desktop +++ b/src/frontends/qriscv/data/org.virtualsquare.uriscv.desktop @@ -7,11 +7,11 @@ Version=1.0 Type=Application -Name=µMPS3 -Comment=Virtual machine simulator based around the MIPS R2/3000 microprocessor +Name=µRISC-V +Comment=Virtual machine simulator based on RISC-V Categories=Education;Emulator; -Icon=org.virtualsquare.umps3 -Exec=umps3 +Icon=org.virtualsquare.uriscv +Exec=uriscv Terminal=false -Keywords=umps;umps3 +Keywords=uriscv,urisc-v diff --git a/src/frontends/qriscv/data/org.virtualsquare.umps3.metainfo.xml b/src/frontends/qriscv/data/org.virtualsquare.uriscv.metainfo.xml similarity index 50% rename from src/frontends/qriscv/data/org.virtualsquare.umps3.metainfo.xml rename to src/frontends/qriscv/data/org.virtualsquare.uriscv.metainfo.xml index 688cf57..dc6b145 100644 --- a/src/frontends/qriscv/data/org.virtualsquare.umps3.metainfo.xml +++ b/src/frontends/qriscv/data/org.virtualsquare.uriscv.metainfo.xml @@ -7,27 +7,27 @@ SPDX-License-Identifier: GPL-3.0-or-later --> - org.virtualsquare.umps3 + org.virtualsquare.uriscv - µMPS3 - Virtual machine simulator based around the MIPS R2/3000 microprocessor + µRISC-V + Virtual machine simulator based on RISC-V FSFAP GPL-3.0-or-later

- µMPS is an educational computer system architecture and an accompanying emulator designed from the ground up to achieve the right trade-off between simplicity and elegance on one side, and realism on the other. This makes µMPS ideally suited for use in education, such as hands-on operating systems or computer architecture university courses. + µRISC-V is an educational computer system architecture and an accompanying emulator designed from the ground up to achieve the right trade-off between simplicity and elegance on one side, and realism on the other. This makes µRISC-V ideally suited for use in education, such as hands-on operating systems or computer architecture university courses.

- The µMPS processor implements the MIPS I instruction set, and can therefore be supported out of the box by existing MIPS compilers. The architecture details a complete set of I/O devices (terminals, disks, flash devices, printers, and network adapters) that feature a clean, consistent, programming interface. + The µRISC-V processor implements the RISC-V instruction set, and can therefore be supported out of the box by existing RISC-V compilers. The architecture details a complete set of I/O devices (terminals, disks, flash devices, printers, and network adapters) that feature a clean, consistent, programming interface.

- The emulator comes with built-in debugging features and an easy to use graphical user interface. Apart from the emulator itself, several support utilities are provided that can get you quickly started in developing programs for µMPS. + The emulator comes with built-in debugging features and an easy to use graphical user interface. Apart from the emulator itself, several support utilities are provided that can get you quickly started in developing programs for µRISC-V.

- org.virtualsquare.umps3.desktop + org.virtualsquare.uriscv.desktop https://wiki.virtualsquare.org/education/pictures/umps3-1.png diff --git a/src/frontends/qriscv/debug_session.cc b/src/frontends/qriscv/debug_session.cc index 7902de0..adb6a44 100644 --- a/src/frontends/qriscv/debug_session.cc +++ b/src/frontends/qriscv/debug_session.cc @@ -189,7 +189,7 @@ void DebugSession::initializeMachine() { QString("Could not initialize machine: " "the file `%1' does not appear to be a valid Core file; " "make sure you are creating the file with the " - "umps3-elf2umps utility") + "uriscv-elf2uriscv utility") .arg(e.fileName.c_str())); return; } catch (const CoreFileOverflow &e) { diff --git a/src/frontends/qriscv/icons/umps3-48.svg b/src/frontends/qriscv/icons/uriscv-48.svg similarity index 99% rename from src/frontends/qriscv/icons/umps3-48.svg rename to src/frontends/qriscv/icons/uriscv-48.svg index 8bc9c7f..fa10c61 100644 --- a/src/frontends/qriscv/icons/umps3-48.svg +++ b/src/frontends/qriscv/icons/uriscv-48.svg @@ -11,7 +11,7 @@ height="48" version="1" id="svg48" - sodipodi:docname="umps3-48.svg" + sodipodi:docname="uriscv-48.svg" inkscape:version="0.92.4 5da689c313, 2019-01-14"> diff --git a/src/frontends/qriscv/monitor_window.cc b/src/frontends/qriscv/monitor_window.cc index 0ff5ad9..5076667 100644 --- a/src/frontends/qriscv/monitor_window.cc +++ b/src/frontends/qriscv/monitor_window.cc @@ -49,7 +49,7 @@ const char MonitorWindow::MonitorWindow() : QMainWindow(), dbgSession(Appl()->getDebugSession()) { - setWindowTitle("uRISCV"); + setWindowTitle("µRISC-V"); QVariant savedGeometry = Appl()->settings.value("MonitorWindow/geometry"); if (savedGeometry.isValid()) @@ -135,7 +135,7 @@ void MonitorWindow::createActions() { quitAction = new QAction("&Quit", this); quitAction->setShortcut(QKeySequence("Ctrl+Q")); - quitAction->setStatusTip("Quit uRISCV"); + quitAction->setStatusTip("Quit µRISC-V"); connect(quitAction, SIGNAL(triggered()), this, SLOT(close())); viewStopMaskAction = new QAction("Stop Mask", this); @@ -383,7 +383,7 @@ QWidget *MonitorWindow::createWelcomeTab() { layout->setContentsMargins(11, 22, 11, 11); QLabel *heading = - new QLabel(QString("Welcome to %1RISCV").arg(QChar(0x00b5))); + new QLabel(QString("Welcome to %1RISC-V").arg(QChar(0x00b5))); QFont font = heading->font(); font.setPointSizeF(font.pointSizeF() * 1.3); font.setBold(true); @@ -595,7 +595,7 @@ void MonitorWindow::onMachineConfigChanged() { configView->Update(); } - setWindowTitle(QString("%1 (%2) - uRISCV") + setWindowTitle(QString("%1 (%2) - µRISC-V") .arg(Appl()->document, Appl()->getCurrentDir())); updateRecentConfigList(); @@ -650,14 +650,14 @@ void MonitorWindow::showTerminal() { } void MonitorWindow::showAboutInfo() { - QString name = QString("%1MPS").arg(QChar(kCodePtMicro)); + QString name = QString("%1RISC-V").arg(QChar(kCodePtMicro)); QString text = - QString("

µMPS %1

" + QString("

µRISC-V %1

" "An educational computer system emulator" "

github.com/" - "virtualsquare/umps3

" - "Copyright © 1998-2020 µMPS authors" + "href='https://github.com/virtualsquare/uriscv'>github.com/" + "virtualsquare/uriscv" + "Copyright © 1998-2024 µRISC-V authors" "
" "

Credits

" "

" @@ -670,7 +670,7 @@ void MonitorWindow::showAboutInfo() { "

" "

License

" "

" - " µMPS is free software, licensed under" + " µRISC-V is free software, licensed under" " the GNU" " General Public License, version 3." "

") diff --git a/src/frontends/qriscv/processor_window.cc b/src/frontends/qriscv/processor_window.cc index 26da330..23043af 100644 --- a/src/frontends/qriscv/processor_window.cc +++ b/src/frontends/qriscv/processor_window.cc @@ -33,7 +33,7 @@ ProcessorWindow::ProcessorWindow(Word cpuId, QWidget *parent) : QMainWindow(parent), dbgSession(Appl()->getDebugSession()), cpuId(cpuId) { cpu = dbgSession->getMachine()->getProcessor(cpuId); - setWindowTitle(QString("uRISCV Processor %1").arg(cpuId)); + setWindowTitle(QString("µRISC-V Processor %1").arg(cpuId)); setDockOptions(AnimatedDocks | AllowTabbedDocks); createToolBar(); diff --git a/src/frontends/qriscv/qriscv.qrc b/src/frontends/qriscv/qriscv.qrc index 6810d37..6b6eb33 100644 --- a/src/frontends/qriscv/qriscv.qrc +++ b/src/frontends/qriscv/qriscv.qrc @@ -43,6 +43,6 @@ SPDX-License-Identifier: GPL-3.0-or-later icons/breakpoint_enabled-16.svg icons/breakpoint_disabled-16.svg - icons/umps3-48.svg + icons/uriscv-48.svg diff --git a/src/frontends/qriscv/terminal_window.cc b/src/frontends/qriscv/terminal_window.cc index c5b15f2..7cad9c3 100644 --- a/src/frontends/qriscv/terminal_window.cc +++ b/src/frontends/qriscv/terminal_window.cc @@ -22,7 +22,7 @@ TerminalWindow::TerminalWindow(unsigned int devNo, QWidget *parent) : QMainWindow(parent), devNo(devNo) { - setWindowTitle(QString("uRISCV Terminal %1").arg(devNo)); + setWindowTitle(QString("µRISC-V Terminal %1").arg(devNo)); setWindowIcon(QIcon(":/icons/terminal-32.svg")); TerminalDevice *terminal = getTerminal(devNo);