Merge remote-tracking branch 'upstream/master' into reg-watchpoints

Author: Sightem

.github/workflows/build.linux.workflow.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   build:
-    name: "Build: ${{ matrix.os }} - ${{ matrix.qtver }}"
+    name: "Build: ${{ matrix.os }} - ${{ matrix.archvariant }}"
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
@@ -19,11 +19,11 @@ jobs:
         statictype: [ON, OFF]
         include:
           - statictype: ON
-            qtver: Qt6
+            archvariant: "x64"
             host_triplet: release
             release_suffix: static
           - statictype: OFF
-            qtver: Qt6-Dynamic
+            archvariant: "x64-Dynamic"
             host_triplet: dynamic-apng-release
             release_suffix: shared
 
@@ -51,26 +51,26 @@ jobs:
       with:
         vcpkgJsonGlob: '**/gui/qt/vcpkg.json'
 
-    - name: Build CEmu ${{ matrix.qtver }} ${{ matrix.config }} on Linux ${{ matrix.arch }}
+    - name: Build CEmu ${{ matrix.archvariant }} ${{ matrix.config }} on Linux ${{ matrix.arch }}
       uses: lukka/run-cmake@67c73a83a46f86c4e0b96b741ac37ff495478c38 # latest as of 2025-10-04
       with:
         cmakeListsTxtPath: '${{ github.workspace }}/gui/qt/CMakeLists.txt'
-        configurePreset: 'Linux-${{ matrix.arch }}-${{ matrix.qtver }}'
+        configurePreset: 'Linux-${{ matrix.archvariant }}'
         configurePresetAdditionalArgs: "['-DDEPS_RELEASE_ONLY=ON', '-DSHORT_VERSION=v3.0']"
-        buildPreset: 'Linux-${{ matrix.arch }}-${{ matrix.qtver }}-${{ matrix.config }}'
+        buildPreset: 'Linux-${{ matrix.archvariant }}-${{ matrix.config }}'
       env:
         VCPKG_DEFAULT_HOST_TRIPLET: ${{ matrix.arch }}-linux-${{ matrix.host_triplet }}
         VCPKG_FORCE_SYSTEM_BINARIES: 1
 
     - name: Upload binary as artifact
       uses: actions/upload-artifact@v4
       with:
-        name: CEmu_linux_${{ matrix.qtver }}_master
-        path: ${{ github.workspace }}/gui/qt/CEmu.build/Linux-${{ matrix.arch }}-${{ matrix.qtver }}/${{ matrix.config }}/CEmu
+        name: CEmu_linux_${{ matrix.archvariant }}_master
+        path: ${{ github.workspace }}/gui/qt/CEmu.build/Linux-${{ matrix.archvariant }}/${{ matrix.config }}/CEmu
 
     - name: Prepare binary for release upload
       run: |
-        mv ${{ github.workspace }}/gui/qt/CEmu.build/Linux-${{ matrix.arch }}-${{ matrix.qtver }}/${{ matrix.config }}/CEmu ${{ github.workspace }}/CEmu-nightly_linux64_qt6_${{ matrix.release_suffix }}
+        mv ${{ github.workspace }}/gui/qt/CEmu.build/Linux-${{ matrix.archvariant }}/${{ matrix.config }}/CEmu ${{ github.workspace }}/CEmu-nightly_linux64_${{ matrix.release_suffix }}
 
     - name: Update nightly release
       if: ${{ github.ref == 'refs/heads/master' && github.event_name != 'pull_request' }}
@@ -80,4 +80,4 @@ jobs:
         prerelease: true
         token: ${{secrets.GITHUB_TOKEN}}
         files: |
-          ${{ github.workspace }}/CEmu-nightly_linux64_qt6_${{ matrix.release_suffix }}
+          ${{ github.workspace }}/CEmu-nightly_linux64_${{ matrix.release_suffix }}

.github/workflows/build.mac.workflow.yml

@@ -8,25 +8,19 @@ on:
 
 jobs:
   build:
-    name: "Build: ${{ matrix.os }} Qt${{ matrix.qtvershort }}"
+    name: "Build: ${{ matrix.os }} ${{ matrix.archname }}"
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        qtvershort: [5_intel, 6_intel, 6_arm]
+        archname: [intel, arm]
         config: [Release]
         include:
-          - qtvershort: "5_intel"
+          - archname: "intel"
             arch: x64
-            qtver: Qt5
             os: macos-13
-          - qtvershort: "6_intel"
-            arch: x64
-            qtver: Qt6
-            os: macos-13
-          - qtvershort: "6_arm"
+          - archname: "arm"
             arch: arm64
-            qtver: Qt6
             os: macos-14
 
     steps:
@@ -48,21 +42,21 @@ jobs:
       with:
         vcpkgJsonGlob: '**/gui/qt/vcpkg.json'
 
-    - name: Build CEmu ${{ matrix.qtver }} ${{ matrix.config }} on macOS ${{ matrix.arch }}
+    - name: Build CEmu ${{ matrix.config }} on macOS ${{ matrix.arch }}
       uses: lukka/run-cmake@67c73a83a46f86c4e0b96b741ac37ff495478c38 # latest as of 2025-10-04
       with:
         cmakeListsTxtPath: '${{ github.workspace }}/gui/qt/CMakeLists.txt'
-        configurePreset: 'Mac-${{ matrix.arch }}-${{ matrix.qtver }}'
+        configurePreset: 'Mac-${{ matrix.arch }}'
         configurePresetAdditionalArgs: "['-DDEPS_RELEASE_ONLY=ON', '-DSHORT_VERSION=v3.0']"
-        buildPreset: 'Mac-${{ matrix.arch }}-${{ matrix.qtver }}-${{ matrix.config }}'
+        buildPreset: 'Mac-${{ matrix.arch }}-${{ matrix.config }}'
       env:
         VCPKG_DEFAULT_HOST_TRIPLET: ${{ matrix.arch }}-osx-release
         VCPKG_FORCE_SYSTEM_BINARIES: 1
 
     - name: Move to temp folder
       run: |
-        mkdir -p /tmp/CEmu-nightly_mac_qt${{matrix.qtvershort}}/
-        mv ${{ github.workspace }}/gui/qt/CEmu.build/Mac-${{ matrix.arch }}-${{ matrix.qtver }}/${{ matrix.config }}/CEmu.app /tmp/CEmu-nightly_mac_qt${{matrix.qtvershort}}/
+        mkdir -p /tmp/CEmu-nightly_mac_${{matrix.archname}}/
+        mv ${{ github.workspace }}/gui/qt/CEmu.build/Mac-${{ matrix.arch }}/${{ matrix.config }}/CEmu.app /tmp/CEmu-nightly_mac_${{matrix.archname}}/
 
     - name: "Codesign CEmu.app"
       env:
@@ -79,21 +73,21 @@ jobs:
           security unlock-keychain -p $MACOS_KEYCHAIN_PWD build.keychain
           security import certificate.p12 -k build.keychain -P $MACOS_CERTIFICATE_PWD -T /usr/bin/codesign
           security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k $MACOS_KEYCHAIN_PWD build.keychain
-          /usr/bin/codesign --deep --force --verify --verbose --sign "$MACOS_CODESIGN_IDENT" --timestamp --options runtime /tmp/CEmu-nightly_mac_qt${{matrix.qtvershort}}/CEmu.app
+          /usr/bin/codesign --deep --force --verify --verbose --sign "$MACOS_CODESIGN_IDENT" --timestamp --options runtime /tmp/CEmu-nightly_mac_${{matrix.archname}}/CEmu.app
 
     - name: "Create the DMG"
       run: |
           brew install create-dmg || brew install create-dmg; # we try twice because sometimes it fails...
           # The codesign variable may be empty (for forks) but that's fine, create-dmg only does code-signing if it's not empty.
           createDmgArgs="--codesign '${{ secrets.MACOS_CODESIGN_IDENT }}' \
-              --volname 'CEmu-nightly Qt${{matrix.qtvershort}}' \
+              --volname 'CEmu-nightly ${{matrix.archname}}' \
               --window-pos 200 120 \
               --window-size 600 400 \
               --icon-size 64 \
               --icon 'CEmu.app' 125 200 \
               --app-drop-link 400 200 \
-              'CEmu-nightly_mac_qt${{matrix.qtvershort}}.dmg' \
-              '/tmp/CEmu-nightly_mac_qt${{matrix.qtvershort}}/'"
+              'CEmu-nightly_mac_${{matrix.archname}}.dmg' \
+              '/tmp/CEmu-nightly_mac_${{matrix.archname}}/'"
           eval "create-dmg $createDmgArgs" || eval "create-dmg $createDmgArgs" # We also retry just in case...
 
     - name: "[macOS] Notarize and staple DMG"
@@ -105,14 +99,14 @@ jobs:
         APPLE_NOTARIZATION_TEAMID: ${{ secrets.APPLE_NOTARIZATION_TEAMID }}
       run: |
         xcrun notarytool store-credentials "notarytool-profile" --apple-id "$APPLE_NOTARIZATION_USERNAME" --team-id "$APPLE_NOTARIZATION_TEAMID" --password "$APPLE_NOTARIZATION_PASSWORD"
-        xcrun notarytool submit "CEmu-nightly_mac_qt${{matrix.qtvershort}}.dmg" --keychain-profile "notarytool-profile" --wait
-        xcrun stapler staple "CEmu-nightly_mac_qt${{matrix.qtvershort}}.dmg"
+        xcrun notarytool submit "CEmu-nightly_mac_${{matrix.archname}}.dmg" --keychain-profile "notarytool-profile" --wait
+        xcrun stapler staple "CEmu-nightly_mac_${{matrix.archname}}.dmg"
 
     - name: Upload dmg as artifact
       uses: actions/upload-artifact@v4
       with:
-          name: CEmu-nightly_mac_qt${{matrix.qtvershort}}
-          path: CEmu-nightly_mac_qt${{matrix.qtvershort}}.dmg
+          name: CEmu-nightly_mac_${{matrix.archname}}
+          path: CEmu-nightly_mac_${{matrix.archname}}.dmg
 
     - name: Update nightly release
       if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request'
@@ -122,4 +116,4 @@ jobs:
         prerelease: true
         token: ${{secrets.GITHUB_TOKEN}}
         files: |
-          CEmu-nightly_mac_qt${{matrix.qtvershort}}.dmg
+          CEmu-nightly_mac_${{matrix.archname}}.dmg

.github/workflows/build.windows.workflow.yml

@@ -8,25 +8,18 @@ on:
 
 jobs:
   build:
-    name: "Build: Windows ${{ matrix.arch }}-${{ matrix.config }}-${{ matrix.qtver }}"
+    name: "Build: Windows ${{ matrix.arch }}-${{ matrix.config }}"
     runs-on: windows-latest
 
     strategy:
       fail-fast: false
       matrix:
-        arch: [x64, x86]
-        qtver: [Qt5, Qt6]
+        arch: [x64]
         config: [Release]
-        exclude:
-          - arch: x86
-            qtver: Qt6
         include:
           - arch: x64
             arch_name: 64-bit
             arch_suffix: "64"
-          - arch: x86
-            arch_name: 32-bit
-            arch_suffix: "32"
     steps:
     - name: Remove Perl Strawberry installation
       # Removes conflicting headers from include paths
@@ -46,29 +39,29 @@ jobs:
       with:
         vcpkgJsonGlob: '**/gui/qt/vcpkg.json'
 
-    - name: Build CEmu ${{ matrix.qtver }} ${{ matrix.config }} on Windows ${{ matrix.arch_name }}
+    - name: Build CEmu ${{ matrix.config }} on Windows ${{ matrix.arch_name }}
       uses: lukka/run-cmake@67c73a83a46f86c4e0b96b741ac37ff495478c38 # latest as of 2025-10-04
       with:
         cmakeListsTxtPath: '${{ github.workspace }}/gui/qt/CMakeLists.txt'
-        configurePreset: 'Win-${{ matrix.arch }}-${{ matrix.qtver }}'
+        configurePreset: 'Win-${{ matrix.arch }}'
         configurePresetAdditionalArgs: "['-DDEPS_RELEASE_ONLY=ON', '-DSHORT_VERSION=v3.0']"
-        buildPreset: 'Win-${{ matrix.arch }}-${{ matrix.qtver }}-${{ matrix.config }}'
+        buildPreset: 'Win-${{ matrix.arch }}-${{ matrix.config }}'
       env:
         VCPKG_DEFAULT_TRIPLET: ${{ matrix.arch }}-windows
         VCPKG_DEFAULT_HOST_TRIPLET: x64-windows-static-release
         VCPKG_FORCE_SYSTEM_BINARIES: 1
 
-    - name: Upload ${{ matrix.arch_name }} ${{ matrix.config }} ${{ matrix.qtver }} EXE
+    - name: Upload ${{ matrix.arch_name }} ${{ matrix.config }} EXE
       uses: actions/upload-artifact@v4
       with:
-        name: CEmu_win${{ matrix.arch_suffix }}_${{ matrix.qtver }}_master
-        path: ${{ github.workspace }}/gui/qt/CEmu.build/Win-${{ matrix.arch }}-${{ matrix.qtver }}/${{ matrix.config }}/CEmu.exe
+        name: CEmu_win${{ matrix.arch_suffix }}_master
+        path: ${{ github.workspace }}/gui/qt/CEmu.build/Win-${{ matrix.arch }}/${{ matrix.config }}/CEmu.exe
 
     - name: Prepare binary for release upload
       if: ${{ matrix.config == 'Release' }}
       run: |
-        $ReleaseName = "CEmu-nightly_win${{ matrix.arch_suffix }}-msvc_${{ matrix.qtver }}.exe".Replace("Qt", "qt")
-        Rename-Item -Path "${{ github.workspace }}/gui/qt/CEmu.build/Win-${{ matrix.arch }}-${{ matrix.qtver }}/${{ matrix.config }}/CEmu.exe" -NewName $ReleaseName
+        $ReleaseName = "CEmu-nightly_win${{ matrix.arch_suffix }}-msvc.exe"
+        Rename-Item -Path "${{ github.workspace }}/gui/qt/CEmu.build/Win-${{ matrix.arch }}/${{ matrix.config }}/CEmu.exe" -NewName $ReleaseName
         echo "RELEASE_NAME=$ReleaseName" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
 
     - name: Update nightly release
@@ -79,4 +72,4 @@ jobs:
         prerelease: true
         token: ${{secrets.GITHUB_TOKEN}}
         files: |
-          ./gui/qt/CEmu.build/Win-${{ matrix.arch }}-${{ matrix.qtver }}/${{ matrix.config }}/${{ env.RELEASE_NAME }}
+          ./gui/qt/CEmu.build/Win-${{ matrix.arch }}/${{ matrix.config }}/${{ env.RELEASE_NAME }}

.github/workflows/coverity.workflow.yml

@@ -10,15 +10,15 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
     - name: Checkout Git Repo
-      uses: actions/checkout@v3
+      uses: actions/checkout@v5
       with:
         submodules: 'recursive'
 
-    - name: Install Linux dependencies (Ubuntu 18.04+)
+    - name: Install Linux dependencies (Ubuntu 22.04+)
       run: |
         set -e
         sudo apt-get update
-        sudo apt-get install qtbase5-dev qt5-qmake libgl1-mesa-dev libarchive-dev libudev-dev libusb-1.0-0-dev
+        sudo apt-get install qt6-base-dev qmake6 libgl1-mesa-dev libarchive-dev libudev-dev libusb-1.0-0-dev
         
     - name: Prepare build
       run: |

core/keypad.c

@@ -88,7 +88,6 @@ static uint8_t keypad_handle_ghosting(uint8_t data, uint8_t queryMask) {
     uint64_t ghostMatrix = data;
     uint8_t peekRows = 0;
     uint8_t ghostData = 0;
-    uint8_t shift = 0;
     for (uint8_t row = 0; row < KEYPAD_ACTUAL_ROWS; row++) {
         if (!(queryMask & (1 << row))) {
             uint8_t peekData = keypad_peek_keymap(row);

gui/qt/CEmu.pro

@@ -1,6 +1,5 @@
 if (lessThan(QT_MAJOR_VERSION, 6)) {
-    lessThan(QT_MAJOR_VERSION, 5) : error("You need at least Qt 5.7 to build CEmu!")
-    lessThan(QT_MINOR_VERSION, 7) : error("You need at least Qt 5.7 to build CEmu!")
+    lessThan(QT_MINOR_VERSION, 2) : error("You need at least Qt 6.2 to build CEmu!")
 }
 
 # Error if git submodules are not downloaded
@@ -60,7 +59,7 @@ TEMPLATE = app
 # Localization
 TRANSLATIONS += i18n/fr_FR.ts i18n/es_ES.ts i18n/nl_NL.ts i18n/zh_CN.ts
 
-CONFIG += c++14 c++2a c++20 console
+CONFIG += c++2a c++20 console
 
 # Seems to fix some LTO issues. See https://github.com/CE-Programming/CEmu/issues/366
 CONFIG += ltcg

gui/qt/CMakeLists.txt

@@ -1,19 +1,8 @@
 cmake_minimum_required(VERSION 3.21.1)
 
-option(USE_QT5 "Build with Qt5 instead of Qt6" OFF)
-
-if(USE_QT5)
-    list(APPEND VCPKG_MANIFEST_FEATURES "qt5")
-    if(APPLE)
-        set(ENV{MACOSX_DEPLOYMENT_TARGET} "10.13")
-        set(ENV{VCPKG_KEEP_ENV_VARS} "MACOSX_DEPLOYMENT_TARGET")
-    endif()
-else()
-    list(APPEND VCPKG_MANIFEST_FEATURES "qt6")
-    if(APPLE)
-        set(ENV{MACOSX_DEPLOYMENT_TARGET} "11.0")
-        set(ENV{VCPKG_KEEP_ENV_VARS} "MACOSX_DEPLOYMENT_TARGET")
-    endif()
+if(APPLE)
+    set(ENV{MACOSX_DEPLOYMENT_TARGET} "11.0")
+    set(ENV{VCPKG_KEEP_ENV_VARS} "MACOSX_DEPLOYMENT_TARGET")
 endif()
 
 option(DEPS_RELEASE_ONLY "Build only release versions of vcpkg dependencies" OFF)
@@ -48,22 +37,10 @@ set(CMAKE_SKIP_RPATH TRUE)
 set(USED_CMAKE_GENERATOR "${CMAKE_GENERATOR}" CACHE STRING "Expose CMAKE_GENERATOR" FORCE)
 message(STATUS "Detected system: ${CMAKE_SYSTEM_NAME} - host processor: ${CMAKE_HOST_SYSTEM_PROCESSOR} - CXX_COMPILER: ${CMAKE_CXX_COMPILER_ID}")
 
-# C11, and C++20 if supported otherwise C++14
 set(CMAKE_C_STANDARD 11)
 set(CMAKE_C_STANDARD_REQUIRED ON)
-include(CheckCXXCompilerFlag)
-if(MSVC)
-    CHECK_CXX_COMPILER_FLAG("/std:c++20" COMPILER_SUPPORTS_CXX20)
-else()
-    CHECK_CXX_COMPILER_FLAG("-std=c++2a" COMPILER_SUPPORTS_CXX20)
-endif()
-if(COMPILER_SUPPORTS_CXX20)
-    set(CMAKE_CXX_STANDARD 20)
-    add_definitions(-DTH_GDB_SUPPORT=1)
-else()
-    set(CMAKE_CXX_STANDARD 14)
-    set(CMAKE_CXX_STANDARD_REQUIRED ON)
-endif()
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 # Sane flags
 if(MSVC)
@@ -84,12 +61,8 @@ endif()
 
 include(GNUInstallDirs)
 
-if(USE_QT5)
-    find_package(Qt5 REQUIRED COMPONENTS Core DBus Gui Network Widgets)
-else()
-    find_package(QT NAMES Qt6 REQUIRED COMPONENTS Core)
-    find_package(Qt6 REQUIRED COMPONENTS DBus Gui Network Widgets)
-endif()
+find_package(QT NAMES Qt6 REQUIRED COMPONENTS Core)
+find_package(Qt6 REQUIRED COMPONENTS DBus Gui Network Widgets)
 
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOMOC ON)
@@ -213,11 +186,7 @@ set(CEmu_Sources
     ${CEmu_Resources}
 )
 
-if(USE_QT5)
-    add_executable(CEmu ${MAYBE_MACOSX_BUNDLE} ${CEmu_Sources})
-else()
-    qt_add_executable(CEmu ${MAYBE_MACOSX_BUNDLE} ${CEmu_Sources})
-endif()
+qt_add_executable(CEmu ${MAYBE_MACOSX_BUNDLE} ${CEmu_Sources})
 
 # TODO better, see https://stackoverflow.com/a/21028226/378298
 execute_process(
@@ -251,6 +220,7 @@ target_compile_definitions(CEmu PRIVATE
     CEMU_VERSION=\"${SHORT_VERSION}${VERSION_SUFFIX}\"
     DEBUG_SUPPORT
     MULTITHREAD
+    TH_GDB_SUPPORT=1
 )
 
 if(CYGWIN OR NOT WIN32)
@@ -284,16 +254,16 @@ if(PkgConfig_FOUND)
     endif()
 endif()
 
-if(APPLE AND NOT (CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "arm64"))
-    message("For now, libpng-apng is disabled on intel macs... see issue #528. APNG capture will not be available")
+if((DEFINED ENV{GITHUB_ACTION}) AND APPLE AND NOT (CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "arm64"))
+    message("For now, libpng-apng is disabled on intel macs on CI... see issue #528. APNG capture will not be available")
 else()
     find_package(PNG QUIET)
     if(PNG_FOUND)
         include(CheckSymbolExists)
         set(CMAKE_REQUIRED_INCLUDES ${PNG_INCLUDE_DIRS})
         check_symbol_exists(PNG_WRITE_APNG_SUPPORTED "png.h" HAVE_PROPER_APNG_LIB)
         if(HAVE_PROPER_APNG_LIB)
-            set_property(TARGET CEmu PROPERTY AUTOMOC_MOC_OPTIONS "-DPNG_WRITE_APNG_SUPPORTED")
+            list(APPEND CMAKE_AUTOMOC_MOC_OPTIONS "-DPNG_SUPPORT" "-DPNG_WRITE_APNG_SUPPORTED")
             target_compile_definitions(CEmu PRIVATE "PNG_SUPPORT")
             target_link_libraries(CEmu PRIVATE PNG::PNG)
         else()