Merge branch 'master' into master

Author: jdupak

.github/workflows/debug.yml

@@ -123,7 +123,7 @@ jobs:
 
       - name: Get official RISC-V tests
         if: ${{ steps.cache-tests.outputs.cache-hit != 'true' }}
-        uses: alehechka/download-tartifact@v1
+        uses: alehechka/download-tartifact@v2
         with:
           name: riscv-official-tests
 

.github/workflows/release.yml

@@ -18,7 +18,7 @@ jobs:
           }
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       # CMake will not configure without Qt installed
       - name: Install Qt
@@ -42,7 +42,7 @@ jobs:
         run: make open_build_service_bundle
 
       - name: Store OBS bundle
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: obs-package-bundle
-          path: ${{ github.workspace }}/build/target/pkg
+          path: ${{ github.workspace }}/build/target/pkg

CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_policy(VERSION 3.10)
 
 project(QtRVSim
         LANGUAGES C CXX
-        VERSION 0.9.7
+        VERSION 0.9.8
         DESCRIPTION "RISC-V CPU simulator for education purposes")
 
 set(KAREL_KOCI "Karel Koci <cynerd@email.cz>")
@@ -47,11 +47,16 @@ set(PACKAGE_OUTPUT_PATH "${EXECUTABLE_OUTPUT_PATH}/pkg"
         CACHE STRING "Absolute path to place generated package files.")
 set(FORCE_COLORED_OUTPUT false CACHE BOOL "Always produce ANSI-colored output (GNU/Clang only).")
 set(USE_ALTERNATE_LINKER "" CACHE STRING "Use alternate linker. Leave empty for system default; alternatives are 'gold', 'lld', 'bfd', 'mold'")
+set(QT_VERSION_MAJOR "auto" CACHE STRING "Qt major version to use. 5|6|auto")
 
 # =============================================================================
 # Generated variables
 # =============================================================================
 
+if (NOT "${QT_VERSION_MAJOR}" MATCHES "5|6|auto")
+    message(FATAL_ERROR "Invalid value for QT_VERSION_MAJOR: ${QT_VERSION_MAJOR} (expected 5, 6 or auto)")
+endif ()
+
 if (${CMAKE_SYSTEM_NAME} MATCHES "Emscripten")
     set(WASM true)
 else ()
@@ -241,7 +246,10 @@ endif ()
 # Based on article https://www.steinzone.de/wordpress/how-to-support-both-qt5-and-qt6-using-cmake/
 # Cannot use version-less approach due to Qt 5.9.5 support constraint.
 
-find_package(QT NAMES Qt5 Qt6 COMPONENTS Core REQUIRED)
+if ("${QT_VERSION_MAJOR}" STREQUAL "auto")
+    find_package(QT NAMES Qt5 Qt6 COMPONENTS Core REQUIRED)
+endif ()
+
 # Normally, we would use variable Qt5 or Qt6 to reference the Qt library. Here we do that through
 # this variable based on detected version major of Qt.
 set(QtLib "Qt${QT_VERSION_MAJOR}")

data/cz.cvut.edu.comparch.qtrvsim.metainfo.xml.in

@@ -17,11 +17,16 @@
   </description>
 
   <releases>
-    <release version="@MAIN_PROJECT_VERSION@" date="2024-02-16">
+    <release version="@MAIN_PROJECT_VERSION@" date="2024-10-01">
       <description>
         <p>Current project release.</p>
       </description>
     </release>
+    <release version="0.9.7" date="2024-02-16">
+      <description>
+        <p>GUI fix crash when no tab is selected, use bundled LibElf on macOS as Homebrew misses RISC-V</p>
+      </description>
+    </release>
     <release version="0.9.6" date="2023-12-11">
       <description>
         <p>RISC-V A extension, ACLINT MTIMER, IRQ support, L2 cache, GUI editor tabs</p>

data/gui.desktop.in

@@ -7,3 +7,4 @@ Type=Application
 Comment=@GENERIC_NAME@
 Terminal=false
 Categories=System;Emulator;
+Keywords=emulator;RISC-V;education;

extras/packaging/deb/debian/changelog

@@ -1,3 +1,27 @@
+qtrvsim (0.9.8-1) unstable; urgency=medium
+
+  * Machine: aclintmtimer fix count type
+  * GUI: fix a crash on nonexistent include
+  * Use win32 config of libelf when compiling natively for Windows
+  * CI: Add Windows Clang debug build and macos ARM
+  * CLI: reporter dump to json
+  * Machine: instruction parsing refactor
+  * GUI: make printer settings persistent and scale to fit PDF page size
+  * Assembler: fix immediate parsing
+  * Assembler: implement GAS modifiers - PC rel still basic only
+  * Machine: fix zext.w/h inst parse and fix tokenized for inst.xxx
+  * Machine: fix parse_csr_address and CSR::RegisterMapByName key type
+  * Machine and GUI: Pseudo LRU cache policy
+  * Add 25x speed for teaching convenience
+  * Machien and GUI: Include Jiri Stefan's work on branch predictor
+  * Machien and GUI: BTB, BHT and BHR are implemented
+  * Project: Explicit cmake qt major version option
+  * Packaging: add Keywords entry into desktop file
+  * Machine: add peripherals high/top address aliases for XLEN=64
+  * GUI: switch "New" dialog page selection to tree widget, polishing required
+
+-- Pavel Pisa <pisa@cmp.felk.cvut.cz>  Tue, 01 Oct 2024 20:45:22 +0200
+
 qtrvsim (0.9.7-1) unstable; urgency=medium
 
   * GUI: fix examples button crashes on Windows and sometimes other platforms

src/cli/reporter.cpp

@@ -24,9 +24,9 @@ void Reporter::machine_exit() {
     report();
     if (e_fail != 0) {
         printf("Machine was expected to fail but it didn't.\n");
-        QCoreApplication::exit(1);
+        exit(1);
     } else {
-        QCoreApplication::exit();
+        exit(0);
     }
 }
 
@@ -62,13 +62,13 @@ void Reporter::machine_exception_reached() {
     ExceptionCause excause = machine->get_exception_cause();
     printf("Machine stopped on %s exception.\n", get_exception_name(excause));
     report();
-    QCoreApplication::exit();
+    exit(0);
 }
 
 void Reporter::cycle_limit_reached() {
     printf("Specified cycle limit reached\n");
     report();
-    QCoreApplication::exit();
+    exit(0);
 }
 
 void Reporter::machine_trap(SimulatorException &e) {
@@ -80,7 +80,7 @@ void Reporter::machine_trap(SimulatorException &e) {
     }
 
     printf("Machine trapped: %s\n", qPrintable(e.msg(false)));
-    QCoreApplication::exit(expected ? 0 : 1);
+    exit(expected ? 0 : 1);
 }
 
 void Reporter::report() {
@@ -219,3 +219,9 @@ void Reporter::report_range(const Reporter::DumpRange &range) {
         fprintf(stderr, "Failure closing %s\n", range.path_to_write.toLocal8Bit().data());
     }
 }
+
+void Reporter::exit(int retcode) {
+    // Exit might not happen immediately, so we need to stop the machine explicitly.
+    machine->pause();
+    QCoreApplication::exit(retcode);
+}

src/cli/reporter.h

@@ -74,6 +74,8 @@ private slots:
     void report_gp_reg(unsigned int i, bool last);
     void report_cache(const char *cache_name, const machine::Cache &cache);
 
+    void exit(int retcode);
+
 public:
     DumpFormat dump_format = DumpFormat::CONSOLE;
     QString dump_file_json;

src/gui/CMakeLists.txt

@@ -49,6 +49,9 @@ set(gui_SOURCES
         windows/coreview/components/value_handlers.cpp
         windows/coreview/components/cache.cpp
         widgets/hidingtabwidget.cpp
+        windows/predictor/predictor_btb_dock.cpp
+        windows/predictor/predictor_bht_dock.cpp
+        windows/predictor/predictor_info_dock.cpp
         )
 set(gui_HEADERS
         dialogs/about/aboutdialog.h
@@ -92,6 +95,9 @@ set(gui_HEADERS
         windows/coreview/components/cache.h
         helper/async_modal.h
         widgets/hidingtabwidget.h
+        windows/predictor/predictor_btb_dock.h
+        windows/predictor/predictor_bht_dock.h
+        windows/predictor/predictor_info_dock.h
         )
 set(gui_UI
         dialogs/gotosymbol/gotosymboldialog.ui