Fix .desktop file and remove uMPS3 references

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);
 

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)
 

src/frontends/qriscv/data/org.virtualsquare.umps3.desktop → 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

src/frontends/qriscv/data/org.virtualsquare.umps3.metainfo.xml → src/frontends/qriscv/data/org.virtualsquare.uriscv.metainfo.xml

@@ -7,27 +7,27 @@ SPDX-License-Identifier: GPL-3.0-or-later
 -->
 
 <component type="desktop-application">
-  <id>org.virtualsquare.umps3</id>
+  <id>org.virtualsquare.uriscv</id>
 
-  <name>µMPS3</name>
-  <summary>Virtual machine simulator based around the MIPS R2/3000 microprocessor</summary>
+  <name>µRISC-V</name>
+  <summary>Virtual machine simulator based on RISC-V</summary>
 
   <metadata_license>FSFAP</metadata_license>
   <project_license>GPL-3.0-or-later</project_license>
 
   <description>
     <p>
-      µ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.
     </p>
     <p>
-      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.
     </p>
     <p>
-      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.
     </p>
   </description>
 
-  <launchable type="desktop-id">org.virtualsquare.umps3.desktop</launchable>
+  <launchable type="desktop-id">org.virtualsquare.uriscv.desktop</launchable>
   <screenshots>
     <screenshot type="default">
       <image>https://wiki.virtualsquare.org/education/pictures/umps3-1.png</image>

src/frontends/qriscv/debug_session.cc

@@ -189,7 +189,7 @@ void DebugSession::initializeMachine() {
         QString("<b>Could not initialize machine:</b> "
                 "the file `%1' does not appear to be a valid <i>Core</i> file; "
                 "make sure you are creating the file with the "
-                "<code>umps3-elf2umps</code> utility")
+                "<code>uriscv-elf2uriscv</code> utility")
             .arg(e.fileName.c_str()));
     return;
   } catch (const CoreFileOverflow &e) {

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("<h2>&micro;MPS %1</h2>"
+      QString("<h2>&micro;RISC-V %1</h2>"
               "<em>An educational computer system emulator</em>"
               "<h4><a "
-              "href='https://github.com/virtualsquare/umps3'>github.com/"
-              "virtualsquare/umps3</a></h4>"
-              "Copyright &copy; 1998-2020 &micro;MPS authors"
+              "href='https://github.com/virtualsquare/uriscv'>github.com/"
+              "virtualsquare/uriscv</a></h4>"
+              "Copyright &copy; 1998-2024 &micro;RISC-V authors"
               "<hr />"
               "<h3 style='margin-top: 0;'>Credits</h3>"
               "<p style='margin: 0 0 0 10px;'>"
@@ -670,7 +670,7 @@ void MonitorWindow::showAboutInfo() {
               "<hr />"
               "<h3 style='margin-top: 0;'>License</h3>"
               "<p style='margin: 0 0 0 10px;'>"
-              " &micro;MPS is free software, licensed under"
+              " &micro;RISC-V is free software, licensed under"
               " the <a href='https://www.gnu.org/licenses/gpl-3.0.html'>GNU"
               " General Public License, version 3</a>."
               "</p>")

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();

src/frontends/qriscv/qriscv.qrc

@@ -43,6 +43,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
     <file>icons/breakpoint_enabled-16.svg</file>
     <file>icons/breakpoint_disabled-16.svg</file>
 
-    <file>icons/umps3-48.svg</file>
+    <file>icons/uriscv-48.svg</file>
   </qresource>
 </RCC>

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);