Qt: Update Base Translation

[ci skip]

.github/ISSUE_TEMPLATE/app_bug_report.yaml

@@ -29,6 +29,9 @@ body:
           - If your bug is the result of upscaling please use the forums or discord for assistance with various upscaling workarounds. Additionally, the unofficial PCSX2 [Wiki](https://wiki.pcsx2.net/Main_Page) often lists various fixes for upscaling issues.
         - We do **not** accept issues relating to Widescreen/no-interlace patches at this time.
           - Any issues pertaining to Widescreen/no-interlace patches please forward them to the [patches repository](https://github.com/PCSX2/pcsx2_patches). 
+        - We do **not** accept issues pertaining to Linux builds other than the official AppImage and Flatpak.
+          - Please contact your packager for support. We have no control over other builds, nor can we investigate any issues, and historically they have been known to be broken.
+          - This includes pre-configured "distributions" such as EmuDeck, the "AUR", etc.
 
   - type: textarea
     id: desc
@@ -67,11 +70,10 @@ body:
       - Windows 11
       - Windows 10 (64bit)
       - Linux (64bit) - Specify distro below
+      - macOS 14 (Sonoma)
       - macOS 13 (Ventura)
       - macOS 12 (Monterey)
       - macOS 11 (Big Sur)
-      - macOS 10.15 (Catalina)
-      - macOS 10.14 (Mojave)
     validations:
       required: true
   - type: input

.github/ISSUE_TEMPLATE/emu_bug_report.yaml

@@ -18,6 +18,8 @@ body:
 
         Please make an effort to make sure your issue isn't already reported.
 
+        Please make sure your game is verified using the built-in game verifier.
+
         Do not create issues involving software piracy of BIOS or ISO files, our rules specifically prohibit this and your issue will be closed.
 
         ### Please Avoid Issues Pertaining to the Following:
@@ -29,6 +31,9 @@ body:
           - If your bug is the result of upscaling please use the forums or discord for assistance with various upscaling workarounds. Additionally, the unofficial PCSX2 [Wiki](https://wiki.pcsx2.net/Main_Page) often lists various fixes for upscaling issues.
         - We do **not** accept issues relating to Widescreen/no-interlace patches at this time.
           - Any issues pertaining to Widescreen/no-interlace patches please forward them to the [patches repository](https://github.com/PCSX2/pcsx2_patches). 
+        - We do **not** accept issues pertaining to Linux builds other than the official AppImage and Flatpak.
+          - Please contact your packager for support. We have no control over other builds, nor can we investigate any issues, and historically they have been known to be broken.
+          - This includes pre-configured "distributions" such as EmuDeck, the "AUR", etc.
 
   - type: textarea
     id: desc
@@ -82,11 +87,10 @@ body:
       - Windows 11
       - Windows 10 (64bit)
       - Linux (64bit) - Specify distro below
+      - macOS 14 (Sonoma)
       - macOS 13 (Ventura)
       - macOS 12 (Monterey)
       - macOS 11 (Big Sur)
-      - macOS 10.15 (Catalina)
-      - macOS 10.14 (Mojave)
     validations:
       required: true
   - type: input
@@ -124,9 +128,9 @@ body:
       description: |
         Any non-default core settings. If you don't want to list them out, please provide screenshots of your configuration window.
 
-        Please note that the safe preset works for most games. MTVU can have some compatibility issues so please disable it before making a report.
+        Please note that defaults tend to work best.
 
-        If you need to modify the settings manually because a game requires you to do so to work, please state that explicitly.
+        If you need to modify the settings manually to fix an issue , please state that explicitly.
     validations:
       required: false
   - type: textarea

.github/ISSUE_TEMPLATE/feature_request.yaml

@@ -2,7 +2,7 @@
 name: Feature request
 description: Suggest a new feature or improve an existing one
 title: "[Feature Request]: "
-labels: ["Enhancement / Feature Request"]
+labels: ["Enhancement / Feature Request", "FR: Awaiting Consideration"]
 # assignees:
 #   - octocat
 body:

.github/dependabot.yml

@@ -6,3 +6,7 @@ updates:
     schedule:
       # Check for updates to GitHub Actions every week
       interval: "weekly"
+    groups:
+      ci-deps:
+        patterns:
+          - "*"

.github/labeler.yml

@@ -2,127 +2,187 @@
 
 # General Labels
 'Build | Project System':
-  - '.github/*'
-  - '.github/**/*'
-  - '*.sln'
-  - '**/*.sln'
-  - '*.vcxproj*'
-  - '**/*.vcxproj*'
-  - 'cmake/*'
-  - 'cmake/**/*'
-  - 'CMakeLists.txt'
-  - '**/CMakeLists.txt'
-  - 'build.sh'
+  - changed-files:
+    - any-glob-to-any-file:
+      - '.github/*'
+      - '.github/**/*'
+      - '*.sln'
+      - '**/*.sln'
+      - '*.vcxproj*'
+      - '**/*.vcxproj*'
+      - 'cmake/*'
+      - 'cmake/**/*'
+      - 'CMakeLists.txt'
+      - '**/CMakeLists.txt'
+      - 'build.sh'
 'Dependencies':
-  - '3rdparty/*'
-  - '3rdparty/**/*'
-  - '**/3rdpartyDeps.props'
-  - '.gitmodules'
+  - changed-files:
+    - any-glob-to-any-file:
+      - '3rdparty/*'
+      - '3rdparty/**/*'
+      - '**/3rdpartyDeps.props'
+      - '.gitmodules'
 'Documentation':
-  - '*.md'
-  - '**/*.md'
-  - '*.pdf'
-  - '**/*.pdf'
+  - changed-files:
+    - any-glob-to-any-file:
+      - '*.md'
+      - '**/*.md'
+      - '*.pdf'
+      - '**/*.pdf'
 'GUI/Qt':
-  - 'pcsx2-qt/*'
-  - 'pcsx2-qt/**/*'
-  - '3rdparty/Qt/*'
-  - '3rdparty/Qt/**/*'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'pcsx2-qt/*'
+      - 'pcsx2-qt/**/*'
+      - '3rdparty/Qt/*'
+      - '3rdparty/Qt/**/*'
 'GameDB':
-  - '**/GameIndex.*'
+  - changed-files:
+    - any-glob-to-any-file:
+      - '**/GameIndex.*'
 'Installer | Package':
-  - 'build.sh'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'build.sh'
 'Translations':
-  - 'pcsx2-qt/Translations/*'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'pcsx2-qt/Translations/*'
 
 # Tools / Features
 'Debugger':
-  - 'pcsx2/DebugTools/*'
-  - 'pcsx2/DebugTools/**/*'
-  - 'pcsx2-qt/Debugger/*'
-  - 'pcsx2-qt/Debugger/**/*'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'pcsx2/DebugTools/*'
+      - 'pcsx2/DebugTools/**/*'
+      - 'pcsx2-qt/Debugger/*'
+      - 'pcsx2-qt/Debugger/**/*'
 'IPC':
-  - 'pcsx2/IPC*'
-  - 'pcsx2/**/IPC*'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'pcsx2/IPC*'
+      - 'pcsx2/**/IPC*'
 'TAS Functionality':
-  - 'pcsx2/Recording/*'
-  - 'pcsx2/Recording/**/*'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'pcsx2/Recording/*'
+      - 'pcsx2/Recording/**/*'
 'RetroAchievements':
-  - 'pcsx2/Frontend/Achievements.*'
-  - 'pcsx2/Achievements.*'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'pcsx2/Frontend/Achievements.*'
+      - 'pcsx2/Achievements.*'
 
 # Emulation Components
 'Counters':
-  - 'pcsx2/Counters.*'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'pcsx2/Counters.*'
 'Vector Units':
-  - 'pcsx2/VU*'
-  - 'pcsx2/**/VU*'
-  - 'pcsx2/*VU*'
-  - 'pcsx2/**/*VU*'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'pcsx2/VU*'
+      - 'pcsx2/**/VU*'
+      - 'pcsx2/*VU*'
+      - 'pcsx2/**/*VU*'
 'VIF':
-  - 'pcsx2/Vif*'
-  - 'pcsx2/**/Vif*'
-  - 'pcsx2/VIF*'
-  - 'pcsx2/**/VIF*'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'pcsx2/Vif*'
+      - 'pcsx2/**/Vif*'
+      - 'pcsx2/VIF*'
+      - 'pcsx2/**/VIF*'
 
 # GS Related Labels
 'GS':
-  - 'pcsx2/GS/*'
-  - 'pcsx2/GS/**/*'
-  - 'bin/resources/shaders/*'
-  - 'bin/resources/shaders/**/*'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'pcsx2/GS/*'
+      - 'pcsx2/GS/**/*'
+      - 'bin/resources/shaders/*'
+      - 'bin/resources/shaders/**/*'
 'GS: Direct3D 11':
-  - 'pcsx2/GS/Renderers/DX11/*'
-  - 'pcsx2/GS/Renderers/DX11/**/*'
-  - 'bin/resources/shaders/dx11/*'
-  - 'bin/resources/shaders/dx11/**/*'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'pcsx2/GS/Renderers/DX11/*'
+      - 'pcsx2/GS/Renderers/DX11/**/*'
+      - 'bin/resources/shaders/dx11/*'
+      - 'bin/resources/shaders/dx11/**/*'
 'GS: Direct3D 12':
-  - 'pcsx2/GS/Renderers/DX12/*'
-  - 'pcsx2/GS/Renderers/DX12/**/*'
-  - 'bin/resources/shaders/dx11/*'
-  - 'bin/resources/shaders/dx11/**/*'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'pcsx2/GS/Renderers/DX12/*'
+      - 'pcsx2/GS/Renderers/DX12/**/*'
+      - 'bin/resources/shaders/dx11/*'
+      - 'bin/resources/shaders/dx11/**/*'
 'GS: Hardware':
-  - 'pcsx2/GS/Renderers/HW/*'
-  - 'pcsx2/GS/Renderers/HW/**/*'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'pcsx2/GS/Renderers/HW/*'
+      - 'pcsx2/GS/Renderers/HW/**/*'
 'GS: OpenGL':
-  - 'pcsx2/GS/Renderers/OpenGL/*'
-  - 'pcsx2/GS/Renderers/OpenGL/**/*'
-  - 'bin/resources/shaders/opengl/*'
-  - 'bin/resources/shaders/opengl/**/*'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'pcsx2/GS/Renderers/OpenGL/*'
+      - 'pcsx2/GS/Renderers/OpenGL/**/*'
+      - 'bin/resources/shaders/opengl/*'
+      - 'bin/resources/shaders/opengl/**/*'
 'GS: Vulkan':
-  - 'pcsx2/GS/Renderers/Vulkan/*'
-  - 'pcsx2/GS/Renderers/Vulkan/**/*'
-  - 'bin/resources/shaders/vulkan/*'
-  - 'bin/resources/shaders/vulkan/**/*'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'pcsx2/GS/Renderers/Vulkan/*'
+      - 'pcsx2/GS/Renderers/Vulkan/**/*'
+      - 'bin/resources/shaders/vulkan/*'
+      - 'bin/resources/shaders/vulkan/**/*'
 'GS: Metal':
-  - 'pcsx2/GS/Renderers/Metal/*'
-  - 'pcsx2/GS/Renderers/Metal/**/*'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'pcsx2/GS/Renderers/Metal/*'
+      - 'pcsx2/GS/Renderers/Metal/**/*'
 'GS: Texture Cache':
-  - 'pcsx2/GS/Renderers/*TextureCache*.*'
-  - 'pcsx2/GS/Renderers/**/*TextureCache*.*'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'pcsx2/GS/Renderers/*TextureCache*.*'
+      - 'pcsx2/GS/Renderers/**/*TextureCache*.*'
 'GS: Software':
-  - 'pcsx2/GS/Renderers/SW/*'
-  - 'pcsx2/GS/Renderers/SW/**/*'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'pcsx2/GS/Renderers/SW/*'
+      - 'pcsx2/GS/Renderers/SW/**/*'
 
 # Other Core Components
 'CDVD':
-  - 'pcsx2/CDVD/*'
-  - 'pcsx2/CDVD/**/*'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'pcsx2/CDVD/*'
+      - 'pcsx2/CDVD/**/*'
 'DEV9':
-  - 'pcsx2/DEV9/*'
-  - 'pcsx2/DEV9/**/*'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'pcsx2/DEV9/*'
+      - 'pcsx2/DEV9/**/*'
 'IPU':
-  - 'pcsx2/IPU/*'
-  - 'pcsx2/IPU/**/*'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'pcsx2/IPU/*'
+      - 'pcsx2/IPU/**/*'
 'Memory Card':
-  - 'pcsx2/SIO/Memcard/*'
-  - 'pcsx2/SIO/Memcard/**/*'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'pcsx2/SIO/Memcard/*'
+      - 'pcsx2/SIO/Memcard/**/*'
 'PAD':
-  - 'pcsx2/SIO/Pad/*'
-  - 'pcsx2/SIO/Pad/**/*'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'pcsx2/SIO/Pad/*'
+      - 'pcsx2/SIO/Pad/**/*'
 'SPU2':
-  - 'pcsx2/SPU2/*'
-  - 'pcsx2/SPU2/**/*'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'pcsx2/SPU2/*'
+      - 'pcsx2/SPU2/**/*'
 'USB':
-  - 'pcsx2/USB/*'
-  - 'pcsx2/USB/**/*'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'pcsx2/USB/*'
+      - 'pcsx2/USB/**/*'

.github/workflows/cron_publish_flatpak.yml

@@ -23,16 +23,23 @@ jobs:
           FLATHUB_RELEASE=$(curl -L -s https://flathub.org/api/v2/appstream/net.pcsx2.PCSX2 | jq -r '.releases | max_by(.version) | .version')
           echo "Latest PCSX2 release is: '${PCSX2_RELEASE}'"
           echo "Latest Flathub release is: '${FLATHUB_RELEASE}'"
+          PCSX2_RELEASE=$(echo $PCSX2_RELEASE | sed 's/[^0-9]*//g')
+          FLATHUB_RELEASE=$(echo $FLATHUB_RELEASE | sed 's/[^0-9]*//g')
           echo "PCSX2_RELEASE=${PCSX2_RELEASE}" >> "$GITHUB_OUTPUT"
           echo "FLATHUB_RELEASE=${FLATHUB_RELEASE}" >> "$GITHUB_OUTPUT"
 
   build:
     needs: check
-    if: needs.check.outputs.FLATHUB_RELEASE < needs.check.outputs.PCSX2_RELEASE
+    # outputs are automatically compared as strings. This doesn't work in our favour
+    # Use fromJson() to convert them to proper integers...
+    # see: https://github.com/github/docs/pull/25870
+    # and: https://github.com/orgs/community/discussions/57480
+    #if: fromJson(needs.check.outputs.FLATHUB_RELEASE) < fromJson(needs.check.outputs.PCSX2_RELEASE)
     name: "Build and publish Flatpak"
     uses: ./.github/workflows/linux_build_flatpak.yml
     with:
       jobName: "Qt"
+      artifactPrefixName: "PCSX2-linux-Qt-x64-flatpak"
       compiler: clang
       cmakeflags: ""
       publish: true

.github/workflows/cron_update_base_translation.yml

@@ -17,7 +17,7 @@ jobs:
         run: ./.github/workflows/scripts/common/update_base_translation.sh
       
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v5
+        uses: peter-evans/create-pull-request@v7
         with:
           title: "Qt: Update Base Translation"
           commit-message: "Qt: Update Base Translation"

.github/workflows/cron_update_controller_db.yml

@@ -19,11 +19,12 @@ jobs:
           mv ./game_controller_db.txt ${{github.workspace}}/bin/resources/game_controller_db.txt
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v5
+        uses: peter-evans/create-pull-request@v7
         with:
           title: "PAD: Update to latest controller database"
           commit-message: "PAD: Update to latest controller database."
           committer: "PCSX2 Bot <PCSX2Bot@users.noreply.github.com>"
           author: "PCSX2 Bot <PCSX2Bot@users.noreply.github.com>"
-          body: "Weekly automatic update of SDL Controller DB"
-          reviewers: lightningterror
+          body: "Weekly automatic update of SDL Controller DB."
+          branch: update-controller-db
+          delete-branch: true

.github/workflows/linux_build_flatpak.yml

@@ -6,6 +6,9 @@ on:
       jobName:
         required: true
         type: string
+      artifactPrefixName:
+        required: true
+        type: string
       os:
         required: false
         type: string
@@ -36,18 +39,30 @@ on:
         required: false
         type: boolean
         default: false
+      stableBuild:
+        required: false
+        type: boolean
+        default: false
 
 jobs:
   build_linux:
     name: ${{ inputs.jobName }}
     runs-on: ${{ inputs.os }}
+    container:
+      image: ghcr.io/flathub-infra/flatpak-github-actions:kde-6.7
+      options: --privileged
     timeout-minutes: 60
 
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4
         with:
-          submodules: recursive
+          set-safe-directory: ${{ env.GITHUB_WORKSPACE }}
+
+      # Work around container ownership issue
+      - name: Set Safe Directory
+        shell: bash
+        run: git config --global --add safe.directory "*"
 
       # Hackity hack. When running the workflow on a schedule, we don't have the tag,
       # it doesn't fetch tags, therefore we don't get a version. So grab them manually.
@@ -56,78 +71,80 @@ jobs:
         if: ${{ inputs.fetchTags }}
         run: git fetch --tags --no-recurse-submodules
 
+      - name: Add stable release identifier file
+        if: ${{ inputs.stableBuild == true || inputs.stableBuild == 'true' }}
+        shell: bash
+        run: |
+          echo "#define DEFAULT_UPDATER_CHANNEL \"stable\"" > ./pcsx2-qt/DefaultUpdaterChannel.h
+          cat ./pcsx2-qt/DefaultUpdaterChannel.h
+
       - name: Prepare Artifact Metadata
         id: artifact-metadata
         shell: bash
         env:
-          OS: linux
-          BUILD_SYSTEM: flatpak
-          ARCH: ${{ inputs.platform }}
+          PREFIX: ${{ inputs.artifactPrefixName }}
           EVENT_NAME: ${{ github.event_name }}
           PR_TITLE: ${{ github.event.pull_request.title }}
           PR_NUM: ${{ github.event.pull_request.number }}
           PR_SHA: ${{ github.event.pull_request.head.sha }}
         run: ./.github/workflows/scripts/common/name-artifacts.sh
 
-      - name: Install Packages
-        env:
-          COMPILER: ${{ inputs.compiler }}
-        run: .github/workflows/scripts/linux/install-packages-flatpak.sh
-
       - name: Download patches
         run: |
           cd bin/resources
-          aria2c -Z "${{ inputs.patchesUrl }}/patches.zip"
-
-      - name: Generate AppStream XML
-        run: |
-          ./.github/workflows/scripts/linux/generate-metainfo.sh .github/workflows/scripts/linux/flatpak/net.pcsx2.PCSX2.metainfo.xml
-          cat .github/workflows/scripts/linux/flatpak/net.pcsx2.PCSX2.metainfo.xml
-          flatpak run org.freedesktop.appstream-glib validate .github/workflows/scripts/linux/flatpak/net.pcsx2.PCSX2.metainfo.xml
+          wget "${{ inputs.patchesUrl }}/patches.zip"
 
       - name: Validate manifest
         run: |
-          flatpak run --command=flatpak-builder-lint org.flatpak.Builder manifest .github/workflows/scripts/linux/flatpak/net.pcsx2.PCSX2.json
+          flatpak-builder-lint manifest .github/workflows/scripts/linux/flatpak/net.pcsx2.PCSX2.json
 
       - name: Build Flatpak
-        uses: flatpak/flatpak-github-actions/flatpak-builder@v6.3
+        uses: flathub-infra/flatpak-github-actions/flatpak-builder@23796715b3dfa4c86ddf50cf29c3cc8b3c82dca8
         with:
           bundle: ${{ steps.artifact-metadata.outputs.artifact-name }}.flatpak
+          upload-artifact: false
           manifest-path: .github/workflows/scripts/linux/flatpak/net.pcsx2.PCSX2.json
           arch: x86_64
           build-bundle: true
           verbose: true
-          mirror-screenshots-url: https://dl.flathub.org/repo/screenshots
+          mirror-screenshots-url: https://dl.flathub.org/media
           branch: ${{ inputs.branch }}
           cache: true
           restore-cache: true
           cache-key: ${{ inputs.os }} ${{ inputs.platform }} ${{ inputs.compiler }} flatpak ${{ hashFiles('.github/workflows/scripts/linux/flatpak/**/*.json') }}
 
-      - name: Commit screenshots to OSTree
-        run: |
-          ostree commit --repo=repo --canonical-permissions --branch=screenshots/x86_64 flatpak_app/screenshots
-
-      #- name: Validate build directory
+      #- name: Validate build
       #  run: |
-      #    flatpak run --command=flatpak-builder-lint org.flatpak.Builder builddir flatpak_app
-      #
-      #- name: Validate repo
-      #  run: |
-      #    flatpak run --command=flatpak-builder-lint org.flatpak.Builder repo repo
+      #    flatpak-builder-lint repo repo
 
       - name: Push to Flathub beta
         if: inputs.publish == true && inputs.branch == 'beta'
-        uses: flatpak/flatpak-github-actions/flat-manager@v6.3
+        uses: flathub-infra/flatpak-github-actions/flat-manager@23796715b3dfa4c86ddf50cf29c3cc8b3c82dca8
         with:
           flat-manager-url: https://hub.flathub.org/
           repository: beta
           token: ${{ secrets.FLATHUB_BETA_TOKEN }}
+          build-log-url: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
 
       - name: Push to Flathub stable
         if: inputs.publish == true && inputs.branch == 'stable'
-        uses: flatpak/flatpak-github-actions/flat-manager@v6.3
+        uses: flathub-infra/flatpak-github-actions/flat-manager@23796715b3dfa4c86ddf50cf29c3cc8b3c82dca8
         with:
           flat-manager-url: https://hub.flathub.org/
           repository: stable
           token: ${{ secrets.FLATHUB_TOKEN }}
+          build-log-url: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+
+      # NOTE - this is done after on purpose so the flatpak file is wherever it needs to be for the previous pushes
+      - name: Prepare artifacts folder
+        # NOTE - 'flatpak-builder' dumps the artifact out into the current directory
+        run: |
+          mkdir -p "$GITHUB_WORKSPACE"/ci-artifacts/
+          mv "./${{ steps.artifact-metadata.outputs.artifact-name }}.flatpak" "$GITHUB_WORKSPACE"/ci-artifacts/
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ steps.artifact-metadata.outputs.artifact-name }}
+          path: ci-artifacts
 

.github/workflows/linux_build_matrix.yml

@@ -15,6 +15,7 @@ jobs:
     uses: ./.github/workflows/linux_build_qt.yml
     with:
       jobName: "AppImage Build"
+      artifactPrefixName: "PCSX2-linux-Qt-x64-appimage-sse4"
       compiler: clang
       cmakeflags: ""
       buildAppImage: true
@@ -25,6 +26,7 @@ jobs:
     uses: ./.github/workflows/linux_build_flatpak.yml
     with:
       jobName: "Flatpak Build"
+      artifactPrefixName: "PCSX2-linux-Qt-x64-flatpak-sse4"
       compiler: clang
       cmakeflags: ""
       publish: false

.github/workflows/linux_build_qt.yml

@@ -6,6 +6,9 @@ on:
       jobName:
         required: true
         type: string
+      artifactPrefixName:
+        required: true
+        type: string
       os:
         required: false
         type: string
@@ -36,6 +39,10 @@ on:
         required: false
         type: boolean
         default: false
+      stableBuild:
+        required: false
+        type: boolean
+        default: false
 
 jobs:
   build_linux:
@@ -51,30 +58,28 @@ jobs:
       CCACHE_MAXSIZE: 100M
 
     steps:
-      # Work around https://github.com/actions/runner-images/issues/8659
-      - name: Remove GCC 13 from runner image
-        shell: bash
-        run: |
-          sudo rm -f /etc/apt/sources.list.d/ubuntu-toolchain-r-ubuntu-test-jammy.list
-          sudo apt-get update
-          sudo apt-get install -y --allow-downgrades libc6=2.35-0ubuntu3.4 libc6-dev=2.35-0ubuntu3.4 libstdc++6=12.3.0-1ubuntu1~22.04 libgcc-s1=12.3.0-1ubuntu1~22.04
-
       - name: Checkout Repository
         uses: actions/checkout@v4
         with:
-          submodules: recursive
+           fetch-depth: 0
 
       # actions/checkout elides tags, fetch them primarily for releases
       - name: Fetch Tags
         if: ${{ inputs.fetchTags }}
         run: git fetch --tags --no-recurse-submodules
 
+      - name: Add stable release identifier file
+        if: ${{ inputs.stableBuild == true || inputs.stableBuild == 'true' }}
+        shell: bash
+        run: |
+          echo "#define DEFAULT_UPDATER_CHANNEL \"stable\"" > ./pcsx2-qt/DefaultUpdaterChannel.h
+          cat ./pcsx2-qt/DefaultUpdaterChannel.h
+
       - name: Prepare Artifact Metadata
         id: artifact-metadata
         shell: bash
         env:
-          OS: linux
-          ARCH: ${{ inputs.platform }}
+          PREFIX: ${{ inputs.artifactPrefixName }}
           EVENT_NAME: ${{ github.event_name }}
           PR_TITLE: ${{ github.event.pull_request.title }}
           PR_NUM: ${{ github.event.pull_request.number }}
@@ -87,27 +92,36 @@ jobs:
         run: echo "timestamp=$(date -u "+%Y-%m-%d-%H;%M;%S")" >> $GITHUB_OUTPUT
 
       - name: ccache cache files
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: .ccache
           key: ${{ inputs.os }} ${{ inputs.platform }} ${{ inputs.compiler }} ${{ inputs.detail }} ccache ${{ steps.ccache_cache_timestamp.outputs.timestamp }}
           restore-keys: ${{ inputs.os }} ${{ inputs.platform }} ${{ inputs.compiler }} ${{ inputs.detail }} ccache
 
       - name: Install Packages
-        env:
-          COMPILER: ${{ inputs.compiler }}
-        run: .github/workflows/scripts/linux/install-packages-qt.sh
+        run: |
+          tools/retry.sh wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc
+          sudo tools/retry.sh apt-add-repository -n 'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main'
+          sudo tools/retry.sh apt-get update
+          sudo tools/retry.sh apt-get -y install \
+            build-essential ccache clang-17 cmake curl extra-cmake-modules git libasound2-dev libaio-dev libavcodec-dev libavformat-dev libavutil-dev \
+            libcurl4-openssl-dev libdbus-1-dev libdecor-0-dev libegl-dev libevdev-dev libfontconfig-dev libfreetype-dev libfuse2 libgtk-3-dev libgudev-1.0-dev \
+            libharfbuzz-dev libinput-dev libopengl-dev libpcap-dev libpipewire-0.3-dev libpulse-dev libssl-dev libswresample-dev libswscale-dev libudev-dev \
+            libwayland-dev libx11-dev libx11-xcb-dev libxcb1-dev libxcb-composite0-dev libxcb-cursor-dev libxcb-damage0-dev libxcb-glx0-dev libxcb-icccm4-dev \
+            libxcb-image0-dev libxcb-keysyms1-dev libxcb-present-dev libxcb-randr0-dev libxcb-render0-dev libxcb-render-util0-dev libxcb-shape0-dev \
+            libxcb-shm0-dev libxcb-sync-dev libxcb-util-dev libxcb-xfixes0-dev libxcb-xinput-dev libxcb-xkb-dev libxext-dev libxkbcommon-x11-dev libxrandr-dev \
+            lld-17 llvm-17 ninja-build patchelf pkg-config zlib1g-dev
 
       - name: Cache Dependencies
         id: cache-deps
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/deps
           key: ${{ inputs.os }} ${{ inputs.platform }} deps ${{ hashFiles('.github/workflows/scripts/linux/build-dependencies-qt.sh') }}
 
       - name: Build Dependencies
         if: steps.cache-deps.outputs.cache-hit != 'true'
-        run: .github/workflows/scripts/linux/build-dependencies-qt.sh
+        run: .github/workflows/scripts/linux/build-dependencies-qt.sh "$HOME/deps"
 
       - name: Download patches
         run: |
@@ -116,16 +130,31 @@ jobs:
 
       - name: Generate CMake
         env:
-          COMPILER: ${{ inputs.compiler }}
           ADDITIONAL_CMAKE_ARGS: ${{ inputs.cmakeflags }}
-          CLANG_PATH: /usr/bin/clang-17
-          CLANGXX_PATH: /usr/bin/clang++-17
         run: |
-          DEPS_PREFIX="$HOME/deps" .github/workflows/scripts/linux/generate-cmake-qt.sh
+          cmake -B build -G Ninja \
+            -DCMAKE_BUILD_TYPE=Release \
+            -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \
+            -DCMAKE_PREFIX_PATH="$HOME/deps" \
+            -DCMAKE_C_COMPILER=clang-17 \
+            -DCMAKE_CXX_COMPILER=clang++-17 \
+            -DCMAKE_EXE_LINKER_FLAGS_INIT="-fuse-ld=lld" \
+            -DCMAKE_MODULE_LINKER_FLAGS_INIT="-fuse-ld=lld" \
+            -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
+            -DENABLE_SETCAP=OFF \
+            -DDISABLE_ADVANCE_SIMD=TRUE \
+            $ADDITIONAL_CMAKE_ARGS
 
       - name: Build PCSX2
         working-directory: build
-        run: ../.github/workflows/scripts/linux/compile.sh
+        run: |
+          # Prepare the Cache
+          ccache -p
+          ccache -z
+          # Build
+          ninja
+          # Save the Cache
+          ccache -s
 
       - name: Run Tests
         working-directory: ./build
@@ -142,7 +171,7 @@ jobs:
 
       - name: Upload artifact
         if: inputs.buildAppImage == true
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ steps.artifact-metadata.outputs.artifact-name }}
           path: ci-artifacts

.github/workflows/macos_build.yml

@@ -6,10 +6,13 @@ on:
       jobName:
         required: true
         type: string
+      artifactPrefixName:
+        required: true
+        type: string
       os:
         required: false
         type: string
-        default: macos-13
+        default: macos-14
       patchesUrl:
         required: false
         type: string
@@ -18,6 +21,10 @@ on:
         required: false
         type: boolean
         default: false
+      stableBuild:
+        required: false
+        type: boolean
+        default: false
 
 jobs:
   build_macos:
@@ -36,22 +43,27 @@ jobs:
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4
-        with:
-          submodules: recursive
 
       # actions/checkout elides tags, fetch them primarily for releases
       - name: Fetch Tags
         if: ${{ inputs.fetchTags }}
         run: git fetch --tags --no-recurse-submodules
 
-      - name: Use Xcode 14.3.1
-        run: sudo xcode-select -s /Applications/Xcode_14.3.1.app
+      - name: Add stable release identifier file
+        if: ${{ inputs.stableBuild == true || inputs.stableBuild == 'true' }}
+        shell: bash
+        run: |
+          echo "#define DEFAULT_UPDATER_CHANNEL \"stable\"" > ./pcsx2-qt/DefaultUpdaterChannel.h
+          cat ./pcsx2-qt/DefaultUpdaterChannel.h
+
+      - name: Use Xcode 15.2
+        run: sudo xcode-select -s /Applications/Xcode_15.2.app
 
       - name: Prepare Artifact Metadata
         id: artifact-metadata
         shell: bash
         env:
-          OS: macos
+          PREFIX: ${{ inputs.artifactPrefixName }}
           EVENT_NAME: ${{ github.event_name }}
           PR_TITLE: ${{ github.event.pull_request.title }}
           PR_NUM: ${{ github.event.pull_request.number }}
@@ -60,26 +72,25 @@ jobs:
 
       - name: Install Packages
         env:
-          PLATFORM: "x64"
           HOMEBREW_NO_INSTALL_CLEANUP: 1
           HOMEBREW_NO_ANALYTICS: 1
         run: |
-          # Unlike other packages, brew's MoltenVK build uses MoltenVK's minimum macOS version of 10.13 so we can use it
-          if ! brew install molten-vk ccache nasm; then
+          if ! brew install ccache nasm; then
             brew update
-            brew install molten-vk ccache nasm
+            brew install ccache nasm
           fi
 
       - name: Cache Dependencies
         id: cache-deps
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/deps
           key: ${{ inputs.os }} deps ${{ hashFiles('.github/workflows/scripts/macos/build-dependencies.sh') }}
 
       - name: Build Dependencies
         if: steps.cache-deps.outputs.cache-hit != 'true'
-        run: .github/workflows/scripts/macos/build-dependencies.sh
+        run: |
+          .github/workflows/scripts/macos/build-dependencies.sh "$HOME/deps"
 
       - name: Download patches
         run: |
@@ -92,7 +103,7 @@ jobs:
         run: echo "timestamp=$(date -u "+%Y-%m-%d-%H;%M;%S")" >> $GITHUB_OUTPUT
 
       - name: Cache ccache cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: .ccache
           key: ${{ inputs.os }} ccache ${{ steps.ccache_cache_timestamp.outputs.timestamp }}
@@ -102,11 +113,9 @@ jobs:
         run: |
           cmake -DCMAKE_PREFIX_PATH="$HOME/deps" \
                 -DCMAKE_BUILD_TYPE=Release \
-                -DUSE_OPENGL=OFF \
+                -DCMAKE_OSX_ARCHITECTURES="x86_64" \
                 -DDISABLE_ADVANCE_SIMD=ON \
                 -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \
-                -DUSE_SYSTEM_LIBS=OFF \
-                -DUSE_SYSTEM_SDL2=ON \
                 -DUSE_LINKED_FFMPEG=ON \
                 -DCMAKE_C_COMPILER_LAUNCHER=ccache \
                 -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
@@ -135,7 +144,6 @@ jobs:
 
       - name: Prepare Build Artifacts
         run: |
-          cp /usr/local/lib/libMoltenVK.dylib build/pcsx2*/PCSX2.app/Contents/Frameworks/
           TAG="$(git tag --points-at HEAD)"
           if [ -z "$TAG" ]; then
             APPNAME="${{ steps.artifact-metadata.outputs.artifact-name }}"
@@ -148,7 +156,7 @@ jobs:
           cp "${{ steps.artifact-metadata.outputs.artifact-name }}.tar.xz" ci-artifacts/macOS.tar.xz
 
       - name: Upload Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ steps.artifact-metadata.outputs.artifact-name }}
           path: "*.tar.xz"

.github/workflows/macos_build_matrix.yml

@@ -15,4 +15,5 @@ jobs:
     uses: ./.github/workflows/macos_build.yml
     with:
       jobName: "MacOS Build"
+      artifactPrefixName: "PCSX2-macos-Qt"
     secrets: inherit

.github/workflows/release_cut_new.yml

@@ -10,16 +10,19 @@ on:
   push:
     branches:
       - master
-  # TODO - future work
-  # workflow_dispatch:
-  #   inputs:
-  #     isStable:
-  #       description: 'Should it be a stable release?'
-  #       required: true
-  #       default: 'false'
-  #     versionTag:
-  #       description: 'The version to tag with'
-  #       required: true
+  workflow_dispatch:
+    inputs:
+      is_prelease:
+        description: 'Should be a pre-release?'
+        required: true
+        default: 'true'
+        type: choice
+        options:
+          - 'true'
+          - 'false'
+      tag_value:
+        description: 'Create a new release from latest master with the given tag, if this is left blank it will bump the patch version. You dont need to include the "v" prefix'
+        required: false
 
 permissions:
   contents: write
@@ -37,11 +40,13 @@ jobs:
       # Docs - https://github.com/mathieudutour/github-tag-action
       - name: Bump Version and Push Tag
         id: tag_version
-        uses: mathieudutour/github-tag-action@v6.1
+        uses: mathieudutour/github-tag-action@v6.2
         with:
           github_token: ${{ github.token }}
           tag_prefix: v
           default_bump: patch
+          # if set, it will overwrite the bump settings
+          custom_tag: ${{ github.event.inputs.tag_value == '' && null || github.event.inputs.tag_value }}
 
       # TODO - we could do this and remove the node.js script, but auto-generated notes only work
       # with PRs -- not commits (determine how much we care).
@@ -62,9 +67,18 @@ jobs:
           node index.js
           mv ./release-notes.md ${GITHUB_WORKSPACE}/release-notes.md
 
-      - name: Create a GitHub Release
-        uses: softprops/action-gh-release@v1
-        if: steps.tag_version.outputs.new_tag
+      - name: Create a GitHub Release (Manual)
+        uses: softprops/action-gh-release@v2
+        if: steps.tag_version.outputs.new_tag && github.event_name == 'workflow_dispatch'
+        with:
+          body_path: ./release-notes.md
+          draft: true
+          prerelease: ${{ github.event_name != 'workflow_dispatch' || inputs.is_prelease == 'true' }}
+          tag_name: ${{ steps.tag_version.outputs.new_tag }}
+
+      - name: Create a GitHub Release (Push)
+        uses: softprops/action-gh-release@v2
+        if: steps.tag_version.outputs.new_tag && github.event_name != 'workflow_dispatch'
         with:
           body_path: ./release-notes.md
           draft: true
@@ -81,10 +95,12 @@ jobs:
     uses: ./.github/workflows/linux_build_qt.yml
     with:
       jobName: "AppImage Build"
+      artifactPrefixName: "PCSX2-linux-Qt-x64-appimage"
       compiler: clang
       cmakeflags: ""
       buildAppImage: true
       fetchTags: true
+      stableBuild: ${{ github.event_name == 'workflow_dispatch' && inputs.is_prelease == 'false' }}
     secrets: inherit
 
   build_linux_flatpak:
@@ -95,11 +111,13 @@ jobs:
     uses: ./.github/workflows/linux_build_flatpak.yml
     with:
       jobName: "Flatpak Build"
+      artifactPrefixName: "PCSX2-linux-Qt-x64-flatpak"
       compiler: clang
       cmakeflags: ""
       branch: "stable"
       publish: false
       fetchTags: true
+      stableBuild: ${{ github.event_name == 'workflow_dispatch' && inputs.is_prelease == 'false' }}
     secrets: inherit
 
   # Windows
@@ -111,10 +129,12 @@ jobs:
     uses: ./.github/workflows/windows_build_qt.yml
     with:
       jobName: "Windows Build"
+      artifactPrefixName: "PCSX2-windows-Qt-x64"
       configuration: CMake
       buildSystem: cmake
       cmakeFlags: -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl
       fetchTags: true
+      stableBuild: ${{ github.event_name == 'workflow_dispatch' && inputs.is_prelease == 'false' }}
     secrets: inherit
 
   # MacOS
@@ -126,7 +146,9 @@ jobs:
     uses: ./.github/workflows/macos_build.yml
     with:
       jobName: "MacOS Build"
+      artifactPrefixName: "PCSX2-macos-Qt"
       fetchTags: true
+      stableBuild: ${{ github.event_name == 'workflow_dispatch' && inputs.is_prelease == 'false' }}
     secrets: inherit
 
   # Upload the Artifacts
@@ -146,7 +168,7 @@ jobs:
       - name: Prepare Artifact Folder
         run: mkdir ./ci-artifacts/
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         name: Download all Artifacts
         with:
           path: ./ci-artifacts/
@@ -159,9 +181,6 @@ jobs:
         working-directory: ./ci-artifacts/
         run: for d in *windows*/; do 7z a "${d}asset.7z" ./$d/*; done
 
-      # Artifact Naming:
-      # MacOS: PCSX2-<tag>-macOS-[additional hyphen seperated tags]
-      # Windows|Linux: PCSX2-<tag>-<windows|linux>-<32bit|64bit>--[additional hyphen seperated tags]
       - name: Name and Upload the Release Assets
         env:
           GITHUB_TOKEN: ${{ github.token }}

.github/workflows/scripts/common/name-artifacts.sh

@@ -1,39 +1,26 @@
 #!/bin/bash
 
 # Artifact Naming Scheme:
-# PCSX2-<OS>-Qt-[ARCH]-[SIMD]-[pr\[PR_NUM\]]-[title|sha\[SHA|PR_TITLE\]
+# PCSX2-<OS>-Qt-[BUILD_SYSTEM]-[ARCH]-[SIMD]-[pr\[PR_NUM\]]-[title|sha\[SHA|PR_TITLE\]
 # -- limited to 200 chars
 # Outputs:
 # - artifact-name
 
+# Example - PCSX2-linux-Qt-x64-flatpak-sse4-sha[e880a2749]
+
 # Inputs as env-vars
-# OS
-# BUILD_SYSTEM
-# ARCH
-# SIMD
+# PREFIX
 # EVENT_NAME
 # PR_TITLE
 # PR_NUM
 # PR_SHA
 
-NAME=""
-
-if [ "${OS}" == "macos" ]; then
-  # MacOS has combined binaries for x64 and ARM64.
-  NAME="PCSX2-${OS}-Qt"
-elif [[ ("${OS}" == "windows" && "$BUILD_SYSTEM" != "cmake") ]]; then
-  NAME="PCSX2-${OS}-Qt-${ARCH}-${SIMD}"
-else
-  NAME="PCSX2-${OS}-Qt-${ARCH}"
+if [[ -z "${PREFIX}" ]]; then
+  echo "PREFIX is not set, can't name artifact without it!"
+  exit 1
 fi
 
-# Add cmake if used to differentate it from msbuild builds
-# Else the two artifacts will have the same name and the files will be merged
-if [[ ! -z "${BUILD_SYSTEM}" ]]; then
-  if [[ "${BUILD_SYSTEM}" == "cmake" ]] || [[ "${BUILD_SYSTEM}" == "flatpak" ]]; then
-    NAME="${NAME}-${BUILD_SYSTEM}"
-  fi
-fi
+NAME="${PREFIX}"
 
 # Add PR / Commit Metadata
 if [ "$EVENT_NAME" == "pull_request" ]; then

.github/workflows/scripts/common/shaderc-changes.patch

@@ -0,0 +1,577 @@
+diff --git a/CHANGES b/CHANGES
+index 5d3dd16..587b612 100644
+--- a/CHANGES
++++ b/CHANGES
+@@ -4,7 +4,7 @@ v2024.1
+  - Update dependencies
+  - Propagate test/install options to Glslang
+ 
+-v2024.0
++v2024.0 2024-03-09
+  - Update dependencies
+  - Utilities:
+     - Use Python3 explicitly in utility scripts
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ffcb54b..7c1a6d8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -117,6 +117,9 @@ if(MSVC)
+   endif()
+ endif(MSVC)
+ 
++if(NOT WIN32)
++  add_definitions("-fvisibility=hidden")
++endif()
+ 
+ # Configure subdirectories.
+ # We depend on these for later projects, so they should come first.
+@@ -124,7 +127,6 @@ add_subdirectory(third_party)
+ 
+ add_subdirectory(libshaderc_util)
+ add_subdirectory(libshaderc)
+-add_subdirectory(glslc)
+ if(${SHADERC_ENABLE_EXAMPLES})
+     add_subdirectory(examples)
+ endif()
+@@ -158,5 +160,3 @@ function(define_pkg_config_file NAME LIBS)
+ endfunction()
+ 
+ define_pkg_config_file(shaderc -lshaderc_shared)
+-define_pkg_config_file(shaderc_static "-lshaderc ${EXTRA_STATIC_PKGCONFIG_LIBS} -lshaderc_util")
+-define_pkg_config_file(shaderc_combined -lshaderc_combined)
+diff --git a/libshaderc/CMakeLists.txt b/libshaderc/CMakeLists.txt
+index df9a88d..b15e5d7 100644
+--- a/libshaderc/CMakeLists.txt
++++ b/libshaderc/CMakeLists.txt
+@@ -24,13 +24,6 @@ set(SHADERC_SOURCES
+   src/shaderc_private.h
+ )
+ 
+-add_library(shaderc STATIC ${SHADERC_SOURCES})
+-shaderc_default_compile_options(shaderc)
+-target_include_directories(shaderc
+-    PUBLIC include
+-    PRIVATE ${glslang_SOURCE_DIR}
+-            ${SPIRV-Headers_SOURCE_DIR}/include)
+-
+ add_library(shaderc_shared SHARED ${SHADERC_SOURCES})
+ shaderc_default_compile_options(shaderc_shared)
+ target_include_directories(shaderc_shared
+@@ -54,7 +47,7 @@ if(SHADERC_ENABLE_INSTALL)
+     DESTINATION
+       ${CMAKE_INSTALL_INCLUDEDIR}/shaderc)
+ 
+-  install(TARGETS shaderc shaderc_shared
++  install(TARGETS shaderc_shared
+     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+     BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR}
+@@ -69,20 +62,8 @@ set(SHADERC_LIBS
+   SPIRV-Tools
+ )
+ 
+-target_link_libraries(shaderc PRIVATE ${SHADERC_LIBS})
+ target_link_libraries(shaderc_shared PRIVATE ${SHADERC_LIBS})
+ 
+-shaderc_add_tests(
+-  TEST_PREFIX shaderc
+-  LINK_LIBS shaderc
+-  INCLUDE_DIRS include ${shaderc_SOURCE_DIR}/libshaderc_util/include ${glslang_SOURCE_DIR}
+-               ${spirv-tools_SOURCE_DIR}/include
+-               ${SPIRV-Headers_SOURCE_DIR}/include
+-  TEST_NAMES
+-    shaderc
+-    shaderc_cpp
+-    shaderc_private)
+-
+ shaderc_add_tests(
+   TEST_PREFIX shaderc_shared
+   LINK_LIBS shaderc_shared SPIRV-Tools
+@@ -94,22 +75,6 @@ shaderc_add_tests(
+     shaderc_cpp
+     shaderc_private)
+ 
+-shaderc_combine_static_lib(shaderc_combined shaderc)
+-
+-if(SHADERC_ENABLE_INSTALL)
+-  install(TARGETS shaderc_combined DESTINATION ${CMAKE_INSTALL_LIBDIR})
+-endif(SHADERC_ENABLE_INSTALL)
+-
+-shaderc_add_tests(
+-  TEST_PREFIX shaderc_combined
+-  LINK_LIBS shaderc_combined ${CMAKE_THREAD_LIBS_INIT}
+-  INCLUDE_DIRS include ${shaderc_SOURCE_DIR}/libshaderc_util/include ${glslang_SOURCE_DIR}
+-               ${spirv-tools_SOURCE_DIR}/include
+-               ${SPIRV-Headers_SOURCE_DIR}/include
+-  TEST_NAMES
+-    shaderc
+-    shaderc_cpp)
+-
+ if(${SHADERC_ENABLE_TESTS})
+   add_executable(shaderc_c_smoke_test ./src/shaderc_c_smoke_test.c)
+   shaderc_default_c_compile_options(shaderc_c_smoke_test)
+diff --git a/libshaderc/include/shaderc/shaderc.h b/libshaderc/include/shaderc/shaderc.h
+index 3a3e97d..65d5b77 100644
+--- a/libshaderc/include/shaderc/shaderc.h
++++ b/libshaderc/include/shaderc/shaderc.h
+@@ -317,7 +317,7 @@ SHADERC_EXPORT void shaderc_compile_options_set_source_language(
+ 
+ // Sets the compiler mode to generate debug information in the output.
+ SHADERC_EXPORT void shaderc_compile_options_set_generate_debug_info(
+-    shaderc_compile_options_t options);
++    shaderc_compile_options_t options, bool enabled, bool enable_non_semantic);
+ 
+ // Sets the compiler optimization level to the given level. Only the last one
+ // takes effect if multiple calls of this function exist.
+@@ -506,6 +506,10 @@ SHADERC_EXPORT void shaderc_compile_options_set_invert_y(
+ SHADERC_EXPORT void shaderc_compile_options_set_nan_clamp(
+     shaderc_compile_options_t options, bool enable);
+ 
++// Returns a string representation of the specified compilation status.
++SHADERC_EXPORT const char* shaderc_compilation_status_to_string(
++    shaderc_compilation_status status);
++
+ // An opaque handle to the results of a call to any shaderc_compile_into_*()
+ // function.
+ typedef struct shaderc_compilation_result* shaderc_compilation_result_t;
+@@ -529,28 +533,31 @@ typedef struct shaderc_compilation_result* shaderc_compilation_result_t;
+ // present.  May be safely called from multiple threads without explicit
+ // synchronization. If there was failure in allocating the compiler object,
+ // null will be returned.
+-SHADERC_EXPORT shaderc_compilation_result_t shaderc_compile_into_spv(
++SHADERC_EXPORT shaderc_compilation_status shaderc_compile_into_spv(
+     const shaderc_compiler_t compiler, const char* source_text,
+     size_t source_text_size, shaderc_shader_kind shader_kind,
+     const char* input_file_name, const char* entry_point_name,
+-    const shaderc_compile_options_t additional_options);
++    const shaderc_compile_options_t additional_options,
++    shaderc_compilation_result_t* result);
+ 
+ // Like shaderc_compile_into_spv, but the result contains SPIR-V assembly text
+ // instead of a SPIR-V binary module.  The SPIR-V assembly syntax is as defined
+ // by the SPIRV-Tools open source project.
+-SHADERC_EXPORT shaderc_compilation_result_t shaderc_compile_into_spv_assembly(
++SHADERC_EXPORT shaderc_compilation_status shaderc_compile_into_spv_assembly(
+     const shaderc_compiler_t compiler, const char* source_text,
+     size_t source_text_size, shaderc_shader_kind shader_kind,
+     const char* input_file_name, const char* entry_point_name,
+-    const shaderc_compile_options_t additional_options);
++    const shaderc_compile_options_t additional_options,
++    shaderc_compilation_result_t* result);
+ 
+ // Like shaderc_compile_into_spv, but the result contains preprocessed source
+ // code instead of a SPIR-V binary module
+-SHADERC_EXPORT shaderc_compilation_result_t shaderc_compile_into_preprocessed_text(
++SHADERC_EXPORT shaderc_compilation_status shaderc_compile_into_preprocessed_text(
+     const shaderc_compiler_t compiler, const char* source_text,
+     size_t source_text_size, shaderc_shader_kind shader_kind,
+     const char* input_file_name, const char* entry_point_name,
+-    const shaderc_compile_options_t additional_options);
++    const shaderc_compile_options_t additional_options,
++    shaderc_compilation_result_t* result);
+ 
+ // Takes an assembly string of the format defined in the SPIRV-Tools project
+ // (https://github.com/KhronosGroup/SPIRV-Tools/blob/master/syntax.md),
+@@ -561,10 +568,11 @@ SHADERC_EXPORT shaderc_compilation_result_t shaderc_compile_into_preprocessed_te
+ // May be safely called from multiple threads without explicit synchronization.
+ // If there was failure in allocating the compiler object, null will be
+ // returned.
+-SHADERC_EXPORT shaderc_compilation_result_t shaderc_assemble_into_spv(
++SHADERC_EXPORT shaderc_compilation_status shaderc_assemble_into_spv(
+     const shaderc_compiler_t compiler, const char* source_assembly,
+     size_t source_assembly_size,
+-    const shaderc_compile_options_t additional_options);
++    const shaderc_compile_options_t additional_options,
++    shaderc_compilation_result_t* result);
+ 
+ // The following functions, operating on shaderc_compilation_result_t objects,
+ // offer only the basic thread-safety guarantee.
+diff --git a/libshaderc/include/shaderc/shaderc.hpp b/libshaderc/include/shaderc/shaderc.hpp
+index 3817af8..5592b49 100644
+--- a/libshaderc/include/shaderc/shaderc.hpp
++++ b/libshaderc/include/shaderc/shaderc.hpp
+@@ -168,8 +168,9 @@ class CompileOptions {
+   }
+ 
+   // Sets the compiler mode to generate debug information in the output.
+-  void SetGenerateDebugInfo() {
+-    shaderc_compile_options_set_generate_debug_info(options_);
++  void SetGenerateDebugInfo(bool enabled, bool non_semantic_debug_info) {
++    shaderc_compile_options_set_generate_debug_info(options_, enabled,
++      non_sematic_debug_info);
+   }
+ 
+   // Sets the compiler optimization level to the given level. Only the last one
+@@ -425,9 +426,10 @@ class Compiler {
+                                         const char* input_file_name,
+                                         const char* entry_point_name,
+                                         const CompileOptions& options) const {
+-    shaderc_compilation_result_t compilation_result = shaderc_compile_into_spv(
++    shaderc_compilation_result_t compilation_result = nullptr;
++    shaderc_compile_into_spv(
+         compiler_, source_text, source_text_size, shader_kind, input_file_name,
+-        entry_point_name, options.options_);
++        entry_point_name, options.options_, &compilation_result);
+     return SpvCompilationResult(compilation_result);
+   }
+ 
+@@ -451,9 +453,10 @@ class Compiler {
+                                         size_t source_text_size,
+                                         shaderc_shader_kind shader_kind,
+                                         const char* input_file_name) const {
+-    shaderc_compilation_result_t compilation_result =
+-        shaderc_compile_into_spv(compiler_, source_text, source_text_size,
+-                                 shader_kind, input_file_name, "main", nullptr);
++    shaderc_compilation_result_t compilation_result = nullptr;
++    shaderc_compile_into_spv(compiler_, source_text, source_text_size,
++                             shader_kind, input_file_name, "main", nullptr,
++                             &compilation_result);
+     return SpvCompilationResult(compilation_result);
+   }
+ 
+@@ -504,8 +507,11 @@ class Compiler {
+   SpvCompilationResult AssembleToSpv(const char* source_assembly,
+                                      size_t source_assembly_size,
+                                      const CompileOptions& options) const {
+-    return SpvCompilationResult(shaderc_assemble_into_spv(
+-        compiler_, source_assembly, source_assembly_size, options.options_));
++    shaderc_compilation_result_t compilation_result = nullptr;
++    shaderc_assemble_into_spv(
++        compiler_, source_assembly, source_assembly_size, options.options_,
++        &compilation_result);
++    return SpvCompilationResult(compilation_result);
+   }
+ 
+   // Assembles the given SPIR-V assembly and returns a SPIR-V binary module
+@@ -513,8 +519,11 @@ class Compiler {
+   // Like the first AssembleToSpv method but uses the default compiler options.
+   SpvCompilationResult AssembleToSpv(const char* source_assembly,
+                                      size_t source_assembly_size) const {
+-    return SpvCompilationResult(shaderc_assemble_into_spv(
+-        compiler_, source_assembly, source_assembly_size, nullptr));
++    shaderc_compilation_result_t compilation_result = nullptr;
++    shaderc_assemble_into_spv(
++        compiler_, source_assembly, source_assembly_size, nullptr,
++        &compilation_result);
++    return SpvCompilationResult(compilation_result);
+   }
+ 
+   // Assembles the given SPIR-V assembly and returns a SPIR-V binary module
+@@ -523,9 +532,11 @@ class Compiler {
+   // std::string.
+   SpvCompilationResult AssembleToSpv(const std::string& source_assembly,
+                                      const CompileOptions& options) const {
+-    return SpvCompilationResult(
+-        shaderc_assemble_into_spv(compiler_, source_assembly.data(),
+-                                  source_assembly.size(), options.options_));
++    shaderc_compilation_result_t compilation_result = nullptr;
++    shaderc_assemble_into_spv(
++      compiler_, source_assembly.data(), source_assembly.size(),
++      options.options_, &compilation_result);
++    return SpvCompilationResult(compilation_result);
+   }
+ 
+   // Assembles the given SPIR-V assembly and returns a SPIR-V binary module
+@@ -533,8 +544,10 @@ class Compiler {
+   // Like the first AssembleToSpv method but the source is provided as a
+   // std::string and also uses default compiler options.
+   SpvCompilationResult AssembleToSpv(const std::string& source_assembly) const {
+-    return SpvCompilationResult(shaderc_assemble_into_spv(
+-        compiler_, source_assembly.data(), source_assembly.size(), nullptr));
++    shaderc_compilation_result_t compilation_result = nullptr;
++    shaderc_assemble_into_spv(compiler_, source_assembly.data(),
++      source_assembly.size(), nullptr, &compilation_result);
++    return SpvCompilationResult(compilation_result);
+   }
+ 
+   // Compiles the given source GLSL and returns the SPIR-V assembly text
+@@ -544,10 +557,11 @@ class Compiler {
+       const char* source_text, size_t source_text_size,
+       shaderc_shader_kind shader_kind, const char* input_file_name,
+       const char* entry_point_name, const CompileOptions& options) const {
+-    shaderc_compilation_result_t compilation_result =
+-        shaderc_compile_into_spv_assembly(
+-            compiler_, source_text, source_text_size, shader_kind,
+-            input_file_name, entry_point_name, options.options_);
++    shaderc_compilation_result_t compilation_result = nullptr;
++    shaderc_compile_into_spv_assembly(
++        compiler_, source_text, source_text_size, shader_kind,
++        input_file_name, entry_point_name, options.options_,
++        &compilation_result);
+     return AssemblyCompilationResult(compilation_result);
+   }
+ 
+@@ -592,10 +606,10 @@ class Compiler {
+       const char* source_text, size_t source_text_size,
+       shaderc_shader_kind shader_kind, const char* input_file_name,
+       const CompileOptions& options) const {
+-    shaderc_compilation_result_t compilation_result =
+-        shaderc_compile_into_preprocessed_text(
++    shaderc_compilation_result_t compilation_result;
++    shaderc_compile_into_preprocessed_text(
+             compiler_, source_text, source_text_size, shader_kind,
+-            input_file_name, "main", options.options_);
++            input_file_name, "main", options.options_, &compilation_result);
+     return PreprocessedSourceCompilationResult(compilation_result);
+   }
+ 
+diff --git a/libshaderc/src/shaderc.cc b/libshaderc/src/shaderc.cc
+index 63f1bbc..c1a9b12 100644
+--- a/libshaderc/src/shaderc.cc
++++ b/libshaderc/src/shaderc.cc
+@@ -418,8 +418,12 @@ void shaderc_compile_options_set_source_language(
+ }
+ 
+ void shaderc_compile_options_set_generate_debug_info(
+-    shaderc_compile_options_t options) {
+-  options->compiler.SetGenerateDebugInfo();
++    shaderc_compile_options_t options, bool enabled, bool enable_non_semantic) {
++  if (enabled) {
++    options->compiler.SetGenerateDebugInfo();
++    if (enable_non_semantic)
++      options->compiler.SetEmitNonSemanticDebugInfo();
++  }
+ }
+ 
+ void shaderc_compile_options_set_optimization_level(
+@@ -591,8 +595,31 @@ void shaderc_compiler_release(shaderc_compiler_t compiler) {
+   delete compiler;
+ }
+ 
++const char* shaderc_compilation_status_to_string(shaderc_compilation_status status)
++{
++  static constexpr const std::pair<shaderc_compilation_status, const char*> status_names[] = {
++    {shaderc_compilation_status_success, "shaderc_compilation_status_success"},
++    {shaderc_compilation_status_invalid_stage, "shaderc_compilation_status_invalid_stage"},
++    {shaderc_compilation_status_compilation_error, "shaderc_compilation_status_compilation_error"},
++    {shaderc_compilation_status_internal_error, "shaderc_compilation_status_internal_error"},
++    {shaderc_compilation_status_null_result_object, "shaderc_compilation_status_null_result_object"},
++    {shaderc_compilation_status_invalid_assembly, "shaderc_compilation_status_invalid_assembly"},
++    {shaderc_compilation_status_validation_error, "shaderc_compilation_status_validation_error"},
++    {shaderc_compilation_status_transformation_error, "shaderc_compilation_status_transformation_error"},
++    {shaderc_compilation_status_configuration_error, "shaderc_compilation_status_configuration_error"},
++  };
++
++  for (const auto& it : status_names)
++  {
++    if (status == it.first)
++      return it.second;
++  }
++
++  return "shaderc_compilation_status_unknown";
++}
++
+ namespace {
+-shaderc_compilation_result_t CompileToSpecifiedOutputType(
++shaderc_compilation_result_vector* CompileToSpecifiedOutputType(
+     const shaderc_compiler_t compiler, const char* source_text,
+     size_t source_text_size, shaderc_shader_kind shader_kind,
+     const char* input_file_name, const char* entry_point_name,
+@@ -669,48 +696,59 @@ shaderc_compilation_result_t CompileToSpecifiedOutputType(
+ }
+ }  // anonymous namespace
+ 
+-shaderc_compilation_result_t shaderc_compile_into_spv(
++shaderc_compilation_status shaderc_compile_into_spv(
+     const shaderc_compiler_t compiler, const char* source_text,
+     size_t source_text_size, shaderc_shader_kind shader_kind,
+     const char* input_file_name, const char* entry_point_name,
+-    const shaderc_compile_options_t additional_options) {
+-  return CompileToSpecifiedOutputType(
++    const shaderc_compile_options_t additional_options,
++    shaderc_compilation_result_t* result) {
++  shaderc_compilation_result_vector* resultv = CompileToSpecifiedOutputType(
+       compiler, source_text, source_text_size, shader_kind, input_file_name,
+       entry_point_name, additional_options,
+       shaderc_util::Compiler::OutputType::SpirvBinary);
++  *result = resultv;
++  return resultv ? resultv->compilation_status : shaderc_compilation_status_internal_error;
+ }
+ 
+-shaderc_compilation_result_t shaderc_compile_into_spv_assembly(
++shaderc_compilation_status shaderc_compile_into_spv_assembly(
+     const shaderc_compiler_t compiler, const char* source_text,
+     size_t source_text_size, shaderc_shader_kind shader_kind,
+     const char* input_file_name, const char* entry_point_name,
+-    const shaderc_compile_options_t additional_options) {
+-  return CompileToSpecifiedOutputType(
++    const shaderc_compile_options_t additional_options,
++    shaderc_compilation_result_t* result) {
++  shaderc_compilation_result_vector* resultv = CompileToSpecifiedOutputType(
+       compiler, source_text, source_text_size, shader_kind, input_file_name,
+       entry_point_name, additional_options,
+       shaderc_util::Compiler::OutputType::SpirvAssemblyText);
++  *result = resultv;
++  return resultv ? resultv->compilation_status : shaderc_compilation_status_internal_error;
+ }
+ 
+-shaderc_compilation_result_t shaderc_compile_into_preprocessed_text(
++shaderc_compilation_status shaderc_compile_into_preprocessed_text(
+     const shaderc_compiler_t compiler, const char* source_text,
+     size_t source_text_size, shaderc_shader_kind shader_kind,
+     const char* input_file_name, const char* entry_point_name,
+-    const shaderc_compile_options_t additional_options) {
+-  return CompileToSpecifiedOutputType(
++    const shaderc_compile_options_t additional_options,
++    shaderc_compilation_result_t* result) {
++  shaderc_compilation_result_vector* resultv = CompileToSpecifiedOutputType(
+       compiler, source_text, source_text_size, shader_kind, input_file_name,
+       entry_point_name, additional_options,
+       shaderc_util::Compiler::OutputType::PreprocessedText);
++  *result = resultv;
++  return resultv ? resultv->compilation_status : shaderc_compilation_status_internal_error;
+ }
+ 
+-shaderc_compilation_result_t shaderc_assemble_into_spv(
++shaderc_compilation_status shaderc_assemble_into_spv(
+     const shaderc_compiler_t compiler, const char* source_assembly,
+     size_t source_assembly_size,
+-    const shaderc_compile_options_t additional_options) {
+-  auto* result = new (std::nothrow) shaderc_compilation_result_spv_binary;
+-  if (!result) return nullptr;
+-  result->compilation_status = shaderc_compilation_status_invalid_assembly;
+-  if (!compiler->initializer) return result;
+-  if (source_assembly == nullptr) return result;
++    const shaderc_compile_options_t additional_options,
++    shaderc_compilation_result_t* result) {
++  auto* bresult = new (std::nothrow) shaderc_compilation_result_spv_binary;
++  if (!bresult) return shaderc_compilation_status_internal_error;
++  bresult->compilation_status = shaderc_compilation_status_invalid_assembly;
++  *result = bresult;
++  if (!compiler->initializer) return bresult->compilation_status;
++  if (source_assembly == nullptr) return bresult->compilation_status;
+ 
+   TRY_IF_EXCEPTIONS_ENABLED {
+     spv_binary assembling_output_data = nullptr;
+@@ -724,22 +762,22 @@ shaderc_compilation_result_t shaderc_assemble_into_spv(
+         GetCompilerTargetEnvVersion(target_env_version),
+         {source_assembly, source_assembly + source_assembly_size},
+         &assembling_output_data, &errors);
+-    result->num_errors = !assembling_succeeded;
++    bresult->num_errors = !assembling_succeeded;
+     if (assembling_succeeded) {
+-      result->SetOutputData(assembling_output_data);
+-      result->output_data_size =
++      bresult->SetOutputData(assembling_output_data);
++      bresult->output_data_size =
+           assembling_output_data->wordCount * sizeof(uint32_t);
+-      result->compilation_status = shaderc_compilation_status_success;
++      bresult->compilation_status = shaderc_compilation_status_success;
+     } else {
+-      result->messages = std::move(errors);
+-      result->compilation_status = shaderc_compilation_status_invalid_assembly;
++      bresult->messages = std::move(errors);
++      bresult->compilation_status = shaderc_compilation_status_invalid_assembly;
+     }
+   }
+   CATCH_IF_EXCEPTIONS_ENABLED(...) {
+-    result->compilation_status = shaderc_compilation_status_internal_error;
++    bresult->compilation_status = shaderc_compilation_status_internal_error;
+   }
+ 
+-  return result;
++  return bresult->compilation_status;
+ }
+ 
+ size_t shaderc_result_get_length(const shaderc_compilation_result_t result) {
+diff --git a/libshaderc_util/include/libshaderc_util/compiler.h b/libshaderc_util/include/libshaderc_util/compiler.h
+index d9d02b9..b076ec8 100644
+--- a/libshaderc_util/include/libshaderc_util/compiler.h
++++ b/libshaderc_util/include/libshaderc_util/compiler.h
+@@ -195,6 +195,7 @@ class Compiler {
+         warnings_as_errors_(false),
+         suppress_warnings_(false),
+         generate_debug_info_(false),
++        emit_non_semantic_debug_info_(false),
+         enabled_opt_passes_(),
+         target_env_(TargetEnv::Vulkan),
+         target_env_version_(TargetEnvVersion::Default),
+@@ -220,6 +221,10 @@ class Compiler {
+   // such as identifier names and line numbers.
+   void SetGenerateDebugInfo();
+ 
++  // Requests that the compiler emit non-semantic debug information.
++  // Requires VK_KHR_shader_non_semantic_info.
++  void SetEmitNonSemanticDebugInfo();
++
+   // Sets the optimization level to the given level. Only the last one takes
+   // effect if multiple calls of this method exist.
+   void SetOptimizationLevel(OptimizationLevel level);
+@@ -486,6 +491,10 @@ class Compiler {
+   // output.
+   bool generate_debug_info_;
+ 
++  // When true and generate_debug_info_ is also set, generate non-semantic debug
++  // information.
++  bool emit_non_semantic_debug_info_;
++
+   // Optimization passes to be applied.
+   std::vector<PassId> enabled_opt_passes_;
+ 
+diff --git a/libshaderc_util/src/compiler.cc b/libshaderc_util/src/compiler.cc
+index e5f5d10..1f9e6a5 100644
+--- a/libshaderc_util/src/compiler.cc
++++ b/libshaderc_util/src/compiler.cc
+@@ -341,6 +341,11 @@ std::tuple<bool, std::vector<uint32_t>, size_t> Compiler::Compile(
+   options.generateDebugInfo = generate_debug_info_;
+   options.disableOptimizer = true;
+   options.optimizeSize = false;
++  options.emitNonSemanticShaderDebugInfo =
++      generate_debug_info_ && emit_non_semantic_debug_info_;
++  options.emitNonSemanticShaderDebugSource =
++      generate_debug_info_ && emit_non_semantic_debug_info_;
++
+   // Note the call to GlslangToSpv also populates compilation_output_data.
+   glslang::GlslangToSpv(*program.getIntermediate(used_shader_stage), spirv,
+                         &options);
+@@ -438,6 +443,10 @@ void Compiler::SetGenerateDebugInfo() {
+   }
+ }
+ 
++void Compiler::SetEmitNonSemanticDebugInfo() {
++  emit_non_semantic_debug_info_ = true;
++}
++
+ void Compiler::SetOptimizationLevel(Compiler::OptimizationLevel level) {
+   // Clear previous settings first.
+   enabled_opt_passes_.clear();
+diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
+index d44f62a..83966b6 100644
+--- a/third_party/CMakeLists.txt
++++ b/third_party/CMakeLists.txt
+@@ -20,9 +20,9 @@ set(SHADERC_TINT_DIR "${SHADERC_THIRD_PARTY_ROOT_DIR}/tint" CACHE STRING
+ set(SHADERC_ABSL_DIR "${SHADERC_THIRD_PARTY_ROOT_DIR}/abseil_cpp" CACHE STRING
+   "Location of re2 source")
+ 
+-set( SKIP_GLSLANG_INSTALL ${SHADERC_SKIP_INSTALL} )
+-set( SKIP_SPIRV_TOOLS_INSTALL ${SHADERC_SKIP_INSTALL} )
+-set( SKIP_GOOGLETEST_INSTALL ${SHADERC_SKIP_INSTALL} )
++set( SKIP_GLSLANG_INSTALL ON )
++set( SKIP_SPIRV_TOOLS_INSTALL ON )
++set( SKIP_GOOGLETEST_INSTALL ON )
+ 
+ # Configure third party projects.
+ if(${SHADERC_ENABLE_TESTS})
+@@ -64,7 +64,10 @@ if (NOT TARGET SPIRV-Tools)
+       add_subdirectory(${SHADERC_RE2_DIR} re2)
+       add_subdirectory(${SHADERC_EFFCEE_DIR} effcee)
+     endif()
+-    add_subdirectory(${SHADERC_SPIRV_TOOLS_DIR} spirv-tools)
++    set(SPIRV_SKIP_EXECUTABLES ON CACHE BOOL "Skip building SPIRV-Tools executables")
++    set(SPIRV_TOOLS_BUILD_STATIC OFF CACHE BOOL "Skip building two SPIRV-Tools libs")
++    set(SPIRV_TOOLS_LIBRARY_TYPE STATIC CACHE STRING "Build static SPIRV-Tools libs")
++    add_subdirectory(${SHADERC_SPIRV_TOOLS_DIR} spirv-tools EXCLUDE_FROM_ALL)
+     if (NOT "${SPIRV_SKIP_TESTS}")
+       if (MSVC)
+         if (${MSVC_VERSION} LESS 1920)
+@@ -87,8 +90,8 @@ if (NOT TARGET glslang)
+       # Glslang tests are off by default. Turn them on if testing Shaderc.
+       set(GLSLANG_TESTS ON)
+     endif()
+-    set(GLSLANG_ENABLE_INSTALL $<NOT:${SKIP_GLSLANG_INSTALL}>)
+-    add_subdirectory(${SHADERC_GLSLANG_DIR} glslang)
++    set(GLSLANG_ENABLE_INSTALL OFF)
++    add_subdirectory(${SHADERC_GLSLANG_DIR} glslang EXCLUDE_FROM_ALL)
+   endif()
+   if (NOT TARGET glslang)
+     message(FATAL_ERROR "glslang was not found - required for compilation")

.github/workflows/scripts/common/update_base_translation.sh

@@ -1,12 +1,14 @@
 #!/bin/bash
 
 SCRIPTDIR=$(dirname "${BASH_SOURCE[0]}")
-source "$SCRIPTDIR/../linux/functions.sh"
 
 set -e
 
 # While we use custom Qt builds for our releases, the Qt6 package will be good enough
 # for just updating translations. Saves building it for this action alone.
-retry_command sudo apt-get -y install qt6-l10n-tools
+"$SCRIPTDIR/../../../../tools/retry.sh" sudo apt-get -y install qt6-l10n-tools python3
 
-PATH=/usr/lib/qt6/bin:$PATH "$SCRIPTDIR/../../../../pcsx2-qt/Translations/update_en_translation.sh"
+"$SCRIPTDIR/../../../../tools/generate_fullscreen_ui_translation_strings.py"
+"$SCRIPTDIR/../../../../pcsx2-qt/Translations/update_glyph_ranges.py"
+"$SCRIPTDIR/../../../../tools/generate_update_fa_glyph_ranges.py"
+PATH=/usr/lib/qt6/bin:$PATH "$SCRIPTDIR/../../../../pcsx2-qt/Translations/update_base_translation.sh"

.github/workflows/scripts/linux/appimage-qt.sh

@@ -26,7 +26,6 @@
 # For more information, please refer to <http://unlicense.org/>
 
 SCRIPTDIR=$(dirname "${BASH_SOURCE[0]}")
-source "$SCRIPTDIR/functions.sh"
 
 if [ "$#" -ne 4 ]; then
     echo "Syntax: $0 <path to pcsx2 directory> <path to build directory> <deps prefix> <output name>"
@@ -42,6 +41,10 @@ BINARY=pcsx2-qt
 APPDIRNAME=PCSX2.AppDir
 STRIP=strip
 
+declare -a MANUAL_LIBS=(
+	"libshaderc_shared.so.1"
+)
+
 declare -a MANUAL_QT_LIBS=(
 	"libQt6WaylandEglClientHwIntegration.so.6"
 )
@@ -52,31 +55,58 @@ declare -a MANUAL_QT_PLUGINS=(
 	"wayland-shell-integration"
 )
 
+declare -a REMOVE_LIBS=(
+	'libwayland-client.so*'
+	'libwayland-cursor.so*'
+	'libwayland-egl.so*'
+)
+
 set -e
 
-LINUXDEPLOY=./linuxdeploy-x86_64.AppImage
-LINUXDEPLOY_PLUGIN_QT=./linuxdeploy-plugin-qt-x86_64.AppImage
-APPIMAGETOOL=./appimagetool-x86_64.AppImage
+LINUXDEPLOY=./linuxdeploy-x86_64
+LINUXDEPLOY_PLUGIN_QT=./linuxdeploy-plugin-qt-x86_64
+APPIMAGETOOL=./appimagetool-x86_64
 PATCHELF=patchelf
 
 if [ ! -f "$LINUXDEPLOY" ]; then
-	retry_command wget -O "$LINUXDEPLOY" https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage
+	"$PCSX2DIR/tools/retry.sh" wget -O "$LINUXDEPLOY" https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage
 	chmod +x "$LINUXDEPLOY"
 fi
 
 if [ ! -f "$LINUXDEPLOY_PLUGIN_QT" ]; then
-	retry_command wget -O "$LINUXDEPLOY_PLUGIN_QT" https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage
+	"$PCSX2DIR/tools/retry.sh" wget -O "$LINUXDEPLOY_PLUGIN_QT" https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage
 	chmod +x "$LINUXDEPLOY_PLUGIN_QT"
 fi
 
+# Using go-appimage
+# Backported from https://github.com/stenzek/duckstation/pull/3251
 if [ ! -f "$APPIMAGETOOL" ]; then
-	retry_command wget -O "$APPIMAGETOOL" https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage
+	APPIMAGETOOLURL=$(wget -q https://api.github.com/repos/probonopd/go-appimage/releases -O - | sed 's/[()",{} ]/\n/g' | grep -o 'https.*continuous.*tool.*86_64.*mage$' | head -1)
+	"$PCSX2DIR/tools/retry.sh" wget -O "$APPIMAGETOOL" "$APPIMAGETOOLURL"
 	chmod +x "$APPIMAGETOOL"
 fi
 
 OUTDIR=$(realpath "./$APPDIRNAME")
 rm -fr "$OUTDIR"
 
+echo "Locating extra libraries..."
+EXTRA_LIBS_ARGS=""
+for lib in "${MANUAL_LIBS[@]}"; do
+	srcpath=$(find "$DEPSDIR" -name "$lib")
+	if [ ! -f "$srcpath" ]; then
+		echo "Missinge extra library $lib. Exiting."
+		exit 1
+	fi
+
+	echo "Found $lib at $srcpath."
+
+	if [ "$EXTRA_LIBS_ARGS" == "" ]; then
+		EXTRA_LIBS_ARGS="--library=$srcpath"
+	else
+		EXTRA_LIBS_ARGS="$EXTRA_LIBS_ARGS,$srcpath"
+	fi
+done
+
 # Why the nastyness? linuxdeploy strips our main binary, and there's no option to turn it off.
 # It also doesn't strip the Qt libs. We can't strip them after running linuxdeploy, because
 # patchelf corrupts the libraries (but they still work), but patchelf+strip makes them crash
@@ -98,11 +128,12 @@ cp "$PCSX2DIR/.github/workflows/scripts/linux/pcsx2-qt.desktop" "net.pcsx2.PCSX2
 cp "$PCSX2DIR/bin/resources/icons/AppIconLarge.png" "PCSX2.png"
 
 echo "Running linuxdeploy to create AppDir..."
-EXTRA_QT_PLUGINS="core;gui;network;svg;waylandclient;widgets;xcbqpa" \
+EXTRA_QT_PLUGINS="core;gui;svg;waylandclient;widgets;xcbqpa" \
 EXTRA_PLATFORM_PLUGINS="libqwayland-egl.so;libqwayland-generic.so" \
+DEPLOY_PLATFORM_THEMES="1" \
 QMAKE="$DEPSDIR/bin/qmake" \
 NO_STRIP="1" \
-$LINUXDEPLOY --plugin qt --appdir="$OUTDIR" --executable="$BUILDDIR/bin/pcsx2-qt" \
+$LINUXDEPLOY --plugin qt --appdir="$OUTDIR" --executable="$BUILDDIR/bin/pcsx2-qt" $EXTRA_LIBS_ARGS \
 --desktop-file="net.pcsx2.PCSX2.desktop" --icon-file="PCSX2.png"
 
 echo "Copying resources into AppDir..."
@@ -136,6 +167,16 @@ for GROUP in "${MANUAL_QT_PLUGINS[@]}"; do
 	done
 done
 
+# Why do we have to manually remove these libs? Because the linuxdeploy Qt plugin
+# copies them, not the "main" linuxdeploy binary, and plugins don't inherit the
+# include list...
+for lib in "${REMOVE_LIBS[@]}"; do
+	for libpath in $(find "$OUTDIR/usr/lib" -name "$lib"); do
+		echo "    Removing problematic library ${libpath}."
+		rm -f "$libpath"
+	done
+done
+
 # Restore unstripped deps (for cache).
 rm -fr "$DEPSDIR"
 mv "$DEPSDIR.bak" "$DEPSDIR"
@@ -161,6 +202,16 @@ for hookpath in "$SCRIPTDIR/apprun-hooks"/*; do
 done
 
 echo "Generating AppImage..."
-rm -f "$NAME.AppImage"
-$APPIMAGETOOL -v "$OUTDIR" "$NAME.AppImage"
+GIT_VERSION=$(git tag --points-at HEAD)
+
+if [[ "${GIT_VERSION}" == "" ]]; then
+	# In the odd event that we run this script before the release gets tagged.
+	GIT_VERSION=$(git describe --tags)
+	if [[ "${GIT_VERSION}" == "" ]]; then
+		GIT_VERSION=$(git rev-parse HEAD)
+	fi
+fi
+
+rm -f "$NAME.AppImage"
+ARCH=x86_64 VERSION="${GIT_VERSION}" "$APPIMAGETOOL" -s "$OUTDIR" && mv ./*.AppImage "$NAME.AppImage"
 

.github/workflows/scripts/linux/build-dependencies-qt.sh

@@ -2,52 +2,141 @@
 
 set -e
 
-INSTALLDIR="$HOME/deps"
+if [ "$#" -ne 1 ]; then
+    echo "Syntax: $0 <output directory>"
+    exit 1
+fi
+
+SCRIPTDIR=$(realpath $(dirname "${BASH_SOURCE[0]}"))
 NPROCS="$(getconf _NPROCESSORS_ONLN)"
-SDL=SDL2-2.28.5
-QT=6.6.1
+INSTALLDIR="$1"
+if [ "${INSTALLDIR:0:1}" != "/" ]; then
+	INSTALLDIR="$PWD/$INSTALLDIR"
+fi
+
 LIBBACKTRACE=ad106d5fdd5d960bd33fae1c48a351af567fd075
+LIBJPEG=9f
+LIBPNG=1.6.43
+LIBWEBP=1.4.0
+LZ4=b8fd2d15309dd4e605070bd4486e26b6ef814e29
+SDL=SDL2-2.30.8
+QT=6.8.0
+ZSTD=1.5.6
+
+SHADERC=2024.1
+SHADERC_GLSLANG=142052fa30f9eca191aa9dcf65359fcaed09eeec
+SHADERC_SPIRVHEADERS=5e3ad389ee56fca27c9705d093ae5387ce404df4
+SHADERC_SPIRVTOOLS=dd4b663e13c07fea4fbb3f70c1c91c86731099f7
 
 mkdir -p deps-build
 cd deps-build
 
 cat > SHASUMS <<EOF
-332cb37d0be20cb9541739c61f79bae5a477427d79ae85e352089afdaf6666e4  $SDL.tar.gz
 fd6f417fe9e3a071cf1424a5152d926a34c4a3c5070745470be6cf12a404ed79  $LIBBACKTRACE.zip
-450c5b4677b2fe40ed07954d7f0f40690068e80a94c9df86c2c905ccd59d02f7  qtbase-everywhere-src-$QT.tar.xz
-ac4ed08950072e375be662cfa64fdb447dd6e935cf29c56a4128d1500492188f  qtimageformats-everywhere-src-$QT.tar.xz
-248deb56d26a463cf3162f530358ccf90cfb654bbf518bb35ddf81b205e09228  qtsvg-everywhere-src-$QT.tar.xz
-4939105a7345ab4e19e7caee8654a836e65bd41910359623e0f233f3aff0914a  qttools-everywhere-src-$QT.tar.xz
-668702e822ad7150b27e7caa2158595fd9b3b77ffbc8262e6509872a3920ee88  qttranslations-everywhere-src-$QT.tar.xz
-66cc2d632dc07fc6cc4e35247f48b7c1753276ccbf86e86d7b24d799725568b1  qtwayland-everywhere-src-$QT.tar.xz
+04705c110cb2469caa79fb71fba3d7bf834914706e9641a4589485c1f832565b  jpegsrc.v$LIBJPEG.tar.gz
+6a5ca0652392a2d7c9db2ae5b40210843c0bbc081cbd410825ab00cc59f14a6c  libpng-$LIBPNG.tar.xz
+61f873ec69e3be1b99535634340d5bde750b2e4447caa1db9f61be3fd49ab1e5  libwebp-$LIBWEBP.tar.gz
+0728800155f3ed0a0c87e03addbd30ecbe374f7b080678bbca1506051d50dec3  $LZ4.tar.gz
+380c295ea76b9bd72d90075793971c8bcb232ba0a69a9b14da4ae8f603350058  $SDL.tar.gz
+8c29e06cf42aacc1eafc4077ae2ec6c6fcb96a626157e0593d5e82a34fd403c1  zstd-$ZSTD.tar.gz
+1bad481710aa27f872de6c9f72651f89a6107f0077003d0ebfcc9fd15cba3c75  qtbase-everywhere-src-$QT.tar.xz
+595bf8557b91e1f8ebc726f1e09868a3c7e610ff5045068f2d4ea2428c49a5d4  qtimageformats-everywhere-src-$QT.tar.xz
+cf7a593d5e520f8177240610d9e55d5b75b0887fe5f385554ff64377f1646199  qtsvg-everywhere-src-$QT.tar.xz
+403115d8268503c6cc6e43310c8ae28eb9e605072a5d04e4a2de8b6af39981f7  qttools-everywhere-src-$QT.tar.xz
+84bf2b67c243cd0c50a08acd7bfa9df2b1965028511815c1b6b65a0687437cb6  qttranslations-everywhere-src-$QT.tar.xz
+175758591638ebf1c6fbb66ac11c7fa0eb8d4ed52e9243cc59075d06a6a2060a  qtwayland-everywhere-src-$QT.tar.xz
+eb3b5f0c16313d34f208d90c2fa1e588a23283eed63b101edd5422be6165d528  shaderc-$SHADERC.tar.gz
+aa27e4454ce631c5a17924ce0624eac736da19fc6f5a2ab15a6c58da7b36950f  shaderc-glslang-$SHADERC_GLSLANG.tar.gz
+5d866ce34a4b6908e262e5ebfffc0a5e11dd411640b5f24c85a80ad44c0d4697  shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz
+03ee1a2c06f3b61008478f4abe9423454e53e580b9488b47c8071547c6a9db47  shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz
 EOF
 
 curl -L \
-	-O "https://libsdl.org/release/$SDL.tar.gz" \
 	-O "https://github.com/ianlancetaylor/libbacktrace/archive/$LIBBACKTRACE.zip" \
+	-O "https://ijg.org/files/jpegsrc.v$LIBJPEG.tar.gz" \
+	-O "https://downloads.sourceforge.net/project/libpng/libpng16/$LIBPNG/libpng-$LIBPNG.tar.xz" \
+	-O "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-$LIBWEBP.tar.gz" \
+	-O "https://github.com/lz4/lz4/archive/$LZ4.tar.gz" \
+	-O "https://libsdl.org/release/$SDL.tar.gz" \
+	-O "https://github.com/facebook/zstd/releases/download/v$ZSTD/zstd-$ZSTD.tar.gz" \
 	-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtbase-everywhere-src-$QT.tar.xz" \
 	-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtimageformats-everywhere-src-$QT.tar.xz" \
 	-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtsvg-everywhere-src-$QT.tar.xz" \
 	-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qttools-everywhere-src-$QT.tar.xz" \
 	-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qttranslations-everywhere-src-$QT.tar.xz" \
-	-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtwayland-everywhere-src-$QT.tar.xz"
+	-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtwayland-everywhere-src-$QT.tar.xz" \
+	-o "shaderc-$SHADERC.tar.gz" "https://github.com/google/shaderc/archive/refs/tags/v$SHADERC.tar.gz" \
+	-o "shaderc-glslang-$SHADERC_GLSLANG.tar.gz" "https://github.com/KhronosGroup/glslang/archive/$SHADERC_GLSLANG.tar.gz" \
+	-o "shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz" "https://github.com/KhronosGroup/SPIRV-Headers/archive/$SHADERC_SPIRVHEADERS.tar.gz" \
+	-o "shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz" "https://github.com/KhronosGroup/SPIRV-Tools/archive/$SHADERC_SPIRVTOOLS.tar.gz"
 
 shasum -a 256 --check SHASUMS
 
-echo "Building SDL..."
-tar xf "$SDL.tar.gz"
-cd "$SDL"
-./configure --prefix "$INSTALLDIR" --enable-dbus --without-x --disable-video-opengl --disable-video-opengles --disable-video-vulkan --disable-wayland-shared --disable-ime --disable-oss --disable-alsa --disable-jack --disable-esd --disable-pipewire --disable-pulseaudio --disable-arts --disable-nas --disable-sndio --disable-fusionsound --disable-diskaudio
-make "-j$NPROCS"
+echo "Building libbacktrace..."
+rm -fr "libbacktrace-$LIBBACKTRACE"
+unzip "$LIBBACKTRACE.zip"
+cd "libbacktrace-$LIBBACKTRACE"
+./configure --prefix="$INSTALLDIR"
+make
 make install
 cd ..
 
-echo "Building libbacktrace..."
-unzip "$LIBBACKTRACE.zip"
-cd "libbacktrace-$LIBBACKTRACE"
-./configure --prefix="$HOME/deps"
-make
+echo "Building libpng..."
+rm -fr "libpng-$LIBPNG"
+tar xf "libpng-$LIBPNG.tar.xz"
+cd "libpng-$LIBPNG"
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DBUILD_SHARED_LIBS=ON -DPNG_TESTS=OFF -DPNG_STATIC=OFF -DPNG_SHARED=ON -DPNG_TOOLS=OFF -B build -G Ninja
+cmake --build build --parallel
+ninja -C build install
+cd ..
+
+echo "Building libjpeg..."
+rm -fr "jpeg-$LIBJPEG"
+tar xf "jpegsrc.v$LIBJPEG.tar.gz"
+cd "jpeg-$LIBJPEG"
+mkdir build
+cd build
+../configure --prefix="$INSTALLDIR" --disable-static --enable-shared
+make "-j$NPROCS"
 make install
+cd ../..
+
+echo "Building LZ4..."
+rm -fr "lz4-$LZ4"
+tar xf "$LZ4.tar.gz"
+cd "lz4-$LZ4"
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DLZ4_BUILD_CLI=OFF -DLZ4_BUILD_LEGACY_LZ4C=OFF -B build-dir -G Ninja build/cmake
+cmake --build build-dir --parallel
+ninja -C build-dir install
+cd ..
+
+echo "Building Zstandard..."
+rm -fr "zstd-$ZSTD"
+tar xf "zstd-$ZSTD.tar.gz"
+cd "zstd-$ZSTD"
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DZSTD_BUILD_SHARED=ON -DZSTD_BUILD_STATIC=OFF -DZSTD_BUILD_PROGRAMS=OFF -B build -G Ninja build/cmake
+cmake --build build --parallel
+ninja -C build install
+cd ..
+
+echo "Building WebP..."
+rm -fr "libwebp-$LIBWEBP"
+tar xf "libwebp-$LIBWEBP.tar.gz"
+cd "libwebp-$LIBWEBP"
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -B build -G Ninja \
+  -DWEBP_BUILD_ANIM_UTILS=OFF -DWEBP_BUILD_CWEBP=OFF -DWEBP_BUILD_DWEBP=OFF -DWEBP_BUILD_GIF2WEBP=OFF -DWEBP_BUILD_IMG2WEBP=OFF \
+  -DWEBP_BUILD_VWEBP=OFF -DWEBP_BUILD_WEBPINFO=OFF -DWEBP_BUILD_WEBPMUX=OFF -DWEBP_BUILD_EXTRAS=OFF -DBUILD_SHARED_LIBS=ON
+cmake --build build --parallel
+ninja -C build install
+cd ..
+
+echo "Building SDL..."
+rm -fr "$SDL"
+tar xf "$SDL.tar.gz"
+cd "$SDL"
+cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DSDL_SHARED=ON -DSDL_STATIC=OFF -G Ninja
+cmake --build build --parallel
+ninja -C build install
 cd ..
 
 # Couple notes:
@@ -56,65 +145,54 @@ cd ..
 # ICU avoids pulling in a bunch of large libraries, and hopefully we can get away without it.
 # OpenGL is needed to render window decorations in Wayland, apparently.
 echo "Building Qt Base..."
+rm -fr "qtbase-everywhere-src-$QT"
 tar xf "qtbase-everywhere-src-$QT.tar.xz"
 cd "qtbase-everywhere-src-$QT"
 mkdir build
 cd build
-../configure -prefix "$INSTALLDIR" -release -dbus-linked -gui -widgets -fontconfig -qt-doubleconversion -ssl -openssl-runtime -opengl desktop -qpa xcb,wayland -xkbcommon -- -DFEATURE_dbus=ON -DFEATURE_icu=OFF -DFEATURE_printsupport=OFF -DFEATURE_sql=OFF
+../configure -prefix "$INSTALLDIR" -release -dbus-linked -gui -widgets -fontconfig -qt-doubleconversion -ssl -openssl-runtime -opengl desktop -qpa xcb,wayland -xkbcommon -xcb -gtk -- -DFEATURE_dbus=ON -DFEATURE_icu=OFF -DFEATURE_printsupport=OFF -DFEATURE_sql=OFF -DFEATURE_system_png=ON -DFEATURE_system_jpeg=ON -DFEATURE_system_zlib=ON -DFEATURE_system_freetype=ON -DFEATURE_system_harfbuzz=ON
 cmake --build . --parallel
-cmake --install .
+ninja install
 cd ../../
 
 echo "Building Qt SVG..."
+rm -fr "qtsvg-everywhere-src-$QT"
 tar xf "qtsvg-everywhere-src-$QT.tar.xz"
 cd "qtsvg-everywhere-src-$QT"
 mkdir build
 cd build
-cmake -G Ninja -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DCMAKE_BUILD_TYPE=Release ..
+"$INSTALLDIR/bin/qt-configure-module" .. -- -DCMAKE_PREFIX_PATH="$INSTALLDIR"
 cmake --build . --parallel
-cmake --install .
+ninja install
 cd ../../
 
 echo "Building Qt Image Formats..."
+rm -fr "qtimageformats-everywhere-src-$QT"
 tar xf "qtimageformats-everywhere-src-$QT.tar.xz"
 cd "qtimageformats-everywhere-src-$QT"
 mkdir build
 cd build
-cmake -G Ninja -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DCMAKE_BUILD_TYPE=Release ..
+"$INSTALLDIR/bin/qt-configure-module" .. -- -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DFEATURE_system_webp=ON
 cmake --build . --parallel
-cmake --install .
+ninja install
 cd ../../
 
 echo "Building Qt Wayland..."
+rm -fr "qtwayland-everywhere-src-$QT"
 tar xf "qtwayland-everywhere-src-$QT.tar.xz"
 cd "qtwayland-everywhere-src-$QT"
 mkdir build
 cd build
-cmake -G Ninja -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DCMAKE_BUILD_TYPE=Release ..
+"$INSTALLDIR/bin/qt-configure-module" .. -- -DCMAKE_PREFIX_PATH="$INSTALLDIR"
 cmake --build . --parallel
-cmake --install .
+ninja install
 cd ../../
 
 echo "Installing Qt Tools..."
+rm -fr "qttools-everywhere-src-$QT"
 tar xf "qttools-everywhere-src-$QT.tar.xz"
 cd "qttools-everywhere-src-$QT"
-# From Mac build-dependencies.sh:
-# Linguist relies on a library in the Designer target, which takes 5-7 minutes to build on the CI
-# Avoid it by not building Linguist, since we only need the tools that come with it
-patch -u src/linguist/CMakeLists.txt <<EOF
---- src/linguist/CMakeLists.txt
-+++ src/linguist/CMakeLists.txt
-@@ -14,7 +14,7 @@
- add_subdirectory(lrelease-pro)
- add_subdirectory(lupdate)
- add_subdirectory(lupdate-pro)
--if(QT_FEATURE_process AND QT_FEATURE_pushbutton AND QT_FEATURE_toolbutton AND TARGET Qt::Widgets AND NOT no-png)
-+if(QT_FEATURE_process AND QT_FEATURE_pushbutton AND QT_FEATURE_toolbutton AND TARGET Qt::Widgets AND TARGET Qt::PrintSupport AND NOT no-png)
-     add_subdirectory(linguist)
- endif()
-EOF
-
-# Also force disable clang scanning, it gets very confused.
+# Force disable clang scanning, it gets very confused.
 patch -u configure.cmake <<EOF
 --- configure.cmake
 +++ configure.cmake
@@ -139,21 +217,40 @@ EOF
 
 mkdir build
 cd build
-cmake -G Ninja -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DCMAKE_BUILD_TYPE=Release -DFEATURE_assistant=OFF -DFEATURE_clang=OFF -DFEATURE_designer=OFF -DFEATURE_kmap2qmap=OFF -DFEATURE_pixeltool=OFF -DFEATURE_pkg_config=OFF -DFEATURE_qev=OFF -DFEATURE_qtattributionsscanner=OFF -DFEATURE_qtdiag=OFF -DFEATURE_qtplugininfo=OFF ..
+"$INSTALLDIR/bin/qt-configure-module" .. -- -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DFEATURE_assistant=OFF -DFEATURE_clang=OFF -DFEATURE_designer=ON -DFEATURE_kmap2qmap=OFF -DFEATURE_pixeltool=OFF -DFEATURE_pkg_config=OFF -DFEATURE_qev=OFF -DFEATURE_qtattributionsscanner=OFF -DFEATURE_qtdiag=OFF -DFEATURE_qtplugininfo=OFF
 cmake --build . --parallel
-cmake --install .
+ninja install
 cd ../../
 
 echo "Installing Qt Translations..."
+rm -fr "qttranslations-everywhere-src-$QT"
 tar xf "qttranslations-everywhere-src-$QT.tar.xz"
 cd "qttranslations-everywhere-src-$QT"
 mkdir build
 cd build
-cmake -G Ninja -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DCMAKE_BUILD_TYPE=Release ..
+"$INSTALLDIR/bin/qt-configure-module" .. -- -DCMAKE_PREFIX_PATH="$INSTALLDIR"
 cmake --build . --parallel
-cmake --install .
+ninja install
 cd ../../
 
+echo "Building shaderc..."
+rm -fr "shaderc-$SHADERC"
+tar xf "shaderc-$SHADERC.tar.gz"
+cd "shaderc-$SHADERC"
+cd third_party
+tar xf "../../shaderc-glslang-$SHADERC_GLSLANG.tar.gz"
+mv "glslang-$SHADERC_GLSLANG" "glslang"
+tar xf "../../shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz"
+mv "SPIRV-Headers-$SHADERC_SPIRVHEADERS" "spirv-headers"
+tar xf "../../shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz"
+mv "SPIRV-Tools-$SHADERC_SPIRVTOOLS" "spirv-tools"
+cd ..
+patch -p1 < "$SCRIPTDIR/../common/shaderc-changes.patch"
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DSHADERC_SKIP_TESTS=ON -DSHADERC_SKIP_EXAMPLES=ON -DSHADERC_SKIP_COPYRIGHT_CHECK=ON -B build -G Ninja
+cmake --build build --parallel
+ninja -C build install
+cd ..
+
 echo "Cleaning up..."
 cd ..
 rm -r deps-build

.github/workflows/scripts/linux/compile.sh

@@ -1,15 +0,0 @@
-#!/bin/bash
-
-set -e
-
-if [ -n "${GITHUB_ACTIONS}" ]; then
-    echo "Warning: Running this script outside of GitHub Actions isn't recommended."
-fi
-
-# Prepare the Cache
-ccache -p
-ccache -z
-# Build
-ninja
-# Save the Cache
-ccache -s

.github/workflows/scripts/linux/flatpak/modules/11-libaio.json

@@ -1,24 +0,0 @@
-{
-  "name": "libaio",
-  "no-autogen": true,
-  "make-install-args": [
-    "prefix=/app"
-  ],
-  "build-options": {
-    "strip": true
-  },
-  "sources": [
-    {
-      "type": "git",
-      "url": "https://pagure.io/libaio.git",
-      "tag": "libaio-0.3.113",
-      "commit": "1b18bfafc6a2f7b9fa2c6be77a95afed8b7be448"
-    }
-  ],
-  "cleanup": [
-    "/include",
-    "/lib/*.a",
-    "/lib/*.la"
-  ]
-}
-

.github/workflows/scripts/linux/flatpak/modules/20-sdl2.json

@@ -1,26 +1,12 @@
 {
   "name": "sdl2",
-  "buildsystem": "autotools",
-  "no-autogen": true,
+  "buildsystem": "cmake-ninja",
+  "builddir": true,
   "config-opts": [
-    "--disable-dbus",
-    "--without-x",
-    "--disable-video-opengl",
-    "--disable-video-opengles",
-    "--disable-video-vulkan",
-    "--disable-wayland-shared",
-    "--disable-ime",
-    "--disable-oss",
-    "--disable-alsa",
-    "--disable-jack",
-    "--disable-esd",
-    "--disable-pipewire",
-    "--disable-pulseaudio",
-    "--disable-arts",
-    "--disable-nas",
-    "--disable-sndio",
-    "--disable-fusionsound",
-    "--disable-diskaudio"
+    "-DBUILD_SHARED_LIBS=ON",
+    "-DSDL_SHARED=ON",
+    "-DSDL_STATIC=OFF",
+    "-DSDL_TESTS=OFF"
   ],
   "build-options": {
     "strip": true
@@ -28,8 +14,8 @@
   "sources": [
     {
       "type": "archive",
-      "url": "https://libsdl.org/release/SDL2-2.28.5.tar.gz",
-      "sha256": "332cb37d0be20cb9541739c61f79bae5a477427d79ae85e352089afdaf6666e4"
+      "url": "https://libsdl.org/release/SDL2-2.30.8.tar.gz",
+      "sha256": "380c295ea76b9bd72d90075793971c8bcb232ba0a69a9b14da4ae8f603350058"
     }
   ],
   "cleanup": [
@@ -42,4 +28,3 @@
     "/share/aclocal"
   ]
 }
-

.github/workflows/scripts/linux/flatpak/modules/22-shaderc.json

@@ -0,0 +1,51 @@
+{
+  "name": "shaderc",
+  "buildsystem": "cmake-ninja",
+  "builddir": true,
+  "config-opts": [
+    "-DCMAKE_BUILD_TYPE=Release",
+    "-DSHADERC_SKIP_TESTS=ON",
+    "-DSHADERC_SKIP_EXAMPLES=ON",
+    "-DSHADERC_SKIP_COPYRIGHT_CHECK=ON"
+  ],
+  "build-options": {
+    "strip": true
+  },
+  "sources": [
+    {
+      "type": "git",
+      "url": "https://github.com/google/shaderc.git",
+      "commit": "47a9387ef5b3600d30d84c71ec77a59dc7db46fa"
+    },
+    {
+      "type": "archive",
+      "url": "https://github.com/KhronosGroup/glslang/archive/142052fa30f9eca191aa9dcf65359fcaed09eeec.tar.gz",
+      "sha256": "aa27e4454ce631c5a17924ce0624eac736da19fc6f5a2ab15a6c58da7b36950f",
+      "dest": "third_party/glslang"
+    },
+    {
+      "type": "archive",
+      "url": "https://github.com/KhronosGroup/SPIRV-Headers/archive/5e3ad389ee56fca27c9705d093ae5387ce404df4.tar.gz",
+      "sha256": "5d866ce34a4b6908e262e5ebfffc0a5e11dd411640b5f24c85a80ad44c0d4697",
+      "dest": "third_party/spirv-headers"
+    },
+    {
+      "type": "archive",
+      "url": "https://github.com/KhronosGroup/SPIRV-Tools/archive/dd4b663e13c07fea4fbb3f70c1c91c86731099f7.tar.gz",
+      "sha256": "03ee1a2c06f3b61008478f4abe9423454e53e580b9488b47c8071547c6a9db47",
+      "dest": "third_party/spirv-tools"
+    },
+    {
+      "type": "patch",
+      "path": "../../../common/shaderc-changes.patch"
+    }
+  ],
+  "cleanup": [
+    "/bin",
+    "/include",
+    "/lib/*.a",
+    "/lib/*.la",
+    "/lib/cmake",
+    "/lib/pkgconfig"
+  ]
+}

.github/workflows/scripts/linux/flatpak/net.pcsx2.PCSX2.json

@@ -1,7 +1,7 @@
 {
   "app-id": "net.pcsx2.PCSX2",
   "runtime": "org.kde.Platform",
-  "runtime-version": "6.6",
+  "runtime-version": "6.7",
   "sdk": "org.kde.Sdk",
   "sdk-extensions": [
     "org.freedesktop.Sdk.Extension.llvm17"
@@ -9,7 +9,7 @@
   "add-extensions": {
     "org.freedesktop.Platform.ffmpeg-full": {
       "directory": "lib/ffmpeg",
-      "version": "22.08",
+      "version": "23.08",
       "add-ld-path": ".",
       "autodownload": true
     }
@@ -26,22 +26,32 @@
   ],
   "modules": [
     "modules/10-libpcap.json",
-    "modules/11-libaio.json",
     "modules/20-sdl2.json",
     "modules/21-libbacktrace.json",
+    "modules/22-shaderc.json",
     {
       "name": "pcsx2",
-      "buildsystem": "simple",
+      "buildsystem": "cmake-ninja",
+      "builddir": true,
+      "no-make-install": true,
       "build-options": {
         "strip": false,
         "no-debuginfo": true,
-        "env": {
-          "DEPS_PREFIX": "/app",
-          "COMPILER": "clang",
-          "CLANG_PATH": "/usr/lib/sdk/llvm17/bin/clang",
-          "CLANGXX_PATH": "/usr/lib/sdk/llvm17/bin/clang++",
-          "ADDITIONAL_CMAKE_ARGS": "-DUSE_LINKED_FFMPEG=ON"
-        }
+        "cflags": "",
+        "cflags-override": true,
+        "cxxflags": "",
+        "cxxflags-override": true,
+        "config-opts": [
+          "-DCMAKE_BUILD_TYPE=Release",
+          "-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON",
+          "-DCMAKE_C_COMPILER=/usr/lib/sdk/llvm17/bin/clang",
+          "-DCMAKE_CXX_COMPILER=/usr/lib/sdk/llvm17/bin/clang++",
+          "-DCMAKE_EXE_LINKER_FLAGS_INIT=-fuse-ld=lld",
+          "-DCMAKE_MODULE_LINKER_FLAGS_INIT=-fuse-ld=lld",
+          "-DCMAKE_SHARED_LINKER_FLAGS_INIT=-fuse-ld=lld",
+          "-DUSE_LINKED_FFMPEG=ON",
+          "-DDISABLE_ADVANCE_SIMD=TRUE"
+        ]
       },
       "sources": [
         {
@@ -49,18 +59,15 @@
           "path": "../../../../.."
         }
       ],
-      "build-commands": [
-        ".github/workflows/scripts/linux/generate-cmake-qt.sh",
-        "cd build && ../.github/workflows/scripts/linux/compile.sh && cd ..",
-        "cp -a build/bin ${FLATPAK_DEST}",
-        "cd build && ninja unittests && cd .."
-      ],
       "post-install": [
-        "install -Dm644 bin/resources/icons/AppIconLarge.png ${FLATPAK_DEST}/share/icons/hicolor/512x512/apps/net.pcsx2.PCSX2.png",
-        "install -Dm644 .github/workflows/scripts/linux/pcsx2-qt.desktop ${FLATPAK_DEST}/share/applications/net.pcsx2.PCSX2.desktop",
-        "desktop-file-edit --set-key=Icon --set-value=net.pcsx2.PCSX2 ${FLATPAK_DEST}/share/applications/net.pcsx2.PCSX2.desktop",
-        "install -Dm644 .github/workflows/scripts/linux/flatpak/net.pcsx2.PCSX2.metainfo.xml ${FLATPAK_DEST}/share/metainfo/net.pcsx2.PCSX2.metainfo.xml",
-        "mkdir -p ${FLATPAK_DEST}/lib/ffmpeg"
+        "cp -a bin \"${FLATPAK_DEST}\"",
+        "install -Dm644 \"${FLATPAK_BUILDER_BUILDDIR}/bin/resources/icons/AppIconLarge.png\" \"${FLATPAK_DEST}/share/icons/hicolor/512x512/apps/net.pcsx2.PCSX2.png\"",
+        "install -Dm644 \"${FLATPAK_BUILDER_BUILDDIR}/.github/workflows/scripts/linux/pcsx2-qt.desktop\" \"${FLATPAK_DEST}/share/applications/net.pcsx2.PCSX2.desktop\"",
+        "desktop-file-edit --set-key=Icon --set-value=net.pcsx2.PCSX2 \"${FLATPAK_DEST}/share/applications/net.pcsx2.PCSX2.desktop\"",
+        "${FLATPAK_BUILDER_BUILDDIR}/.github/workflows/scripts/linux/generate-metainfo.sh \"${FLATPAK_BUILDER_BUILDDIR}/net.pcsx2.PCSX2.metainfo.xml\"",
+        "cat \"${FLATPAK_BUILDER_BUILDDIR}/net.pcsx2.PCSX2.metainfo.xml\"",
+        "install -Dm644 \"${FLATPAK_BUILDER_BUILDDIR}/net.pcsx2.PCSX2.metainfo.xml\" \"${FLATPAK_DEST}/share/metainfo/net.pcsx2.PCSX2.metainfo.xml\"",
+        "mkdir -p \"${FLATPAK_DEST}/lib/ffmpeg\""
       ]
     }
   ]

.github/workflows/scripts/linux/functions.sh

@@ -1,16 +0,0 @@
-#!/bin/bash
-
-function retry_command {
-	# Package servers tend to be unreliable at times..
-	# Retry a bunch of times.
-	local RETRIES=10
-
-	for i in $(seq 1 "$RETRIES"); do
-		"$@" && break
-		if [ "$i" == "$RETRIES" ]; then
-			echo "Command \"$@\" failed after ${RETRIES} retries."
-			exit 1
-		fi
-	done
-}
-

.github/workflows/scripts/linux/generate-cmake-qt.sh

@@ -1,50 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-if [[ -z "${DEPS_PREFIX}" ]]; then
-  echo "DEPS_PREFIX is not set."
-  exit 1
-fi
-
-echo "Using build dependencies from: ${DEPS_PREFIX}"
-
-if [ "${COMPILER}" = "clang" ]; then
-  if [[ -z "${CLANG_PATH}" ]] || [[ -z "${CLANGXX_PATH}" ]]; then
-    echo "CLANG_PATH or CLANGXX_PATH is not set."
-    exit 1
-  fi
-
-	echo "Using clang toolchain"
-	cat > "clang-toolchain.cmake" << EOF
-set(CMAKE_C_COMPILER "${CLANG_PATH}")
-set(CMAKE_CXX_COMPILER "${CLANGXX_PATH}")
-set(CMAKE_EXE_LINKER_FLAGS_INIT "-fuse-ld=lld")
-set(CMAKE_MODULE_LINKER_FLAGS_INIT "-fuse-ld=lld")
-set(CMAKE_SHARED_LINKER_FLAGS_INIT "-fuse-ld=lld")
-EOF
-	ADDITIONAL_CMAKE_ARGS="$ADDITIONAL_CMAKE_ARGS -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_TOOLCHAIN_FILE=clang-toolchain.cmake"
-fi
-
-echo "Additional CMake Args - ${ADDITIONAL_CMAKE_ARGS}"
-
-# Generate CMake into ./build
-# DISABLE_ADVANCE_SIMD is needed otherwise we end up doing -march=native.
-
-# shellcheck disable=SC2086
-cmake \
-	-B build \
-	-G Ninja \
-	$ADDITIONAL_CMAKE_ARGS \
-	-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-	-DCMAKE_BUILD_TYPE=Release \
-	-DQT_BUILD=ON \
-	-DCUBEB_API=ON \
-	-DX11_API=ON \
-	-DWAYLAND_API=ON \
-	-DENABLE_SETCAP=OFF \
-	-DCMAKE_PREFIX_PATH="${DEPS_PREFIX}" \
-	-DUSE_SYSTEM_SDL2=ON \
-	-DUSE_SYSTEM_ZSTD=OFF \
-	-DDISABLE_ADVANCE_SIMD=TRUE
-

.github/workflows/scripts/linux/generate-metainfo.sh

@@ -8,7 +8,7 @@ if [[ $# -lt 1 ]]; then
 fi
 
 OUTFILE=$1
-GIT_DATE=$(git log -1 --pretty=%cd --date=short)
+GIT_DATE=$(git log -1 --pretty=%cd --date=iso8601)
 GIT_VERSION=$(git tag --points-at HEAD)
 GIT_HASH=$(git rev-parse HEAD)
 

.github/workflows/scripts/linux/install-packages-flatpak.sh

@@ -1,58 +0,0 @@
-#!/bin/bash
-
-SCRIPTDIR=$(dirname "${BASH_SOURCE[0]}")
-source "$SCRIPTDIR/functions.sh"
-
-set -e
-
-ARCH=x86_64
-KDE_BRANCH=6.6
-BRANCH=23.08
-FLAT_MANAGER_CLIENT_DIR="$HOME/.local/bin"
-
-# Build packages. Mostly needed for flat-manager-client.
-declare -a BUILD_PACKAGES=(
-  "flatpak"
-  "flatpak-builder"
-  "appstream-util"
-  "python3-aiohttp"
-  "python3-tenacity"
-  "python3-gi"
-  "gobject-introspection"
-  "libappstream-glib8"
-  "libappstream-glib-dev"
-  "libappstream-dev"
-  "gir1.2-ostree-1.0"
-)
-
-# Flatpak runtimes and SDKs.
-declare -a FLATPAK_PACKAGES=(
-  "org.kde.Platform/${ARCH}/${KDE_BRANCH}"
-  "org.kde.Sdk/${ARCH}/${KDE_BRANCH}"
-  "org.freedesktop.Platform.ffmpeg-full/${ARCH}/${BRANCH}"
-  "org.freedesktop.Sdk.Extension.llvm17/${ARCH}/${BRANCH}"
-  "org.freedesktop.appstream-glib/${ARCH}/stable"
-)
-
-retry_command sudo apt-get -qq update
-
-# Install packages needed for building
-echo "Will install the following packages for building - ${BUILD_PACKAGES[*]}"
-retry_command sudo apt-get -y install "${BUILD_PACKAGES[@]}"
-
-sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-
-# Install packages needed for building
-echo "Will install the following packages for building - ${FLATPAK_PACKAGES[*]}"
-retry_command sudo flatpak -y install "${FLATPAK_PACKAGES[@]}"
-
-echo "Installing Flatpak Builder"
-retry_command sudo flatpak -y install flathub org.flatpak.builder
-
-echo "Downloading flat-manager-client"
-mkdir -p "$FLAT_MANAGER_CLIENT_DIR"
-pushd "$FLAT_MANAGER_CLIENT_DIR"
-aria2c -Z "https://raw.githubusercontent.com/flatpak/flat-manager/9401efbdc0d6bd489507d8401c567ba219d735d5/flat-manager-client"
-chmod +x flat-manager-client
-echo "$FLAT_MANAGER_CLIENT_DIR" >> $GITHUB_PATH
-popd

.github/workflows/scripts/linux/install-packages-qt.sh

@@ -1,84 +0,0 @@
-#!/bin/bash
-
-SCRIPTDIR=$(dirname "${BASH_SOURCE[0]}")
-source "$SCRIPTDIR/functions.sh"
-
-set -e
-
-# Packages - Build and Qt
-declare -a BUILD_PACKAGES=(
-	"build-essential"
-	"g++"
-	"git"
-	"cmake"
-	"ccache"
-	"ninja-build"
-	"patchelf"
-	"libfuse2"
-	"libglib2.0-dev"
-	"libfontconfig1-dev"
-	"libharfbuzz-dev"
-	"libjpeg-dev"
-	"libpng-dev"
-	"libfreetype-dev"
-	"libinput-dev"
-	"libxcb-*-dev"
-	"libxkbcommon-dev"
-	"libxkbcommon-x11-dev"
-	"libxrender-dev"
-	"libwayland-dev"
-	"libgl1-mesa-dev"
-	"libegl-dev"
-	"libegl1-mesa-dev"
-	"libgl1-mesa-dev"
-	"libssl-dev"
-)
-
-# Packages - PCSX2
-declare -a PCSX2_PACKAGES=(
-	"extra-cmake-modules"
-	"libaio-dev"
-	"libasound2-dev"
-	"libbz2-dev"
-	"libcurl4-openssl-dev"
-	"libdbus-1-dev"
-	"libegl1-mesa-dev"
-	"libgl1-mesa-dev"
-	"libgtk-3-dev"
-	"libharfbuzz-dev"
-	"libjpeg-dev"
-	"liblzma-dev"
-	"libpcap0.8-dev"
-	"libpng-dev"
-	"libpulse-dev"
-	"librsvg2-dev"
-	"libsamplerate0-dev"
-	"libudev-dev"
-	"libx11-xcb-dev"
-	"libavcodec-dev"
-	"libavformat-dev"
-	"libavutil-dev"
-	"libswresample-dev"
-	"libswscale-dev"
-	"pkg-config"
-	"zlib1g-dev"
-)
-
-if [ "${COMPILER}" = "clang" ]; then
-	BUILD_PACKAGES+=("llvm-17" "lld-17" "clang-17")
-
-	# Ubuntu 22.04 doesn't ship with LLVM 16, so we need to pull it from the llvm.org repos.
-	retry_command wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
-	sudo apt-add-repository -n 'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main'
-fi
-
-retry_command sudo apt-get -qq update && break
-
-# Install packages needed for building
-echo "Will install the following packages for building - ${BUILD_PACKAGES[*]}"
-retry_command sudo apt-get -y install "${BUILD_PACKAGES[@]}"
-
-# Install packages needed by pcsx2
-PCSX2_PACKAGES=("${PCSX2_PACKAGES[@]}")
-echo "Will install the following packages for pcsx2 - ${PCSX2_PACKAGES[*]}"
-retry_command sudo apt-get -y install "${PCSX2_PACKAGES[@]}"

.github/workflows/scripts/linux/pcsx2-qt.metainfo.xml.in

@@ -1,33 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Uses the AppStream standard https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html -->
 <component type="desktop">
   <id>net.pcsx2.PCSX2</id>
   <launchable type="desktop-id">net.pcsx2.PCSX2.desktop</launchable>
   <metadata_license>CC0-1.0</metadata_license>
-  <project_license>GPL-3.0</project_license>
+  <project_license>GPL-3.0+</project_license>
   <name>PCSX2</name>
   <developer_name>PCSX2</developer_name>
   <summary>PlayStation 2 Emulator</summary>
   <description>
-    <p>PCSX2 is a free and open-source PlayStation 2 (PS2) emulator. Its purpose is to emulate the PS2's hardware, using a combination of MIPS CPU Interpreters, Recompilers and a Virtual Machine which manages hardware states and PS2 system memory. This allows you to play PS2 games on your PC, with many additional features and benefits.</p>
+    <p>PCSX2 is a free and open-source PlayStation 2 (PS2) emulator. Its purpose is to emulate the PS2's hardware, using a combination of MIPS CPU Interpreters, Recompilers, and a Virtual Machine which manages hardware states and PS2 system memory. This allows you to play PS2 games on your PC, with many additional features and benefits.</p>
     <p>PlayStation 2 and PS2 are registered trademarks of Sony Interactive Entertainment. This application is not affiliated in any way with Sony Interactive Entertainment.</p>
   </description>
   <url type="homepage">https://pcsx2.net/</url>
   <url type="bugtracker">https://github.com/PCSX2/pcsx2/issues</url>
   <url type="donation">https://github.com/sponsors/PCSX2</url>
   <url type="faq">https://pcsx2.net/docs/</url>
-  <url type="help">https://discord.com/invite/TCz3t9k</url>
+  <url type="help">https://pcsx2.net/discord</url>
   <url type="translate">https://crowdin.com/project/pcsx2-emulator</url>
-  <url type="vcs-browser">https://github.com/PCSX2/pcsx2</url>
+  <url type="contact">https://mastodon.social/@PCSX2</url>
   <screenshots>
     <screenshot type="default">
-      <image>https://raw.githubusercontent.com/PCSX2/pcsx2/master/.github/workflows/scripts/linux/flatpak/screenshots/screenshot1.png</image>
+      <image>
+        https://raw.githubusercontent.com/PCSX2/pcsx2/master/.github/workflows/scripts/linux/flatpak/screenshots/screenshot1.png
+      </image>
+      <caption>
+        The main PCSX2 Qt interface
+      </caption>
     </screenshot>
     <screenshot>
-      <image>https://raw.githubusercontent.com/PCSX2/pcsx2/master/.github/workflows/scripts/linux/flatpak/screenshots/screenshot2.png</image>
+      <image>
+        https://raw.githubusercontent.com/PCSX2/pcsx2/master/.github/workflows/scripts/linux/flatpak/screenshots/screenshot2.png
+      </image>
+      <caption>
+        PCSX2 running a game
+      </caption>
     </screenshot>
   </screenshots>
   <content_rating type="oars-1.1"/>
-  <update_contact>stenzek_AT_gmail.com</update_contact>
+  <update_contact>pcsx2_AT_pcsx2.net</update_contact>
   <releases>
     <release version="@GIT_VERSION@" date="@GIT_DATE@" />
   </releases>

.github/workflows/scripts/macos/build-dependencies-universal.sh

@@ -0,0 +1,371 @@
+#!/bin/bash
+
+set -e
+
+merge_binaries() {
+	X86DIR=$1
+	ARMDIR=$2
+	echo "Merging ARM64 binaries from $ARMDIR into fat binaries at $X86DIR..."
+
+	IFS="
+"
+	pushd "$X86DIR"
+	for X86BIN in $(find . -type f \( -name '*.dylib' -o -name '*.a' -o -perm +111 \)); do
+		if file "$X86DIR/$X86BIN" | grep "Mach-O " >/dev/null; then
+			ARMBIN="${ARMDIR}/${X86BIN}"
+			echo "Merge $ARMBIN to $X86BIN..."
+			lipo -create "$X86BIN" "$ARMBIN" -o "$X86BIN"
+		fi
+	done
+	popd
+}
+
+if [ "$#" -ne 1 ]; then
+    echo "Syntax: $0 <output directory>"
+    exit 1
+fi
+
+# The bundled ffmpeg has a lot of things disabled to reduce code size.
+# Users may want to use system ffmpeg for additional features
+: ${BUILD_FFMPEG:=1}
+
+export MACOSX_DEPLOYMENT_TARGET=11.0
+
+NPROCS="$(getconf _NPROCESSORS_ONLN)"
+SCRIPTDIR=$(realpath $(dirname "${BASH_SOURCE[0]}"))
+INSTALLDIR="$1"
+if [ "${INSTALLDIR:0:1}" != "/" ]; then
+	INSTALLDIR="$PWD/$INSTALLDIR"
+fi
+
+FREETYPE=2.13.2
+HARFBUZZ=8.3.1
+SDL=SDL2-2.30.8
+ZSTD=1.5.6
+LZ4=b8fd2d15309dd4e605070bd4486e26b6ef814e29
+LIBPNG=1.6.43
+LIBJPEG=9f
+LIBWEBP=1.4.0
+FFMPEG=6.0
+MOLTENVK=1.2.9
+QT=6.7.2
+
+SHADERC=2024.1
+SHADERC_GLSLANG=142052fa30f9eca191aa9dcf65359fcaed09eeec
+SHADERC_SPIRVHEADERS=5e3ad389ee56fca27c9705d093ae5387ce404df4
+SHADERC_SPIRVTOOLS=dd4b663e13c07fea4fbb3f70c1c91c86731099f7
+
+mkdir -p deps-build
+cd deps-build
+
+export PKG_CONFIG_PATH="$INSTALLDIR/lib/pkgconfig:$PKG_CONFIG_PATH"
+export LDFLAGS="-L$INSTALLDIR/lib $LDFLAGS"
+export CFLAGS="-I$INSTALLDIR/include $CFLAGS"
+export CXXFLAGS="-I$INSTALLDIR/include $CXXFLAGS"
+CMAKE_COMMON=(
+	-DCMAKE_BUILD_TYPE=Release
+	-DCMAKE_SHARED_LINKER_FLAGS="-dead_strip -dead_strip_dylibs"
+	-DCMAKE_PREFIX_PATH="$INSTALLDIR"
+	-DCMAKE_INSTALL_PREFIX="$INSTALLDIR"
+	-DCMAKE_INSTALL_NAME_DIR='$<INSTALL_PREFIX>/lib'
+)
+CMAKE_ARCH_X64=-DCMAKE_OSX_ARCHITECTURES="x86_64"
+CMAKE_ARCH_ARM64=-DCMAKE_OSX_ARCHITECTURES="arm64"
+CMAKE_ARCH_UNIVERSAL=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"
+
+cat > SHASUMS <<EOF
+12991c4e55c506dd7f9b765933e62fd2be2e06d421505d7950a132e4f1bb484d  freetype-$FREETYPE.tar.xz
+19a54fe9596f7a47c502549fce8e8a10978c697203774008cc173f8360b19a9a  harfbuzz-$HARFBUZZ.tar.gz
+380c295ea76b9bd72d90075793971c8bcb232ba0a69a9b14da4ae8f603350058  $SDL.tar.gz
+8c29e06cf42aacc1eafc4077ae2ec6c6fcb96a626157e0593d5e82a34fd403c1  zstd-$ZSTD.tar.gz
+0728800155f3ed0a0c87e03addbd30ecbe374f7b080678bbca1506051d50dec3  $LZ4.tar.gz
+6a5ca0652392a2d7c9db2ae5b40210843c0bbc081cbd410825ab00cc59f14a6c  libpng-$LIBPNG.tar.xz
+61f873ec69e3be1b99535634340d5bde750b2e4447caa1db9f61be3fd49ab1e5  libwebp-$LIBWEBP.tar.gz
+04705c110cb2469caa79fb71fba3d7bf834914706e9641a4589485c1f832565b  jpegsrc.v$LIBJPEG.tar.gz
+57be87c22d9b49c112b6d24bc67d42508660e6b718b3db89c44e47e289137082  ffmpeg-$FFMPEG.tar.xz
+f415a09385030c6510a936155ce211f617c31506db5fbc563e804345f1ecf56e  v$MOLTENVK.tar.gz
+c5f22a5e10fb162895ded7de0963328e7307611c688487b5d152c9ee64767599  qtbase-everywhere-src-$QT.tar.xz
+e1a1d8785fae67d16ad0a443b01d5f32663a6b68d275f1806ebab257485ce5d6  qtimageformats-everywhere-src-$QT.tar.xz
+fb0d1286a35be3583fee34aeb5843c94719e07193bdf1d4d8b0dc14009caef01  qtsvg-everywhere-src-$QT.tar.xz
+58e855ad1b2533094726c8a425766b63a04a0eede2ed85086860e54593aa4b2a  qttools-everywhere-src-$QT.tar.xz
+9845780b5dc1b7279d57836db51aeaf2e4a1160c42be09750616f39157582ca9  qttranslations-everywhere-src-$QT.tar.xz
+eb3b5f0c16313d34f208d90c2fa1e588a23283eed63b101edd5422be6165d528  shaderc-$SHADERC.tar.gz
+aa27e4454ce631c5a17924ce0624eac736da19fc6f5a2ab15a6c58da7b36950f  shaderc-glslang-$SHADERC_GLSLANG.tar.gz
+5d866ce34a4b6908e262e5ebfffc0a5e11dd411640b5f24c85a80ad44c0d4697  shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz
+03ee1a2c06f3b61008478f4abe9423454e53e580b9488b47c8071547c6a9db47  shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz
+EOF
+
+curl -C - -L \
+	-o "freetype-$FREETYPE.tar.xz" "https://sourceforge.net/projects/freetype/files/freetype2/$FREETYPE/freetype-$FREETYPE.tar.xz/download" \
+	-o "harfbuzz-$HARFBUZZ.tar.gz" "https://github.com/harfbuzz/harfbuzz/archive/refs/tags/$HARFBUZZ.tar.gz" \
+	-O "https://libsdl.org/release/$SDL.tar.gz" \
+	-O "https://github.com/facebook/zstd/releases/download/v$ZSTD/zstd-$ZSTD.tar.gz" \
+	-O "https://github.com/lz4/lz4/archive/$LZ4.tar.gz" \
+	-O "https://downloads.sourceforge.net/project/libpng/libpng16/$LIBPNG/libpng-$LIBPNG.tar.xz" \
+	-O "https://ijg.org/files/jpegsrc.v$LIBJPEG.tar.gz" \
+	-O "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-$LIBWEBP.tar.gz" \
+	-O "https://ffmpeg.org/releases/ffmpeg-$FFMPEG.tar.xz" \
+	-O "https://github.com/KhronosGroup/MoltenVK/archive/refs/tags/v$MOLTENVK.tar.gz" \
+	-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtbase-everywhere-src-$QT.tar.xz" \
+	-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtimageformats-everywhere-src-$QT.tar.xz" \
+	-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtsvg-everywhere-src-$QT.tar.xz" \
+	-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qttools-everywhere-src-$QT.tar.xz" \
+	-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qttranslations-everywhere-src-$QT.tar.xz" \
+	-o "shaderc-$SHADERC.tar.gz" "https://github.com/google/shaderc/archive/refs/tags/v$SHADERC.tar.gz" \
+	-o "shaderc-glslang-$SHADERC_GLSLANG.tar.gz" "https://github.com/KhronosGroup/glslang/archive/$SHADERC_GLSLANG.tar.gz" \
+	-o "shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz" "https://github.com/KhronosGroup/SPIRV-Headers/archive/$SHADERC_SPIRVHEADERS.tar.gz" \
+	-o "shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz" "https://github.com/KhronosGroup/SPIRV-Tools/archive/$SHADERC_SPIRVTOOLS.tar.gz"
+
+shasum -a 256 --check SHASUMS
+
+echo "Installing SDL..."
+rm -fr "$SDL"
+tar xf "$SDL.tar.gz"
+cd "$SDL"
+cmake -B build "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DSDL_X11=OFF -DBUILD_SHARED_LIBS=ON
+make -C build "-j$NPROCS"
+make -C build install
+cd ..
+
+if [ "$BUILD_FFMPEG" -ne 0 ]; then
+	echo "Installing FFmpeg..."
+	rm -fr "ffmpeg-$FFMPEG"
+	tar xf "ffmpeg-$FFMPEG.tar.xz"
+	cd "ffmpeg-$FFMPEG"
+	mkdir build
+	cd build
+	LDFLAGS="-dead_strip $LDFLAGS" CFLAGS="-Os $CFLAGS" CXXFLAGS="-Os $CXXFLAGS" \
+		../configure --prefix="$INSTALLDIR" \
+		--enable-cross-compile --arch=x86_64 --cc='clang -arch x86_64' --cxx='clang++ -arch x86_64' --disable-x86asm \
+		--disable-all --disable-autodetect --disable-static --enable-shared \
+		--enable-avcodec --enable-avformat --enable-avutil --enable-swresample --enable-swscale \
+		--enable-audiotoolbox --enable-videotoolbox \
+		--enable-encoder=ffv1,qtrle,pcm_s16be,pcm_s16le,*_at,*_videotoolbox \
+		--enable-muxer=avi,matroska,mov,mp3,mp4,wav \
+		--enable-protocol=file
+	make "-j$NPROCS"
+	cd ..
+	mkdir build-arm64
+	cd build-arm64
+	LDFLAGS="-dead_strip $LDFLAGS" CFLAGS="-Os $CFLAGS" CXXFLAGS="-Os $CXXFLAGS" \
+		../configure --prefix="$INSTALLDIR" \
+		--enable-cross-compile --arch=arm64 --cc='clang -arch arm64' --cxx='clang++ -arch arm64' --disable-x86asm \
+		--disable-all --disable-autodetect --disable-static --enable-shared \
+		--enable-avcodec --enable-avformat --enable-avutil --enable-swresample --enable-swscale \
+		--enable-audiotoolbox --enable-videotoolbox \
+		--enable-encoder=ffv1,qtrle,pcm_s16be,pcm_s16le,*_at,*_videotoolbox \
+		--enable-muxer=avi,matroska,mov,mp3,mp4,wav \
+		--enable-protocol=file
+	make "-j$NPROCS"
+	cd ..
+	merge_binaries $(realpath build) $(realpath build-arm64)
+	cd build
+	make install
+	cd ../..
+fi
+
+echo "Installing Zstd..."
+rm -fr "zstd-$ZSTD"
+tar xf "zstd-$ZSTD.tar.gz"
+cd "zstd-$ZSTD"
+cmake "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_X64" -DBUILD_SHARED_LIBS=ON -DZSTD_BUILD_PROGRAMS=OFF -B build-dir build/cmake
+make -C build-dir "-j$NPROCS"
+cmake "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_ARM64" -DBUILD_SHARED_LIBS=ON -DZSTD_BUILD_PROGRAMS=OFF -B build-dir-arm64 build/cmake
+make -C build-dir-arm64 "-j$NPROCS"
+merge_binaries $(realpath build-dir) $(realpath build-dir-arm64)
+make -C build-dir install
+cd ..
+
+echo "Installing LZ4..."
+rm -fr "lz4-$LZ4"
+tar xf "$LZ4.tar.gz"
+cd "lz4-$LZ4"
+cmake "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_X64" -DBUILD_SHARED_LIBS=ON -DLZ4_BUILD_CLI=OFF -DLZ4_BUILD_LEGACY_LZ4C=OFF -B build-dir build/cmake
+make -C build-dir "-j$NPROCS"
+cmake "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_ARM64" -DBUILD_SHARED_LIBS=ON -DLZ4_BUILD_CLI=OFF -DLZ4_BUILD_LEGACY_LZ4C=OFF -B build-dir-arm64 build/cmake
+make -C build-dir-arm64 "-j$NPROCS"
+merge_binaries $(realpath build-dir) $(realpath build-dir-arm64)
+make -C build-dir install
+cd ..
+
+echo "Installing libpng..."
+rm -fr "libpng-$LIBPNG"
+tar xf "libpng-$LIBPNG.tar.xz"
+cd "libpng-$LIBPNG"
+cmake "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_X64" -DBUILD_SHARED_LIBS=ON -DPNG_TESTS=OFF -DPNG_FRAMEWORK=OFF -B build
+make -C build "-j$NPROCS"
+cmake "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_ARM64" -DBUILD_SHARED_LIBS=ON -DPNG_TESTS=OFF -DPNG_FRAMEWORK=OFF -DPNG_ARM_NEON=on -B build-arm64
+make -C build-arm64 "-j$NPROCS"
+merge_binaries $(realpath build) $(realpath build-arm64)
+make -C build install
+cd ..
+
+echo "Installing libjpeg..."
+rm -fr "jpeg-$LIBJPEG"
+tar xf "jpegsrc.v$LIBJPEG.tar.gz"
+cd "jpeg-$LIBJPEG"
+mkdir build
+cd build
+../configure --prefix="$INSTALLDIR" --disable-static --enable-shared --host="x86_64-apple-darwin" CFLAGS="-arch x86_64"
+make "-j$NPROCS"
+cd ..
+mkdir build-arm64
+cd build-arm64
+../configure --prefix="$INSTALLDIR" --disable-static --enable-shared --host="aarch64-apple-darwin" CFLAGS="-arch arm64"
+make "-j$NPROCS"
+cd ..
+merge_binaries $(realpath build) $(realpath build-arm64)
+make -C build install
+cd ..
+
+echo "Installing WebP..."
+rm -fr "libwebp-$LIBWEBP"
+tar xf "libwebp-$LIBWEBP.tar.gz"
+cd "libwebp-$LIBWEBP"
+cmake "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_X64" -B build \
+	-DWEBP_BUILD_ANIM_UTILS=OFF -DWEBP_BUILD_CWEBP=OFF -DWEBP_BUILD_DWEBP=OFF -DWEBP_BUILD_GIF2WEBP=OFF -DWEBP_BUILD_IMG2WEBP=OFF \
+	-DWEBP_BUILD_VWEBP=OFF -DWEBP_BUILD_WEBPINFO=OFF -DWEBP_BUILD_WEBPMUX=OFF -DWEBP_BUILD_EXTRAS=OFF -DBUILD_SHARED_LIBS=ON
+make -C build "-j$NPROCS"
+cmake "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_ARM64" -B build-arm64 \
+	-DWEBP_BUILD_ANIM_UTILS=OFF -DWEBP_BUILD_CWEBP=OFF -DWEBP_BUILD_DWEBP=OFF -DWEBP_BUILD_GIF2WEBP=OFF -DWEBP_BUILD_IMG2WEBP=OFF \
+	-DWEBP_BUILD_VWEBP=OFF -DWEBP_BUILD_WEBPINFO=OFF -DWEBP_BUILD_WEBPMUX=OFF -DWEBP_BUILD_EXTRAS=OFF -DBUILD_SHARED_LIBS=ON
+make -C build-arm64 "-j$NPROCS"
+merge_binaries $(realpath build) $(realpath build-arm64)
+make -C build install
+cd ..
+
+echo "Building FreeType without HarfBuzz..."
+rm -fr "freetype-$FREETYPE"
+tar xf "freetype-$FREETYPE.tar.xz"
+cd "freetype-$FREETYPE"
+cmake "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DBUILD_SHARED_LIBS=ON -DFT_REQUIRE_ZLIB=ON -DFT_REQUIRE_PNG=ON -DFT_DISABLE_BZIP2=TRUE -DFT_DISABLE_BROTLI=TRUE -DFT_DISABLE_HARFBUZZ=TRUE -B build
+cmake --build build --parallel
+cmake --install build
+cd ..
+
+echo "Building HarfBuzz..."
+rm -fr "harfbuzz-$HARFBUZZ"
+tar xf "harfbuzz-$HARFBUZZ.tar.gz"
+cd "harfbuzz-$HARFBUZZ"
+cmake "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DBUILD_SHARED_LIBS=ON -DHB_BUILD_UTILS=OFF -B build
+cmake --build build --parallel
+cmake --install build
+cd ..
+
+echo "Building FreeType with HarfBuzz..."
+rm -fr "freetype-$FREETYPE"
+tar xf "freetype-$FREETYPE.tar.xz"
+cd "freetype-$FREETYPE"
+cmake "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DBUILD_SHARED_LIBS=ON -DFT_REQUIRE_ZLIB=ON -DFT_REQUIRE_PNG=ON -DFT_DISABLE_BZIP2=TRUE -DFT_DISABLE_BROTLI=TRUE -DFT_REQUIRE_HARFBUZZ=TRUE -B build
+cmake --build build --parallel
+cmake --install build
+cd ..
+
+# MoltenVK already builds universal binaries, nothing special to do here.
+echo "Installing MoltenVK..."
+rm -fr "MoltenVK-${MOLTENVK}"
+tar xf "v$MOLTENVK.tar.gz"
+cd "MoltenVK-${MOLTENVK}"
+./fetchDependencies --macos
+make macos
+cp Package/Latest/MoltenVK/dynamic/dylib/macOS/libMoltenVK.dylib "$INSTALLDIR/lib/"
+cd ..
+
+echo "Installing Qt Base..."
+rm -fr "qtbase-everywhere-src-$QT"
+tar xf "qtbase-everywhere-src-$QT.tar.xz"
+cd "qtbase-everywhere-src-$QT"
+# since we don't have a direct reference to QtSvg, it doesn't deployed directly from the main binary
+# (only indirectly from iconengines), and the libqsvg.dylib imageformat plugin does not get deployed.
+# We could run macdeployqt twice, but that's even more janky than patching it.
+patch -u src/tools/macdeployqt/shared/shared.cpp <<EOF
+--- shared.cpp
++++ shared.cpp
+@@ -1119,14 +1119,8 @@
+         addPlugins(QStringLiteral("networkinformation"));
+     }
+ 
+-    // All image formats (svg if QtSvg is used)
+-    const bool usesSvg = deploymentInfo.containsModule("Svg", libInfix);
+-    addPlugins(QStringLiteral("imageformats"), [usesSvg](const QString &lib) {
+-        if (lib.contains(QStringLiteral("qsvg")) && !usesSvg)
+-            return false;
+-        return true;
+-    });
+-
++    // All image formats
++    addPlugins(QStringLiteral("imageformats"));
+     addPlugins(QStringLiteral("iconengines"));
+ 
+     // Platforminputcontext plugins if QtGui is in use
+EOF
+cmake -B build "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DFEATURE_dbus=OFF -DFEATURE_framework=OFF -DFEATURE_icu=OFF -DFEATURE_opengl=OFF -DFEATURE_printsupport=OFF -DFEATURE_sql=OFF -DFEATURE_gssapi=OFF -DFEATURE_system_png=ON -DFEATURE_system_jpeg=ON -DFEATURE_system_zlib=ON -DFEATURE_system_freetype=ON -DFEATURE_system_harfbuzz=ON
+make -C build "-j$NPROCS"
+make -C build install
+cd ..
+
+echo "Installing Qt SVG..."
+rm -fr "qtsvg-everywhere-src-$QT"
+tar xf "qtsvg-everywhere-src-$QT.tar.xz"
+cd "qtsvg-everywhere-src-$QT"
+mkdir build
+cd build
+"$INSTALLDIR/bin/qt-configure-module" .. -- "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL"
+make "-j$NPROCS"
+make install
+cd ../..
+
+echo "Installing Qt Image Formats..."
+rm -fr "qtimageformats-everywhere-src-$QT"
+tar xf "qtimageformats-everywhere-src-$QT.tar.xz"
+cd "qtimageformats-everywhere-src-$QT"
+mkdir build
+cd build
+"$INSTALLDIR/bin/qt-configure-module" .. -- "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DFEATURE_system_webp=ON
+make "-j$NPROCS"
+make install
+cd ../..
+
+echo "Installing Qt Tools..."
+rm -fr "qttools-everywhere-src-$QT"
+tar xf "qttools-everywhere-src-$QT.tar.xz"
+cd "qttools-everywhere-src-$QT"
+mkdir build
+cd build
+"$INSTALLDIR/bin/qt-configure-module" .. -- "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DFEATURE_assistant=OFF -DFEATURE_clang=OFF -DFEATURE_designer=OFF -DFEATURE_kmap2qmap=OFF -DFEATURE_pixeltool=OFF -DFEATURE_pkg_config=OFF -DFEATURE_qev=OFF -DFEATURE_qtattributionsscanner=OFF -DFEATURE_qtdiag=OFF -DFEATURE_qtplugininfo=OFF
+make "-j$NPROCS"
+make install
+cd ../..
+
+echo "Building shaderc..."
+rm -fr "shaderc-$SHADERC"
+tar xf "shaderc-$SHADERC.tar.gz"
+cd "shaderc-$SHADERC"
+cd third_party
+tar xf "../../shaderc-glslang-$SHADERC_GLSLANG.tar.gz"
+mv "glslang-$SHADERC_GLSLANG" "glslang"
+tar xf "../../shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz"
+mv "SPIRV-Headers-$SHADERC_SPIRVHEADERS" "spirv-headers"
+tar xf "../../shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz"
+mv "SPIRV-Tools-$SHADERC_SPIRVTOOLS" "spirv-tools"
+cd ..
+patch -p1 < "$SCRIPTDIR/../common/shaderc-changes.patch"
+cmake "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DSHADERC_SKIP_TESTS=ON -DSHADERC_SKIP_EXAMPLES=ON -DSHADERC_SKIP_COPYRIGHT_CHECK=ON -B build
+make -C build "-j$NPROCS"
+make -C build install
+cd ..
+
+echo "Installing Qt Translations..."
+rm -fr "qttranslations-everywhere-src-$QT"
+tar xf "qttranslations-everywhere-src-$QT.tar.xz"
+cd "qttranslations-everywhere-src-$QT"
+mkdir build
+cd build
+"$INSTALLDIR/bin/qt-configure-module" .. -- "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL"
+make "-j$NPROCS"
+make install
+cd ../..
+
+echo "Cleaning up..."
+cd ..
+rm -rf deps-build

.github/workflows/scripts/macos/build-dependencies.sh

@@ -2,144 +2,328 @@
 
 set -e
 
+if [ "$#" -ne 1 ]; then
+    echo "Syntax: $0 <output directory>"
+    exit 1
+fi
+
+# The bundled ffmpeg has a lot of things disabled to reduce code size.
+# Users may want to use system ffmpeg for additional features
+: ${BUILD_FFMPEG:=1}
+
 export MACOSX_DEPLOYMENT_TARGET=11.0
 
-INSTALLDIR="$HOME/deps"
 NPROCS="$(getconf _NPROCESSORS_ONLN)"
-SDL=SDL2-2.28.5
-PNG=1.6.37
-JPG=9e
-FFMPEG=6.0
-QT=6.6.0
+SCRIPTDIR=$(realpath $(dirname "${BASH_SOURCE[0]}"))
+INSTALLDIR="$1"
+if [ "${INSTALLDIR:0:1}" != "/" ]; then
+	INSTALLDIR="$PWD/$INSTALLDIR"
+fi
 
-mkdir deps-build
+FREETYPE=2.13.2
+HARFBUZZ=8.3.1
+SDL=SDL2-2.30.8
+ZSTD=1.5.6
+LZ4=b8fd2d15309dd4e605070bd4486e26b6ef814e29
+LIBPNG=1.6.43
+LIBJPEG=9f
+LIBWEBP=1.4.0
+FFMPEG=6.0
+MOLTENVK=1.2.9
+QT=6.7.2
+
+SHADERC=2024.1
+SHADERC_GLSLANG=142052fa30f9eca191aa9dcf65359fcaed09eeec
+SHADERC_SPIRVHEADERS=5e3ad389ee56fca27c9705d093ae5387ce404df4
+SHADERC_SPIRVTOOLS=dd4b663e13c07fea4fbb3f70c1c91c86731099f7
+
+mkdir -p deps-build
 cd deps-build
 
 export PKG_CONFIG_PATH="$INSTALLDIR/lib/pkgconfig:$PKG_CONFIG_PATH"
-export LDFLAGS="-L$INSTALLDIR/lib -dead_strip $LDFLAGS"
-export CFLAGS="-I$INSTALLDIR/include -Os $CFLAGS"
-export CXXFLAGS="-I$INSTALLDIR/include -Os $CXXFLAGS"
+export LDFLAGS="-L$INSTALLDIR/lib $LDFLAGS"
+export CFLAGS="-I$INSTALLDIR/include $CFLAGS"
+export CXXFLAGS="-I$INSTALLDIR/include $CXXFLAGS"
+CMAKE_COMMON=(
+	-DCMAKE_BUILD_TYPE=Release
+	-DCMAKE_SHARED_LINKER_FLAGS="-dead_strip -dead_strip_dylibs"
+	-DCMAKE_PREFIX_PATH="$INSTALLDIR"
+	-DCMAKE_INSTALL_PREFIX="$INSTALLDIR"
+	-DCMAKE_OSX_ARCHITECTURES="x86_64"
+	-DCMAKE_INSTALL_NAME_DIR='$<INSTALL_PREFIX>/lib'
+)
 
 cat > SHASUMS <<EOF
-332cb37d0be20cb9541739c61f79bae5a477427d79ae85e352089afdaf6666e4  $SDL.tar.gz
-505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca  libpng-$PNG.tar.xz
+12991c4e55c506dd7f9b765933e62fd2be2e06d421505d7950a132e4f1bb484d  freetype-$FREETYPE.tar.xz
+19a54fe9596f7a47c502549fce8e8a10978c697203774008cc173f8360b19a9a  harfbuzz-$HARFBUZZ.tar.gz
+380c295ea76b9bd72d90075793971c8bcb232ba0a69a9b14da4ae8f603350058  $SDL.tar.gz
+8c29e06cf42aacc1eafc4077ae2ec6c6fcb96a626157e0593d5e82a34fd403c1  zstd-$ZSTD.tar.gz
+0728800155f3ed0a0c87e03addbd30ecbe374f7b080678bbca1506051d50dec3  $LZ4.tar.gz
+6a5ca0652392a2d7c9db2ae5b40210843c0bbc081cbd410825ab00cc59f14a6c  libpng-$LIBPNG.tar.xz
+61f873ec69e3be1b99535634340d5bde750b2e4447caa1db9f61be3fd49ab1e5  libwebp-$LIBWEBP.tar.gz
+04705c110cb2469caa79fb71fba3d7bf834914706e9641a4589485c1f832565b  jpegsrc.v$LIBJPEG.tar.gz
 57be87c22d9b49c112b6d24bc67d42508660e6b718b3db89c44e47e289137082  ffmpeg-$FFMPEG.tar.xz
-039d53312acb5897a9054bd38c9ccbdab72500b71fdccdb3f4f0844b0dd39e0e  qtbase-everywhere-src-$QT.tar.xz
-e1542cb50176e237809895c6549598c08587c63703d100be54ac2d806834e384  qtimageformats-everywhere-src-$QT.tar.xz
-33da25fef51102f564624a7ea3e57cb4a0a31b7b44783d1af5749ac36d3c72de  qtsvg-everywhere-src-$QT.tar.xz
-4e9feebc142bbb6e453e1dc3277e09ec45c8ef081b5ee2a029e6684b5905ba99  qttools-everywhere-src-$QT.tar.xz
-a0d89a236f64b810eb0fe4ae1e90db22b0e86263521b35f89e69f1392815078c  qttranslations-everywhere-src-$QT.tar.xz
+f415a09385030c6510a936155ce211f617c31506db5fbc563e804345f1ecf56e  v$MOLTENVK.tar.gz
+c5f22a5e10fb162895ded7de0963328e7307611c688487b5d152c9ee64767599  qtbase-everywhere-src-$QT.tar.xz
+e1a1d8785fae67d16ad0a443b01d5f32663a6b68d275f1806ebab257485ce5d6  qtimageformats-everywhere-src-$QT.tar.xz
+fb0d1286a35be3583fee34aeb5843c94719e07193bdf1d4d8b0dc14009caef01  qtsvg-everywhere-src-$QT.tar.xz
+58e855ad1b2533094726c8a425766b63a04a0eede2ed85086860e54593aa4b2a  qttools-everywhere-src-$QT.tar.xz
+9845780b5dc1b7279d57836db51aeaf2e4a1160c42be09750616f39157582ca9  qttranslations-everywhere-src-$QT.tar.xz
+eb3b5f0c16313d34f208d90c2fa1e588a23283eed63b101edd5422be6165d528  shaderc-$SHADERC.tar.gz
+aa27e4454ce631c5a17924ce0624eac736da19fc6f5a2ab15a6c58da7b36950f  shaderc-glslang-$SHADERC_GLSLANG.tar.gz
+5d866ce34a4b6908e262e5ebfffc0a5e11dd411640b5f24c85a80ad44c0d4697  shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz
+03ee1a2c06f3b61008478f4abe9423454e53e580b9488b47c8071547c6a9db47  shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz
 EOF
 
 curl -L \
+	-o "freetype-$FREETYPE.tar.xz" "https://sourceforge.net/projects/freetype/files/freetype2/$FREETYPE/freetype-$FREETYPE.tar.xz/download" \
+	-o "harfbuzz-$HARFBUZZ.tar.gz" "https://github.com/harfbuzz/harfbuzz/archive/refs/tags/$HARFBUZZ.tar.gz" \
 	-O "https://libsdl.org/release/$SDL.tar.gz" \
-	-O "https://downloads.sourceforge.net/project/libpng/libpng16/$PNG/libpng-$PNG.tar.xz" \
+	-O "https://github.com/facebook/zstd/releases/download/v$ZSTD/zstd-$ZSTD.tar.gz" \
+	-O "https://github.com/lz4/lz4/archive/$LZ4.tar.gz" \
+	-O "https://downloads.sourceforge.net/project/libpng/libpng16/$LIBPNG/libpng-$LIBPNG.tar.xz" \
+	-O "https://ijg.org/files/jpegsrc.v$LIBJPEG.tar.gz" \
+	-O "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-$LIBWEBP.tar.gz" \
 	-O "https://ffmpeg.org/releases/ffmpeg-$FFMPEG.tar.xz" \
+	-O "https://github.com/KhronosGroup/MoltenVK/archive/refs/tags/v$MOLTENVK.tar.gz" \
 	-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtbase-everywhere-src-$QT.tar.xz" \
 	-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtimageformats-everywhere-src-$QT.tar.xz" \
 	-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtsvg-everywhere-src-$QT.tar.xz" \
 	-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qttools-everywhere-src-$QT.tar.xz" \
 	-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qttranslations-everywhere-src-$QT.tar.xz" \
+	-o "shaderc-$SHADERC.tar.gz" "https://github.com/google/shaderc/archive/refs/tags/v$SHADERC.tar.gz" \
+	-o "shaderc-glslang-$SHADERC_GLSLANG.tar.gz" "https://github.com/KhronosGroup/glslang/archive/$SHADERC_GLSLANG.tar.gz" \
+	-o "shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz" "https://github.com/KhronosGroup/SPIRV-Headers/archive/$SHADERC_SPIRVHEADERS.tar.gz" \
+	-o "shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz" "https://github.com/KhronosGroup/SPIRV-Tools/archive/$SHADERC_SPIRVTOOLS.tar.gz"
 
 shasum -a 256 --check SHASUMS
 
 echo "Installing SDL..."
+rm -fr "$SDL"
 tar xf "$SDL.tar.gz"
 cd "$SDL"
-
-# MFI causes multiple joystick connection events, I'm guessing because both the HIDAPI and MFI interfaces
-# race each other, and sometimes both end up getting through. So, just force MFI off.
-patch -u CMakeLists.txt <<EOF
---- CMakeLists.txt	2023-08-03 01:33:11
-+++ CMakeLists.txt	2023-08-26 12:58:53
-@@ -2105,7 +2105,7 @@
-           #import <Foundation/Foundation.h>
-           #import <CoreHaptics/CoreHaptics.h>
-           int main() { return 0; }" HAVE_FRAMEWORK_COREHAPTICS)
--      if(HAVE_FRAMEWORK_GAMECONTROLLER AND HAVE_FRAMEWORK_COREHAPTICS)
-+      if(HAVE_FRAMEWORK_GAMECONTROLLER AND HAVE_FRAMEWORK_COREHAPTICS AND FALSE)
-         # Only enable MFI if we also have CoreHaptics to ensure rumble works
-         set(SDL_JOYSTICK_MFI 1)
-         set(SDL_FRAMEWORK_GAMECONTROLLER 1)
-
-EOF
-
-cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DSDL_X11=OFF
+cmake -B build "${CMAKE_COMMON[@]}" -DSDL_X11=OFF -DBUILD_SHARED_LIBS=ON
 make -C build "-j$NPROCS"
 make -C build install
 cd ..
 
+if [ "$BUILD_FFMPEG" -ne 0 ]; then
+	echo "Installing FFmpeg..."
+	rm -fr "ffmpeg-$FFMPEG"
+	tar xf "ffmpeg-$FFMPEG.tar.xz"
+	cd "ffmpeg-$FFMPEG"
+	LDFLAGS="-dead_strip $LDFLAGS" CFLAGS="-Os $CFLAGS" CXXFLAGS="-Os $CXXFLAGS" \
+		./configure --prefix="$INSTALLDIR" \
+		--enable-cross-compile --arch=x86_64 --cc='clang -arch x86_64' --cxx='clang++ -arch x86_64' \
+		--disable-all --disable-autodetect --disable-static --enable-shared \
+		--enable-avcodec --enable-avformat --enable-avutil --enable-swresample --enable-swscale \
+		--enable-audiotoolbox --enable-videotoolbox \
+		--enable-encoder=ffv1,qtrle,pcm_s16be,pcm_s16le,*_at,*_videotoolbox \
+		--enable-muxer=avi,matroska,mov,mp3,mp4,wav \
+		--enable-protocol=file
+	make "-j$NPROCS"
+	make install
+	cd ..
+fi
+
+echo "Installing Zstd..."
+rm -fr "zstd-$ZSTD"
+tar xf "zstd-$ZSTD.tar.gz"
+cd "zstd-$ZSTD"
+cmake "${CMAKE_COMMON[@]}" -DBUILD_SHARED_LIBS=ON -DZSTD_BUILD_PROGRAMS=OFF -B build-dir build/cmake
+make -C build-dir "-j$NPROCS"
+make -C build-dir install
+cd ..
+
+echo "Installing LZ4..."
+rm -fr "lz4-$LZ4"
+tar xf "$LZ4.tar.gz"
+cd "lz4-$LZ4"
+cmake "${CMAKE_COMMON[@]}" -DBUILD_SHARED_LIBS=ON -DLZ4_BUILD_CLI=OFF -DLZ4_BUILD_LEGACY_LZ4C=OFF -B build-dir build/cmake
+make -C build-dir "-j$NPROCS"
+make -C build-dir install
+cd ..
+
 echo "Installing libpng..."
-tar xf "libpng-$PNG.tar.xz"
-cd "libpng-$PNG"
-./configure --prefix "$INSTALLDIR" --disable-dependency-tracking
-make "-j$NPROCS"
-make install
+rm -fr "libpng-$LIBPNG"
+tar xf "libpng-$LIBPNG.tar.xz"
+cd "libpng-$LIBPNG"
+cmake "${CMAKE_COMMON[@]}" -DBUILD_SHARED_LIBS=ON -DPNG_TESTS=OFF -DPNG_FRAMEWORK=OFF -B build
+make -C build "-j$NPROCS"
+make -C build install
 cd ..
 
-echo "Installing FFmpeg..."
-tar xf "ffmpeg-$FFMPEG.tar.xz"
-cd "ffmpeg-$FFMPEG"
-./configure --prefix="$INSTALLDIR" --disable-all --disable-autodetect --disable-static --enable-shared \
-	--enable-avcodec --enable-avformat --enable-avutil --enable-swresample --enable-swscale \
-	--enable-audiotoolbox --enable-videotoolbox \
-	--enable-encoder=ffv1,qtrle,pcm_s16be,pcm_s16le,*_at,*_videotoolbox \
-	--enable-muxer=avi,matroska,mov,mp3,mp4,wav \
-	--enable-protocol=file
+echo "Installing libjpeg..."
+rm -fr "jpeg-$LIBJPEG"
+tar xf "jpegsrc.v$LIBJPEG.tar.gz"
+cd "jpeg-$LIBJPEG"
+mkdir build
+cd build
+../configure --prefix="$INSTALLDIR" --disable-static --enable-shared --host="x86_64-apple-darwin" CFLAGS="-arch x86_64"
 make "-j$NPROCS"
 make install
+cd ../..
+
+echo "Installing WebP..."
+rm -fr "libwebp-$LIBWEBP"
+tar xf "libwebp-$LIBWEBP.tar.gz"
+cd "libwebp-$LIBWEBP"
+cmake "${CMAKE_COMMON[@]}" -B build \
+	-DWEBP_BUILD_ANIM_UTILS=OFF -DWEBP_BUILD_CWEBP=OFF -DWEBP_BUILD_DWEBP=OFF -DWEBP_BUILD_GIF2WEBP=OFF -DWEBP_BUILD_IMG2WEBP=OFF \
+	-DWEBP_BUILD_VWEBP=OFF -DWEBP_BUILD_WEBPINFO=OFF -DWEBP_BUILD_WEBPMUX=OFF -DWEBP_BUILD_EXTRAS=OFF -DBUILD_SHARED_LIBS=ON
+make -C build "-j$NPROCS"
+make -C build install
+cd ..
+
+echo "Building FreeType without HarfBuzz..."
+rm -fr "freetype-$FREETYPE"
+tar xf "freetype-$FREETYPE.tar.xz"
+cd "freetype-$FREETYPE"
+cmake "${CMAKE_COMMON[@]}" -DBUILD_SHARED_LIBS=ON -DFT_REQUIRE_ZLIB=ON -DFT_REQUIRE_PNG=ON -DFT_DISABLE_BZIP2=TRUE -DFT_DISABLE_BROTLI=TRUE -DFT_DISABLE_HARFBUZZ=TRUE -B build
+cmake --build build --parallel
+cmake --install build
+cd ..
+
+echo "Building HarfBuzz..."
+rm -fr "harfbuzz-$HARFBUZZ"
+tar xf "harfbuzz-$HARFBUZZ.tar.gz"
+cd "harfbuzz-$HARFBUZZ"
+cmake "${CMAKE_COMMON[@]}" -DBUILD_SHARED_LIBS=ON -DHB_BUILD_UTILS=OFF -B build
+cmake --build build --parallel
+cmake --install build
+cd ..
+
+echo "Building FreeType with HarfBuzz..."
+rm -fr "freetype-$FREETYPE"
+tar xf "freetype-$FREETYPE.tar.xz"
+cd "freetype-$FREETYPE"
+cmake "${CMAKE_COMMON[@]}" -DBUILD_SHARED_LIBS=ON -DFT_REQUIRE_ZLIB=ON -DFT_REQUIRE_PNG=ON -DFT_DISABLE_BZIP2=TRUE -DFT_DISABLE_BROTLI=TRUE -DFT_REQUIRE_HARFBUZZ=TRUE -B build
+cmake --build build --parallel
+cmake --install build
+cd ..
+
+# MoltenVK already builds universal binaries, nothing special to do here.
+echo "Installing MoltenVK..."
+rm -fr "MoltenVK-${MOLTENVK}"
+tar xf "v$MOLTENVK.tar.gz"
+cd "MoltenVK-${MOLTENVK}"
+sed -i '' 's/xcodebuild "$@"/xcodebuild $XCODEBUILD_EXTRA_ARGS "$@"/g' fetchDependencies
+sed -i '' 's/XCODEBUILD :=/XCODEBUILD ?=/g' Makefile
+XCODEBUILD_EXTRA_ARGS="VALID_ARCHS=x86_64" ./fetchDependencies --macos
+XCODEBUILD="set -o pipefail && xcodebuild VALID_ARCHS=x86_64" make macos
+cp Package/Latest/MoltenVK/dynamic/dylib/macOS/libMoltenVK.dylib "$INSTALLDIR/lib/"
 cd ..
 
 echo "Installing Qt Base..."
+rm -fr "qtbase-everywhere-src-$QT"
 tar xf "qtbase-everywhere-src-$QT.tar.xz"
 cd "qtbase-everywhere-src-$QT"
-cmake -B build -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DCMAKE_BUILD_TYPE=Release -DFEATURE_optimize_size=ON -DFEATURE_dbus=OFF -DFEATURE_framework=OFF -DFEATURE_icu=OFF -DFEATURE_opengl=OFF -DFEATURE_printsupport=OFF -DFEATURE_sql=OFF -DFEATURE_gssapi=OFF
-make -C build "-j$NPROCS"
-make -C build install
-cd ..
-echo "Installing Qt SVG..."
-tar xf "qtsvg-everywhere-src-$QT.tar.xz"
-cd "qtsvg-everywhere-src-$QT"
-cmake -B build -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DCMAKE_BUILD_TYPE=MinSizeRel
-make -C build "-j$NPROCS"
-make -C build install
-cd ..
-echo "Installing Qt Image Formats..."
-tar xf "qtimageformats-everywhere-src-$QT.tar.xz"
-cd "qtimageformats-everywhere-src-$QT"
-cmake -B build -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DCMAKE_BUILD_TYPE=MinSizeRel
-make -C build "-j$NPROCS"
-make -C build install
-cd ..
-echo "Installing Qt Tools..."
-tar xf "qttools-everywhere-src-$QT.tar.xz"
-cd "qttools-everywhere-src-$QT"
-# Linguist relies on a library in the Designer target, which takes 5-7 minutes to build on the CI
-# Avoid it by not building Linguist, since we only need the tools that come with it
-patch -u src/linguist/CMakeLists.txt <<EOF
---- src/linguist/CMakeLists.txt
-+++ src/linguist/CMakeLists.txt
-@@ -14,7 +14,7 @@
- add_subdirectory(lrelease-pro)
- add_subdirectory(lupdate)
- add_subdirectory(lupdate-pro)
--if(QT_FEATURE_process AND QT_FEATURE_pushbutton AND QT_FEATURE_toolbutton AND TARGET Qt::Widgets AND NOT no-png)
-+if(QT_FEATURE_process AND QT_FEATURE_pushbutton AND QT_FEATURE_toolbutton AND TARGET Qt::Widgets AND TARGET Qt::PrintSupport AND NOT no-png)
-     add_subdirectory(linguist)
- endif()
+
+# since we don't have a direct reference to QtSvg, it doesn't deployed directly from the main binary
+# (only indirectly from iconengines), and the libqsvg.dylib imageformat plugin does not get deployed.
+# We could run macdeployqt twice, but that's even more janky than patching it.
+
+# https://github.com/qt/qtbase/commit/7b018629c3c3ab23665bf1da00c43c1546042035
+# The QProcess default wait time of 30s may be too short in e.g. CI environments where processes may be blocked
+# for a longer time waiting for CPU or IO.
+
+patch -u src/tools/macdeployqt/shared/shared.cpp <<EOF
+--- shared.cpp
++++ shared.cpp
+@@ -152,7 +152,7 @@
+     LogDebug() << " inspecting" << binaryPath;
+     QProcess otool;
+     otool.start("otool", QStringList() << "-L" << binaryPath);
+-    otool.waitForFinished();
++    otool.waitForFinished(-1);
+ 
+     if (otool.exitStatus() != QProcess::NormalExit || otool.exitCode() != 0) {
+         LogError() << otool.readAllStandardError();
+@@ -1122,14 +1122,8 @@
+         addPlugins(QStringLiteral("networkinformation"));
+     }
+ 
+-    // All image formats (svg if QtSvg is used)
+-    const bool usesSvg = deploymentInfo.containsModule("Svg", libInfix);
+-    addPlugins(QStringLiteral("imageformats"), [usesSvg](const QString &lib) {
+-        if (lib.contains(QStringLiteral("qsvg")) && !usesSvg)
+-            return false;
+-        return true;
+-    });
+-
++    // All image formats
++    addPlugins(QStringLiteral("imageformats"));
+     addPlugins(QStringLiteral("iconengines"));
+ 
+     // Platforminputcontext plugins if QtGui is in use
 EOF
-cmake -B build -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DCMAKE_BUILD_TYPE=Release -DFEATURE_assistant=OFF -DFEATURE_clang=OFF -DFEATURE_designer=OFF -DFEATURE_kmap2qmap=OFF -DFEATURE_pixeltool=OFF -DFEATURE_pkg_config=OFF -DFEATURE_qev=OFF -DFEATURE_qtattributionsscanner=OFF -DFEATURE_qtdiag=OFF -DFEATURE_qtplugininfo=OFF
-make -C build "-j$NPROCS"
-make -C build install
-cd ..
-echo "Installing Qt Translations..."
-tar xf "qttranslations-everywhere-src-$QT.tar.xz"
-cd "qttranslations-everywhere-src-$QT"
-cmake -B build -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DCMAKE_BUILD_TYPE=Release
+cmake -B build "${CMAKE_COMMON[@]}" -DFEATURE_dbus=OFF -DFEATURE_framework=OFF -DFEATURE_icu=OFF -DFEATURE_opengl=OFF -DFEATURE_sql=OFF -DFEATURE_gssapi=OFF -DFEATURE_system_png=ON -DFEATURE_system_jpeg=ON -DFEATURE_system_zlib=ON -DFEATURE_system_freetype=ON -DFEATURE_system_harfbuzz=ON
 make -C build "-j$NPROCS"
 make -C build install
 cd ..
 
+echo "Installing Qt SVG..."
+rm -fr "qtsvg-everywhere-src-$QT"
+tar xf "qtsvg-everywhere-src-$QT.tar.xz"
+cd "qtsvg-everywhere-src-$QT"
+mkdir build
+cd build
+"$INSTALLDIR/bin/qt-configure-module" .. -- "${CMAKE_COMMON[@]}"
+make "-j$NPROCS"
+make install
+cd ../..
+
+echo "Installing Qt Image Formats..."
+rm -fr "qtimageformats-everywhere-src-$QT"
+tar xf "qtimageformats-everywhere-src-$QT.tar.xz"
+cd "qtimageformats-everywhere-src-$QT"
+mkdir build
+cd build
+"$INSTALLDIR/bin/qt-configure-module" .. -- "${CMAKE_COMMON[@]}" -DFEATURE_system_webp=ON
+make "-j$NPROCS"
+make install
+cd ../..
+
+echo "Installing Qt Tools..."
+rm -fr "qttools-everywhere-src-$QT"
+tar xf "qttools-everywhere-src-$QT.tar.xz"
+cd "qttools-everywhere-src-$QT"
+mkdir build
+cd build
+"$INSTALLDIR/bin/qt-configure-module" .. -- "${CMAKE_COMMON[@]}" -DFEATURE_assistant=OFF -DFEATURE_clang=OFF -DFEATURE_designer=ON -DFEATURE_kmap2qmap=OFF -DFEATURE_pixeltool=OFF -DFEATURE_pkg_config=OFF -DFEATURE_qev=OFF -DFEATURE_qtattributionsscanner=OFF -DFEATURE_qtdiag=OFF -DFEATURE_qtplugininfo=OFF
+make "-j$NPROCS"
+make install
+cd ../..
+
+echo "Building shaderc..."
+rm -fr "shaderc-$SHADERC"
+tar xf "shaderc-$SHADERC.tar.gz"
+cd "shaderc-$SHADERC"
+cd third_party
+tar xf "../../shaderc-glslang-$SHADERC_GLSLANG.tar.gz"
+mv "glslang-$SHADERC_GLSLANG" "glslang"
+tar xf "../../shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz"
+mv "SPIRV-Headers-$SHADERC_SPIRVHEADERS" "spirv-headers"
+tar xf "../../shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz"
+mv "SPIRV-Tools-$SHADERC_SPIRVTOOLS" "spirv-tools"
+cd ..
+patch -p1 < "$SCRIPTDIR/../common/shaderc-changes.patch"
+cmake "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DSHADERC_SKIP_TESTS=ON -DSHADERC_SKIP_EXAMPLES=ON -DSHADERC_SKIP_COPYRIGHT_CHECK=ON -B build
+make -C build "-j$NPROCS"
+make -C build install
+cd ..
+
+echo "Installing Qt Translations..."
+rm -fr "qttranslations-everywhere-src-$QT"
+tar xf "qttranslations-everywhere-src-$QT.tar.xz"
+cd "qttranslations-everywhere-src-$QT"
+mkdir build
+cd build
+"$INSTALLDIR/bin/qt-configure-module" .. -- "${CMAKE_COMMON[@]}"
+make "-j$NPROCS"
+make install
+cd ../..
+
 echo "Cleaning up..."
 cd ..
-rm -r deps-build
+rm -rf deps-build

.github/workflows/scripts/releases/announce-release/package-lock.json

@@ -461,15 +461,15 @@
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
     "node_modules/ws": {
-      "version": "8.2.3",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz",
-      "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==",
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
+      "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
       "engines": {
         "node": ">=10.0.0"
       },
       "peerDependencies": {
         "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
+        "utf-8-validate": ">=5.0.2"
       },
       "peerDependenciesMeta": {
         "bufferutil": {
@@ -842,9 +842,9 @@
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
     "ws": {
-      "version": "8.2.3",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz",
-      "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==",
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
+      "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
       "requires": {}
     }
   }

.github/workflows/scripts/windows/build-dependencies-arm64.bat

@@ -0,0 +1,296 @@
+@echo off
+setlocal enabledelayedexpansion
+
+echo Setting environment...
+if exist "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsamd64_arm64.bat" (
+  call "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsamd64_arm64.bat"
+) else if exist "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsamd64_arm64.bat" (
+  call "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsamd64_arm64.bat"
+) else (
+  echo Visual Studio 2022 not found.
+  goto error
+)
+
+set SEVENZIP="C:\Program Files\7-Zip\7z.exe"
+set PATCH="C:\Program Files\Git\usr\bin\patch.exe"
+
+if defined DEBUG (
+  echo DEBUG=%DEBUG%
+) else (
+  set DEBUG=1
+)
+
+pushd %~dp0
+set "SCRIPTDIR=%CD%"
+cd ..\..\..\..
+mkdir deps-build
+cd deps-build || goto error
+set "BUILDDIR=%CD%"
+cd ..
+mkdir deps-arm64
+cd deps-arm64 || goto error
+set "INSTALLDIR=%CD%"
+cd ..
+cd deps || goto error
+set "X64INSTALLDIR=%CD%"
+cd ..
+popd
+
+echo SCRIPTDIR=%SCRIPTDIR%
+echo BUILDDIR=%BUILDDIR%
+echo INSTALLDIR=%INSTALLDIR%
+
+cd "%BUILDDIR%"
+
+set FREETYPE=2.13.2
+set HARFBUZZ=8.3.1
+set LIBJPEG=9f
+set LIBPNG=1643
+set LZ4=b8fd2d15309dd4e605070bd4486e26b6ef814e29
+set QT=6.8.0
+set QTMINOR=6.8
+set SDL=SDL2-2.30.8
+set WEBP=1.4.0
+set ZLIB=1.3.1
+set ZLIBSHORT=131
+set ZSTD=1.5.6
+
+set SHADERC=2024.1
+set SHADERC_GLSLANG=142052fa30f9eca191aa9dcf65359fcaed09eeec
+set SHADERC_SPIRVHEADERS=5e3ad389ee56fca27c9705d093ae5387ce404df4
+set SHADERC_SPIRVTOOLS=dd4b663e13c07fea4fbb3f70c1c91c86731099f7
+
+call :downloadfile "freetype-%FREETYPE%.tar.gz" https://sourceforge.net/projects/freetype/files/freetype2/%FREETYPE%/freetype-%FREETYPE%.tar.gz/download 1ac27e16c134a7f2ccea177faba19801131116fd682efc1f5737037c5db224b5 || goto error
+call :downloadfile "harfbuzz-%HARFBUZZ%.zip" https://github.com/harfbuzz/harfbuzz/archive/refs/tags/%HARFBUZZ%.zip b2bc56184ae37324bc4829fde7d3f9e6916866ad711ee85792e457547c9fd127 || goto error
+call :downloadfile "lpng%LIBPNG%.zip" https://download.sourceforge.net/libpng/lpng1643.zip fc466a1e638e635d6c66363bdf3f38555b81b0141d0b06ba45b49ccca327436d || goto error
+call :downloadfile "jpegsr%LIBJPEG%.zip" https://ijg.org/files/jpegsr%LIBJPEG%.zip 6255da8c89e09d694e6800688c76145eb6870a76ac0d36c74fccd61b3940aafa || goto error
+call :downloadfile "libwebp-%WEBP%.tar.gz" "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-%WEBP%.tar.gz" 61f873ec69e3be1b99535634340d5bde750b2e4447caa1db9f61be3fd49ab1e5 || goto error
+call :downloadfile "lz4-%LZ4%.zip" "https://github.com/lz4/lz4/archive/%LZ4%.zip" 0c33119688d6b180c7e760b0acd70059222389cfd581632623784bee27e51a31 || goto error
+call :downloadfile "%SDL%.zip" "https://libsdl.org/release/%SDL%.zip" abe2921dffcb25d39d270454810b211a9f47be3e5e802bc45e7d058f286a325e || goto error
+call :downloadfile "qtbase-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtbase-everywhere-src-%QT%.zip" c3b41915341d853b6374cf93f1fcced2c8e4be9360f29c656960e1d0d15046a3 || goto error
+call :downloadfile "qtimageformats-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtimageformats-everywhere-src-%QT%.zip" 809081a7bdf7e48262fbe9437e4e756df6ad2649433e803c4040026e650d7c91 || goto error
+call :downloadfile "qtsvg-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtsvg-everywhere-src-%QT%.zip" 89f1ef4595f68c3d34c63a7c1c4ce475e701e103f0473f3fd0718a2e5234de6e || goto error
+call :downloadfile "qttools-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttools-everywhere-src-%QT%.zip" 3f813f49d6d28c532dc4b104084f60ff382337f184698fcd6e70ab9efad977c1 || goto error
+call :downloadfile "qttranslations-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttranslations-everywhere-src-%QT%.zip" 91c33d9946279c9c613b02e52a33df610cc01d13ea6e321b4c4d8ee708b9a03e || goto error
+call :downloadfile "zlib%ZLIBSHORT%.zip" "https://zlib.net/zlib%ZLIBSHORT%.zip" 72af66d44fcc14c22013b46b814d5d2514673dda3d115e64b690c1ad636e7b17 || goto error
+call :downloadfile "zstd-%ZSTD%.zip" "https://github.com/facebook/zstd/archive/refs/tags/v%ZSTD%.zip" 3b1c3b46e416d36931efd34663122d7f51b550c87f74de2d38249516fe7d8be5 || goto error
+call :downloadfile "zstd-fd5f8106a58601a963ee816e6a57aa7c61fafc53.patch" https://github.com/facebook/zstd/commit/fd5f8106a58601a963ee816e6a57aa7c61fafc53.patch 675f144b11f8ab2424b64bed8ccdca5d3f35b9326046fa7a883925dd180f0651 || goto error
+
+call :downloadfile "shaderc-%SHADERC%.zip" "https://github.com/google/shaderc/archive/refs/tags/v%SHADERC%.zip" 6c9f42ed6bf42750f5369b089909abfdcf0101488b4a1f41116d5159d00af8e7 || goto error
+call :downloadfile "shaderc-glslang-%SHADERC_GLSLANG%.zip" "https://github.com/KhronosGroup/glslang/archive/%SHADERC_GLSLANG%.zip" 03ad8a6fa987af4653d0cfe6bdaed41bcf617f1366a151fb1574da75950cd3e8 || goto error
+call :downloadfile "shaderc-spirv-headers-%SHADERC_SPIRVHEADERS%.zip" "https://github.com/KhronosGroup/SPIRV-Headers/archive/%SHADERC_SPIRVHEADERS%.zip" fa59a54334feaba5702b9c25724c3f4746123865769b36dd5a28d9ef5e9d39ab || goto error
+call :downloadfile "shaderc-spirv-tools-%SHADERC_SPIRVTOOLS%.zip" "https://github.com/KhronosGroup/SPIRV-Tools/archive/%SHADERC_SPIRVTOOLS%.zip" bf385994c20293485b378c27dfdbd77a31b949deabccd9218a977f173eda9f6f || goto error
+
+if %DEBUG%==1 (
+  echo Building debug and release libraries...
+) else (
+  echo Building release libraries...
+)
+
+set FORCEPDB=-DCMAKE_SHARED_LINKER_FLAGS_RELEASE="/DEBUG"
+set ARM64TOOLCHAIN=-DCMAKE_TOOLCHAIN_FILE="%SCRIPTDIR%\cmake-toolchain-windows-arm64.cmake"
+
+echo Building Zlib...
+rmdir /S /Q "zlib-%ZLIB%"
+%SEVENZIP% x "zlib%ZLIBSHORT%.zip" || goto error
+cd "zlib-%ZLIB%" || goto error
+cmake %ARM64TOOLCHAIN% -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DZLIB_BUILD_EXAMPLES=OFF -B build -G Ninja || goto error
+cmake --build build --parallel || goto error
+ninja -C build install || goto error
+cd .. || goto error
+
+echo Building libpng...
+rmdir /S /Q "lpng%LIBPNG%"
+%SEVENZIP% x "lpng%LIBPNG%.zip" || goto error
+cd "lpng%LIBPNG%" || goto error
+cmake %ARM64TOOLCHAIN% -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DBUILD_SHARED_LIBS=ON -DPNG_TESTS=OFF -DPNG_STATIC=OFF -DPNG_SHARED=ON -DPNG_TOOLS=OFF -B build -G Ninja || goto error
+cmake --build build --parallel || goto error
+ninja -C build install || goto error
+cd .. || goto error
+
+echo Building libjpeg...
+rmdir /S /Q "jpeg-%LIBJPEG%"
+%SEVENZIP% x "jpegsr%LIBJPEG%.zip" || goto error
+cd "jpeg-%LIBJPEG%" || goto error
+%PATCH% -p1 < "%SCRIPTDIR%\libjpeg-cmake.patch" || goto error
+cmake %ARM64TOOLCHAIN% -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF -B build -G Ninja || goto error
+cmake --build build --parallel || goto error
+ninja -C build install || goto error
+cd .. || goto error
+
+echo Building LZ4...
+rmdir /S /Q "lz4"
+%SEVENZIP% x "lz4-%LZ4%.zip" || goto error
+rename "lz4-%LZ4%" "lz4" || goto error
+cd "lz4" || goto error
+cmake %ARM64TOOLCHAIN% -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DLZ4_BUILD_CLI=OFF -DLZ4_BUILD_LEGACY_LZ4C=OFF -DCMAKE_C_FLAGS="/wd4711 /wd5045" -B build-dir -G Ninja build/cmake || goto error
+cmake --build build-dir --parallel || goto error
+ninja -C build-dir install || goto error
+cd ..
+
+echo Building FreeType without HarfBuzz...
+rmdir /S /Q "freetype-%FREETYPE%"
+tar -xf "freetype-%FREETYPE%.tar.gz" || goto error
+cd "freetype-%FREETYPE%" || goto error
+cmake %ARM64TOOLCHAIN% -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DFT_REQUIRE_ZLIB=TRUE -DFT_REQUIRE_PNG=TRUE -DFT_DISABLE_BZIP2=TRUE -DFT_DISABLE_BROTLI=TRUE -DFT_DISABLE_HARFBUZZ=TRUE -B build -G Ninja || goto error
+cmake --build build --parallel || goto error
+ninja -C build install || goto error
+cd .. || goto error
+
+echo Building HarfBuzz...
+rmdir /S /Q "harfbuzz-%HARFBUZZ%"
+%SEVENZIP% x "-x^!harfbuzz-%HARFBUZZ%\README" "harfbuzz-%HARFBUZZ%.zip" || goto error
+cd "harfbuzz-%HARFBUZZ%" || goto error
+cmake %ARM64TOOLCHAIN% -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DHB_BUILD_UTILS=OFF -B build -G Ninja || goto error
+cmake --build build --parallel || goto error
+ninja -C build install || goto error
+cd .. || goto error
+
+echo Building FreeType with HarfBuzz...
+rmdir /S /Q "freetype-%FREETYPE%"
+tar -xf "freetype-%FREETYPE%.tar.gz" || goto error
+cd "freetype-%FREETYPE%" || goto error
+cmake %ARM64TOOLCHAIN% -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DFT_REQUIRE_ZLIB=TRUE -DFT_REQUIRE_PNG=TRUE -DFT_DISABLE_BZIP2=TRUE -DFT_DISABLE_BROTLI=TRUE -DFT_REQUIRE_HARFBUZZ=TRUE -B build -G Ninja || goto error
+cmake --build build --parallel || goto error
+ninja -C build install || goto error
+cd .. || goto error
+
+echo Building Zstandard...
+rmdir /S /Q "zstd-%ZSTD%"
+%SEVENZIP% x "-x^!zstd-%ZSTD%\tests\cli-tests\bin" "zstd-%ZSTD%.zip" || goto error
+cd "zstd-%ZSTD%"
+%PATCH% -p1 < "..\zstd-fd5f8106a58601a963ee816e6a57aa7c61fafc53.patch" || goto error
+cmake %ARM64TOOLCHAIN% -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DZSTD_BUILD_SHARED=ON -DZSTD_BUILD_STATIC=OFF -DZSTD_BUILD_PROGRAMS=OFF -B build -G Ninja build/cmake
+cmake --build build --parallel || goto error
+ninja -C build install || goto error
+cd .. || goto error
+
+echo Building WebP...
+rmdir /S /Q "libwebp-%WEBP%"
+tar -xf "libwebp-%WEBP%.tar.gz" || goto error
+cd "libwebp-%WEBP%" || goto error
+cmake -B build %ARM64TOOLCHAIN% -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DWEBP_BUILD_ANIM_UTILS=OFF -DWEBP_BUILD_CWEBP=OFF -DWEBP_BUILD_DWEBP=OFF -DWEBP_BUILD_GIF2WEBP=OFF -DWEBP_BUILD_IMG2WEBP=OFF -DWEBP_BUILD_VWEBP=OFF -DWEBP_BUILD_WEBPINFO=OFF -DWEBP_BUILD_WEBPMUX=OFF -DWEBP_BUILD_EXTRAS=OFF -DBUILD_SHARED_LIBS=ON -G Ninja || goto error
+cmake --build build --parallel || goto error
+ninja -C build install || goto error
+cd .. || goto error
+
+echo Building SDL...
+rmdir /S /Q "%SDL%"
+%SEVENZIP% x "%SDL%.zip" || goto error
+cd "%SDL%" || goto error
+cmake -B build %ARM64TOOLCHAIN% -DCMAKE_BUILD_TYPE=Release %FORCEPDB% -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DSDL_SHARED=ON -DSDL_STATIC=OFF -G Ninja || goto error
+cmake --build build --parallel || goto error
+ninja -C build install || goto error
+copy build\SDL2.pdb "%INSTALLDIR%\bin" || goto error
+cd .. || goto error
+
+if %DEBUG%==1 (
+  set QTBUILDSPEC=-DCMAKE_CONFIGURATION_TYPES="Release;Debug" -G "Ninja Multi-Config"
+) else (
+  set QTBUILDSPEC=-DCMAKE_BUILD_TYPE=Release -G Ninja
+)
+
+echo Building Qt base...
+rmdir /S /Q "qtbase-everywhere-src-%QT%"
+%SEVENZIP% x "qtbase-everywhere-src-%QT%.zip" || goto error
+cd "qtbase-everywhere-src-%QT%" || goto error
+cmake -B build %ARM64TOOLCHAIN% -DFEATURE_sql=OFF -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DQT_HOST_PATH="%X64INSTALLDIR%" %FORCEPDB% -DINPUT_gui=yes -DINPUT_widgets=yes -DINPUT_ssl=yes -DINPUT_openssl=no -DINPUT_schannel=yes -DFEATURE_system_png=ON -DFEATURE_system_jpeg=ON -DFEATURE_system_zlib=ON -DFEATURE_system_freetype=ON -DFEATURE_system_harfbuzz=ON %QTBUILDSPEC% || goto error
+cmake --build build --parallel || goto error
+ninja -C build install || goto error
+cd .. || goto error
+
+echo Building Qt SVG...
+rmdir /S /Q "qtsvg-everywhere-src-%QT%"
+%SEVENZIP% x "qtsvg-everywhere-src-%QT%.zip" || goto error
+cd "qtsvg-everywhere-src-%QT%" || goto error
+mkdir build || goto error
+cd build || goto error
+call "%INSTALLDIR%\bin\qt-configure-module.bat" .. -- %FORCEPDB% -DCMAKE_PREFIX_PATH="%INSTALLDIR%" || goto error
+cmake --build . --parallel || goto error
+ninja install || goto error
+cd ..\.. || goto error
+
+echo Building Qt Image Formats...
+rmdir /S /Q "qtimageformats-everywhere-src-%QT%"
+%SEVENZIP% x "qtimageformats-everywhere-src-%QT%.zip" || goto error
+cd "qtimageformats-everywhere-src-%QT%" || goto error
+mkdir build || goto error
+cd build || goto error
+call "%INSTALLDIR%\bin\qt-configure-module.bat" .. -- %FORCEPDB% -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DFEATURE_system_webp=ON || goto error
+cmake --build . --parallel || goto error
+ninja install || goto error
+cd ..\.. || goto error
+
+echo Building Qt Tools...
+rmdir /S /Q "qtimageformats-everywhere-src-%QT%"
+%SEVENZIP% x "qttools-everywhere-src-%QT%.zip" || goto error
+cd "qttools-everywhere-src-%QT%" || goto error
+mkdir build || goto error
+cd build || goto error
+call "%INSTALLDIR%\bin\qt-configure-module.bat" .. -- %FORCEPDB% -DFEATURE_assistant=OFF -DFEATURE_clang=OFF -DFEATURE_designer=OFF -DFEATURE_kmap2qmap=OFF -DFEATURE_pixeltool=OFF -DFEATURE_pkg_config=OFF -DFEATURE_qev=OFF -DFEATURE_qtattributionsscanner=OFF -DFEATURE_qtdiag=OFF -DFEATURE_qtplugininfo=OFF || goto error
+cmake --build . --parallel || goto error
+ninja install || goto error
+cd ..\.. || goto error
+
+echo Building Qt Translations...
+rmdir /S /Q "qttranslations-everywhere-src-%QT%"
+%SEVENZIP% x "qttranslations-everywhere-src-%QT%.zip" || goto error
+cd "qttranslations-everywhere-src-%QT%" || goto error
+mkdir build || goto error
+cd build || goto error
+call "%INSTALLDIR%\bin\qt-configure-module.bat" .. -- %FORCEPDB% || goto error
+cmake --build . --parallel || goto error
+ninja install || goto error
+cd ..\.. || goto error
+
+echo Building shaderc...
+rmdir /S /Q "shaderc-%SHADERC%"
+%SEVENZIP% x "shaderc-%SHADERC%.zip" || goto error
+cd "shaderc-%SHADERC%" || goto error
+cd third_party || goto error
+%SEVENZIP% x "..\..\shaderc-glslang-%SHADERC_GLSLANG%.zip" || goto error
+rename "glslang-%SHADERC_GLSLANG%" "glslang" || goto error
+%SEVENZIP% x "..\..\shaderc-spirv-headers-%SHADERC_SPIRVHEADERS%.zip" || goto error
+rename "SPIRV-Headers-%SHADERC_SPIRVHEADERS%" "spirv-headers" || goto error
+%SEVENZIP% x "..\..\shaderc-spirv-tools-%SHADERC_SPIRVTOOLS%.zip" || goto error
+rename "SPIRV-Tools-%SHADERC_SPIRVTOOLS%" "spirv-tools" || goto error
+cd .. || goto error
+%PATCH% -p1 < "%SCRIPTDIR%\..\common\shaderc-changes.patch" || goto error
+cmake %ARM64TOOLCHAIN% -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DSHADERC_SKIP_TESTS=ON -DSHADERC_SKIP_EXAMPLES=ON -DSHADERC_SKIP_COPYRIGHT_CHECK=ON -DSHADERC_ENABLE_SHARED_CRT=ON -B build -G Ninja || goto error
+cmake --build build --parallel || goto error
+ninja -C build install || goto error
+cd .. || goto error
+
+echo Cleaning up...
+cd ..
+rd /S /Q deps-build
+
+echo Exiting with success.
+exit 0
+
+:error
+echo Failed with error #%errorlevel%.
+pause
+exit %errorlevel%
+
+:downloadfile
+if not exist "%~1" (
+  echo Downloading %~1 from %~2...
+  curl -L -o "%~1" "%~2" || goto error
+)
+
+rem based on https://gist.github.com/gsscoder/e22daefaff9b5d8ac16afb070f1a7971
+set idx=0
+for /f %%F in ('certutil -hashfile "%~1" SHA256') do (
+    set "out!idx!=%%F"
+    set /a idx += 1
+)
+set filechecksum=%out1%
+
+if /i %~3==%filechecksum% (
+    echo Validated %~1.
+    exit /B 0
+) else (
+    echo Expected %~3 got %filechecksum%.
+    exit /B 1
+)

.github/workflows/scripts/windows/build-dependencies.bat

@@ -12,6 +12,7 @@ if exist "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Bu
 )
 
 set SEVENZIP="C:\Program Files\7-Zip\7z.exe"
+set PATCH="C:\Program Files\Git\usr\bin\patch.exe"
 
 if defined DEBUG (
   echo DEBUG=%DEBUG%
@@ -35,18 +36,48 @@ echo SCRIPTDIR=%SCRIPTDIR%
 echo BUILDDIR=%BUILDDIR%
 echo INSTALLDIR=%INSTALLDIR%
 
+set "PATH=%PATH%;%INSTALLDIR%\bin"
+
 cd "%BUILDDIR%"
 
-set QT=6.6.1
-set QTMINOR=6.6
-set SDL=SDL2-2.28.5
+set FREETYPE=2.13.2
+set HARFBUZZ=8.3.1
+set LIBJPEG=9f
+set LIBPNG=1643
+set LZ4=b8fd2d15309dd4e605070bd4486e26b6ef814e29
+set QT=6.8.0
+set QTMINOR=6.8
+set SDL=SDL2-2.30.8
+set WEBP=1.4.0
+set ZLIB=1.3.1
+set ZLIBSHORT=131
+set ZSTD=1.5.6
 
-call :downloadfile "%SDL%.zip" "https://libsdl.org/release/%SDL%.zip" 97bd14ee0ec67494d2b93f1a4f7da2bf891103c57090d96fdcc2b019d885c76a || goto error
-call :downloadfile "qtbase-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtbase-everywhere-src-%QT%.zip" 818f92518d1a89ee98ae818891a7d2f0e41aa45b933d55215da2df6d5459428e || goto error
-call :downloadfile "qtimageformats-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtimageformats-everywhere-src-%QT%.zip" 03f01042f86b4dbf7329a179f20835817c660a183178c11570cc0535b3c3ba58 || goto error
-call :downloadfile "qtsvg-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtsvg-everywhere-src-%QT%.zip" d44d5ead8d4682f54c91687b5e32f2735f086419e3889e05609feae1a7f02da9 || goto error
-call :downloadfile "qttools-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttools-everywhere-src-%QT%.zip" a17eba4e1c00dbd62c13d708c2bc918c2954b2b25a94d3c05e891d62e8f187c8 || goto error
-call :downloadfile "qttranslations-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttranslations-everywhere-src-%QT%.zip" e5ccf0eefd6b1ef9604fdf57f6d16ad8484d07fb141ca3a2d9c3f1771296ae25 || goto error
+set SHADERC=2024.1
+set SHADERC_GLSLANG=142052fa30f9eca191aa9dcf65359fcaed09eeec
+set SHADERC_SPIRVHEADERS=5e3ad389ee56fca27c9705d093ae5387ce404df4
+set SHADERC_SPIRVTOOLS=dd4b663e13c07fea4fbb3f70c1c91c86731099f7
+
+call :downloadfile "freetype-%FREETYPE%.tar.gz" https://sourceforge.net/projects/freetype/files/freetype2/%FREETYPE%/freetype-%FREETYPE%.tar.gz/download 1ac27e16c134a7f2ccea177faba19801131116fd682efc1f5737037c5db224b5 || goto error
+call :downloadfile "harfbuzz-%HARFBUZZ%.zip" https://github.com/harfbuzz/harfbuzz/archive/refs/tags/%HARFBUZZ%.zip b2bc56184ae37324bc4829fde7d3f9e6916866ad711ee85792e457547c9fd127 || goto error
+call :downloadfile "lpng%LIBPNG%.zip" https://download.sourceforge.net/libpng/lpng1643.zip fc466a1e638e635d6c66363bdf3f38555b81b0141d0b06ba45b49ccca327436d || goto error
+call :downloadfile "jpegsr%LIBJPEG%.zip" https://ijg.org/files/jpegsr%LIBJPEG%.zip 6255da8c89e09d694e6800688c76145eb6870a76ac0d36c74fccd61b3940aafa || goto error
+call :downloadfile "libwebp-%WEBP%.tar.gz" "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-%WEBP%.tar.gz" 61f873ec69e3be1b99535634340d5bde750b2e4447caa1db9f61be3fd49ab1e5 || goto error
+call :downloadfile "lz4-%LZ4%.zip" "https://github.com/lz4/lz4/archive/%LZ4%.zip" 0c33119688d6b180c7e760b0acd70059222389cfd581632623784bee27e51a31 || goto error
+call :downloadfile "%SDL%.zip" "https://libsdl.org/release/%SDL%.zip" abe2921dffcb25d39d270454810b211a9f47be3e5e802bc45e7d058f286a325e || goto error
+call :downloadfile "qtbase-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtbase-everywhere-src-%QT%.zip" c3b41915341d853b6374cf93f1fcced2c8e4be9360f29c656960e1d0d15046a3 || goto error
+call :downloadfile "qtimageformats-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtimageformats-everywhere-src-%QT%.zip" 809081a7bdf7e48262fbe9437e4e756df6ad2649433e803c4040026e650d7c91 || goto error
+call :downloadfile "qtsvg-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtsvg-everywhere-src-%QT%.zip" 89f1ef4595f68c3d34c63a7c1c4ce475e701e103f0473f3fd0718a2e5234de6e || goto error
+call :downloadfile "qttools-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttools-everywhere-src-%QT%.zip" 3f813f49d6d28c532dc4b104084f60ff382337f184698fcd6e70ab9efad977c1 || goto error
+call :downloadfile "qttranslations-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttranslations-everywhere-src-%QT%.zip" 91c33d9946279c9c613b02e52a33df610cc01d13ea6e321b4c4d8ee708b9a03e || goto error
+call :downloadfile "zlib%ZLIBSHORT%.zip" "https://zlib.net/zlib%ZLIBSHORT%.zip" 72af66d44fcc14c22013b46b814d5d2514673dda3d115e64b690c1ad636e7b17 || goto error
+call :downloadfile "zstd-%ZSTD%.zip" "https://github.com/facebook/zstd/archive/refs/tags/v%ZSTD%.zip" 3b1c3b46e416d36931efd34663122d7f51b550c87f74de2d38249516fe7d8be5 || goto error
+call :downloadfile "zstd-fd5f8106a58601a963ee816e6a57aa7c61fafc53.patch" https://github.com/facebook/zstd/commit/fd5f8106a58601a963ee816e6a57aa7c61fafc53.patch 675f144b11f8ab2424b64bed8ccdca5d3f35b9326046fa7a883925dd180f0651 || goto error
+
+call :downloadfile "shaderc-%SHADERC%.zip" "https://github.com/google/shaderc/archive/refs/tags/v%SHADERC%.zip" 6c9f42ed6bf42750f5369b089909abfdcf0101488b4a1f41116d5159d00af8e7 || goto error
+call :downloadfile "shaderc-glslang-%SHADERC_GLSLANG%.zip" "https://github.com/KhronosGroup/glslang/archive/%SHADERC_GLSLANG%.zip" 03ad8a6fa987af4653d0cfe6bdaed41bcf617f1366a151fb1574da75950cd3e8 || goto error
+call :downloadfile "shaderc-spirv-headers-%SHADERC_SPIRVHEADERS%.zip" "https://github.com/KhronosGroup/SPIRV-Headers/archive/%SHADERC_SPIRVHEADERS%.zip" fa59a54334feaba5702b9c25724c3f4746123865769b36dd5a28d9ef5e9d39ab || goto error
+call :downloadfile "shaderc-spirv-tools-%SHADERC_SPIRVTOOLS%.zip" "https://github.com/KhronosGroup/SPIRV-Tools/archive/%SHADERC_SPIRVTOOLS%.zip" bf385994c20293485b378c27dfdbd77a31b949deabccd9218a977f173eda9f6f || goto error
 
 if %DEBUG%==1 (
   echo Building debug and release libraries...
@@ -54,18 +85,100 @@ if %DEBUG%==1 (
   echo Building release libraries...
 )
 
+set FORCEPDB=-DCMAKE_SHARED_LINKER_FLAGS_RELEASE="/DEBUG"
+
+echo Building Zlib...
+rmdir /S /Q "zlib-%ZLIB%"
+%SEVENZIP% x "zlib%ZLIBSHORT%.zip" || goto error
+cd "zlib-%ZLIB%" || goto error
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DZLIB_BUILD_EXAMPLES=OFF -B build -G Ninja || goto error
+cmake --build build --parallel || goto error
+ninja -C build install || goto error
+cd .. || goto error
+
+echo Building libpng...
+rmdir /S /Q "lpng%LIBPNG%"
+%SEVENZIP% x "lpng%LIBPNG%.zip" || goto error
+cd "lpng%LIBPNG%" || goto error
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DBUILD_SHARED_LIBS=ON -DPNG_TESTS=OFF -DPNG_STATIC=OFF -DPNG_SHARED=ON -DPNG_TOOLS=OFF -B build -G Ninja || goto error
+cmake --build build --parallel || goto error
+ninja -C build install || goto error
+cd .. || goto error
+
+echo Building libjpeg...
+rmdir /S /Q "jpeg-%LIBJPEG%"
+%SEVENZIP% x "jpegsr%LIBJPEG%.zip" || goto error
+cd "jpeg-%LIBJPEG%" || goto error
+%PATCH% -p1 < "%SCRIPTDIR%\libjpeg-cmake.patch" || goto error
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF -B build -G Ninja || goto error
+cmake --build build --parallel || goto error
+ninja -C build install || goto error
+cd .. || goto error
+
+echo Building LZ4...
+rmdir /S /Q "lz4"
+%SEVENZIP% x "lz4-%LZ4%.zip" || goto error
+rename "lz4-%LZ4%" "lz4" || goto error
+cd "lz4" || goto error
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DLZ4_BUILD_CLI=OFF -DLZ4_BUILD_LEGACY_LZ4C=OFF -DCMAKE_C_FLAGS="/wd4711 /wd5045" -B build-dir -G Ninja build/cmake || goto error
+cmake --build build-dir --parallel || goto error
+ninja -C build-dir install || goto error
+cd ..
+
+echo Building FreeType without HarfBuzz...
+rmdir /S /Q "freetype-%FREETYPE%"
+tar -xf "freetype-%FREETYPE%.tar.gz" || goto error
+cd "freetype-%FREETYPE%" || goto error
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DFT_REQUIRE_ZLIB=TRUE -DFT_REQUIRE_PNG=TRUE -DFT_DISABLE_BZIP2=TRUE -DFT_DISABLE_BROTLI=TRUE -DFT_DISABLE_HARFBUZZ=TRUE -B build -G Ninja || goto error
+cmake --build build --parallel || goto error
+ninja -C build install || goto error
+cd .. || goto error
+
+echo Building HarfBuzz...
+rmdir /S /Q "harfbuzz-%HARFBUZZ%"
+%SEVENZIP% x "-x^!harfbuzz-%HARFBUZZ%\README" "harfbuzz-%HARFBUZZ%.zip" || goto error
+cd "harfbuzz-%HARFBUZZ%" || goto error
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DHB_BUILD_UTILS=OFF -B build -G Ninja || goto error
+cmake --build build --parallel || goto error
+ninja -C build install || goto error
+cd .. || goto error
+
+echo Building FreeType with HarfBuzz...
+rmdir /S /Q "freetype-%FREETYPE%"
+tar -xf "freetype-%FREETYPE%.tar.gz" || goto error
+cd "freetype-%FREETYPE%" || goto error
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DFT_REQUIRE_ZLIB=TRUE -DFT_REQUIRE_PNG=TRUE -DFT_DISABLE_BZIP2=TRUE -DFT_DISABLE_BROTLI=TRUE -DFT_REQUIRE_HARFBUZZ=TRUE -B build -G Ninja || goto error
+cmake --build build --parallel || goto error
+ninja -C build install || goto error
+cd .. || goto error
+
+echo Building Zstandard...
+rmdir /S /Q "zstd-%ZSTD%"
+%SEVENZIP% x "-x^!zstd-%ZSTD%\tests\cli-tests\bin" "zstd-%ZSTD%.zip" || goto error
+cd "zstd-%ZSTD%"
+%PATCH% -p1 < "..\zstd-fd5f8106a58601a963ee816e6a57aa7c61fafc53.patch" || goto error
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DZSTD_BUILD_SHARED=ON -DZSTD_BUILD_STATIC=OFF -DZSTD_BUILD_PROGRAMS=OFF -B build -G Ninja build/cmake
+cmake --build build --parallel || goto error
+ninja -C build install || goto error
+cd .. || goto error
+
+echo Building WebP...
+rmdir /S /Q "libwebp-%WEBP%"
+tar -xf "libwebp-%WEBP%.tar.gz" || goto error
+cd "libwebp-%WEBP%" || goto error
+cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DWEBP_BUILD_ANIM_UTILS=OFF -DWEBP_BUILD_CWEBP=OFF -DWEBP_BUILD_DWEBP=OFF -DWEBP_BUILD_GIF2WEBP=OFF -DWEBP_BUILD_IMG2WEBP=OFF -DWEBP_BUILD_VWEBP=OFF -DWEBP_BUILD_WEBPINFO=OFF -DWEBP_BUILD_WEBPMUX=OFF -DWEBP_BUILD_EXTRAS=OFF -DBUILD_SHARED_LIBS=ON -G Ninja || goto error
+cmake --build build --parallel || goto error
+ninja -C build install || goto error
+cd .. || goto error
+
 echo Building SDL...
 rmdir /S /Q "%SDL%"
 %SEVENZIP% x "%SDL%.zip" || goto error
 cd "%SDL%" || goto error
-if %DEBUG%==1 (
-  cmake -B build-debug -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DSDL_SHARED=ON -DSDL_STATIC=OFF -G Ninja || goto error
-  cmake --build build-debug --parallel || goto error
-  ninja -C build-debug install || goto error
-)
-cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DSDL_SHARED=ON -DSDL_STATIC=OFF -G Ninja || goto error
+cmake -B build -DCMAKE_BUILD_TYPE=Release %FORCEPDB% -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DSDL_SHARED=ON -DSDL_STATIC=OFF -G Ninja || goto error
 cmake --build build --parallel || goto error
 ninja -C build install || goto error
+copy build\SDL2.pdb "%INSTALLDIR%\bin" || goto error
 cd .. || goto error
 
 if %DEBUG%==1 (
@@ -78,7 +191,14 @@ echo Building Qt base...
 rmdir /S /Q "qtbase-everywhere-src-%QT%"
 %SEVENZIP% x "qtbase-everywhere-src-%QT%.zip" || goto error
 cd "qtbase-everywhere-src-%QT%" || goto error
-cmake -B build -DFEATURE_sql=OFF -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DINPUT_gui=yes -DINPUT_widgets=yes -DINPUT_ssl=yes -DINPUT_openssl=no -DINPUT_schannel=yes %QTBUILDSPEC% || goto error
+
+rem Disable the PCRE2 JIT, it doesn't properly verify AVX2 support.
+%PATCH% -p1 < "%SCRIPTDIR%\qtbase-disable-pcre2-jit.patch" || goto error
+
+rem Hackfix settings icon stretching
+%PATCH% -p1 < "%SCRIPTDIR%\qtbase-fix-icon-stretch.patch" || goto error
+
+cmake -B build -DFEATURE_sql=OFF -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" %FORCEPDB% -DINPUT_gui=yes -DINPUT_widgets=yes -DINPUT_ssl=yes -DINPUT_openssl=no -DINPUT_schannel=yes -DFEATURE_system_png=ON -DFEATURE_system_jpeg=ON -DFEATURE_system_zlib=ON -DFEATURE_system_freetype=ON -DFEATURE_system_harfbuzz=ON %QTBUILDSPEC% || goto error
 cmake --build build --parallel || goto error
 ninja -C build install || goto error
 cd .. || goto error
@@ -89,7 +209,7 @@ rmdir /S /Q "qtsvg-everywhere-src-%QT%"
 cd "qtsvg-everywhere-src-%QT%" || goto error
 mkdir build || goto error
 cd build || goto error
-call "%INSTALLDIR%\bin\qt-configure-module.bat" .. || goto error
+call "%INSTALLDIR%\bin\qt-configure-module.bat" .. -- %FORCEPDB% -DCMAKE_PREFIX_PATH="%INSTALLDIR%" || goto error
 cmake --build . --parallel || goto error
 ninja install || goto error
 cd ..\.. || goto error
@@ -100,7 +220,7 @@ rmdir /S /Q "qtimageformats-everywhere-src-%QT%"
 cd "qtimageformats-everywhere-src-%QT%" || goto error
 mkdir build || goto error
 cd build || goto error
-call "%INSTALLDIR%\bin\qt-configure-module.bat" .. || goto error
+call "%INSTALLDIR%\bin\qt-configure-module.bat" .. -- %FORCEPDB% -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DFEATURE_system_webp=ON || goto error
 cmake --build . --parallel || goto error
 ninja install || goto error
 cd ..\.. || goto error
@@ -111,7 +231,7 @@ rmdir /S /Q "qtimageformats-everywhere-src-%QT%"
 cd "qttools-everywhere-src-%QT%" || goto error
 mkdir build || goto error
 cd build || goto error
-call "%INSTALLDIR%\bin\qt-configure-module.bat" .. -- -DFEATURE_assistant=OFF -DFEATURE_clang=OFF -DFEATURE_designer=OFF -DFEATURE_kmap2qmap=OFF -DFEATURE_pixeltool=OFF -DFEATURE_pkg_config=OFF -DFEATURE_qev=OFF -DFEATURE_qtattributionsscanner=OFF -DFEATURE_qtdiag=OFF -DFEATURE_qtplugininfo=OFF || goto error
+call "%INSTALLDIR%\bin\qt-configure-module.bat" .. -- %FORCEPDB% -DFEATURE_assistant=OFF -DFEATURE_clang=OFF -DFEATURE_designer=ON -DFEATURE_kmap2qmap=OFF -DFEATURE_pixeltool=OFF -DFEATURE_pkg_config=OFF -DFEATURE_qev=OFF -DFEATURE_qtattributionsscanner=OFF -DFEATURE_qtdiag=OFF -DFEATURE_qtplugininfo=OFF || goto error
 cmake --build . --parallel || goto error
 ninja install || goto error
 cd ..\.. || goto error
@@ -122,11 +242,29 @@ rmdir /S /Q "qttranslations-everywhere-src-%QT%"
 cd "qttranslations-everywhere-src-%QT%" || goto error
 mkdir build || goto error
 cd build || goto error
-call "%INSTALLDIR%\bin\qt-configure-module.bat" .. || goto error
+call "%INSTALLDIR%\bin\qt-configure-module.bat" .. -- %FORCEPDB% || goto error
 cmake --build . --parallel || goto error
 ninja install || goto error
 cd ..\.. || goto error
 
+echo Building shaderc...
+rmdir /S /Q "shaderc-%SHADERC%"
+%SEVENZIP% x "shaderc-%SHADERC%.zip" || goto error
+cd "shaderc-%SHADERC%" || goto error
+cd third_party || goto error
+%SEVENZIP% x "..\..\shaderc-glslang-%SHADERC_GLSLANG%.zip" || goto error
+rename "glslang-%SHADERC_GLSLANG%" "glslang" || goto error
+%SEVENZIP% x "..\..\shaderc-spirv-headers-%SHADERC_SPIRVHEADERS%.zip" || goto error
+rename "SPIRV-Headers-%SHADERC_SPIRVHEADERS%" "spirv-headers" || goto error
+%SEVENZIP% x "..\..\shaderc-spirv-tools-%SHADERC_SPIRVTOOLS%.zip" || goto error
+rename "SPIRV-Tools-%SHADERC_SPIRVTOOLS%" "spirv-tools" || goto error
+cd .. || goto error
+%PATCH% -p1 < "%SCRIPTDIR%\..\common\shaderc-changes.patch" || goto error
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DSHADERC_SKIP_TESTS=ON -DSHADERC_SKIP_EXAMPLES=ON -DSHADERC_SKIP_COPYRIGHT_CHECK=ON -DSHADERC_ENABLE_SHARED_CRT=ON -B build -G Ninja || goto error
+cmake --build build --parallel || goto error
+ninja -C build install || goto error
+cd .. || goto error
+
 echo Cleaning up...
 cd ..
 rd /S /Q deps-build

.github/workflows/scripts/windows/cmake-toolchain-windows-arm64.cmake

@@ -0,0 +1,4 @@
+set(CMAKE_CROSSCOMPILING TRUE)
+set(CMAKE_SYSTEM_NAME Windows)
+set(CMAKE_SYSTEM_VERSION 10)
+set(CMAKE_SYSTEM_PROCESSOR arm64)

.github/workflows/scripts/windows/libjpeg-cmake.patch

@@ -0,0 +1,422 @@
+diff -ruN jpeg-9f/CMakeLists.txt jpeg-9f-new/CMakeLists.txt
+--- jpeg-9f/CMakeLists.txt	1970-01-01 10:00:00.000000000 +1000
++++ jpeg-9f-new/CMakeLists.txt	2024-03-23 21:29:37.969221600 +1000
+@@ -0,0 +1,110 @@
++# CMake configuration for IJG libjpeg
++# Modified from https://github.com/csparker247/jpeg-cmake/blob/develop/resources/CMakeLists.txt
++# To install, copy this file and jconfig.h.in into a libjpeg source directory
++# Adapted from LuaDist's CMakeLists
++# https://github.com/LuaDist/libjpeg/blob/master/CMakeLists.txt
++
++cmake_minimum_required(VERSION 3.5)
++
++### Setup the project ###
++file(READ "configure.ac" ac)
++string(REGEX MATCH "AC_INIT\\(\\[libjpeg\\],\ \\[([0-9]*\\.[0-9]*\\.[0-9]*)\\]\\)" _ ${ac})
++set(version ${CMAKE_MATCH_1})
++project(libjpeg VERSION ${version} LANGUAGES C)
++set(C_STANDARD 99)
++
++### Include extra packages ###
++include(CMakeDependentOption)
++include(GNUInstallDirs)
++
++### Options ###
++option(BUILD_SHARED_LIBS "Build shared libraries" ON)
++option(BUILD_STATIC_LIBS "Build static libraries" ON)
++
++# Make sure we build at least one library
++if(NOT(BUILD_SHARED_LIBS OR BUILD_STATIC_LIBS))
++  message(FATAL_ERROR "Both static and shared libraries are disabled. Nothing will be built.")
++endif()
++
++### Configure jconfig.h ###
++include(ConfigureJConfig.cmake)
++
++### Build the object library ###
++set(PUBLIC_HDRS
++  jconfig.h
++  jerror.h
++  jmorecfg.h
++  jpeglib.h
++)
++
++set(SRCS
++  jaricom.c jcapimin.c jcapistd.c jcarith.c jccoefct.c jccolor.c
++  jcdctmgr.c jchuff.c jcinit.c jcmainct.c jcmarker.c jcmaster.c jcomapi.c
++  jcparam.c jcprepct.c jcsample.c jctrans.c jdapimin.c jdapistd.c jdarith.c
++  jdatadst.c jdatasrc.c jdcoefct.c jdcolor.c jddctmgr.c jdhuff.c jdinput.c
++  jdmainct.c jdmarker.c jdmaster.c jdmerge.c jdpostct.c jdsample.c jdtrans.c
++  jerror.c jfdctflt.c jfdctfst.c jfdctint.c jidctflt.c jidctfst.c jidctint.c
++  jmemmgr.c jmemnobs.c jquant1.c jquant2.c jutils.c
++)
++
++### Create static and shared libs ###
++if(BUILD_SHARED_LIBS)
++  add_library(libjpeg SHARED ${SRCS})
++  target_compile_definitions(libjpeg PRIVATE COMPILING_LIBJPEG)
++  target_include_directories(libjpeg
++    PUBLIC
++      $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
++      $<INSTALL_INTERFACE:include>
++  )
++  set_target_properties(libjpeg
++    PROPERTIES
++      VERSION ${PROJECT_VERSION_MAJOR}
++      POSITION_INDEPENDENT_CODE ON
++      CLEAN_DIRECT_OUTPUT ON
++      PUBLIC_HEADER "${PUBLIC_HDRS}"
++  )
++  install(TARGETS libjpeg
++    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
++  )
++endif()
++
++if(BUILD_STATIC_LIBS)
++  add_library(libjpeg_static STATIC $<TARGET_OBJECTS:jpeg_objs>)
++  target_include_directories(libjpeg_static
++    PUBLIC
++      $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
++      $<INSTALL_INTERFACE:include>
++  )
++  set_target_properties(libjpeg_static
++    PROPERTIES
++      OUTPUT_NAME jpeg
++      VERSION ${PROJECT_VERSION_MAJOR}
++      POSITION_INDEPENDENT_CODE ON
++      CLEAN_DIRECT_OUTPUT ON
++      PUBLIC_HEADER "${PUBLIC_HDRS}"
++  )
++  install(TARGETS libjpeg_static
++    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
++  )
++endif()
++
++# Configure and install pkg-config and libtool files
++if(BUILD_STATIC_LIBS OR BUILD_SHARED_LIBS)
++  # Compute the la file's weird version number
++  math(EXPR JPEG_CONF_VER_MAJOR "${PROJECT_VERSION_MAJOR} + ${PROJECT_VERSION_MINOR}")
++  set(JPEG_LIB_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
++  set(JPEG_LIB_VERSION_MINOR ${PROJECT_VERSION_MINOR})
++
++  # Configure and install
++  configure_file(libjpeg.pc.cmakein libjpeg.pc @ONLY)
++  install(FILES
++    ${CMAKE_CURRENT_BINARY_DIR}/libjpeg.pc
++    DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig
++  )
++endif()
++
+diff -ruN jpeg-9f/ConfigureJConfig.cmake jpeg-9f-new/ConfigureJConfig.cmake
+--- jpeg-9f/ConfigureJConfig.cmake	1970-01-01 10:00:00.000000000 +1000
++++ jpeg-9f-new/ConfigureJConfig.cmake	2024-03-23 21:09:37.223882900 +1000
+@@ -0,0 +1,95 @@
++include(CheckIncludeFile)
++include(CheckSymbolExists)
++include(CheckTypeSize)
++
++# Define this if your system has an ANSI-conforming <stddef.h> file.
++check_include_file(stddef.h HAVE_STDDEF_H)
++
++# Define this if your system has an ANSI-conforming <stdlib.h> file.
++check_include_file(stdlib.h HAVE_STDLIB_H)
++
++# Does your compiler support function prototypes?
++# (If not, you also need to use ansi2knr, see install.txt)
++set(HAVE_PROTOTYPES true CACHE BOOL "Does your compiler support function prototypes?")
++
++# Does your compiler support the declaration "unsigned char" ?
++# How about "unsigned short" ?
++check_type_size("unsigned char" UNSIGNED_CHAR LANGUAGE C)
++check_type_size("unsigned short" UNSIGNED_SHORT LANGUAGE C)
++
++# Define "void" as "char" if your compiler doesn't know about type void.
++# NOTE: be sure to define void such that "void *" represents the most general
++# pointer type, e.g., that returned by malloc().
++# NOT IMPLEMENTED: Modify in jconfig.h.in #
++
++# Define "const" as empty if your compiler doesn't know the "const" keyword.
++# NOT IMPLEMENTED: Modify in jconfig.h.in #
++
++# Define this if an ordinary "char" type is unsigned.
++# If you're not sure, leaving it undefined will work at some cost in speed.
++# If you defined HAVE_UNSIGNED_CHAR then the speed difference is minimal.
++set(CHAR_IS_UNSIGNED false CACHE BOOL "char type is unsigned")
++
++# Define this if your system does not have an ANSI/SysV <string.h>,
++# but does have a BSD-style <strings.h>.
++set(NEED_BSD_STRINGS false CACHE BOOL "Use BSD <strings.h>. Use only if system lacks ANSI/SysV <strings.h>")
++
++# Define this if your system does not provide typedef size_t in any of the
++# ANSI-standard places (stddef.h, stdlib.h, or stdio.h), but places it in
++# <sys/types.h> instead.
++set(NEED_SYS_TYPES_H false CACHE BOOL "size_t defined in <sys/types.h>")
++
++# For 80x86 machines, you need to define NEED_FAR_POINTERS,
++# unless you are using a large-data memory model or 80386 flat-memory mode.
++# On less brain-damaged CPUs this symbol must not be defined.
++# (Defining this symbol causes large data structures to be referenced through
++# "far" pointers and to be allocated with a special version of malloc.)
++set(NEED_FAR_POINTERS false CACHE BOOL "Reference large data structures through 'far' pointers allocated with a special version of malloc")
++
++# Define this if your linker needs global names to be unique in less
++# than the first 15 characters.
++set(NEED_SHORT_EXTERNAL_NAMES false CACHE BOOL "Global names must be unique in less than the first 15 characters")
++
++# Although a real ANSI C compiler can deal perfectly well with pointers to
++# unspecified structures (see "incomplete types" in the spec), a few pre-ANSI
++# and pseudo-ANSI compilers get confused.  To keep one of these bozos happy,
++# define INCOMPLETE_TYPES_BROKEN.  This is not recommended unless you
++# actually get "missing structure definition" warnings or errors while
++# compiling the JPEG code.
++set(INCOMPLETE_TYPES_BROKEN false CACHE BOOL "Disable pointers to unspecified structures")
++
++# Define "boolean" as unsigned char, not enum, on Windows systems.
++# NOT IMPLEMENTED: Modify in jconfig.h.in #
++
++# The following options affect code selection within the JPEG library,
++# but they don't need to be visible to applications using the library.
++# To minimize application namespace pollution, the symbols won't be
++# defined unless JPEG_INTERNALS has been defined.
++#
++
++# Define this if your compiler implements ">>" on signed values as a logical
++# (unsigned) shift; leave it undefined if ">>" is a signed (arithmetic) shift,
++# which is the normal and rational definition.
++set(RIGHT_SHIFT_IS_UNSIGNED false CACHE BOOL "Compiler implements >> on signed values as a logical (unsigned) shift")
++
++# The remaining options do not affect the JPEG library proper,
++# but only the sample applications cjpeg/djpeg (see cjpeg.c, djpeg.c).
++# Other applications can ignore these.
++#
++
++mark_as_advanced(FORCE
++  HAVE_PROTOTYPES
++  HAVE_UNSIGNED_CHAR
++  HAVE_UNSIGNED_SHORT
++  CHAR_IS_UNSIGNED
++  HAVE_STDDEF_H
++  HAVE_STDLIB_H
++  NEED_BSD_STRINGS
++  NEED_SYS_TYPES_H
++  NEED_FAR_POINTERS
++  NEED_SHORT_EXTERNAL_NAMES
++  INCOMPLETE_TYPES_BROKEN
++  RIGHT_SHIFT_IS_UNSIGNED
++)
++
++configure_file(jconfig.h.in ${CMAKE_CURRENT_SOURCE_DIR}/jconfig.h)
+diff -ruN jpeg-9f/jconfig.h.in jpeg-9f-new/jconfig.h.in
+--- jpeg-9f/jconfig.h.in	1970-01-01 10:00:00.000000000 +1000
++++ jpeg-9f-new/jconfig.h.in	2024-03-23 21:06:05.204994600 +1000
+@@ -0,0 +1,173 @@
++/*
++ * jconfig.h.in
++ *
++ * Copyright (C) 1991-1994, Thomas G. Lane.
++ * Modified 2009-2013 by Guido Vollbeding.
++ * This file is part of the Independent JPEG Group's software.
++ * For conditions of distribution and use, see the accompanying README file.
++ *
++ * This file is a modification of jconfig.txt from libjpeg. In addition to
++ * documenting the configuration options that are required to customize the
++ * JPEG software for a particular system, it is used by jpeg-cmake to configure
++ * jconfig.h
++ */
++
++
++/*
++ * These symbols indicate the properties of your machine or compiler.
++ * #define the symbol if yes, #undef it if no.
++ */
++
++/* Does your compiler support function prototypes?
++ * (If not, you also need to use ansi2knr, see install.txt)
++ */
++#cmakedefine HAVE_PROTOTYPES
++
++/* Does your compiler support the declaration "unsigned char" ?
++ * How about "unsigned short" ?
++ */
++#cmakedefine HAVE_UNSIGNED_CHAR
++#cmakedefine HAVE_UNSIGNED_SHORT
++
++/* Define "void" as "char" if your compiler doesn't know about type void.
++ * NOTE: be sure to define void such that "void *" represents the most general
++ * pointer type, e.g., that returned by malloc().
++ */
++/* #define void char */
++
++/* Define "const" as empty if your compiler doesn't know the "const" keyword.
++ */
++/* #define const */
++
++/* Define this if an ordinary "char" type is unsigned.
++ * If you're not sure, leaving it undefined will work at some cost in speed.
++ * If you defined HAVE_UNSIGNED_CHAR then the speed difference is minimal.
++ */
++#cmakedefine CHAR_IS_UNSIGNED
++
++/* Define this if your system has an ANSI-conforming <stddef.h> file.
++ */
++#cmakedefine HAVE_STDDEF_H
++
++/* Define this if your system has an ANSI-conforming <stdlib.h> file.
++ */
++#cmakedefine HAVE_STDLIB_H
++
++/* Define this if your system does not have an ANSI/SysV <string.h>,
++ * but does have a BSD-style <strings.h>.
++ */
++#cmakedefine NEED_BSD_STRINGS
++
++/* Define this if your system does not provide typedef size_t in any of the
++ * ANSI-standard places (stddef.h, stdlib.h, or stdio.h), but places it in
++ * <sys/types.h> instead.
++ */
++#cmakedefine NEED_SYS_TYPES_H
++
++/* For 80x86 machines, you need to define NEED_FAR_POINTERS,
++ * unless you are using a large-data memory model or 80386 flat-memory mode.
++ * On less brain-damaged CPUs this symbol must not be defined.
++ * (Defining this symbol causes large data structures to be referenced through
++ * "far" pointers and to be allocated with a special version of malloc.)
++ */
++#cmakedefine NEED_FAR_POINTERS
++
++/* Define this if your linker needs global names to be unique in less
++ * than the first 15 characters.
++ */
++#cmakedefine NEED_SHORT_EXTERNAL_NAMES
++
++/* Although a real ANSI C compiler can deal perfectly well with pointers to
++ * unspecified structures (see "incomplete types" in the spec), a few pre-ANSI
++ * and pseudo-ANSI compilers get confused.  To keep one of these bozos happy,
++ * define INCOMPLETE_TYPES_BROKEN.  This is not recommended unless you
++ * actually get "missing structure definition" warnings or errors while
++ * compiling the JPEG code.
++ */
++#cmakedefine INCOMPLETE_TYPES_BROKEN
++
++/* Define "boolean" as unsigned char, not enum, on Windows systems.
++ */
++#ifdef _WIN32
++#ifndef __RPCNDR_H__		/* don't conflict if rpcndr.h already read */
++typedef unsigned char boolean;
++#endif
++#ifndef FALSE			/* in case these macros already exist */
++#define FALSE	0		/* values of boolean */
++#endif
++#ifndef TRUE
++#define TRUE	1
++#endif
++#define HAVE_BOOLEAN		/* prevent jmorecfg.h from redefining it */
++#endif
++
++
++/*
++ * The following options affect code selection within the JPEG library,
++ * but they don't need to be visible to applications using the library.
++ * To minimize application namespace pollution, the symbols won't be
++ * defined unless JPEG_INTERNALS has been defined.
++ */
++
++#ifdef JPEG_INTERNALS
++
++/* Define this if your compiler implements ">>" on signed values as a logical
++ * (unsigned) shift; leave it undefined if ">>" is a signed (arithmetic) shift,
++ * which is the normal and rational definition.
++ */
++#cmakedefine RIGHT_SHIFT_IS_UNSIGNED
++
++
++#endif /* JPEG_INTERNALS */
++
++
++/*
++ * The remaining options do not affect the JPEG library proper,
++ * but only the sample applications cjpeg/djpeg (see cjpeg.c, djpeg.c).
++ * Other applications can ignore these.
++ */
++
++#ifdef JPEG_CJPEG_DJPEG
++
++/* These defines indicate which image (non-JPEG) file formats are allowed. */
++
++#cmakedefine BMP_SUPPORTED		/* BMP image file format */
++#cmakedefine GIF_SUPPORTED		/* GIF image file format */
++#cmakedefine PPM_SUPPORTED		/* PBMPLUS PPM/PGM image file format */
++#cmakedefine RLE_SUPPORTED		/* Utah RLE image file format */
++#cmakedefine TARGA_SUPPORTED		/* Targa image file format */
++
++/*
++ * This defines the default output format for djpeg. Must be one of the FMT_*
++ * enums found in djpeg.c or djpegalt.c
++ */
++#cmakedefine DEFAULT_FMT @DEFAULT_FMT@
++
++/* Define this if you want to name both input and output files on the command
++ * line, rather than using stdout and optionally stdin.  You MUST do this if
++ * your system can't cope with binary I/O to stdin/stdout.  See comments at
++ * head of cjpeg.c or djpeg.c.
++ */
++#cmakedefine TWO_FILE_COMMANDLINE
++
++/* Define this if your system needs explicit cleanup of temporary files.
++ * This is crucial under MS-DOS, where the temporary "files" may be areas
++ * of extended memory; on most other systems it's not as important.
++ */
++#cmakedefine NEED_SIGNAL_CATCHER
++
++/* By default, we open image files with fopen(...,"rb") or fopen(...,"wb").
++ * This is necessary on systems that distinguish text files from binary files,
++ * and is harmless on most systems that don't.  If you have one of the rare
++ * systems that complains about the "b" spec, define this symbol.
++ */
++#cmakedefine DONT_USE_B_MODE
++
++/* Define this if you want percent-done progress reports from cjpeg/djpeg.
++ */
++#cmakedefine PROGRESS_REPORT
++
++/* Define this if you *don't* want overwrite confirmation */
++#cmakedefine NO_OVERWRITE_CHECK
++
++#endif /* JPEG_CJPEG_DJPEG */
+diff -ruN jpeg-9f/jmorecfg.h jpeg-9f-new/jmorecfg.h
+--- jpeg-9f/jmorecfg.h	2022-03-31 19:41:26.000000000 +1000
++++ jpeg-9f-new/jmorecfg.h	2024-03-23 21:20:25.514814400 +1000
+@@ -244,8 +244,13 @@
+ #define LOCAL(type)		static type
+ /* a function referenced thru EXTERNs: */
+ #define GLOBAL(type)		type
++
+ /* a reference to a GLOBAL function: */
+-#define EXTERN(type)		extern type
++#ifdef COMPILING_LIBJPEG
++#define EXTERN(type)		__declspec(dllexport) extern type
++#else
++#define EXTERN(type)		__declspec(dllimport) extern type
++#endif
+ 
+ 
+ /* This macro is used to declare a "method", that is, a function pointer.
+diff -ruN jpeg-9f/libjpeg.pc.cmakein jpeg-9f-new/libjpeg.pc.cmakein
+--- jpeg-9f/libjpeg.pc.cmakein	1970-01-01 10:00:00.000000000 +1000
++++ jpeg-9f-new/libjpeg.pc.cmakein	2024-03-23 21:06:13.922695100 +1000
+@@ -0,0 +1,10 @@
++prefix=@CMAKE_INSTALL_PREFIX@
++exec_prefix=${prefix}
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
++
++Name: libjpeg
++Description: Reads and writes JPEG files
++Version: @JPEG_LIB_VERSION_MAJOR@.@JPEG_LIB_VERSION_MINOR@.0
++Libs: -L${libdir} -ljpeg
++Cflags: -I${includedir}

.github/workflows/scripts/windows/qtbase-disable-pcre2-jit.patch

@@ -0,0 +1,35 @@
+--- qtbase/src/3rdparty/pcre2/CMakeLists.txt	2024-03-19 08:46:43.000000000 -0700
++++ qtbase/src/3rdparty/pcre2/CMakeLists.txt	2024-06-06 21:52:20.539619500 -0700
+@@ -41,6 +41,7 @@
+         src/pcre2_xclass.c
+     DEFINES
+         HAVE_CONFIG_H
++        PCRE2_DISABLE_JIT
+     PUBLIC_DEFINES
+         PCRE2_CODE_UNIT_WIDTH=16
+     PUBLIC_INCLUDE_DIRECTORIES
+@@ -52,23 +53,8 @@
+ ## Scopes:
+ #####################################################################
+ 
+-qt_internal_extend_target(BundledPcre2 CONDITION QNX OR UIKIT
+-    DEFINES
+-        PCRE2_DISABLE_JIT
+-)
+-
+-qt_internal_extend_target(BundledPcre2 CONDITION (TEST_architecture_arch STREQUAL "arm") AND WIN32
+-    DEFINES
+-        PCRE2_DISABLE_JIT
+-)
+-
+-qt_internal_extend_target(BundledPcre2 CONDITION (TEST_architecture_arch STREQUAL "arm64") AND WIN32
+-    DEFINES
+-        PCRE2_DISABLE_JIT
+-)
+-
+ if (APPLE)
+-    target_compile_options(BundledPcre2 PRIVATE "SHELL:-Xarch_arm64 -DPCRE2_DISABLE_JIT")
++    target_compile_options(BundledPcre2 PRIVATE "SHELL:-Xarch_arm64")
+ endif()
+ 
+ qt_internal_extend_target(BundledPcre2 CONDITION WIN32

.github/workflows/scripts/windows/qtbase-fix-icon-stretch.patch

@@ -0,0 +1,13 @@
+diff --git a/src/plugins/styles/modernwindows/qwindowsvistastyle.cpp b/src/plugins/styles/modernwindows/qwindowsvistastyle.cpp
+index 208420d7e8..26ef6f31ef 100644
+--- a/src/plugins/styles/modernwindows/qwindowsvistastyle.cpp
++++ b/src/plugins/styles/modernwindows/qwindowsvistastyle.cpp
+@@ -4232,8 +4232,6 @@ QRect QWindowsVistaStyle::subElementRect(SubElement element, const QStyleOption
+
+     case SE_ItemViewItemDecoration:
+         rect = QWindowsStyle::subElementRect(element, option, widget);
+-        if (qstyleoption_cast<const QStyleOptionViewItem *>(option))
+-            rect.adjust(-2, 0, 2, 0);
+         break;
+
+     case SE_ItemViewItemFocusRect:

.github/workflows/triage_pr.yml

@@ -8,7 +8,7 @@ jobs:
     if: github.repository == 'PCSX2/pcsx2'
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/labeler@main
+    - uses: actions/labeler@v5
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
 

.github/workflows/windows_build_matrix.yml

@@ -27,6 +27,7 @@ jobs:
     uses: ./.github/workflows/windows_build_qt.yml
     with:
       jobName: "MSVC SSE4"
+      artifactPrefixName: "PCSX2-windows-Qt-x64-sse4-msvc"
       configuration: Release
       simd: "SSE4"
     secrets: inherit
@@ -38,6 +39,7 @@ jobs:
     uses: ./.github/workflows/windows_build_qt.yml
     with:
       jobName: "MSVC AVX2"
+      artifactPrefixName: "PCSX2-windows-Qt-x64-avx2-msvc"
       configuration: Release AVX2
     secrets: inherit
 
@@ -47,6 +49,7 @@ jobs:
     uses: ./.github/workflows/windows_build_qt.yml
     with:
       jobName: "CMake MSVC"
+      artifactPrefixName: "PCSX2-windows-Qt-x64-cmake-msvc"
       configuration: CMake
       buildSystem: cmake
     secrets: inherit
@@ -58,6 +61,7 @@ jobs:
     uses: ./.github/workflows/windows_build_qt.yml
     with:
       jobName: "Clang SSE4"
+      artifactPrefixName: "PCSX2-windows-Qt-x64-sse4-clang"
       configuration: Release Clang
       simd: "SSE4"
     secrets: inherit
@@ -69,6 +73,7 @@ jobs:
     uses: ./.github/workflows/windows_build_qt.yml
     with:
       jobName: "Clang AVX2"
+      artifactPrefixName: "PCSX2-windows-Qt-x64-avx2-clang"
       configuration: Release Clang AVX2
     secrets: inherit
 
@@ -78,6 +83,7 @@ jobs:
     uses: ./.github/workflows/windows_build_qt.yml
     with:
       jobName: "CMake Clang"
+      artifactPrefixName: "PCSX2-windows-Qt-x64-cmake-clang"
       configuration: CMake
       buildSystem: cmake
       cmakeFlags: -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl -DPCSX2_EXE_NAME=pcsx2-qt-clang

.github/workflows/windows_build_qt.yml

@@ -6,6 +6,9 @@ on:
       jobName:
         required: true
         type: string
+      artifactPrefixName:
+        required: true
+        type: string
       os:
         required: false
         type: string
@@ -37,6 +40,10 @@ on:
         required: false
         type: boolean
         default: false
+      stableBuild:
+        required: false
+        type: boolean
+        default: false
 
 jobs:
   build_windows_qt:
@@ -48,24 +55,30 @@ jobs:
       POWERSHELL_TELEMETRY_OPTOUT: 1
 
     steps:
+      - name: Tempfix Clang
+        if: inputs.configuration == 'CMake'
+        run: choco uninstall llvm
+        
       - name: Checkout Repository
         uses: actions/checkout@v4
-        with:
-          submodules: recursive
 
       # actions/checkout elides tags, fetch them primarily for releases
       - name: Fetch Tags
         if: ${{ inputs.fetchTags }}
         run: git fetch --tags --no-recurse-submodules
 
+      - name: Add stable release identifier file
+        if: ${{ inputs.stableBuild == true || inputs.stableBuild == 'true' }}
+        shell: bash
+        run: |
+          echo "#define DEFAULT_UPDATER_CHANNEL \"stable\"" > ./pcsx2-qt/DefaultUpdaterChannel.h
+          cat ./pcsx2-qt/DefaultUpdaterChannel.h
+
       - name: Prepare Artifact Metadata
         id: artifact-metadata
         shell: bash
         env:
-          OS: windows
-          BUILD_SYSTEM: ${{ inputs.buildSystem }}
-          ARCH: ${{ inputs.platform }}
-          SIMD: ${{ inputs.simd }}
+          PREFIX: ${{ inputs.artifactPrefixName }}
           EVENT_NAME: ${{ github.event_name }}
           PR_TITLE: ${{ github.event.pull_request.title }}
           PR_NUM: ${{ github.event.pull_request.number }}
@@ -74,7 +87,7 @@ jobs:
 
       - name: Setup msbuild
         if: inputs.configuration != 'CMake'
-        uses: microsoft/setup-msbuild@v1
+        uses: microsoft/setup-msbuild@v2
 
       - name: Download patches
         shell: cmd
@@ -84,7 +97,7 @@ jobs:
 
       - name: Cache Dependencies
         id: cache-deps
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: deps
           key: ${{ inputs.os }} ${{ inputs.platform }} deps ${{ hashFiles('.github/workflows/scripts/windows/build-dependencies.bat') }}
@@ -119,10 +132,11 @@ jobs:
         shell: cmd
         run: |
           call "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+          set PATH=%PATH%;%GITHUB_WORKSPACE%\bin
           cmake --build build --config Release --target unittests
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ steps.artifact-metadata.outputs.artifact-name }}
           path: |
@@ -136,7 +150,7 @@ jobs:
             !./bin/**/*.lib
 
       - name: Upload artifact - with symbols
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ steps.artifact-metadata.outputs.artifact-name }}-symbols
           path: ./bin/**/*.pdb

.gitignore

@@ -56,6 +56,14 @@ oprofile_data/
 /UpgradeLog*.htm
 /.vscode*
 
+# Jetbrains Rider
+/.idea*
+
+# KDevelop 4 Workspace Configuration Files
+*.kdev4
+/.kdev4*
+
+# Resources and docs in /bin are tracked
 /bin/**/*.dll
 /bin/**/*.dmp
 /bin/**/*.exp
@@ -67,11 +75,13 @@ oprofile_data/
 /bin/bios
 /bin/cache
 /bin/cheats
+/bin/patches
 /bin/covers
 /bin/dumps
 /bin/gamesettings
 /bin/help
 /bin/inis
+/bin/inis/debuggersettings
 /bin/logs
 /bin/memcards
 /bin/plugins
@@ -80,7 +90,25 @@ oprofile_data/
 /bin/textures
 /bin/translations
 /bin/inputprofiles
+/bin/videos
+/bin/portable.ini
+/bin/portable.txt
+
+# Resources and docs copied from /bin
+/bin-arm64
+
+# Manually added by user.
+/bin/resources/patches.zip
+
+# Resources that are runtime downloaded.
+/bin/resources/fonts/NotoSansJP-Regular.ttf
+/bin/resources/fonts/NotoSansKR-Regular.ttf
+/bin/resources/fonts/NotoSansSC-Regular.ttf
+/bin/resources/fonts/NotoSansTC-Regular.ttf
+
+/deps-build
 /deps
+/deps-arm64
 /ipch
 
 !/3rdparty/libjpeg/change.log
@@ -91,3 +119,4 @@ oprofile_data/
 CMakeSettings.json
 /ci-artifacts/
 /out/
+/.cache/

.gitmodules

@@ -1,32 +0,0 @@
-[submodule "3rdparty/xz/xz"]
-	path = 3rdparty/xz/xz
-	url = https://github.com/PCSX2/xz.git
-[submodule "3rdparty/gtest"]
-	path = 3rdparty/gtest
-	url = https://github.com/google/googletest.git
-[submodule "3rdparty/fmt/fmt"]
-	path = 3rdparty/fmt/fmt
-	url = https://github.com/fmtlib/fmt.git
-[submodule "3rdparty/wil"]
-	path = 3rdparty/wil
-	url = https://github.com/microsoft/wil.git
-	branch = master
-[submodule "3rdparty/rapidyaml/rapidyaml"]
-	path = 3rdparty/rapidyaml/rapidyaml
-	url = https://github.com/biojppm/rapidyaml.git
-	branch = master
-[submodule "3rdparty/glslang/glslang"]
-	path = 3rdparty/glslang/glslang
-	url = https://github.com/KhronosGroup/glslang.git
-[submodule "3rdparty/vulkan-headers"]
-	path = 3rdparty/vulkan-headers
-	url = https://github.com/KhronosGroup/Vulkan-Headers.git
-[submodule "3rdparty/zstd/zstd"]
-	path = 3rdparty/zstd/zstd
-	url = https://github.com/facebook/zstd.git
-[submodule "3rdparty/rcheevos/rcheevos"]
-	path = 3rdparty/rcheevos/rcheevos
-	url = https://github.com/RetroAchievements/rcheevos.git
-[submodule "3rdparty/libwebp/libwebp"]
-	path = 3rdparty/libwebp/libwebp
-	url = https://github.com/webmproject/libwebp

3rdparty/3rdparty.props

@@ -16,6 +16,23 @@
       <WarningLevel>TurnOffAllWarnings</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <MinimalRebuild>false</MinimalRebuild>
+      <ConformanceMode>true</ConformanceMode>
+
+      <!-- MSVC automatically adds __AVX__ and __AVX2__ appropriately -->
+      <PreprocessorDefinitions>_M_X86;__SSE4_1__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <EnableEnhancedInstructionSet Condition="!$(Configuration.Contains(AVX2)) Or $(Configuration.Contains(Clang))">NotSet</EnableEnhancedInstructionSet>
+      <EnableEnhancedInstructionSet Condition="$(Configuration.Contains(AVX2)) And !$(Configuration.Contains(Clang))">AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
+      <AdditionalOptions Condition="'$(Platform)'=='x64' And $(Configuration.Contains(Clang)) And !$(Configuration.Contains(AVX2))"> -march=nehalem %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions Condition="'$(Platform)'=='x64' And $(Configuration.Contains(Clang)) And $(Configuration.Contains(AVX2))"> -march=haswell %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions Condition="'$(Platform)'=='ARM64' And $(Configuration.Contains(Clang))"> -march=armv8.4-a %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions Condition="!$(Configuration.Contains(Clang))">%(AdditionalOptions) /Zc:externConstexpr /Zc:__cplusplus /Zo /utf-8</AdditionalOptions>
+
+      <!-- Force ThinLTO for Release builds, MSVC doesn't seem to do it otherwise. -->
+      <!-- Also due to include order, needs to be set here, rather than in CodeGen_Release.props -->
+      <AdditionalOptions Condition="$(Configuration.Contains(Clang)) And $(Configuration.Contains(Release))"> -flto=thin %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
   </ItemDefinitionGroup>
 </Project>

3rdparty/ccc/CMakeLists.txt

@@ -0,0 +1,41 @@
+cmake_minimum_required(VERSION 3.14)
+project(ccc)
+
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+add_library(ccc STATIC
+	src/ccc/ast.cpp
+	src/ccc/ast.h
+	src/ccc/elf.cpp
+	src/ccc/elf.h
+	src/ccc/elf_symtab.cpp
+	src/ccc/elf_symtab.h
+	src/ccc/importer_flags.cpp
+	src/ccc/importer_flags.h
+	src/ccc/mdebug_analysis.cpp
+	src/ccc/mdebug_analysis.h
+	src/ccc/mdebug_importer.cpp
+	src/ccc/mdebug_importer.h
+	src/ccc/mdebug_section.cpp
+	src/ccc/mdebug_section.h
+	src/ccc/mdebug_symbols.cpp
+	src/ccc/mdebug_symbols.h
+	src/ccc/sndll.cpp
+	src/ccc/sndll.h
+	src/ccc/stabs.cpp
+	src/ccc/stabs.h
+	src/ccc/stabs_to_ast.cpp
+	src/ccc/stabs_to_ast.h
+	src/ccc/symbol_database.cpp
+	src/ccc/symbol_database.h
+	src/ccc/symbol_file.cpp
+	src/ccc/symbol_file.h
+	src/ccc/symbol_table.cpp
+	src/ccc/symbol_table.h
+	src/ccc/util.cpp
+	src/ccc/util.h
+)
+
+target_include_directories(ccc PUBLIC src)

3rdparty/ccc/README.md

@@ -0,0 +1,37 @@
+# Chaos Compiler Collection
+
+This code was originally developed in the following repository and was copied
+into PCSX2 by the author:
+
+- [https://github.com/chaoticgd/ccc](https://github.com/chaoticgd/ccc)
+
+It includes additional resources that are not present in the PCSX2 repository.
+
+## Documentation
+
+### DWARF (.debug) Section
+
+- [DWARF Debugging Information Format](https://dwarfstd.org/doc/dwarf_1_1_0.pdf)
+
+### MIPS Debug (.mdebug) Section
+
+- [Third Eye Software and the MIPS symbol table (Peter Rowell)](http://datahedron.com/mips.html)
+- [MIPS Mdebug Debugging Information (David Anderson, 1996)](https://www.prevanders.net/Mdebug.ps)
+- MIPS Assembly Language Programmer's Guide, Symbol Table Chapter (Silicon Graphics, 1992)
+- Tru64 UNIX Object File and Symbol Table Format Specification, Symbol Table Chapter
+- `mdebugread.c` from gdb (reading)
+- `ecoff.c` from gas (writing)
+- `include/coff/sym.h` from binutils (headers)
+
+### MIPS EABI
+
+- [MIPS EABI](https://sourceware.org/legacy-ml/binutils/2003-06/msg00436.html)
+
+### STABS
+
+- [The "stabs" representation of debugging information (Julia Menapace, Jim Kingdon, and David MacKenzie, 1992-???)](https://sourceware.org/gdb/onlinedocs/stabs.html)
+- `stabs.c` from binutils (reading)
+- `stabsread.c` from gdb (reading)
+- `dbxread.c` from gdb (reading)
+- `dbxout.c` from gcc (writing)
+- `stab.def` from gcc (symbol codes)

3rdparty/ccc/ccc.vcxproj

@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(SolutionDir)common\vsprops\BaseProjectConfig.props" />
   <Import Project="$(SolutionDir)common\vsprops\WinSDK.props" />
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{D6973076-9317-4EF2-A0B8-B7A18AC0713E}</ProjectGuid>
+    <ProjectGuid>{2589F8CE-EA77-4B73-911E-64074569795B}</ProjectGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset Condition="!$(Configuration.Contains(Clang))">$(DefaultPlatformToolset)</PlatformToolset>
     <PlatformToolset Condition="$(Configuration.Contains(Clang))">ClangCL</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
+    <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization Condition="$(Configuration.Contains(Release))">true</WholeProgramOptimization>
     <UseDebugLibraries Condition="$(Configuration.Contains(Debug))">true</UseDebugLibraries>
     <UseDebugLibraries Condition="!$(Configuration.Contains(Debug))">false</UseDebugLibraries>
@@ -18,6 +18,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings" />
   <ImportGroup Label="PropertySheets">
+    <Import Project="..\DefaultProjectRootDir.props" />
     <Import Project="..\3rdparty.props" />
     <Import Condition="$(Configuration.Contains(Debug))" Project="..\..\common\vsprops\CodeGen_Debug.props" />
     <Import Condition="$(Configuration.Contains(Devel))" Project="..\..\common\vsprops\CodeGen_Devel.props" />
@@ -28,39 +29,47 @@
   <PropertyGroup>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
+  <ItemGroup>
+    <ClInclude Include="src\ccc\ast.h" />
+    <ClInclude Include="src\ccc\elf.h" />
+    <ClInclude Include="src\ccc\elf_symtab.h" />
+    <ClInclude Include="src\ccc\importer_flags.h" />
+    <ClInclude Include="src\ccc\mdebug_analysis.h" />
+    <ClInclude Include="src\ccc\mdebug_importer.h" />
+    <ClInclude Include="src\ccc\mdebug_section.h" />
+    <ClInclude Include="src\ccc\mdebug_symbols.h" />
+    <ClInclude Include="src\ccc\sndll.h" />
+    <ClInclude Include="src\ccc\stabs.h" />
+    <ClInclude Include="src\ccc\stabs_to_ast.h" />
+    <ClInclude Include="src\ccc\symbol_database.h" />
+    <ClInclude Include="src\ccc\symbol_file.h" />
+    <ClInclude Include="src\ccc\symbol_table.h" />
+    <ClInclude Include="src\ccc\util.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="src\ccc\ast.cpp" />
+    <ClCompile Include="src\ccc\elf.cpp" />
+    <ClCompile Include="src\ccc\elf_symtab.cpp" />
+    <ClCompile Include="src\ccc\importer_flags.cpp" />
+    <ClCompile Include="src\ccc\mdebug_analysis.cpp" />
+    <ClCompile Include="src\ccc\mdebug_importer.cpp" />
+    <ClCompile Include="src\ccc\mdebug_section.cpp" />
+    <ClCompile Include="src\ccc\mdebug_symbols.cpp" />
+    <ClCompile Include="src\ccc\sndll.cpp" />
+    <ClCompile Include="src\ccc\stabs.cpp" />
+    <ClCompile Include="src\ccc\stabs_to_ast.cpp" />
+    <ClCompile Include="src\ccc\symbol_database.cpp" />
+    <ClCompile Include="src\ccc\symbol_file.cpp" />
+    <ClCompile Include="src\ccc\symbol_table.cpp" />
+    <ClCompile Include="src\ccc\util.cpp" />
+  </ItemGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <CompileAs>CompileAsC</CompileAs>
       <WarningLevel>TurnOffAllWarnings</WarningLevel>
-      <PreprocessorDefinitions Condition="'$(Platform)'=='x64'">PNG_INTEL_SSE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)3rdparty\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <LanguageStandard>stdcpp20</LanguageStandard>
     </ClCompile>
   </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="intel\filter_sse2_intrinsics.c" />
-    <ClCompile Include="intel\intel_init.c" />
-    <ClCompile Include="png.c" />
-    <ClCompile Include="pngerror.c" />
-    <ClCompile Include="pngget.c" />
-    <ClCompile Include="pngmem.c" />
-    <ClCompile Include="pngpread.c" />
-    <ClCompile Include="pngread.c" />
-    <ClCompile Include="pngrio.c" />
-    <ClCompile Include="pngrtran.c" />
-    <ClCompile Include="pngrutil.c" />
-    <ClCompile Include="pngset.c" />
-    <ClCompile Include="pngtrans.c" />
-    <ClCompile Include="pngwio.c" />
-    <ClCompile Include="pngwrite.c" />
-    <ClCompile Include="pngwtran.c" />
-    <ClCompile Include="pngwutil.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\zlib\zlib.vcxproj">
-      <Project>{2f6c0388-20cb-4242-9f6c-a6ebb6a83f47}</Project>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets" />
-</Project>
+</Project>

3rdparty/ccc/ccc.vcxproj.filters

@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="src\ccc\ast.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\ccc\elf.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\ccc\elf_symtab.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\ccc\importer_flags.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\ccc\mdebug_analysis.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\ccc\mdebug_importer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\ccc\mdebug_section.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\ccc\mdebug_symbols.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\ccc\sndll.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\ccc\stabs.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\ccc\stabs_to_ast.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\ccc\symbol_database.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\ccc\symbol_file.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\ccc\symbol_table.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\ccc\util.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="src\ccc\ast.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\ccc\elf.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\ccc\elf_symtab.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\ccc\importer_flags.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\ccc\mdebug_analysis.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\ccc\mdebug_importer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\ccc\mdebug_section.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\ccc\mdebug_symbols.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\ccc\sndll.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\ccc\stabs.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\ccc\stabs_to_ast.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\ccc\symbol_database.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\ccc\symbol_file.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\ccc\symbol_table.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\ccc\util.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>

3rdparty/ccc/src/ccc/ast.cpp

@@ -0,0 +1,562 @@
+// This file is part of the Chaos Compiler Collection.
+// SPDX-License-Identifier: MIT
+
+#include "ast.h"
+
+#include "importer_flags.h"
+#include "symbol_database.h"
+
+namespace ccc::ast {
+
+static bool compare_nodes_and_merge(
+	CompareResult& dest, const Node& node_lhs, const Node& node_rhs, const SymbolDatabase* database);
+static bool try_to_match_wobbly_typedefs(
+	const Node& node_lhs, const Node& node_rhs, const SymbolDatabase& database);
+
+void Node::set_access_specifier(AccessSpecifier specifier, u32 importer_flags)
+{
+	if((importer_flags & NO_ACCESS_SPECIFIERS) == 0) {
+		access_specifier = specifier;
+	}
+}
+
+std::pair<Node*, DataType*> Node::physical_type(SymbolDatabase& database, s32 max_depth)
+{
+	Node* type = this;
+	DataType* symbol = nullptr;
+	for(s32 i = 0; i < max_depth && type->descriptor == TYPE_NAME; i++) {
+		DataType* data_type = database.data_types.symbol_from_handle(type->as<TypeName>().data_type_handle);
+		if (!data_type || !data_type->type()) {
+			break;
+		}
+		
+		type = data_type->type();
+		symbol = data_type;
+	}
+	
+	return std::pair(type, symbol);
+}
+
+std::pair<const Node*, const DataType*> Node::physical_type(const SymbolDatabase& database, s32 max_depth) const
+{
+	return const_cast<Node*>(this)->physical_type(const_cast<SymbolDatabase&>(database), max_depth);
+}
+
+const char* member_function_modifier_to_string(MemberFunctionModifier modifier)
+{
+	switch(modifier) {
+		case MemberFunctionModifier::NONE: return "none";
+		case MemberFunctionModifier::STATIC: return "static";
+		case MemberFunctionModifier::VIRTUAL: return "virtual";
+	}
+	return "";
+}
+
+bool StructOrUnion::flatten_fields(
+	std::vector<FlatField>& output,
+	const DataType* symbol,
+	const SymbolDatabase& database,
+	bool skip_statics,
+	s32 base_offset,
+	s32 max_fields,
+	s32 max_depth) const
+{
+	if(max_depth == 0) {
+		return false;
+	}
+	
+	for(const std::unique_ptr<Node>& type_name : base_classes) {
+		if(type_name->descriptor != TYPE_NAME) {
+			continue;
+		}
+		
+		s32 new_base_offset = base_offset + type_name->offset_bytes;
+		
+		DataTypeHandle handle = type_name->as<TypeName>().data_type_handle;
+		const DataType* base_class_symbol = database.data_types.symbol_from_handle(handle);
+		if(!base_class_symbol || !base_class_symbol->type() || base_class_symbol->type()->descriptor != STRUCT_OR_UNION) {
+			continue;
+		}
+		
+		const StructOrUnion& base_class = base_class_symbol->type()->as<StructOrUnion>();
+		if(!base_class.flatten_fields(output, base_class_symbol, database, skip_statics, new_base_offset, max_fields, max_depth - 1)) {
+			return false;
+		}
+	}
+	
+	for(const std::unique_ptr<Node>& field : fields) {
+		if(skip_statics && field->storage_class == STORAGE_CLASS_STATIC) {
+			continue;
+		}
+		
+		if((s32) output.size() >= max_fields) {
+			return false;
+		}
+		
+		FlatField& flat = output.emplace_back();
+		flat.node = field.get();
+		flat.symbol = symbol;
+		flat.base_offset = base_offset;
+	}
+	
+	return true;
+}
+
+const char* type_name_source_to_string(TypeNameSource source)
+{
+	switch(source) {
+		case TypeNameSource::REFERENCE: return "reference";
+		case TypeNameSource::CROSS_REFERENCE: return "cross_reference";
+		case TypeNameSource::UNNAMED_THIS: return "this";
+	}
+	return "";
+}
+
+const char* forward_declared_type_to_string(ForwardDeclaredType type)
+{
+	switch(type) {
+		case ForwardDeclaredType::STRUCT: return "struct";
+		case ForwardDeclaredType::UNION: return "union";
+		case ForwardDeclaredType::ENUM: return "enum";
+	}
+	return "";
+}
+
+DataTypeHandle TypeName::data_type_handle_unless_forward_declared() const
+{
+	if(!is_forward_declared) {
+		return data_type_handle;
+	} else {
+		return DataTypeHandle();
+	}
+}
+
+CompareResult compare_nodes(
+	const Node& node_lhs, const Node& node_rhs, const SymbolDatabase* database, bool check_intrusive_fields)
+{
+	CompareResult result = CompareResultType::MATCHES_NO_SWAP;
+	
+	if(node_lhs.descriptor != node_rhs.descriptor) {
+		return CompareFailReason::DESCRIPTOR;
+	}
+	
+	if(check_intrusive_fields) {
+		if(node_lhs.storage_class != node_rhs.storage_class) {
+			// In some cases we can determine that a type was typedef'd for C
+			// translation units, but not for C++ translation units, so we need
+			// to add a special case for that here.
+			if(node_lhs.storage_class == STORAGE_CLASS_TYPEDEF && node_rhs.storage_class == STORAGE_CLASS_NONE) {
+				result = CompareResultType::MATCHES_FAVOUR_LHS;
+			} else if(node_lhs.storage_class == STORAGE_CLASS_NONE && node_rhs.storage_class == STORAGE_CLASS_TYPEDEF) {
+				result = CompareResultType::MATCHES_FAVOUR_RHS;
+			} else {
+				return CompareFailReason::STORAGE_CLASS;
+			}
+		}
+		
+		// Vtable pointers and constructors can sometimes contain type numbers
+		// that are different between translation units, so we don't want to
+		// compare them.
+		bool is_vtable_pointer = node_lhs.is_vtable_pointer && node_rhs.is_vtable_pointer;
+		bool is_numbered_constructor = node_lhs.name.starts_with("$_") && node_rhs.name.starts_with("$_");
+		if(node_lhs.name != node_rhs.name && !is_vtable_pointer && !is_numbered_constructor) {
+			return CompareFailReason::NAME;
+		}
+		
+		if(node_lhs.offset_bytes != node_rhs.offset_bytes) {
+			return CompareFailReason::RELATIVE_OFFSET_BYTES;
+		}
+		
+		if(node_lhs.size_bits != node_rhs.size_bits) {
+			return CompareFailReason::SIZE_BITS;
+		}
+		
+		if(node_lhs.is_const != node_rhs.is_const) {
+			return CompareFailReason::CONSTNESS;
+		}
+	}
+	
+	switch(node_lhs.descriptor) {
+		case ARRAY: {
+			const auto [lhs, rhs] = Node::as<Array>(node_lhs, node_rhs);
+			
+			if(compare_nodes_and_merge(result, *lhs.element_type.get(), *rhs.element_type.get(), database)) {
+				return result;
+			}
+			
+			if(lhs.element_count != rhs.element_count) {
+				return CompareFailReason::ARRAY_ELEMENT_COUNT;
+			}
+			
+			break;
+		}
+		case BITFIELD: {
+			const auto [lhs, rhs] = Node::as<BitField>(node_lhs, node_rhs);
+			
+			if(lhs.bitfield_offset_bits != rhs.bitfield_offset_bits) {
+				return CompareFailReason::BITFIELD_OFFSET_BITS;
+			}
+			
+			if(compare_nodes_and_merge(result, *lhs.underlying_type.get(), *rhs.underlying_type.get(), database)) {
+				return result;
+			}
+			
+			break;
+		}
+		case BUILTIN: {
+			const auto [lhs, rhs] = Node::as<BuiltIn>(node_lhs, node_rhs);
+			
+			if(lhs.bclass != rhs.bclass) {
+				return CompareFailReason::BUILTIN_CLASS;
+			}
+			
+			break;
+		}
+		case ENUM: {
+			const auto [lhs, rhs] = Node::as<Enum>(node_lhs, node_rhs);
+			
+			if(lhs.constants != rhs.constants) {
+				return CompareFailReason::ENUM_CONSTANTS;
+			}
+			
+			break;
+		}
+		case ERROR_NODE: {
+			break;
+		}
+		case FUNCTION: {
+			const auto [lhs, rhs] = Node::as<Function>(node_lhs, node_rhs);
+			
+			if(lhs.return_type.has_value() != rhs.return_type.has_value()) {
+				return CompareFailReason::FUNCTION_RETURN_TYPE_HAS_VALUE;
+			}
+			
+			if(lhs.return_type.has_value()) {
+				if(compare_nodes_and_merge(result, *lhs.return_type->get(), *rhs.return_type->get(), database)) {
+					return result;
+				}
+			}
+			
+			if(lhs.parameters.has_value() && rhs.parameters.has_value()) {
+				if(lhs.parameters->size() != rhs.parameters->size()) {
+					return CompareFailReason::FUNCTION_PARAMAETER_COUNT;
+				}
+				for(size_t i = 0; i < lhs.parameters->size(); i++) {
+					if(compare_nodes_and_merge(result, *(*lhs.parameters)[i].get(), *(*rhs.parameters)[i].get(), database)) {
+						return result;
+					}
+				}
+			} else if(lhs.parameters.has_value() != rhs.parameters.has_value()) {
+				return CompareFailReason::FUNCTION_PARAMETERS_HAS_VALUE;
+			}
+			
+			if(lhs.modifier != rhs.modifier) {
+				return CompareFailReason::FUNCTION_MODIFIER;
+			}
+			
+			break;
+		}
+		case POINTER_OR_REFERENCE: {
+			const auto [lhs, rhs] = Node::as<PointerOrReference>(node_lhs, node_rhs);
+			
+			if(lhs.is_pointer != rhs.is_pointer) {
+				return CompareFailReason::DESCRIPTOR;
+			}
+			
+			if(compare_nodes_and_merge(result, *lhs.value_type.get(), *rhs.value_type.get(), database)) {
+				return result;
+			}
+			
+			break;
+		}
+		case POINTER_TO_DATA_MEMBER: {
+			const auto [lhs, rhs] = Node::as<PointerToDataMember>(node_lhs, node_rhs);
+			
+			if(compare_nodes_and_merge(result, *lhs.class_type.get(), *rhs.class_type.get(), database)) {
+				return result;
+			}
+			
+			if(compare_nodes_and_merge(result, *lhs.member_type.get(), *rhs.member_type.get(), database)) {
+				return result;
+			}
+			
+			break;
+		}
+		case STRUCT_OR_UNION: {
+			const auto [lhs, rhs] = Node::as<StructOrUnion>(node_lhs, node_rhs);
+			
+			if(lhs.is_struct != rhs.is_struct) {
+				return CompareFailReason::DESCRIPTOR;
+			}
+			
+			if(lhs.base_classes.size() != rhs.base_classes.size()) {
+				return CompareFailReason::BASE_CLASS_COUNT;
+			}
+			
+			for(size_t i = 0; i < lhs.base_classes.size(); i++) {
+				if(compare_nodes_and_merge(result, *lhs.base_classes[i].get(), *rhs.base_classes[i].get(), database)) {
+					return result;
+				}
+			}
+			
+			if(lhs.fields.size() != rhs.fields.size()) {
+				return CompareFailReason::FIELDS_SIZE;
+			}
+			
+			for(size_t i = 0; i < lhs.fields.size(); i++) {
+				if(compare_nodes_and_merge(result, *lhs.fields[i].get(), *rhs.fields[i].get(), database)) {
+					return result;
+				}
+			}
+			
+			if(lhs.member_functions.size() != rhs.member_functions.size()) {
+				return CompareFailReason::MEMBER_FUNCTION_COUNT;
+			}
+			
+			for(size_t i = 0; i < lhs.member_functions.size(); i++) {
+				if(compare_nodes_and_merge(result, *lhs.member_functions[i].get(), *rhs.member_functions[i].get(), database)) {
+					return result;
+				}
+			}
+			
+			break;
+		}
+		case TYPE_NAME: {
+			const auto [lhs, rhs] = Node::as<TypeName>(node_lhs, node_rhs);
+			
+			// Don't check the source so that REFERENCE and CROSS_REFERENCE are
+			// treated as the same.
+			if(lhs.data_type_handle != rhs.data_type_handle) {
+				return CompareFailReason::TYPE_NAME;
+			}
+			
+			const TypeName::UnresolvedStabs* lhs_unresolved_stabs = lhs.unresolved_stabs.get();
+			const TypeName::UnresolvedStabs* rhs_unresolved_stabs = rhs.unresolved_stabs.get();
+			if(lhs_unresolved_stabs && rhs_unresolved_stabs) {
+				if(lhs_unresolved_stabs->type_name != rhs_unresolved_stabs->type_name) {
+					return CompareFailReason::TYPE_NAME;
+				}
+			} else if(lhs_unresolved_stabs || rhs_unresolved_stabs) {
+				return CompareFailReason::TYPE_NAME;
+			}
+			
+			break;
+		}
+	}
+	return result;
+}
+
+static bool compare_nodes_and_merge(
+	CompareResult& dest, const Node& node_lhs, const Node& node_rhs, const SymbolDatabase* database)
+{
+	CompareResult result = compare_nodes(node_lhs, node_rhs, database, true);
+	if(database) {
+		if(result.type == CompareResultType::DIFFERS && try_to_match_wobbly_typedefs(node_lhs, node_rhs, *database)) {
+			result.type = CompareResultType::MATCHES_FAVOUR_LHS;
+		} else if(result.type == CompareResultType::DIFFERS && try_to_match_wobbly_typedefs(node_rhs, node_lhs, *database)) {
+			result.type = CompareResultType::MATCHES_FAVOUR_RHS;
+		}
+	}
+	
+	if(dest.type != result.type) {
+		if(dest.type == CompareResultType::DIFFERS || result.type == CompareResultType::DIFFERS) {
+			// If any of the inner types differ, the outer type does too.
+			dest.type = CompareResultType::DIFFERS;
+		} else if(dest.type == CompareResultType::MATCHES_CONFUSED || result.type == CompareResultType::MATCHES_CONFUSED) {
+			// Propagate confusion.
+			dest.type = CompareResultType::MATCHES_CONFUSED; 
+		} else if(dest.type == CompareResultType::MATCHES_FAVOUR_LHS && result.type == CompareResultType::MATCHES_FAVOUR_RHS) {
+			// One of the results favours the LHS node and the other favours the
+			// RHS node so we are confused.
+			dest.type = CompareResultType::MATCHES_CONFUSED; 
+		} else if(dest.type == CompareResultType::MATCHES_FAVOUR_RHS && result.type == CompareResultType::MATCHES_FAVOUR_LHS) {
+			// One of the results favours the LHS node and the other favours the
+			// RHS node so we are confused.
+			dest.type = CompareResultType::MATCHES_CONFUSED; 
+		} else if(dest.type == CompareResultType::MATCHES_FAVOUR_LHS || result.type == CompareResultType::MATCHES_FAVOUR_LHS) {
+			// One of the results favours the LHS node and the other is neutral
+			// so go with the LHS node.
+			dest.type = CompareResultType::MATCHES_FAVOUR_LHS;
+		} else if(dest.type == CompareResultType::MATCHES_FAVOUR_RHS || result.type == CompareResultType::MATCHES_FAVOUR_RHS) {
+			// One of the results favours the RHS node and the other is neutral
+			// so go with the RHS node.
+			dest.type = CompareResultType::MATCHES_FAVOUR_RHS;
+		}
+	}
+	
+	if(dest.fail_reason == CompareFailReason::NONE) {
+		dest.fail_reason = result.fail_reason;
+	}
+	
+	return dest.type == CompareResultType::DIFFERS;
+}
+
+static bool try_to_match_wobbly_typedefs(
+	const Node& type_name_node, const Node& raw_node, const SymbolDatabase& database)
+{
+	// Detect if one side has a typedef when the other just has the plain type.
+	// This was previously a common reason why type deduplication would fail.
+	if(type_name_node.descriptor != TYPE_NAME) {
+		return false;
+	}
+	
+	const TypeName& type_name = type_name_node.as<TypeName>();
+	if(const TypeName::UnresolvedStabs* unresolved_stabs = type_name.unresolved_stabs.get()) {
+		if(unresolved_stabs->referenced_file_handle == (u32) -1 || !unresolved_stabs->stabs_type_number.valid()) {
+			return false;
+		}
+		
+		const SourceFile* source_file =
+			database.source_files.symbol_from_handle(unresolved_stabs->referenced_file_handle);
+		CCC_ASSERT(source_file);
+		
+		auto handle = source_file->stabs_type_number_to_handle.find(unresolved_stabs->stabs_type_number);
+		if(handle != source_file->stabs_type_number_to_handle.end()) {
+			const DataType* referenced_type = database.data_types.symbol_from_handle(handle->second);
+			CCC_ASSERT(referenced_type && referenced_type->type());
+			// Don't compare 'intrusive' fields e.g. the offset.
+			CompareResult new_result = compare_nodes(*referenced_type->type(), raw_node, &database, false);
+			if(new_result.type != CompareResultType::DIFFERS) {
+				return true;
+			}
+		}
+	}
+	
+	return false;
+}
+
+const char* compare_fail_reason_to_string(CompareFailReason reason)
+{
+	switch(reason) {
+		case CompareFailReason::NONE: return "error";
+		case CompareFailReason::DESCRIPTOR: return "descriptor";
+		case CompareFailReason::STORAGE_CLASS: return "storage class";
+		case CompareFailReason::NAME: return "name";
+		case CompareFailReason::RELATIVE_OFFSET_BYTES: return "relative offset";
+		case CompareFailReason::ABSOLUTE_OFFSET_BYTES: return "absolute offset";
+		case CompareFailReason::BITFIELD_OFFSET_BITS: return "bitfield offset";
+		case CompareFailReason::SIZE_BITS: return "size";
+		case CompareFailReason::CONSTNESS: return "constness";
+		case CompareFailReason::ARRAY_ELEMENT_COUNT: return "array element count";
+		case CompareFailReason::BUILTIN_CLASS: return "builtin class";
+		case CompareFailReason::FUNCTION_RETURN_TYPE_HAS_VALUE: return "function return type has value";
+		case CompareFailReason::FUNCTION_PARAMAETER_COUNT: return "function paramaeter count";
+		case CompareFailReason::FUNCTION_PARAMETERS_HAS_VALUE: return "function parameter";
+		case CompareFailReason::FUNCTION_MODIFIER: return "function modifier";
+		case CompareFailReason::ENUM_CONSTANTS: return "enum constant";
+		case CompareFailReason::BASE_CLASS_COUNT: return "base class count";
+		case CompareFailReason::FIELDS_SIZE: return "fields size";
+		case CompareFailReason::MEMBER_FUNCTION_COUNT: return "member function count";
+		case CompareFailReason::VTABLE_GLOBAL: return "vtable global";
+		case CompareFailReason::TYPE_NAME: return "type name";
+		case CompareFailReason::VARIABLE_CLASS: return "variable class";
+		case CompareFailReason::VARIABLE_TYPE: return "variable type";
+		case CompareFailReason::VARIABLE_STORAGE: return "variable storage";
+		case CompareFailReason::VARIABLE_BLOCK: return "variable block";
+	}
+	return "";
+}
+
+const char* node_type_to_string(const Node& node)
+{
+	switch(node.descriptor) {
+		case ARRAY: return "array";
+		case BITFIELD: return "bitfield";
+		case BUILTIN: return "builtin";
+		case ENUM: return "enum";
+		case ERROR_NODE: return "error";
+		case FUNCTION: return "function";
+		case POINTER_OR_REFERENCE: {
+			const PointerOrReference& pointer_or_reference = node.as<PointerOrReference>();
+			if(pointer_or_reference.is_pointer) {
+				return "pointer";
+			} else {
+				return "reference";
+			}
+		}
+		case POINTER_TO_DATA_MEMBER: return "pointer_to_data_member";
+		case STRUCT_OR_UNION: {
+			const StructOrUnion& struct_or_union = node.as<StructOrUnion>();
+			if(struct_or_union.is_struct) {
+				return "struct";
+			} else {
+				return "union";
+			}
+		}
+		case TYPE_NAME: return "type_name";
+	}
+	return "";
+}
+
+const char* storage_class_to_string(StorageClass storage_class)
+{
+	switch(storage_class) {
+		case STORAGE_CLASS_NONE: return "none";
+		case STORAGE_CLASS_TYPEDEF: return "typedef";
+		case STORAGE_CLASS_EXTERN: return "extern";
+		case STORAGE_CLASS_STATIC: return "static";
+		case STORAGE_CLASS_AUTO: return "auto";
+		case STORAGE_CLASS_REGISTER: return "register";
+	}
+	return "";
+}
+
+const char* access_specifier_to_string(AccessSpecifier specifier)
+{
+	switch(specifier) {
+		case AS_PUBLIC: return "public";
+		case AS_PROTECTED: return "protected";
+		case AS_PRIVATE: return "private";
+	}
+	return "";
+}
+
+const char* builtin_class_to_string(BuiltInClass bclass)
+{
+	switch(bclass) {
+		case BuiltInClass::VOID_TYPE: return "void";
+		case BuiltInClass::UNSIGNED_8: return "8-bit unsigned integer";
+		case BuiltInClass::SIGNED_8: return "8-bit signed integer";
+		case BuiltInClass::UNQUALIFIED_8: return "8-bit integer";
+		case BuiltInClass::BOOL_8: return "8-bit boolean";
+		case BuiltInClass::UNSIGNED_16: return "16-bit unsigned integer";
+		case BuiltInClass::SIGNED_16: return "16-bit signed integer";
+		case BuiltInClass::UNSIGNED_32: return "32-bit unsigned integer";
+		case BuiltInClass::SIGNED_32: return "32-bit signed integer";
+		case BuiltInClass::FLOAT_32: return "32-bit floating point";
+		case BuiltInClass::UNSIGNED_64: return "64-bit unsigned integer";
+		case BuiltInClass::SIGNED_64: return "64-bit signed integer";
+		case BuiltInClass::FLOAT_64: return "64-bit floating point";
+		case BuiltInClass::UNSIGNED_128: return "128-bit unsigned integer";
+		case BuiltInClass::SIGNED_128: return "128-bit signed integer";
+		case BuiltInClass::UNQUALIFIED_128: return "128-bit integer";
+		case BuiltInClass::FLOAT_128: return "128-bit floating point";
+	}
+	return "";
+}
+
+s32 builtin_class_size(BuiltInClass bclass)
+{
+	switch(bclass) {
+		case BuiltInClass::VOID_TYPE: return 0;
+		case BuiltInClass::UNSIGNED_8: return 1;
+		case BuiltInClass::SIGNED_8: return 1;
+		case BuiltInClass::UNQUALIFIED_8: return 1;
+		case BuiltInClass::BOOL_8: return 1;
+		case BuiltInClass::UNSIGNED_16: return 2;
+		case BuiltInClass::SIGNED_16: return 2;
+		case BuiltInClass::UNSIGNED_32: return 4;
+		case BuiltInClass::SIGNED_32: return 4;
+		case BuiltInClass::FLOAT_32: return 4;
+		case BuiltInClass::UNSIGNED_64: return 8;
+		case BuiltInClass::SIGNED_64: return 8;
+		case BuiltInClass::FLOAT_64: return 8;
+		case BuiltInClass::UNSIGNED_128: return 16;
+		case BuiltInClass::SIGNED_128: return 16;
+		case BuiltInClass::UNQUALIFIED_128: return 16;
+		case BuiltInClass::FLOAT_128: return 16;
+	}
+	return 0;
+}
+
+}

3rdparty/ccc/src/ccc/ast.h

@@ -0,0 +1,377 @@
+// This file is part of the Chaos Compiler Collection.
+// SPDX-License-Identifier: MIT
+
+#pragma once
+
+#include "symbol_database.h"
+
+namespace ccc::ast {
+
+enum NodeDescriptor : u8 {
+	ARRAY,
+	BITFIELD,
+	BUILTIN,
+	ENUM,
+	ERROR_NODE,
+	FUNCTION,
+	POINTER_OR_REFERENCE,
+	POINTER_TO_DATA_MEMBER,
+	STRUCT_OR_UNION,
+	TYPE_NAME
+};
+
+enum AccessSpecifier {
+	AS_PUBLIC = 0,
+	AS_PROTECTED = 1,
+	AS_PRIVATE = 2
+};
+
+// To add a new type of node:
+//  1. Add it to the NodeDescriptor enum.
+//  2. Create a struct for it.
+//  3. Add support for it in for_each_node.
+//  4. Add support for it in compute_size_bytes_recursive.
+//  5. Add support for it in compare_nodes.
+//  6. Add support for it in node_type_to_string.
+//  7. Add support for it in CppPrinter::ast_node.
+//  8. Add support for it in write_json.
+//  9. Add support for it in refine_node.
+struct Node {
+	const NodeDescriptor descriptor;
+	u8 is_const : 1 = false;
+	u8 is_volatile : 1 = false;
+	u8 is_virtual_base_class : 1 = false;
+	u8 is_vtable_pointer : 1 = false;
+	u8 is_constructor_or_destructor : 1 = false;
+	u8 is_special_member_function : 1 = false;
+	u8 is_operator_member_function : 1 = false;
+	u8 cannot_compute_size : 1 = false;
+	u8 storage_class : 4 = STORAGE_CLASS_NONE;
+	u8 access_specifier : 2 = AS_PUBLIC;
+	
+	s32 size_bytes = -1;
+	
+	// If the name isn't populated for a given node, the name from the last
+	// ancestor to have one should be used i.e. when processing the tree you
+	// should pass the name down.
+	std::string name;
+	
+	s32 offset_bytes = -1; // Offset relative to start of last inline struct/union.
+	s32 size_bits = -1; // Size stored in the .mdebug symbol table, may not be set.
+	
+	Node(NodeDescriptor d) : descriptor(d) {}
+	Node(const Node& rhs) = default;
+	virtual ~Node() {}
+	
+	template <typename SubType>
+	SubType& as() {
+		CCC_ASSERT(descriptor == SubType::DESCRIPTOR);
+		return *static_cast<SubType*>(this);
+	}
+	
+	template <typename SubType>
+	const SubType& as() const {
+		CCC_ASSERT(descriptor == SubType::DESCRIPTOR);
+		return *static_cast<const SubType*>(this);
+	}
+	
+	template <typename SubType>
+	static std::pair<const SubType&, const SubType&> as(const Node& lhs, const Node& rhs) {
+		CCC_ASSERT(lhs.descriptor == SubType::DESCRIPTOR && rhs.descriptor == SubType::DESCRIPTOR);
+		return std::pair<const SubType&, const SubType&>(static_cast<const SubType&>(lhs), static_cast<const SubType&>(rhs));
+	}
+	
+	void set_access_specifier(AccessSpecifier specifier, u32 importer_flags);
+	
+	// If this node is a type name, repeatedly resolve it to the type it's
+	// referencing, otherwise return (this, nullptr).
+	std::pair<Node*, DataType*> physical_type(SymbolDatabase& database, s32 max_depth = 100);
+	std::pair<const Node*, const DataType*> physical_type(const SymbolDatabase& database, s32 max_depth = 100) const;
+};
+
+struct Array : Node {
+	std::unique_ptr<Node> element_type;
+	s32 element_count = -1;
+	
+	Array() : Node(DESCRIPTOR) {}
+	static const constexpr NodeDescriptor DESCRIPTOR = ARRAY;
+};
+
+struct BitField : Node {
+	s32 bitfield_offset_bits = -1; // Offset relative to the last byte (not the position of the underlying type!).
+	std::unique_ptr<Node> underlying_type;
+	
+	BitField() : Node(DESCRIPTOR) {}
+	static const constexpr NodeDescriptor DESCRIPTOR = BITFIELD;
+};
+
+enum class BuiltInClass {
+	VOID_TYPE,
+	UNSIGNED_8, SIGNED_8, UNQUALIFIED_8, BOOL_8,
+	UNSIGNED_16, SIGNED_16,
+	UNSIGNED_32, SIGNED_32, FLOAT_32,
+	UNSIGNED_64, SIGNED_64, FLOAT_64,
+	UNSIGNED_128, SIGNED_128, UNQUALIFIED_128, FLOAT_128
+};
+
+struct BuiltIn : Node {
+	BuiltInClass bclass = BuiltInClass::VOID_TYPE;
+	
+	BuiltIn() : Node(DESCRIPTOR) {}
+	static const constexpr NodeDescriptor DESCRIPTOR = BUILTIN;
+};
+
+struct Enum : Node {
+	std::vector<std::pair<s32, std::string>> constants;
+	
+	Enum() : Node(DESCRIPTOR) {}
+	static const constexpr NodeDescriptor DESCRIPTOR = ENUM;
+};
+
+struct Error : Node {
+	std::string message;
+	
+	Error() : Node(ERROR_NODE) {}
+	static const constexpr NodeDescriptor DESCRIPTOR = ERROR_NODE;
+};
+
+enum class MemberFunctionModifier {
+	NONE,
+	STATIC,
+	VIRTUAL
+};
+
+const char* member_function_modifier_to_string(MemberFunctionModifier modifier);
+
+struct Function : Node {
+	std::optional<std::unique_ptr<Node>> return_type;
+	std::optional<std::vector<std::unique_ptr<Node>>> parameters;
+	MemberFunctionModifier modifier = MemberFunctionModifier::NONE;
+	s32 vtable_index = -1;
+	FunctionHandle definition_handle; // Filled in by fill_in_pointers_to_member_function_definitions.
+	
+	Function() : Node(DESCRIPTOR) {}
+	static const constexpr NodeDescriptor DESCRIPTOR = FUNCTION;
+};
+
+struct PointerOrReference : Node {
+	bool is_pointer = true;
+	std::unique_ptr<Node> value_type;
+	
+	PointerOrReference() : Node(DESCRIPTOR) {}
+	static const constexpr NodeDescriptor DESCRIPTOR = POINTER_OR_REFERENCE;
+};
+
+struct PointerToDataMember : Node {
+	std::unique_ptr<Node> class_type;
+	std::unique_ptr<Node> member_type;
+	
+	PointerToDataMember() : Node(DESCRIPTOR) {}
+	static const constexpr NodeDescriptor DESCRIPTOR = POINTER_TO_DATA_MEMBER;
+};
+
+struct StructOrUnion : Node {
+	bool is_struct = true;
+	std::vector<std::unique_ptr<Node>> base_classes;
+	std::vector<std::unique_ptr<Node>> fields;
+	std::vector<std::unique_ptr<Node>> member_functions;
+	
+	StructOrUnion() : Node(DESCRIPTOR) {}
+	static const constexpr NodeDescriptor DESCRIPTOR = STRUCT_OR_UNION;
+	
+	struct FlatField {
+		// The field itself.
+		const Node* node;
+		// The symbol that owns the node.
+		const DataType* symbol;
+		// Offset of the innermost enclosing base class in the object.
+		s32 base_offset = 0;
+	};
+	
+	// Generate a flat list of all the fields in this class as well as all the
+	// base classes recursively, but only until the max_fields or max_depth
+	// limits are reached. Return true if all the fields were enumerated.
+	bool flatten_fields(
+		std::vector<FlatField>& output,
+		const DataType* symbol,
+		const SymbolDatabase& database,
+		bool skip_statics,
+		s32 base_offset = 0,
+		s32 max_fields = 100000,
+		s32 max_depth = 100) const;
+};
+
+enum class TypeNameSource : u8 {
+	REFERENCE, // A STABS type reference.
+	CROSS_REFERENCE, // A STABS cross reference.
+	UNNAMED_THIS // A this parameter (or return type) referencing an unnamed type.
+};
+
+const char* type_name_source_to_string(TypeNameSource source);
+
+enum class ForwardDeclaredType {
+	STRUCT,
+	UNION,
+	ENUM // Should be illegal but STABS supports cross references to enums so it's here.
+};
+
+const char* forward_declared_type_to_string(ForwardDeclaredType type);
+
+struct TypeName : Node {
+	DataTypeHandle data_type_handle;
+	TypeNameSource source = TypeNameSource::REFERENCE;
+	bool is_forward_declared = false;
+	
+	DataTypeHandle data_type_handle_unless_forward_declared() const;
+	
+	struct UnresolvedStabs {
+		std::string type_name;
+		SourceFileHandle referenced_file_handle;
+		StabsTypeNumber stabs_type_number;
+		std::optional<ForwardDeclaredType> type;
+	};
+	
+	std::unique_ptr<UnresolvedStabs> unresolved_stabs;
+	
+	TypeName() : Node(DESCRIPTOR) {}
+	static const constexpr NodeDescriptor DESCRIPTOR = TYPE_NAME;
+};
+
+enum class CompareResultType {
+	MATCHES_NO_SWAP,    // Both lhs and rhs are identical.
+	MATCHES_CONFUSED,   // Both lhs and rhs are almost identical, and we don't which is better.
+	MATCHES_FAVOUR_LHS, // Both lhs and rhs are almost identical, but lhs is better.
+	MATCHES_FAVOUR_RHS, // Both lhs and rhs are almost identical, but rhs is better.
+	DIFFERS,            // The two nodes differ substantially.
+};
+
+enum class CompareFailReason {
+	NONE,
+	DESCRIPTOR,
+	STORAGE_CLASS,
+	NAME,
+	RELATIVE_OFFSET_BYTES,
+	ABSOLUTE_OFFSET_BYTES,
+	BITFIELD_OFFSET_BITS,
+	SIZE_BITS,
+	CONSTNESS,
+	ARRAY_ELEMENT_COUNT,
+	BUILTIN_CLASS,
+	FUNCTION_RETURN_TYPE_HAS_VALUE,
+	FUNCTION_PARAMAETER_COUNT,
+	FUNCTION_PARAMETERS_HAS_VALUE,
+	FUNCTION_MODIFIER,
+	ENUM_CONSTANTS,
+	BASE_CLASS_COUNT,
+	FIELDS_SIZE,
+	MEMBER_FUNCTION_COUNT,
+	VTABLE_GLOBAL,
+	TYPE_NAME,
+	VARIABLE_CLASS,
+	VARIABLE_TYPE,
+	VARIABLE_STORAGE,
+	VARIABLE_BLOCK
+};
+
+struct CompareResult {
+	CompareResult(CompareResultType type) : type(type), fail_reason(CompareFailReason::NONE) {}
+	CompareResult(CompareFailReason reason) : type(CompareResultType::DIFFERS), fail_reason(reason) {}
+	CompareResultType type;
+	CompareFailReason fail_reason;
+};
+
+// Compare two AST nodes and their children recursively. This will only check
+// fields that will be equal for two versions of the same type from different
+// translation units.
+CompareResult compare_nodes(const Node& lhs, const Node& rhs, const SymbolDatabase* database, bool check_intrusive_fields);
+
+const char* compare_fail_reason_to_string(CompareFailReason reason);
+const char* node_type_to_string(const Node& node);
+const char* storage_class_to_string(StorageClass storage_class);
+const char* access_specifier_to_string(AccessSpecifier specifier);
+const char* builtin_class_to_string(BuiltInClass bclass);
+
+s32 builtin_class_size(BuiltInClass bclass);
+
+enum TraversalOrder {
+	PREORDER_TRAVERSAL,
+	POSTORDER_TRAVERSAL
+};
+
+enum ExplorationMode {
+	EXPLORE_CHILDREN,
+	DONT_EXPLORE_CHILDREN
+};
+
+template <typename ThisNode, typename Callback>
+void for_each_node(ThisNode& node, TraversalOrder order, Callback callback)
+{
+	if(order == PREORDER_TRAVERSAL && callback(node) == DONT_EXPLORE_CHILDREN) {
+		return;
+	}
+	switch(node.descriptor) {
+		case ARRAY: {
+			auto& array = node.template as<Array>();
+			for_each_node(*array.element_type.get(), order, callback);
+			break;
+		}
+		case BITFIELD: {
+			auto& bitfield = node.template as<BitField>();
+			for_each_node(*bitfield.underlying_type.get(), order, callback);
+			break;
+		}
+		case BUILTIN: {
+			break;
+		}
+		case ENUM: {
+			break;
+		}
+		case ERROR_NODE: {
+			break;
+		}
+		case FUNCTION: {
+			auto& func = node.template as<Function>();
+			if(func.return_type.has_value()) {
+				for_each_node(*func.return_type->get(), order, callback);
+			}
+			if(func.parameters.has_value()) {
+				for(auto& child : *func.parameters) {
+					for_each_node(*child.get(), order, callback);
+				}
+			}
+			break;
+		}
+		case POINTER_OR_REFERENCE: {
+			auto& pointer_or_reference = node.template as<PointerOrReference>();
+			for_each_node(*pointer_or_reference.value_type.get(), order, callback);
+			break;
+		}
+		case POINTER_TO_DATA_MEMBER: {
+			auto& pointer = node.template as<PointerToDataMember>();
+			for_each_node(*pointer.class_type.get(), order, callback);
+			for_each_node(*pointer.member_type.get(), order, callback);
+			break;
+		}
+		case STRUCT_OR_UNION: {
+			auto& struct_or_union = node.template as<StructOrUnion>();
+			for(auto& child : struct_or_union.base_classes) {
+				for_each_node(*child.get(), order, callback);
+			}
+			for(auto& child : struct_or_union.fields) {
+				for_each_node(*child.get(), order, callback);
+			}
+			for(auto& child : struct_or_union.member_functions) {
+				for_each_node(*child.get(), order, callback);
+			}
+			break;
+		}
+		case TYPE_NAME: {
+			break;
+		}
+	}
+	if(order == POSTORDER_TRAVERSAL) {
+		callback(node);
+	}
+}
+
+}

3rdparty/ccc/src/ccc/elf.cpp

@@ -0,0 +1,125 @@
+// This file is part of the Chaos Compiler Collection.
+// SPDX-License-Identifier: MIT
+
+#include "elf.h"
+
+namespace ccc {
+
+Result<ElfFile> ElfFile::parse(std::vector<u8> image)
+{
+	ElfFile elf;
+	elf.image = std::move(image);
+	
+	const ElfIdentHeader* ident = get_packed<ElfIdentHeader>(elf.image, 0);
+	CCC_CHECK(ident, "ELF ident header out of range.");
+	CCC_CHECK(ident->magic == CCC_FOURCC("\x7f\x45\x4c\x46"), "Not an ELF file.");
+	CCC_CHECK(ident->e_class == ElfIdentClass::B32, "Wrong ELF class (not 32 bit).");
+	
+	const ElfFileHeader* header = get_packed<ElfFileHeader>(elf.image, sizeof(ElfIdentHeader));
+	CCC_CHECK(header, "ELF file header out of range.");
+	elf.file_header = *header;
+	
+	const ElfSectionHeader* shstr_section_header = get_packed<ElfSectionHeader>(elf.image, header->shoff + header->shstrndx * sizeof(ElfSectionHeader));
+	CCC_CHECK(shstr_section_header, "ELF section name header out of range.");
+	
+	for(u32 i = 0; i < header->shnum; i++) {
+		u64 header_offset = header->shoff + i * sizeof(ElfSectionHeader);
+		const ElfSectionHeader* section_header = get_packed<ElfSectionHeader>(elf.image, header_offset);
+		CCC_CHECK(section_header, "ELF section header out of range.");
+		
+		const char* name = get_string(elf.image, shstr_section_header->offset + section_header->name);
+		CCC_CHECK(section_header, "ELF section name out of range.");
+		
+		ElfSection& section = elf.sections.emplace_back();
+		section.name = name;
+		section.header = *section_header;
+	}
+	
+	for(u32 i = 0; i < header->phnum; i++) {
+		u64 header_offset = header->phoff + i * sizeof(ElfProgramHeader);
+		const ElfProgramHeader* program_header = get_packed<ElfProgramHeader>(elf.image, header_offset);
+		CCC_CHECK(program_header, "ELF program header out of range.");
+		
+		elf.segments.emplace_back(*program_header);
+	}
+	
+	return elf;
+}
+
+Result<void> ElfFile::create_section_symbols(
+	SymbolDatabase& database, const SymbolGroup& group) const
+{
+	for(const ElfSection& section : sections) {
+		Address address = Address::non_zero(section.header.addr);
+		
+		Result<Section*> symbol = database.sections.create_symbol(
+			section.name, address, group.source, group.module_symbol);
+		CCC_RETURN_IF_ERROR(symbol);
+		
+		(*symbol)->set_size(section.header.size);
+	}
+	
+	return Result<void>();
+}
+
+const ElfSection* ElfFile::lookup_section(const char* name) const
+{
+	for(const ElfSection& section : sections) {
+		if(section.name == name) {
+			return &section;
+		}
+	}
+	return nullptr;
+}
+
+std::optional<u32> ElfFile::file_offset_to_virtual_address(u32 file_offset) const
+{
+	for(const ElfProgramHeader& segment : segments) {
+		if(file_offset >= segment.offset && file_offset < segment.offset + segment.filesz) {
+			return segment.vaddr + file_offset - segment.offset;
+		}
+	}
+	return std::nullopt;
+}
+
+const ElfProgramHeader* ElfFile::entry_point_segment() const
+{
+	const ccc::ElfProgramHeader* entry_segment = nullptr;
+	for(const ccc::ElfProgramHeader& segment : segments) {
+		if(file_header.entry >= segment.vaddr && file_header.entry < segment.vaddr + segment.filesz) {
+			entry_segment = &segment;
+		}
+	}
+	return entry_segment;
+}
+
+Result<std::span<const u8>> ElfFile::get_virtual(u32 address, u32 size) const
+{
+	u32 end_address = address + size;
+	
+	if(end_address >= address) {
+		for(const ElfProgramHeader& segment : segments) {
+			if(address >= segment.vaddr && end_address <= segment.vaddr + segment.filesz) {
+				size_t begin_offset = segment.offset + (address - segment.vaddr);
+				size_t end_offset = begin_offset + size;
+				if(begin_offset <= image.size() && end_offset <= image.size()) {
+					return std::span<const u8>(image.data() + begin_offset, image.data() + end_offset);
+				}
+			}
+		}
+	}
+	
+	return CCC_FAILURE("No ELF segment for address range 0x%x to 0x%x.", address, end_address);
+}
+
+Result<void> ElfFile::copy_virtual(u8* dest, u32 address, u32 size) const
+{
+	Result<std::span<const u8>> block = get_virtual(address, size);
+	CCC_RETURN_IF_ERROR(block);
+	
+	memcpy(dest, block->data(), size);
+	
+	return Result<void>();
+}
+
+}

3rdparty/ccc/src/ccc/elf.h

@@ -0,0 +1,156 @@
+// This file is part of the Chaos Compiler Collection.
+// SPDX-License-Identifier: MIT
+
+#pragma once
+
+#include "symbol_database.h"
+
+namespace ccc {
+
+enum class ElfIdentClass : u8 {
+	B32 = 0x1,
+	B64 = 0x2
+};
+
+CCC_PACKED_STRUCT(ElfIdentHeader,
+	/* 0x0 */ u32 magic; // 7f 45 4c 46
+	/* 0x4 */ ElfIdentClass e_class;
+	/* 0x5 */ u8 endianess;
+	/* 0x6 */ u8 version;
+	/* 0x7 */ u8 os_abi;
+	/* 0x8 */ u8 abi_version;
+	/* 0x9 */ u8 pad[7];
+)
+
+enum class ElfFileType : u16 {
+	NONE   = 0x00,
+	REL    = 0x01,
+	EXEC   = 0x02,
+	DYN    = 0x03,
+	CORE   = 0x04,
+	LOOS   = 0xfe00,
+	HIOS   = 0xfeff,
+	LOPROC = 0xff00,
+	HIPROC = 0xffff
+};
+
+enum class ElfMachine : u16 {
+	MIPS = 0x08
+};
+
+CCC_PACKED_STRUCT(ElfFileHeader,
+	/* 0x10 */ ElfFileType type;
+	/* 0x12 */ ElfMachine machine;
+	/* 0x14 */ u32 version;
+	/* 0x18 */ u32 entry;
+	/* 0x1c */ u32 phoff;
+	/* 0x20 */ u32 shoff;
+	/* 0x24 */ u32 flags;
+	/* 0x28 */ u16 ehsize;
+	/* 0x2a */ u16 phentsize;
+	/* 0x2c */ u16 phnum;
+	/* 0x2e */ u16 shentsize;
+	/* 0x30 */ u16 shnum;
+	/* 0x32 */ u16 shstrndx;
+)
+
+enum class ElfSectionType : u32 {
+	NULL_SECTION = 0x0,
+	PROGBITS = 0x1,
+	SYMTAB = 0x2,
+	STRTAB = 0x3,
+	RELA = 0x4,
+	HASH = 0x5,
+	DYNAMIC = 0x6,
+	NOTE = 0x7,
+	NOBITS = 0x8,
+	REL = 0x9,
+	SHLIB = 0xa,
+	DYNSYM = 0xb,
+	INIT_ARRAY = 0xe,
+	FINI_ARRAY = 0xf,
+	PREINIT_ARRAY = 0x10,
+	GROUP = 0x11,
+	SYMTAB_SHNDX = 0x12,
+	NUM = 0x13,
+	LOOS = 0x60000000,
+	MIPS_DEBUG = 0x70000005
+};
+
+CCC_PACKED_STRUCT(ElfSectionHeader,
+	/* 0x00 */ u32 name;
+	/* 0x04 */ ElfSectionType type;
+	/* 0x08 */ u32 flags;
+	/* 0x0c */ u32 addr;
+	/* 0x10 */ u32 offset;
+	/* 0x14 */ u32 size;
+	/* 0x18 */ u32 link;
+	/* 0x1c */ u32 info;
+	/* 0x20 */ u32 addralign;
+	/* 0x24 */ u32 entsize;
+)
+
+struct ElfSection {
+	std::string name;
+	ElfSectionHeader header;
+};
+
+CCC_PACKED_STRUCT(ElfProgramHeader,
+	/* 0x00 */ u32 type;
+	/* 0x04 */ u32 offset;
+	/* 0x08 */ u32 vaddr;
+	/* 0x0c */ u32 paddr;
+	/* 0x10 */ u32 filesz;
+	/* 0x14 */ u32 memsz;
+	/* 0x18 */ u32 flags;
+	/* 0x1c */ u32 align;
+)
+
+struct ElfFile {
+	ElfFileHeader file_header;
+	std::vector<u8> image;
+	std::vector<ElfSection> sections;
+	std::vector<ElfProgramHeader> segments;
+	
+	// Parse the ELF file header, section headers and program headers.
+	static Result<ElfFile> parse(std::vector<u8> image);
+	
+	// Create a section object for each section header in the ELF file.
+	Result<void> create_section_symbols(SymbolDatabase& database, const SymbolGroup& group) const;
+	
+	const ElfSection* lookup_section(const char* name) const;
+	std::optional<u32> file_offset_to_virtual_address(u32 file_offset) const;
+	
+	// Find the program header for the segment that contains the entry point.
+	const ElfProgramHeader* entry_point_segment() const;
+	
+	// Retrieve a block of data in an ELF file given its address and size.
+	Result<std::span<const u8>> get_virtual(u32 address, u32 size) const;
+	
+	// Copy a block of data in an ELF file to the destination buffer given its
+	// address and size.
+	Result<void> copy_virtual(u8* dest, u32 address, u32 size) const;
+	
+	// Retrieve an object of type T from an ELF file given its address.
+	template <typename T>
+	Result<T> get_object_virtual(u32 address) const
+	{
+		Result<std::span<const u8>> result = get_virtual(address, sizeof(T));
+		CCC_RETURN_IF_ERROR(result);
+		
+		return *(T*) result->data();
+	}
+	
+	// Retrieve an array of objects of type T from an ELF file given its
+	// address and element count.
+	template <typename T>
+	Result<std::span<const T>> get_array_virtual(u32 address, u32 element_count) const
+	{
+		Result<std::span<const u8>> result = get_virtual(address, element_count * sizeof(T));
+		CCC_RETURN_IF_ERROR(result);
+		
+		return std::span<const T>((T*) result->data(), (T*) (result->data() + result->size()));
+	}
+};
+
+}

3rdparty/ccc/src/ccc/elf_symtab.cpp

@@ -0,0 +1,213 @@
+// This file is part of the Chaos Compiler Collection.
+// SPDX-License-Identifier: MIT
+
+#include "elf_symtab.h"
+
+#include "importer_flags.h"
+
+namespace ccc::elf {
+
+enum class SymbolBind : u8 {
+	LOCAL = 0,
+	GLOBAL = 1,
+	WEAK = 2,
+	NUM = 3,
+	GNU_UNIQUE = 10
+};
+
+enum class SymbolType : u8 {
+	NOTYPE = 0,
+	OBJECT = 1,
+	FUNC = 2,
+	SECTION = 3,
+	FILE = 4,
+	COMMON = 5,
+	TLS = 6,
+	NUM = 7,
+	GNU_IFUNC = 10
+};
+
+enum class SymbolVisibility {
+	DEFAULT = 0,
+	INTERNAL = 1,
+	HIDDEN = 2,
+	PROTECTED = 3
+};
+
+CCC_PACKED_STRUCT(Symbol,
+	/* 0x0 */ u32 name;
+	/* 0x4 */ u32 value;
+	/* 0x8 */ u32 size;
+	/* 0xc */ u8 info;
+	/* 0xd */ u8 other;
+	/* 0xe */ u16 shndx;
+	
+	SymbolType type() const { return (SymbolType) (info & 0xf); }
+	SymbolBind bind() const { return (SymbolBind) (info >> 4); }
+	SymbolVisibility visibility() const { return (SymbolVisibility) (other & 0x3); }
+)
+
+static const char* symbol_bind_to_string(SymbolBind bind);
+static const char* symbol_type_to_string(SymbolType type);
+static const char* symbol_visibility_to_string(SymbolVisibility visibility);
+
+Result<void> import_symbols(
+	SymbolDatabase& database,
+	const SymbolGroup& group,
+	std::span<const u8> symtab,
+	std::span<const u8> strtab,
+	u32 importer_flags,
+	DemanglerFunctions demangler)
+{
+	for(u32 i = 0; i < symtab.size() / sizeof(Symbol); i++) {
+		const Symbol* symbol = get_packed<Symbol>(symtab, i * sizeof(Symbol));
+		CCC_ASSERT(symbol);
+		
+		Address address;
+		if(symbol->value != 0) {
+			address = symbol->value;
+		}
+		
+		if(!address.valid() || symbol->visibility() != SymbolVisibility::DEFAULT) {
+			continue;
+		}
+		
+		if(!(importer_flags & DONT_DEDUPLICATE_SYMBOLS)) {
+			if(database.functions.first_handle_from_starting_address(address).valid()) {
+				continue;
+			}
+			
+			if(database.global_variables.first_handle_from_starting_address(address).valid()) {
+				continue;
+			}
+			
+			if(database.local_variables.first_handle_from_starting_address(address).valid()) {
+				continue;
+			}
+		}
+		
+		const char* string = get_string(strtab, symbol->name);
+		CCC_CHECK(string, "Symbol string out of range.");
+		
+		switch(symbol->type()) {
+			case SymbolType::NOTYPE: {
+				Result<Label*> label = database.labels.create_symbol(
+					string, group.source, group.module_symbol, address, importer_flags, demangler);
+				CCC_RETURN_IF_ERROR(label);
+				
+				// These symbols get emitted at the same addresses as functions
+				// and aren't extremely useful, so we want to mark them to
+				// prevent them from possibly being used as function names.
+				(*label)->is_junk =
+					(*label)->name() == "__gnu_compiled_c" ||
+					(*label)->name() == "__gnu_compiled_cplusplus" ||
+					(*label)->name() == "gcc2_compiled.";
+				
+				break;
+			}
+			case SymbolType::OBJECT: {
+				if(symbol->size != 0) {
+					Result<GlobalVariable*> global_variable = database.global_variables.create_symbol(
+						string, group.source, group.module_symbol, address, importer_flags, demangler);
+					CCC_RETURN_IF_ERROR(global_variable);
+					
+					if(*global_variable) {
+						(*global_variable)->set_size(symbol->size);
+					}
+				} else {
+					Result<Label*> label = database.labels.create_symbol(
+						string, group.source, group.module_symbol, address, importer_flags, demangler);
+					CCC_RETURN_IF_ERROR(label);
+				}
+				
+				break;
+			}
+			case SymbolType::FUNC: {
+				Result<Function*> function = database.functions.create_symbol(
+					string, group.source, group.module_symbol, address, importer_flags, demangler);
+				CCC_RETURN_IF_ERROR(function);
+				
+				if(*function) {
+					(*function)->set_size(symbol->size);
+				}
+				
+				break;
+			}
+			case SymbolType::FILE: {
+				Result<SourceFile*> source_file = database.source_files.create_symbol(
+					string, group.source, group.module_symbol);
+				CCC_RETURN_IF_ERROR(source_file);
+				
+				break;
+			}
+			default: {}
+		}
+	}
+	
+	return Result<void>();
+}
+
+Result<void> print_symbol_table(FILE* out, std::span<const u8> symtab, std::span<const u8> strtab)
+{
+	fprintf(out, "ELF SYMBOLS:\n");
+	fprintf(out, "   Num:    Value  Size Type    Bind   Vis      Ndx Name\n");
+	
+	for(u32 i = 0; i < symtab.size() / sizeof(Symbol); i++) {
+		const Symbol* symbol = get_packed<Symbol>(symtab, i * sizeof(Symbol));
+		CCC_ASSERT(symbol);
+		
+		const char* type = symbol_type_to_string(symbol->type());
+		const char* bind = symbol_bind_to_string(symbol->bind());
+		const char* visibility = symbol_visibility_to_string(symbol->visibility());
+		
+		const char* string = get_string(strtab, symbol->name);
+		CCC_CHECK(string, "Symbol string out of range.");
+		
+		fprintf(out, "%6u: %08x %5u %-7s %-7s %-7s %3u %s\n",
+			i, symbol->value, symbol->size, type, bind, visibility, symbol->shndx, string);
+		
+	}
+	
+	return Result<void>();
+}
+
+static const char* symbol_bind_to_string(SymbolBind bind)
+{
+	switch(bind) {
+		case SymbolBind::LOCAL: return "LOCAL";
+		case SymbolBind::GLOBAL: return "GLOBAL";
+		case SymbolBind::WEAK: return "WEAK";
+		case SymbolBind::NUM: return "NUM";
+		case SymbolBind::GNU_UNIQUE: return "GNU_UNIQUE";
+	}
+	return "ERROR";
+}
+
+static const char* symbol_type_to_string(SymbolType type)
+{
+	switch(type) {
+		case SymbolType::NOTYPE: return "NOTYPE";
+		case SymbolType::OBJECT: return "OBJECT";
+		case SymbolType::FUNC: return "FUNC";
+		case SymbolType::SECTION: return "SECTION";
+		case SymbolType::FILE: return "FILE";
+		case SymbolType::COMMON: return "COMMON";
+		case SymbolType::TLS: return "TLS";
+		case SymbolType::NUM: return "NUM";
+		case SymbolType::GNU_IFUNC: return "GNU_IFUNC";
+	}
+	return "ERROR";
+}
+
+static const char* symbol_visibility_to_string(SymbolVisibility visibility)
+{
+	switch(visibility) {
+		case SymbolVisibility::DEFAULT: return "DEFAULT";
+		case SymbolVisibility::INTERNAL: return "INTERNAL";
+		case SymbolVisibility::HIDDEN: return "HIDDEN";
+		case SymbolVisibility::PROTECTED: return "PROTECTED";
+	}
+	return "ERROR";
+}
+
+}

3rdparty/ccc/src/ccc/elf_symtab.h

@@ -0,0 +1,20 @@
+// This file is part of the Chaos Compiler Collection.
+// SPDX-License-Identifier: MIT
+
+#pragma once
+
+#include "symbol_database.h"
+
+namespace ccc::elf {
+
+Result<void> import_symbols(
+	SymbolDatabase& database,
+	const SymbolGroup& group,
+	std::span<const u8> symtab,
+	std::span<const u8> strtab,
+	u32 importer_flags,
+	DemanglerFunctions demangler);
+	
+Result<void> print_symbol_table(FILE* out, std::span<const u8> symtab, std::span<const u8> strtab);
+
+}

3rdparty/ccc/src/ccc/importer_flags.cpp

@@ -0,0 +1,95 @@
+// This file is part of the Chaos Compiler Collection.
+// SPDX-License-Identifier: MIT
+
+#include "importer_flags.h"
+
+namespace ccc {
+
+const std::vector<ImporterFlagInfo> IMPORTER_FLAGS = {
+	{DEMANGLE_PARAMETERS, "--demangle-parameters", {
+		"Include parameters in demangled function names."
+	}},
+	{DEMANGLE_RETURN_TYPE, "--demangle-return-type", {
+		"Include return types at the end of demangled",
+		"function names if they're available."
+	}},
+	{DONT_DEDUPLICATE_SYMBOLS, "--dont-deduplicate-symbols", {
+		"Do not deduplicate matching symbols from",
+		"different symbol tables. This options has no",
+		"effect on data types."
+	}},
+	{DONT_DEDUPLICATE_TYPES, "--dont-deduplicate-types", {
+		"Do not deduplicate data types from different",
+		"translation units."
+	}},
+	{DONT_DEMANGLE_NAMES, "--dont-demangle-names", {
+		"Do not demangle function names, global variable",
+		"names, or overloaded operator names."
+	}},
+	{INCLUDE_GENERATED_MEMBER_FUNCTIONS, "--include-generated-functions", {
+		"Output member functions that were likely",
+		"automatically generated by the compiler."
+	}},
+	{NO_ACCESS_SPECIFIERS, "--no-access-specifiers", {
+		"Do not print access specifiers."
+	}},
+	{NO_MEMBER_FUNCTIONS, "--no-member-functions", {
+		"Do not print member functions."
+	}},
+	{NO_OPTIMIZED_OUT_FUNCTIONS, "--no-optimized-out-functions", {
+		"Discard functions that were optimized out."
+	}},
+	{STRICT_PARSING, "--strict", {
+		"Make more types of errors fatal."
+	}},
+	{TYPEDEF_ALL_ENUMS, "--typedef-all-enums", {
+		"Force all emitted C++ enums to be defined using",
+		"a typedef. With STABS, it is not always possible",
+		"to determine if an enum was like this in the",
+		"original source code, so this option should be",
+		"useful for reverse engineering C projects."
+	}},
+	{TYPEDEF_ALL_STRUCTS, "--typedef-all-structs", {
+		"Force all emitted C++ structure types to be",
+		"defined using a typedef."
+	}},
+	{TYPEDEF_ALL_UNIONS, "--typedef-all-unions", {
+		"Force all emitted C++ union types to be defined",
+		"using a typedef."
+	}},
+	{UNIQUE_FUNCTIONS, "--unique-functions", {
+		" If multiple identical .mdebug function symbols",
+		"are present, find the one that seems to have",
+		"actually been included in the linked binary, and",
+		"remove the addresses from all the rest. Using",
+		"this importer flag in combination with",
+		"--no-optimized-out-functions will remove these",
+		"duplicate function symbols entirely."
+	}}
+};
+
+u32 parse_importer_flag(const char* argument)
+{
+	for(const ImporterFlagInfo& flag : IMPORTER_FLAGS) {
+		if(strcmp(flag.argument, argument) == 0) {
+			return flag.flag;
+		}
+	}
+	return NO_IMPORTER_FLAGS;
+}
+
+void print_importer_flags_help(FILE* out)
+{
+	for(const ImporterFlagInfo& flag : IMPORTER_FLAGS) {
+		fprintf(out, "\n");
+		fprintf(out, "  %-29s ", flag.argument);
+		for(size_t i = 0; i < flag.help_text.size(); i++) {
+			if(i > 0) {
+				fprintf(out, "                                ");
+			}
+			fprintf(out, "%s\n", flag.help_text[i]);
+		}
+	}
+}
+
+}

3rdparty/ccc/src/ccc/importer_flags.h

@@ -0,0 +1,39 @@
+// This file is part of the Chaos Compiler Collection.
+// SPDX-License-Identifier: MIT
+
+#pragma once
+
+#include "util.h"
+
+namespace ccc {
+
+enum ImporterFlags {
+	NO_IMPORTER_FLAGS = 0,
+	DEMANGLE_PARAMETERS = (1 << 0),
+	DEMANGLE_RETURN_TYPE = (1 << 1),
+	DONT_DEDUPLICATE_SYMBOLS = (1 << 2),
+	DONT_DEDUPLICATE_TYPES = (1 << 3),
+	DONT_DEMANGLE_NAMES = (1 << 4),
+	INCLUDE_GENERATED_MEMBER_FUNCTIONS = (1 << 5),
+	NO_ACCESS_SPECIFIERS = (1 << 6),
+	NO_MEMBER_FUNCTIONS = (1 << 7),
+	NO_OPTIMIZED_OUT_FUNCTIONS = (1 << 8),
+	STRICT_PARSING = (1 << 9),
+	TYPEDEF_ALL_ENUMS = (1 << 10),
+	TYPEDEF_ALL_STRUCTS = (1 << 11),
+	TYPEDEF_ALL_UNIONS = (1 << 12),
+	UNIQUE_FUNCTIONS = (1 << 13)
+};
+
+struct ImporterFlagInfo {
+	ImporterFlags flag;
+	const char* argument;
+	std::vector<const char*> help_text;
+};
+
+extern const std::vector<ImporterFlagInfo> IMPORTER_FLAGS;
+
+u32 parse_importer_flag(const char* argument);
+void print_importer_flags_help(FILE* out);
+
+}

3rdparty/ccc/src/ccc/mdebug_analysis.cpp

@@ -0,0 +1,349 @@
+// This file is part of the Chaos Compiler Collection.
+// SPDX-License-Identifier: MIT
+
+#include "mdebug_analysis.h"
+
+#include "stabs_to_ast.h"
+
+namespace ccc::mdebug {
+
+Result<void> LocalSymbolTableAnalyser::stab_magic(const char* magic)
+{
+	return Result<void>();
+}
+
+Result<void> LocalSymbolTableAnalyser::source_file(const char* path, Address text_address)
+{
+	if(m_next_relative_path.empty()) {
+		m_next_relative_path = m_source_file.command_line_path;
+	}
+	
+	return Result<void>();
+}
+
+Result<void> LocalSymbolTableAnalyser::data_type(const ParsedSymbol& symbol)
+{
+	Result<std::unique_ptr<ast::Node>> node = stabs_type_to_ast(
+		*symbol.name_colon_type.type.get(), nullptr, m_stabs_to_ast_state, 0, false, false);
+	CCC_RETURN_IF_ERROR(node);
+	
+	if(symbol.is_typedef && (*node)->descriptor == ast::STRUCT_OR_UNION) {
+		ast::StructOrUnion& struct_or_union = (*node)->as<ast::StructOrUnion>();
+		const std::string& name = symbol.name_colon_type.name;
+		StabsTypeNumber type_number = symbol.name_colon_type.type->type_number;
+		fix_recursively_emitted_structures(struct_or_union, name, type_number, m_stabs_to_ast_state.file_handle);
+	}
+	
+	bool is_struct = (*node)->descriptor == ast::STRUCT_OR_UNION && (*node)->as<ast::StructOrUnion>().is_struct;
+	bool force_typedef =
+		((m_context.importer_flags & TYPEDEF_ALL_ENUMS) && (*node)->descriptor == ast::ENUM) ||
+		((m_context.importer_flags & TYPEDEF_ALL_STRUCTS) && (*node)->descriptor == ast::STRUCT_OR_UNION && is_struct) ||
+		((m_context.importer_flags & TYPEDEF_ALL_UNIONS) && (*node)->descriptor == ast::STRUCT_OR_UNION && !is_struct);
+	
+	(*node)->name = (symbol.name_colon_type.name == " ") ? "" : symbol.name_colon_type.name;
+	if(symbol.is_typedef || force_typedef) {
+		(*node)->storage_class = STORAGE_CLASS_TYPEDEF;
+	}
+	
+	const char* name = (*node)->name.c_str();
+	StabsTypeNumber number = symbol.name_colon_type.type->type_number;
+	
+	if(m_context.importer_flags & DONT_DEDUPLICATE_TYPES) {
+		Result<DataType*> data_type = m_database.data_types.create_symbol(
+			name, m_context.group.source, m_context.group.module_symbol);
+		CCC_RETURN_IF_ERROR(data_type);
+		
+		m_source_file.stabs_type_number_to_handle[number] = (*data_type)->handle();
+		(*data_type)->set_type(std::move(*node));
+		
+		(*data_type)->files = {m_source_file.handle()};
+	} else {
+		Result<ccc::DataType*> type = m_database.create_data_type_if_unique(
+			std::move(*node), number, name, m_source_file, m_context.group);
+		CCC_RETURN_IF_ERROR(type);
+	}
+	
+	return Result<void>();
+}
+
+Result<void> LocalSymbolTableAnalyser::global_variable(
+	const char* mangled_name, Address address, const StabsType& type, bool is_static, GlobalStorageLocation location)
+{
+	Result<GlobalVariable*> global = m_database.global_variables.create_symbol(
+		mangled_name, m_context.group.source, m_context.group.module_symbol, address, m_context.importer_flags, m_context.demangler);
+	CCC_RETURN_IF_ERROR(global);
+	CCC_ASSERT(*global);
+	
+	m_global_variables.emplace_back((*global)->handle());
+	
+	Result<std::unique_ptr<ast::Node>> node = stabs_type_to_ast(type, nullptr, m_stabs_to_ast_state, 0, true, false);
+	CCC_RETURN_IF_ERROR(node);
+	
+	if(is_static) {
+		(*global)->storage_class = STORAGE_CLASS_STATIC;
+	}
+	(*global)->set_type(std::move(*node));
+	
+	(*global)->storage.location = location;
+	
+	return Result<void>();
+}
+
+Result<void> LocalSymbolTableAnalyser::sub_source_file(const char* path, Address text_address)
+{
+	if(m_current_function && m_state == IN_FUNCTION_BEGINNING) {
+		Function::SubSourceFile& sub = m_current_function->sub_source_files.emplace_back();
+		sub.address = text_address;
+		sub.relative_path = path;
+	} else {
+		m_next_relative_path = path;
+	}
+	
+	return Result<void>();
+}
+
+Result<void> LocalSymbolTableAnalyser::procedure(
+	const char* mangled_name, Address address, const ProcedureDescriptor* procedure_descriptor, bool is_static)
+{
+	if(!m_current_function || strcmp(mangled_name, m_current_function->mangled_name().c_str()) != 0) {
+		Result<void> result = create_function(mangled_name, address);
+		CCC_RETURN_IF_ERROR(result);
+	}
+	
+	if(is_static) {
+		m_current_function->storage_class = STORAGE_CLASS_STATIC;
+	}
+	
+	if(procedure_descriptor) {
+		m_current_function->stack_frame_size = procedure_descriptor->frame_size;
+	}
+	
+	return Result<void>();
+}
+
+Result<void> LocalSymbolTableAnalyser::label(const char* label, Address address, s32 line_number)
+{
+	if(address.valid() && m_current_function && label[0] == '$') {
+		Function::LineNumberPair& pair = m_current_function->line_numbers.emplace_back();
+		pair.address = address;
+		pair.line_number = line_number;
+	}
+	
+	return Result<void>();
+}
+
+Result<void> LocalSymbolTableAnalyser::text_end(const char* name, s32 function_size)
+{
+	if(m_state == IN_FUNCTION_BEGINNING) {
+		CCC_CHECK(m_current_function, "END TEXT symbol outside of function.");
+		m_current_function->set_size(function_size);
+		m_state = IN_FUNCTION_END;
+	}
+	
+	return Result<void>();
+}
+
+Result<void> LocalSymbolTableAnalyser::function(const char* mangled_name, const StabsType& return_type, Address address)
+{
+	if(!m_current_function || strcmp(mangled_name, m_current_function->mangled_name().c_str()) != 0) {
+		Result<void> result = create_function(mangled_name, address);
+		CCC_RETURN_IF_ERROR(result);
+	} else {
+		// For MTV Music Maker 2, the addresses for static functions stored in
+		// the PROC symbols are relative to the translation unit, while the
+		// addresses stored in the FUN symbol are absolute. This is the only
+		// game I've found that seems to have this problem, but since in all
+		// other cases it seems all these addresses are all absolute, I may as
+		// well add in a hack here to deal with it.
+		bool no_module_base_address = m_context.group.module_symbol && m_context.group.module_symbol->address().get_or_zero() == 0;
+		bool new_address_greater = address.valid() && address > m_current_function->address();
+		if(no_module_base_address && new_address_greater) {
+			m_database.functions.move_symbol(m_current_function->handle(), address);
+		}
+	}
+	
+	Result<std::unique_ptr<ast::Node>> node = stabs_type_to_ast(return_type, nullptr, m_stabs_to_ast_state, 0, true, true);
+	CCC_RETURN_IF_ERROR(node);
+	m_current_function->set_type(std::move(*node));
+	
+	return Result<void>();
+}
+
+Result<void> LocalSymbolTableAnalyser::function_end()
+{
+	if(m_current_function) {
+		m_current_function->set_parameter_variables(std::move(m_current_parameter_variables), m_database);
+		m_current_function->set_local_variables(std::move(m_current_local_variables), m_database);
+	}
+	
+	m_current_function = nullptr;
+	m_current_parameter_variables = std::vector<ParameterVariableHandle>();
+	m_current_local_variables = std::vector<LocalVariableHandle>();
+	
+	m_blocks.clear();
+	m_pending_local_variables.clear();
+	
+	m_state = NOT_IN_FUNCTION;
+	
+	return Result<void>();
+}
+
+Result<void> LocalSymbolTableAnalyser::parameter(
+	const char* name, const StabsType& type, bool is_stack, s32 value, bool is_by_reference)
+{
+	CCC_CHECK(m_current_function, "Parameter symbol before first func/proc symbol.");
+	
+	Result<ParameterVariable*> parameter_variable = m_database.parameter_variables.create_symbol(
+		name, m_context.group.source, m_context.group.module_symbol);
+	CCC_RETURN_IF_ERROR(parameter_variable);
+	
+	m_current_parameter_variables.emplace_back((*parameter_variable)->handle());
+	
+	Result<std::unique_ptr<ast::Node>> node = stabs_type_to_ast(type, nullptr, m_stabs_to_ast_state, 0, true, true);
+	CCC_RETURN_IF_ERROR(node);
+	(*parameter_variable)->set_type(std::move(*node));
+	
+	if(is_stack) {
+		StackStorage& stack_storage = (*parameter_variable)->storage.emplace<StackStorage>();
+		stack_storage.stack_pointer_offset = value;
+	} else {
+		RegisterStorage& register_storage = (*parameter_variable)->storage.emplace<RegisterStorage>();
+		register_storage.dbx_register_number = value;
+		register_storage.is_by_reference = is_by_reference;
+	}
+	
+	return Result<void>();
+}
+
+Result<void> LocalSymbolTableAnalyser::local_variable(
+	const char* name, const StabsType& type, u32 value, StabsSymbolDescriptor desc, SymbolClass sclass)
+{
+	if(!m_current_function) {
+		return Result<void>();
+	}
+	
+	Address address = (desc == StabsSymbolDescriptor::STATIC_LOCAL_VARIABLE) ? value : Address();
+	Result<LocalVariable*> local_variable = m_database.local_variables.create_symbol(
+		name, address, m_context.group.source, m_context.group.module_symbol);
+	CCC_RETURN_IF_ERROR(local_variable);
+	
+	m_current_local_variables.emplace_back((*local_variable)->handle());
+	m_pending_local_variables.emplace_back((*local_variable)->handle());
+	
+	Result<std::unique_ptr<ast::Node>> node = stabs_type_to_ast(type, nullptr, m_stabs_to_ast_state, 0, true, false);
+	CCC_RETURN_IF_ERROR(node);
+	
+	if(desc == StabsSymbolDescriptor::STATIC_LOCAL_VARIABLE) {
+		GlobalStorage& global_storage = (*local_variable)->storage.emplace<GlobalStorage>();
+		std::optional<GlobalStorageLocation> location_opt =
+			symbol_class_to_global_variable_location(sclass);
+		CCC_CHECK(location_opt.has_value(),
+			"Invalid static local variable location %s.",
+			symbol_class(sclass));
+		global_storage.location = *location_opt;
+		(*node)->storage_class = STORAGE_CLASS_STATIC;
+	} else if(desc == StabsSymbolDescriptor::REGISTER_VARIABLE) {
+		RegisterStorage& register_storage = (*local_variable)->storage.emplace<RegisterStorage>();
+		register_storage.dbx_register_number = (s32) value;
+	} else if(desc == StabsSymbolDescriptor::LOCAL_VARIABLE) {
+		StackStorage& stack_storage = (*local_variable)->storage.emplace<StackStorage>();
+		stack_storage.stack_pointer_offset = (s32) value;
+	} else {
+		return CCC_FAILURE("LocalSymbolTableAnalyser::local_variable() called with bad symbol descriptor.");
+	}
+	
+	(*local_variable)->set_type(std::move(*node));
+	
+	return Result<void>();
+}
+
+Result<void> LocalSymbolTableAnalyser::lbrac(s32 begin_offset)
+{
+	for(LocalVariableHandle local_variable_handle : m_pending_local_variables) {
+		if(LocalVariable* local_variable = m_database.local_variables.symbol_from_handle(local_variable_handle)) {
+			local_variable->live_range.low = m_source_file.address().value + begin_offset;
+		}
+	}
+	
+	m_blocks.emplace_back(std::move(m_pending_local_variables));
+	m_pending_local_variables = {};
+	
+	return Result<void>();
+}
+
+Result<void> LocalSymbolTableAnalyser::rbrac(s32 end_offset)
+{
+	CCC_CHECK(!m_blocks.empty(), "RBRAC symbol without a matching LBRAC symbol.");
+	
+	std::vector<LocalVariableHandle>& variables = m_blocks.back();
+	for(LocalVariableHandle local_variable_handle : variables) {
+		if(LocalVariable* local_variable = m_database.local_variables.symbol_from_handle(local_variable_handle)) {
+			local_variable->live_range.high = m_source_file.address().value + end_offset;
+		}
+	}
+	
+	m_blocks.pop_back();
+	
+	return Result<void>();
+}
+
+Result<void> LocalSymbolTableAnalyser::finish()
+{
+	CCC_CHECK(m_state != IN_FUNCTION_BEGINNING,
+		"Unexpected end of symbol table for '%s'.", m_source_file.name().c_str());
+	
+	if(m_current_function) {
+		Result<void> result = function_end();
+		CCC_RETURN_IF_ERROR(result);
+	}
+	
+	m_source_file.set_functions(std::move(m_functions), m_database);
+	m_source_file.set_global_variables(std::move(m_global_variables), m_database);
+	
+	return Result<void>();
+}
+
+Result<void> LocalSymbolTableAnalyser::create_function(const char* mangled_name, Address address)
+{
+	if(m_current_function) {
+		Result<void> result = function_end();
+		CCC_RETURN_IF_ERROR(result);
+	}
+	
+	Result<Function*> function = m_database.functions.create_symbol(
+		mangled_name, m_context.group.source, m_context.group.module_symbol, address, m_context.importer_flags, m_context.demangler);
+	CCC_RETURN_IF_ERROR(function);
+	CCC_ASSERT(*function);
+	m_current_function = *function;
+	
+	m_functions.emplace_back(m_current_function->handle());
+	
+	m_state = IN_FUNCTION_BEGINNING;
+	
+	if(!m_next_relative_path.empty() && m_current_function->relative_path != m_source_file.command_line_path) {
+		m_current_function->relative_path = m_next_relative_path;
+	}
+	
+	return Result<void>();
+}
+
+std::optional<GlobalStorageLocation> symbol_class_to_global_variable_location(SymbolClass symbol_class)
+{
+	std::optional<GlobalStorageLocation> location;
+	switch(symbol_class) {
+		case SymbolClass::NIL: location = GlobalStorageLocation::NIL; break;
+		case SymbolClass::DATA: location = GlobalStorageLocation::DATA; break;
+		case SymbolClass::BSS: location = GlobalStorageLocation::BSS; break;
+		case SymbolClass::ABS: location = GlobalStorageLocation::ABS; break;
+		case SymbolClass::SDATA: location = GlobalStorageLocation::SDATA; break;
+		case SymbolClass::SBSS: location = GlobalStorageLocation::SBSS; break;
+		case SymbolClass::RDATA: location = GlobalStorageLocation::RDATA; break;
+		case SymbolClass::COMMON: location = GlobalStorageLocation::COMMON; break;
+		case SymbolClass::SCOMMON: location = GlobalStorageLocation::SCOMMON; break;
+		case SymbolClass::SUNDEFINED: location = GlobalStorageLocation::SUNDEFINED; break;
+		default: {}
+	}
+	return location;
+}
+
+}

3rdparty/ccc/src/ccc/mdebug_analysis.h

@@ -0,0 +1,99 @@
+// This file is part of the Chaos Compiler Collection.
+// SPDX-License-Identifier: MIT
+
+#pragma once
+
+#include "importer_flags.h"
+#include "mdebug_section.h"
+#include "mdebug_symbols.h"
+#include "stabs.h"
+#include "stabs_to_ast.h"
+#include "symbol_database.h"
+
+namespace ccc::mdebug {
+	
+struct AnalysisContext {
+	const mdebug::SymbolTableReader* reader = nullptr;
+	const std::map<u32, const mdebug::Symbol*>* external_functions = nullptr;
+	const std::map<std::string, const mdebug::Symbol*>* external_globals = nullptr;
+	SymbolGroup group;
+	u32 importer_flags = NO_IMPORTER_FLAGS;
+	DemanglerFunctions demangler;
+};
+
+class LocalSymbolTableAnalyser {
+public:
+	LocalSymbolTableAnalyser(SymbolDatabase& database, const StabsToAstState& stabs_to_ast_state, const AnalysisContext& context, SourceFile& source_file)
+		: m_database(database)
+		, m_context(context)
+		, m_stabs_to_ast_state(stabs_to_ast_state)
+		, m_source_file(source_file) {}
+	
+	// Functions for processing individual symbols.
+	//
+	// In most cases these symbols will appear in the following order:
+	//   PROC TEXT
+	//   ... line numbers ... ($LM<N>)
+	//   END TEXT
+	//   LABEL TEXT FUN
+	//   ... parameters ...
+	//   ... blocks ... (... local variables ... LBRAC ... subblocks ... RBRAC)
+	//   NIL NIL FUN
+	//
+	// For some compiler versions the symbols can appear in this order:
+	//   LABEL TEXT FUN
+	//   ... parameters ...
+	//   first line number ($LM1)
+	//   PROC TEXT
+	//   ... line numbers ... ($LM<N>)
+	//   END TEXT
+	//   ... blocks ... (... local variables ... LBRAC ... subblocks ... RBRAC)
+	Result<void> stab_magic(const char* magic);
+	Result<void> source_file(const char* path, Address text_address);
+	Result<void> data_type(const ParsedSymbol& symbol);
+	Result<void> global_variable(
+		const char* mangled_name, Address address, const StabsType& type, bool is_static, GlobalStorageLocation location);
+	Result<void> sub_source_file(const char* name, Address text_address);
+	Result<void> procedure(
+		const char* mangled_name, Address address, const ProcedureDescriptor* procedure_descriptor, bool is_static);
+	Result<void> label(const char* label, Address address, s32 line_number);
+	Result<void> text_end(const char* name, s32 function_size);
+	Result<void> function(const char* mangled_name, const StabsType& return_type, Address address);
+	Result<void> function_end();
+	Result<void> parameter(
+		const char* name, const StabsType& type, bool is_stack, s32 value, bool is_by_reference);
+	Result<void> local_variable(
+		const char* name, const StabsType& type, u32 value, StabsSymbolDescriptor desc, SymbolClass sclass);
+	Result<void> lbrac(s32 begin_offset);
+	Result<void> rbrac(s32 end_offset);
+	
+	Result<void> finish();
+	
+	Result<void> create_function(const char* mangled_name, Address address);
+	
+protected:
+	enum AnalysisState {
+		NOT_IN_FUNCTION,
+		IN_FUNCTION_BEGINNING,
+		IN_FUNCTION_END
+	};
+	
+	SymbolDatabase& m_database;
+	const AnalysisContext& m_context;
+	const StabsToAstState& m_stabs_to_ast_state;
+	
+	AnalysisState m_state = NOT_IN_FUNCTION;
+	SourceFile& m_source_file;
+	std::vector<FunctionHandle> m_functions;
+	std::vector<GlobalVariableHandle> m_global_variables;
+	Function* m_current_function = nullptr;
+	std::vector<ParameterVariableHandle> m_current_parameter_variables;
+	std::vector<LocalVariableHandle> m_current_local_variables;
+	std::vector<std::vector<LocalVariableHandle>> m_blocks;
+	std::vector<LocalVariableHandle> m_pending_local_variables;
+	std::string m_next_relative_path;
+};
+
+std::optional<GlobalStorageLocation> symbol_class_to_global_variable_location(SymbolClass symbol_class);
+
+};

3rdparty/ccc/src/ccc/mdebug_importer.cpp

@@ -0,0 +1,668 @@
+// This file is part of the Chaos Compiler Collection.
+// SPDX-License-Identifier: MIT
+
+#include "mdebug_importer.h"
+
+namespace ccc::mdebug {
+
+static Result<void> resolve_type_names(
+	SymbolDatabase& database, const SymbolGroup& group, u32 importer_flags);
+static Result<void> resolve_type_name(
+	ast::TypeName& type_name,
+	SymbolDatabase& database,
+	const SymbolGroup& group,
+	u32 importer_flags);
+static void compute_size_bytes(ast::Node& node, SymbolDatabase& database);
+static void detect_duplicate_functions(SymbolDatabase& database, const SymbolGroup& group);
+static void detect_fake_functions(SymbolDatabase& database, const std::map<u32, const mdebug::Symbol*>& external_functions, const SymbolGroup& group);
+static void destroy_optimized_out_functions(
+	SymbolDatabase& database, const SymbolGroup& group);
+
+Result<void> import_symbol_table(
+	SymbolDatabase& database,
+	std::span<const u8> elf,
+	s32 section_offset,
+	const SymbolGroup& group,
+	u32 importer_flags,
+	const DemanglerFunctions& demangler,
+	const std::atomic_bool* interrupt)
+{
+	SymbolTableReader reader;
+	
+	Result<void> reader_result = reader.init(elf, section_offset);
+	CCC_RETURN_IF_ERROR(reader_result);
+	
+	Result<std::vector<mdebug::Symbol>> external_symbols = reader.parse_external_symbols();
+	CCC_RETURN_IF_ERROR(external_symbols);
+	
+	// The addresses of the global variables aren't present in the local symbol
+	// table, so here we extract them from the external table. In addition, for
+	// some games we need to cross reference the function symbols in the local
+	// symbol table with the entries in the external symbol table.
+	std::map<u32, const mdebug::Symbol*> external_functions;
+	std::map<std::string, const mdebug::Symbol*> external_globals;
+	for(const mdebug::Symbol& external : *external_symbols) {
+		if(external.symbol_type == mdebug::SymbolType::PROC) {
+			external_functions[external.value] = &external;
+		}
+		
+		if(external.symbol_type == mdebug::SymbolType::GLOBAL
+			&& (external.symbol_class != mdebug::SymbolClass::UNDEFINED)) {
+			external_globals[external.string] = &external;
+		}
+	}
+	
+	// Bundle together some unchanging state to pass to import_files.
+	AnalysisContext context;
+	context.reader = &reader;
+	context.external_functions = &external_functions;
+	context.external_globals = &external_globals;
+	context.group = group;
+	context.importer_flags = importer_flags;
+	context.demangler = demangler;
+	
+	Result<void> result = import_files(database, context, interrupt);
+	CCC_RETURN_IF_ERROR(result);
+	
+	return Result<void>();
+}
+
+Result<void> import_files(SymbolDatabase& database, const AnalysisContext& context, const std::atomic_bool* interrupt)
+{
+	Result<s32> file_count = context.reader->file_count();
+	CCC_RETURN_IF_ERROR(file_count);
+	
+	for(s32 i = 0; i < *file_count; i++) {
+		if(interrupt && *interrupt) {
+			return CCC_FAILURE("Operation interrupted by user.");
+		}
+		
+		Result<mdebug::File> file = context.reader->parse_file(i);
+		CCC_RETURN_IF_ERROR(file);
+		
+		Result<void> result = import_file(database, *file, context);
+		CCC_RETURN_IF_ERROR(result);
+	}
+	
+	// The files field may be modified by further analysis passes, so we
+	// need to save this information here.
+	for(DataType& data_type : database.data_types) {
+		if(context.group.is_in_group(data_type) && data_type.files.size() == 1) {
+			data_type.only_defined_in_single_translation_unit = true;
+		}
+	}
+	
+	// Lookup data types and store data type handles in type names.
+	Result<void> type_name_result = resolve_type_names(database, context.group, context.importer_flags);
+	CCC_RETURN_IF_ERROR(type_name_result);
+	
+	// Compute the size in bytes of all the AST nodes.
+	database.for_each_symbol([&](ccc::Symbol& symbol) {
+		if(context.group.is_in_group(symbol) && symbol.type()) {
+			compute_size_bytes(*symbol.type(), database);
+		}
+	});
+	
+	// Propagate the size information to the global variable symbols.
+	for(GlobalVariable& global_variable : database.global_variables) {
+		if(global_variable.type() && global_variable.type()->size_bytes > -1) {
+			global_variable.set_size((u32) global_variable.type()->size_bytes);
+		}
+	}
+	
+	// Propagate the size information to the static local variable symbols.
+	for(LocalVariable& local_variable : database.local_variables) {
+		bool is_static_local = std::holds_alternative<GlobalStorage>(local_variable.storage);
+		if(is_static_local && local_variable.type() && local_variable.type()->size_bytes > -1) {
+			local_variable.set_size((u32) local_variable.type()->size_bytes);
+		}
+	}
+	
+	// Some games (e.g. Jet X2O) have multiple function symbols across different
+	// translation units with the same name and address.
+	if(context.importer_flags & UNIQUE_FUNCTIONS) {
+		detect_duplicate_functions(database, context.group);
+	}
+	
+	// If multiple functions appear at the same address, discard the addresses
+	// of all of them except the real one.
+	if(context.external_functions) {
+		detect_fake_functions(database, *context.external_functions, context.group);
+	}
+	
+	// Remove functions with no address. If there are any such functions, this
+	// will invalidate all pointers to symbols.
+	if(context.importer_flags & NO_OPTIMIZED_OUT_FUNCTIONS) {
+		destroy_optimized_out_functions(database, context.group);
+	}
+	
+	return Result<void>();
+}
+
+Result<void> import_file(SymbolDatabase& database, const mdebug::File& input, const AnalysisContext& context)
+{
+	// Parse the stab strings into a data structure that's vaguely
+	// one-to-one with the text-based representation.
+	u32 importer_flags_for_this_file = context.importer_flags;
+	Result<std::vector<ParsedSymbol>> symbols = parse_symbols(input.symbols, importer_flags_for_this_file);
+	CCC_RETURN_IF_ERROR(symbols);
+	
+	// In stabs, types can be referenced by their number from other stabs,
+	// so here we build a map of type numbers to the parsed types.
+	std::map<StabsTypeNumber, const StabsType*> stabs_types;
+	for(const ParsedSymbol& symbol : *symbols) {
+		if(symbol.type == ParsedSymbolType::NAME_COLON_TYPE) {
+			symbol.name_colon_type.type->enumerate_numbered_types(stabs_types);
+		}
+	}
+	
+	Result<SourceFile*> source_file = database.source_files.create_symbol(
+		input.full_path, input.address, context.group.source, context.group.module_symbol);
+	CCC_RETURN_IF_ERROR(source_file);
+	
+	(*source_file)->working_dir = input.working_dir;
+	(*source_file)->command_line_path = input.command_line_path;
+	
+	// Sometimes the INFO symbols contain information about what toolchain
+	// version was used for building the executable.
+	for(const mdebug::Symbol& symbol : input.symbols) {
+		if(symbol.symbol_class == mdebug::SymbolClass::INFO && strcmp(symbol.string, "@stabs") != 0) {
+			(*source_file)->toolchain_version_info.emplace(symbol.string);
+		}
+	}
+	
+	StabsToAstState stabs_to_ast_state;
+	stabs_to_ast_state.file_handle = (*source_file)->handle().value;
+	stabs_to_ast_state.stabs_types = &stabs_types;
+	stabs_to_ast_state.importer_flags = importer_flags_for_this_file;
+	stabs_to_ast_state.demangler = context.demangler;
+	
+	// Convert the parsed stabs symbols to a more standard C AST.
+	LocalSymbolTableAnalyser analyser(database, stabs_to_ast_state, context, **source_file);
+	for(const ParsedSymbol& symbol : *symbols) {
+		if(symbol.duplicate) {
+			continue;
+		}
+		
+		switch(symbol.type) {
+			case ParsedSymbolType::NAME_COLON_TYPE: {
+				switch(symbol.name_colon_type.descriptor) {
+					case StabsSymbolDescriptor::LOCAL_FUNCTION:
+					case StabsSymbolDescriptor::GLOBAL_FUNCTION: {
+						const char* name = symbol.name_colon_type.name.c_str();
+						const StabsType& type = *symbol.name_colon_type.type.get();
+						Result<void> result = analyser.function(name, type, symbol.raw->value);
+						CCC_RETURN_IF_ERROR(result);
+						break;
+					}
+					case StabsSymbolDescriptor::REFERENCE_PARAMETER_A:
+					case StabsSymbolDescriptor::REGISTER_PARAMETER:
+					case StabsSymbolDescriptor::VALUE_PARAMETER:
+					case StabsSymbolDescriptor::REFERENCE_PARAMETER_V: {
+						const char* name = symbol.name_colon_type.name.c_str();
+						const StabsType& type = *symbol.name_colon_type.type.get();
+						bool is_stack_variable = symbol.name_colon_type.descriptor == StabsSymbolDescriptor::VALUE_PARAMETER;
+						bool is_by_reference = symbol.name_colon_type.descriptor == StabsSymbolDescriptor::REFERENCE_PARAMETER_A
+							|| symbol.name_colon_type.descriptor == StabsSymbolDescriptor::REFERENCE_PARAMETER_V;
+						
+						Result<void> result = analyser.parameter(name, type, is_stack_variable, symbol.raw->value, is_by_reference);
+						CCC_RETURN_IF_ERROR(result);
+						break;
+					}
+					case StabsSymbolDescriptor::REGISTER_VARIABLE:
+					case StabsSymbolDescriptor::LOCAL_VARIABLE:
+					case StabsSymbolDescriptor::STATIC_LOCAL_VARIABLE: {
+						const char* name = symbol.name_colon_type.name.c_str();
+						const StabsType& type = *symbol.name_colon_type.type.get();
+						Result<void> result = analyser.local_variable(
+							name, type, symbol.raw->value, symbol.name_colon_type.descriptor, symbol.raw->symbol_class);
+						CCC_RETURN_IF_ERROR(result);
+						break;
+					}
+					case StabsSymbolDescriptor::GLOBAL_VARIABLE:
+					case StabsSymbolDescriptor::STATIC_GLOBAL_VARIABLE: {
+						const char* name = symbol.name_colon_type.name.c_str();
+						u32 address = -1;
+						std::optional<GlobalStorageLocation> location =
+							symbol_class_to_global_variable_location(symbol.raw->symbol_class);
+						if(symbol.name_colon_type.descriptor == StabsSymbolDescriptor::GLOBAL_VARIABLE) {
+							// The address for non-static global variables is
+							// only stored in the external symbol table (and
+							// the ELF symbol table), so we pull that
+							// information in here.
+							if(context.external_globals) {
+								auto global_symbol = context.external_globals->find(symbol.name_colon_type.name);
+								if(global_symbol != context.external_globals->end()) {
+									address = (u32) global_symbol->second->value;
+									location = symbol_class_to_global_variable_location(global_symbol->second->symbol_class);
+								}
+							}
+						} else {
+							// And for static global variables it's just stored
+							// in the local symbol table.
+							address = (u32) symbol.raw->value;
+						}
+						CCC_CHECK(location.has_value(), "Invalid global variable location.")
+						const StabsType& type = *symbol.name_colon_type.type.get();
+						bool is_static = symbol.name_colon_type.descriptor == StabsSymbolDescriptor::STATIC_GLOBAL_VARIABLE;
+						Result<void> result = analyser.global_variable(name, address, type, is_static, *location);
+						CCC_RETURN_IF_ERROR(result);
+						break;
+					}
+					case StabsSymbolDescriptor::TYPE_NAME:
+					case StabsSymbolDescriptor::ENUM_STRUCT_OR_TYPE_TAG: {
+						Result<void> result = analyser.data_type(symbol);
+						CCC_RETURN_IF_ERROR(result);
+						break;
+					}
+				}
+				break;
+			}
+			case ParsedSymbolType::SOURCE_FILE: {
+				Result<void> result = analyser.source_file(symbol.raw->string, symbol.raw->value);
+				CCC_RETURN_IF_ERROR(result);
+				break;
+			}
+			case ParsedSymbolType::SUB_SOURCE_FILE: {
+				Result<void> result = analyser.sub_source_file(symbol.raw->string, symbol.raw->value);
+				CCC_RETURN_IF_ERROR(result);
+				break;
+			}
+			case ParsedSymbolType::LBRAC: {
+				Result<void> result = analyser.lbrac(symbol.raw->value);
+				CCC_RETURN_IF_ERROR(result);
+				break;
+			}
+			case ParsedSymbolType::RBRAC: {
+				Result<void> result = analyser.rbrac(symbol.raw->value);
+				CCC_RETURN_IF_ERROR(result);
+				break;
+			}
+			case ParsedSymbolType::FUNCTION_END: {
+				Result<void> result = analyser.function_end();
+				CCC_RETURN_IF_ERROR(result);
+				break;
+			}
+			case ParsedSymbolType::NON_STABS: {
+				if(symbol.raw->symbol_class == mdebug::SymbolClass::TEXT) {
+					if(symbol.raw->symbol_type == mdebug::SymbolType::PROC) {
+						Result<void> result = analyser.procedure(symbol.raw->string, symbol.raw->value, symbol.raw->procedure_descriptor, false);
+						CCC_RETURN_IF_ERROR(result);
+					} else if(symbol.raw->symbol_type == mdebug::SymbolType::STATICPROC) {
+						Result<void> result = analyser.procedure(symbol.raw->string, symbol.raw->value, symbol.raw->procedure_descriptor, true);
+						CCC_RETURN_IF_ERROR(result);
+					} else if(symbol.raw->symbol_type == mdebug::SymbolType::LABEL) {
+						Result<void> result = analyser.label(symbol.raw->string, symbol.raw->value, symbol.raw->index);
+						CCC_RETURN_IF_ERROR(result);
+					} else if(symbol.raw->symbol_type == mdebug::SymbolType::END) {
+						Result<void> result = analyser.text_end(symbol.raw->string, symbol.raw->value);
+						CCC_RETURN_IF_ERROR(result);
+					}
+				}
+				break;
+			}
+		}
+	}
+	
+	Result<void> result = analyser.finish();
+	CCC_RETURN_IF_ERROR(result);
+	
+	return Result<void>();
+}
+
+static Result<void> resolve_type_names(
+	SymbolDatabase& database, const SymbolGroup& group, u32 importer_flags)
+{
+	Result<void> result;
+	database.for_each_symbol([&](ccc::Symbol& symbol) {
+		if(group.is_in_group(symbol) && symbol.type()) {
+			ast::for_each_node(*symbol.type(), ast::PREORDER_TRAVERSAL, [&](ast::Node& node) {
+				if(node.descriptor == ast::TYPE_NAME) {
+					Result<void> type_name_result = resolve_type_name(node.as<ast::TypeName>(), database, group, importer_flags);
+					if(!type_name_result.success()) {
+						result = std::move(type_name_result);
+					}
+				}
+				return ast::EXPLORE_CHILDREN;
+			});
+		}
+	});
+	return result;
+}
+
+static Result<void> resolve_type_name(
+	ast::TypeName& type_name,
+	SymbolDatabase& database,
+	const SymbolGroup& group,
+	u32 importer_flags)
+{
+	ast::TypeName::UnresolvedStabs* unresolved_stabs = type_name.unresolved_stabs.get();
+	if(!unresolved_stabs) {
+		return Result<void>();
+	}
+	
+	// Lookup the type by its STABS type number. This path ensures that the
+	// correct type is found even if multiple types have the same name.
+	if(unresolved_stabs->referenced_file_handle != (u32) -1 && unresolved_stabs->stabs_type_number.valid()) {
+		const SourceFile* source_file = database.source_files.symbol_from_handle(unresolved_stabs->referenced_file_handle);
+		CCC_ASSERT(source_file);
+		auto handle = source_file->stabs_type_number_to_handle.find(unresolved_stabs->stabs_type_number);
+		if(handle != source_file->stabs_type_number_to_handle.end()) {
+			type_name.data_type_handle = handle->second.value;
+			type_name.is_forward_declared = false;
+			type_name.unresolved_stabs.reset();
+			return Result<void>();
+		}
+	}
+	
+	// Looking up the type by its STABS type number failed, so look for it by
+	// its name instead. This happens when a type is forward declared but not
+	// defined in a given translation unit.
+	if(!unresolved_stabs->type_name.empty()) {
+		for(auto& name_handle : database.data_types.handles_from_name(unresolved_stabs->type_name)) {
+			DataType* data_type = database.data_types.symbol_from_handle(name_handle.second);
+			if(data_type && group.is_in_group(*data_type)) {
+				type_name.data_type_handle = name_handle.second.value;
+				type_name.is_forward_declared = true;
+				type_name.unresolved_stabs.reset();
+				return Result<void>();
+			}
+		}
+	}
+	
+	// If this branch is taken it means the type name was probably from an
+	// automatically generated member function of a nested struct trying to
+	// reference the struct (for the this parameter). We shouldn't create a
+	// forward declared type in this case.
+	if(type_name.source == ast::TypeNameSource::UNNAMED_THIS) {
+		return Result<void>();
+	}
+	
+	// Type lookup failed. This happens when a type is forward declared in a
+	// translation unit with symbols but is not defined in one. We haven't
+	// already created a forward declared type, so we create one now.
+	std::unique_ptr<ast::Node> forward_declared_node;
+	if(unresolved_stabs->type.has_value()) {
+		switch(*unresolved_stabs->type) {
+			case ast::ForwardDeclaredType::STRUCT: {
+				std::unique_ptr<ast::StructOrUnion> node = std::make_unique<ast::StructOrUnion>();
+				node->is_struct = true;
+				forward_declared_node = std::move(node);
+				break;
+			}
+			case ast::ForwardDeclaredType::UNION: {
+				std::unique_ptr<ast::StructOrUnion> node = std::make_unique<ast::StructOrUnion>();
+				node->is_struct = false;
+				forward_declared_node = std::move(node);
+				break;
+			}
+			case ast::ForwardDeclaredType::ENUM: {
+				std::unique_ptr<ast::Enum> node = std::make_unique<ast::Enum>();
+				forward_declared_node = std::move(node);
+				break;
+			}
+		}
+	}
+	
+	if(forward_declared_node) {
+		Result<DataType*> forward_declared_type = database.data_types.create_symbol(
+			unresolved_stabs->type_name, group.source, group.module_symbol);
+		CCC_RETURN_IF_ERROR(forward_declared_type);
+		
+		(*forward_declared_type)->set_type(std::move(forward_declared_node));
+		(*forward_declared_type)->not_defined_in_any_translation_unit = true;
+		
+		type_name.data_type_handle = (*forward_declared_type)->handle().value;
+		type_name.is_forward_declared = true;
+		type_name.unresolved_stabs.reset();
+		
+		return Result<void>();
+	}
+	
+	const char* error_message = "Unresolved %s type name '%s' with STABS type number (%d,%d).";
+	if(importer_flags & STRICT_PARSING) {
+		return CCC_FAILURE(error_message,
+			ast::type_name_source_to_string(type_name.source),
+			type_name.unresolved_stabs->type_name.c_str(),
+			type_name.unresolved_stabs->stabs_type_number.file,
+			type_name.unresolved_stabs->stabs_type_number.type);
+	} else {
+		CCC_WARN(error_message,
+			ast::type_name_source_to_string(type_name.source),
+			type_name.unresolved_stabs->type_name.c_str(),
+			type_name.unresolved_stabs->stabs_type_number.file,
+			type_name.unresolved_stabs->stabs_type_number.type);
+	}
+	
+	return Result<void>();
+}
+
+static void compute_size_bytes(ast::Node& node, SymbolDatabase& database)
+{
+	for_each_node(node, ast::POSTORDER_TRAVERSAL, [&](ast::Node& node) {
+		// Skip nodes that have already been processed.
+		if(node.size_bytes > -1 || node.cannot_compute_size) {
+			return ast::EXPLORE_CHILDREN;
+		}
+		
+		// Can't compute size recursively.
+		node.cannot_compute_size = true;
+		
+		switch(node.descriptor) {
+			case ast::ARRAY: {
+				ast::Array& array = node.as<ast::Array>();
+				if(array.element_type->size_bytes > -1) {
+					array.size_bytes = array.element_type->size_bytes * array.element_count;
+				}
+				break;
+			}
+			case ast::BITFIELD: {
+				break;
+			}
+			case ast::BUILTIN: {
+				ast::BuiltIn& built_in = node.as<ast::BuiltIn>();
+				built_in.size_bytes = builtin_class_size(built_in.bclass);
+				break;
+			}
+			case ast::FUNCTION: {
+				break;
+			}
+			case ast::ENUM: {
+				node.size_bytes = 4;
+				break;
+			}
+			case ast::ERROR_NODE: {
+				break;
+			}
+			case ast::STRUCT_OR_UNION: {
+				node.size_bytes = node.size_bits / 8;
+				break;
+			}
+			case ast::POINTER_OR_REFERENCE: {
+				node.size_bytes = 4;
+				break;
+			}
+			case ast::POINTER_TO_DATA_MEMBER: {
+				break;
+			}
+			case ast::TYPE_NAME: {
+				ast::TypeName& type_name = node.as<ast::TypeName>();
+				DataType* resolved_type = database.data_types.symbol_from_handle(type_name.data_type_handle_unless_forward_declared());
+				if(resolved_type) {
+					ast::Node* resolved_node = resolved_type->type();
+					CCC_ASSERT(resolved_node);
+					if(resolved_node->size_bytes < 0 && !resolved_node->cannot_compute_size) {
+						compute_size_bytes(*resolved_node, database);
+					}
+					type_name.size_bytes = resolved_node->size_bytes;
+				}
+				break;
+			}
+		}
+		
+		if(node.size_bytes > -1) {
+			node.cannot_compute_size = false;
+		}
+		
+		return ast::EXPLORE_CHILDREN;
+	});
+}
+
+static void detect_duplicate_functions(SymbolDatabase& database, const SymbolGroup& group)
+{
+	std::vector<FunctionHandle> duplicate_functions;
+	
+	for(Function& test_function : database.functions) {
+		if(!test_function.address().valid() && !group.is_in_group(test_function)) {
+			continue;
+		}
+		
+		// Find cases where there are two or more functions at the same address.
+		auto functions_with_same_address = database.functions.handles_from_starting_address(test_function.address());
+		if(functions_with_same_address.begin() == functions_with_same_address.end()) {
+			continue;
+		}
+		if(++functions_with_same_address.begin() == functions_with_same_address.end()) {
+			continue;
+		}
+		
+		// Try to figure out the address of the translation unit which the
+		// version of the function that actually ended up in the linked binary
+		// comes from. We can't just check which source file the symbol comes
+		// from because it may be present in multiple.
+		u32 source_file_address = UINT32_MAX;
+		for(SourceFile& source_file : database.source_files) {
+			if(source_file.address() < test_function.address()) {
+				source_file_address = std::min(source_file.address().value, source_file_address);
+			}
+		}
+		
+		if(source_file_address == UINT32_MAX) {
+			continue;
+		}
+		
+		// Remove the addresses from all the matching symbols from other
+		// translation units.
+		FunctionHandle best_handle;
+		u32 best_offset = UINT32_MAX;
+		for(const auto& [address, handle] : functions_with_same_address) {
+			ccc::Function* function = database.functions.symbol_from_handle(handle);
+			if(!function || !group.is_in_group(*function) || function->mangled_name() != test_function.mangled_name()) {
+				continue;
+			}
+			
+			if(address - source_file_address < best_offset) {
+				if(best_handle.valid()) {
+					duplicate_functions.emplace_back(best_handle);
+				}
+				best_handle = function->handle();
+				best_offset = address - source_file_address;
+			} else {
+				duplicate_functions.emplace_back(function->handle());
+			}
+		}
+		
+		for(FunctionHandle duplicate_function : duplicate_functions) {
+			database.functions.move_symbol(duplicate_function, Address());
+		}
+		duplicate_functions.clear();
+	}
+}
+
+static void detect_fake_functions(SymbolDatabase& database, const std::map<u32, const mdebug::Symbol*>& external_functions, const SymbolGroup& group)
+{
+	// Find cases where multiple fake function symbols were emitted for a given
+	// address and cross-reference with the external symbol table to try and
+	// find which one is the real one.
+	s32 fake_function_count = 0;
+	for(Function& function : database.functions) {
+		if(!function.address().valid() || !group.is_in_group(function)) {
+			continue;
+		}
+		
+		// Find cases where there are two or more functions at the same address.
+		auto functions_with_same_address = database.functions.handles_from_starting_address(function.address());
+		if(functions_with_same_address.begin() == functions_with_same_address.end()) {
+			continue;
+		}
+		if(++functions_with_same_address.begin() == functions_with_same_address.end()) {
+			continue;
+		}
+		
+		auto external_function = external_functions.find(function.address().value);
+		if(external_function == external_functions.end() || strcmp(function.mangled_name().c_str(), external_function->second->string) != 0) {
+			database.functions.move_symbol(function.handle(), Address());
+			
+			if(fake_function_count < 10) {
+				CCC_WARN("Discarding address of function symbol '%s' as it is probably incorrect.", function.mangled_name().c_str());
+			} else if(fake_function_count == 10) {
+				CCC_WARN("Discarding more addresses of function symbols.");
+			}
+			
+			fake_function_count++;
+		}
+	}
+}
+
+static void destroy_optimized_out_functions(
+	SymbolDatabase& database, const SymbolGroup& group)
+{
+	bool marked = false;
+	
+	for(Function& function : database.functions) {
+		if(group.is_in_group(function) && !function.address().valid()) {
+			function.mark_for_destruction();
+			marked = true;
+		}
+	}
+	
+	if(marked) {
+		// This will invalidate all pointers to symbols in the database.
+		database.destroy_marked_symbols();
+	}
+}
+
+void fill_in_pointers_to_member_function_definitions(SymbolDatabase& database)
+{
+	// Fill in pointers from member function declaration to corresponding definitions.
+	for(Function& function : database.functions) {
+		const std::string& qualified_name = function.name();
+		std::string::size_type name_separator_pos = qualified_name.find_last_of("::");
+		if(name_separator_pos == std::string::npos || name_separator_pos < 2) {
+			continue;
+		}
+		
+		std::string function_name = qualified_name.substr(name_separator_pos + 1);
+		
+		// This won't work for some template types.
+		std::string::size_type type_separator_pos = qualified_name.find_last_of("::", name_separator_pos - 2);
+		std::string type_name;
+		if(type_separator_pos != std::string::npos) {
+			type_name = qualified_name.substr(type_separator_pos + 1, name_separator_pos - type_separator_pos - 2);
+		} else {
+			type_name = qualified_name.substr(0, name_separator_pos - 1);
+		}
+		
+		for(const auto& name_handle : database.data_types.handles_from_name(type_name)) {
+			DataType* data_type = database.data_types.symbol_from_handle(name_handle.second);
+			if(!data_type || !data_type->type() || data_type->type()->descriptor != ast::STRUCT_OR_UNION) {
+				continue;
+			}
+			
+			ast::StructOrUnion& struct_or_union = data_type->type()->as<ast::StructOrUnion>();
+			for(std::unique_ptr<ast::Node>& declaration : struct_or_union.member_functions) {
+				if(declaration->name == function_name) {
+					declaration->as<ast::Function>().definition_handle = function.handle().value;
+					function.is_member_function_ish = true;
+					break;
+				}
+			}
+			
+			if(function.is_member_function_ish) {
+				break;
+			}
+		}
+	}
+}
+
+}

3rdparty/ccc/src/ccc/mdebug_importer.h

@@ -0,0 +1,31 @@
+// This file is part of the Chaos Compiler Collection.
+// SPDX-License-Identifier: MIT
+
+#pragma once
+
+#include <atomic>
+
+#include "mdebug_analysis.h"
+#include "mdebug_section.h"
+#include "symbol_database.h"
+
+namespace ccc::mdebug {
+
+// Perform all the main analysis passes on the mdebug symbol table and convert
+// it to a set of C++ ASTs.
+Result<void> import_symbol_table(
+	SymbolDatabase& database,
+	std::span<const u8> elf,
+	s32 section_offset,
+	const SymbolGroup& group,
+	u32 importer_flags,
+	const DemanglerFunctions& demangler,
+	const std::atomic_bool* interrupt);
+Result<void> import_files(SymbolDatabase& database, const AnalysisContext& context, const std::atomic_bool* interrupt);
+Result<void> import_file(SymbolDatabase& database, const mdebug::File& input, const AnalysisContext& context);
+
+// Try to add pointers from member function declarations to their definitions
+// using a heuristic.
+void fill_in_pointers_to_member_function_definitions(SymbolDatabase& database);
+
+}

3rdparty/ccc/src/ccc/mdebug_section.cpp

@@ -0,0 +1,474 @@
+// This file is part of the Chaos Compiler Collection.
+// SPDX-License-Identifier: MIT
+
+#include "mdebug_section.h"
+
+namespace ccc::mdebug {
+
+// MIPS debug symbol table headers.
+// See include/coff/sym.h from GNU binutils for more information.
+
+CCC_PACKED_STRUCT(SymbolicHeader,
+	/* 0x00 */ s16 magic;
+	/* 0x02 */ s16 version_stamp;
+	/* 0x04 */ s32 line_number_count;
+	/* 0x08 */ s32 line_numbers_size_bytes;
+	/* 0x0c */ s32 line_numbers_offset;
+	/* 0x10 */ s32 dense_numbers_count;
+	/* 0x14 */ s32 dense_numbers_offset;
+	/* 0x18 */ s32 procedure_descriptor_count;
+	/* 0x1c */ s32 procedure_descriptors_offset;
+	/* 0x20 */ s32 local_symbol_count;
+	/* 0x24 */ s32 local_symbols_offset;
+	/* 0x28 */ s32 optimization_symbols_count;
+	/* 0x2c */ s32 optimization_symbols_offset;
+	/* 0x30 */ s32 auxiliary_symbol_count;
+	/* 0x34 */ s32 auxiliary_symbols_offset;
+	/* 0x38 */ s32 local_strings_size_bytes;
+	/* 0x3c */ s32 local_strings_offset;
+	/* 0x40 */ s32 external_strings_size_bytes;
+	/* 0x44 */ s32 external_strings_offset;
+	/* 0x48 */ s32 file_descriptor_count;
+	/* 0x4c */ s32 file_descriptors_offset;
+	/* 0x50 */ s32 relative_file_descriptor_count;
+	/* 0x54 */ s32 relative_file_descriptors_offset;
+	/* 0x58 */ s32 external_symbols_count;
+	/* 0x5c */ s32 external_symbols_offset;
+)
+
+CCC_PACKED_STRUCT(FileDescriptor,
+	/* 0x00 */ u32 address;
+	/* 0x04 */ s32 file_path_string_offset;
+	/* 0x08 */ s32 strings_offset;
+	/* 0x0c */ s32 cb_ss;
+	/* 0x10 */ s32 isym_base;
+	/* 0x14 */ s32 symbol_count;
+	/* 0x18 */ s32 line_number_entry_index_base;
+	/* 0x1c */ s32 cline;
+	/* 0x20 */ s32 optimization_entry_index_base;
+	/* 0x24 */ s32 copt;
+	/* 0x28 */ u16 ipd_first;
+	/* 0x2a */ u16 procedure_descriptor_count;
+	/* 0x2c */ s32 iaux_base;
+	/* 0x30 */ s32 caux;
+	/* 0x34 */ s32 rfd_base;
+	/* 0x38 */ s32 crfd;
+	/* 0x3c */ u32 lang : 5;
+	/* 0x3c */ u32 f_merge : 1;
+	/* 0x3c */ u32 f_readin : 1;
+	/* 0x3c */ u32 f_big_endian : 1;
+	/* 0x3c */ u32 reserved_1 : 22;
+	/* 0x40 */ s32 line_number_offset;
+	/* 0x44 */ s32 cb_line;
+)
+static_assert(sizeof(FileDescriptor) == 0x48);
+
+CCC_PACKED_STRUCT(SymbolHeader,
+	/* 0x0 */ u32 iss;
+	/* 0x4 */ u32 value;
+	/* 0x8 */ u32 st : 6;
+	/* 0x8 */ u32 sc : 5;
+	/* 0x8 */ u32 reserved : 1;
+	/* 0x8 */ u32 index : 20;
+)
+static_assert(sizeof(SymbolHeader) == 0xc);
+
+CCC_PACKED_STRUCT(ExternalSymbolHeader,
+	/* 0x0 */ u16 flags;
+	/* 0x2 */ s16 ifd;
+	/* 0x4 */ SymbolHeader symbol;
+)
+static_assert(sizeof(ExternalSymbolHeader) == 0x10);
+
+static void print_symbol(FILE* out, const Symbol& symbol);
+static void print_procedure_descriptor(FILE* out, const ProcedureDescriptor& procedure_descriptor);
+static Result<s32> get_corruption_fixing_fudge_offset(s32 section_offset, const SymbolicHeader& hdrr);
+static Result<Symbol> get_symbol(const SymbolHeader& header, std::span<const u8> elf, s32 strings_offset);
+
+Result<void> SymbolTableReader::init(std::span<const u8> elf, s32 section_offset)
+{
+	m_elf = elf;
+	m_section_offset = section_offset;
+	
+	m_hdrr = get_packed<SymbolicHeader>(m_elf, m_section_offset);
+	CCC_CHECK(m_hdrr != nullptr, "MIPS debug section header out of bounds.");
+	CCC_CHECK(m_hdrr->magic == 0x7009, "Invalid symbolic header.");
+	
+	Result<s32> fudge_offset = get_corruption_fixing_fudge_offset(m_section_offset, *m_hdrr);
+	CCC_RETURN_IF_ERROR(fudge_offset);
+	m_fudge_offset = *fudge_offset;
+	
+	m_ready = true;
+	
+	return Result<void>();
+}
+	
+s32 SymbolTableReader::file_count() const
+{
+	CCC_ASSERT(m_ready);
+	return m_hdrr->file_descriptor_count;
+}
+
+Result<File> SymbolTableReader::parse_file(s32 index) const
+{
+	CCC_ASSERT(m_ready);
+	
+	File file;
+	
+	u64 fd_offset = m_hdrr->file_descriptors_offset + index * sizeof(FileDescriptor);
+	const FileDescriptor* fd_header = get_packed<FileDescriptor>(m_elf, fd_offset + m_fudge_offset);
+	CCC_CHECK(fd_header != nullptr, "MIPS debug file descriptor out of bounds.");
+	CCC_CHECK(fd_header->f_big_endian == 0, "Not little endian or bad file descriptor table.");
+	
+	file.address = fd_header->address;
+	
+	s32 rel_raw_path_offset = fd_header->strings_offset + fd_header->file_path_string_offset;
+	s32 raw_path_offset = m_hdrr->local_strings_offset + rel_raw_path_offset + m_fudge_offset;
+	const char* command_line_path = get_string(m_elf, raw_path_offset);
+	if(command_line_path) {
+		file.command_line_path = command_line_path;
+	}
+	
+	// Parse local symbols.
+	for(s64 j = 0; j < fd_header->symbol_count; j++) {
+		u64 rel_symbol_offset = (fd_header->isym_base + j) * sizeof(SymbolHeader);
+		u64 symbol_offset = m_hdrr->local_symbols_offset + rel_symbol_offset + m_fudge_offset;
+		const SymbolHeader* symbol_header = get_packed<SymbolHeader>(m_elf, symbol_offset);
+		CCC_CHECK(symbol_header != nullptr, "Symbol header out of bounds.");
+		
+		s32 strings_offset = m_hdrr->local_strings_offset + fd_header->strings_offset + m_fudge_offset;
+		Result<Symbol> sym = get_symbol(*symbol_header, m_elf, strings_offset);
+		CCC_RETURN_IF_ERROR(sym);
+		
+		bool string_offset_equal = (s32) symbol_header->iss == fd_header->file_path_string_offset;
+		if(file.working_dir.empty() && string_offset_equal && sym->is_stabs() && sym->code() == N_SO && file.symbols.size() > 2) {
+			const Symbol& working_dir = file.symbols.back();
+			if(working_dir.is_stabs() && working_dir.code() == N_SO) {
+				file.working_dir = working_dir.string;
+			}
+		}
+		
+		file.symbols.emplace_back(std::move(*sym));
+	}
+	
+	// Parse procedure descriptors.
+	for(s64 i = 0; i < fd_header->procedure_descriptor_count; i++) {
+		u64 rel_procedure_offset = (fd_header->ipd_first + i) * sizeof(ProcedureDescriptor);
+		u64 procedure_offset = m_hdrr->procedure_descriptors_offset + rel_procedure_offset + m_fudge_offset;
+		const ProcedureDescriptor* procedure_descriptor = get_packed<ProcedureDescriptor>(m_elf, procedure_offset);
+		CCC_CHECK(procedure_descriptor != nullptr, "Procedure descriptor out of bounds.");
+		
+		CCC_CHECK(procedure_descriptor->symbol_index < file.symbols.size(), "Symbol index out of bounds.");
+		file.symbols[procedure_descriptor->symbol_index].procedure_descriptor = procedure_descriptor;
+	}
+
+	
+	file.full_path = merge_paths(file.working_dir, file.command_line_path);
+	
+	return file;
+}
+
+Result<std::vector<Symbol>> SymbolTableReader::parse_external_symbols() const
+{
+	CCC_ASSERT(m_ready);
+	
+	std::vector<Symbol> external_symbols;
+	for(s64 i = 0; i < m_hdrr->external_symbols_count; i++) {
+		u64 sym_offset = m_hdrr->external_symbols_offset + i * sizeof(ExternalSymbolHeader);
+		const ExternalSymbolHeader* external_header = get_packed<ExternalSymbolHeader>(m_elf, sym_offset + m_fudge_offset);
+		CCC_CHECK(external_header != nullptr, "External header out of bounds.");
+		
+		Result<Symbol> sym = get_symbol(external_header->symbol, m_elf, m_hdrr->external_strings_offset + m_fudge_offset);
+		CCC_RETURN_IF_ERROR(sym);
+		external_symbols.emplace_back(std::move(*sym));
+	}
+	
+	return external_symbols;
+}
+
+void SymbolTableReader::print_header(FILE* dest) const
+{
+	CCC_ASSERT(m_ready);
+	
+	fprintf(dest, "Symbolic Header, magic = %hx, vstamp = %hx:\n",
+		(u16) m_hdrr->magic,
+		(u16) m_hdrr->version_stamp);
+	fprintf(dest, "\n");
+	fprintf(dest, "                              Offset              Size (Bytes)        Count\n");
+	fprintf(dest, "                              ------              ------------        -----\n");
+	fprintf(dest, "  Line Numbers                0x%-8x          "  "0x%-8x          "  "%-8d\n",
+		(u32) m_hdrr->line_numbers_offset,
+		(u32) m_hdrr->line_numbers_size_bytes,
+		m_hdrr->line_number_count);
+	fprintf(dest, "  Dense Numbers               0x%-8x          "  "0x%-8x          "  "%-8d\n",
+		(u32) m_hdrr->dense_numbers_offset,
+		(u32) m_hdrr->dense_numbers_count * 8,
+		m_hdrr->dense_numbers_count);
+	fprintf(dest, "  Procedure Descriptors       0x%-8x          "  "0x%-8x          "  "%-8d\n",
+		(u32) m_hdrr->procedure_descriptors_offset,
+		(u32) m_hdrr->procedure_descriptor_count * (u32) sizeof(ProcedureDescriptor),
+		m_hdrr->procedure_descriptor_count);
+	fprintf(dest, "  Local Symbols               0x%-8x          "  "0x%-8x          "  "%-8d\n",
+		(u32) m_hdrr->local_symbols_offset,
+		(u32) m_hdrr->local_symbol_count * (u32) sizeof(SymbolHeader),
+		m_hdrr->local_symbol_count);
+	fprintf(dest, "  Optimization Symbols        0x%-8x          "  "-                   " "%-8d\n",
+		(u32) m_hdrr->optimization_symbols_offset,
+		m_hdrr->optimization_symbols_count);
+	fprintf(dest, "  Auxiliary Symbols           0x%-8x          "  "0x%-8x          "  "%-8d\n",
+		(u32) m_hdrr->auxiliary_symbols_offset,
+		(u32) m_hdrr->auxiliary_symbol_count * 4,
+		m_hdrr->auxiliary_symbol_count);
+	fprintf(dest, "  Local Strings               0x%-8x          "  "0x%-8x          "  "-\n",
+		(u32) m_hdrr->local_strings_offset,
+		(u32) m_hdrr->local_strings_size_bytes);
+	fprintf(dest, "  External Strings            0x%-8x          "  "0x%-8x          "  "-\n",
+		(u32) m_hdrr->external_strings_offset,
+		(u32) m_hdrr->external_strings_size_bytes);
+	fprintf(dest, "  File Descriptors            0x%-8x          "  "0x%-8x          "  "%-8d\n",
+		(u32) m_hdrr->file_descriptors_offset,
+		(u32) m_hdrr->file_descriptor_count * (u32) sizeof(FileDescriptor),
+		m_hdrr->file_descriptor_count);
+	fprintf(dest, "  Relative File Descriptors   0x%-8x          "  "0x%-8x          "  "%-8d\n",
+		(u32) m_hdrr->relative_file_descriptors_offset,
+		(u32) m_hdrr->relative_file_descriptor_count * 4,
+		m_hdrr->relative_file_descriptor_count);
+	fprintf(dest, "  External Symbols            0x%-8x          "  "0x%-8x          "  "%-8d\n",
+		(u32) m_hdrr->external_symbols_offset,
+		(u32) m_hdrr->external_symbols_count * 16,
+		m_hdrr->external_symbols_count);
+}
+
+Result<void> SymbolTableReader::print_symbols(FILE* out, bool print_locals, bool print_procedure_descriptors, bool print_externals) const
+{
+	if(print_locals || print_procedure_descriptors) {
+		s32 count = file_count();
+		for(s32 i = 0; i < count; i++) {
+			Result<File> file = parse_file(i);
+			CCC_RETURN_IF_ERROR(file);
+			
+			fprintf(out, "FILE %s:\n", file->command_line_path.c_str());
+			for(const Symbol& symbol : file->symbols) {
+				if(print_locals || symbol.procedure_descriptor) {
+					print_symbol(out, symbol);
+				}
+				if(print_procedure_descriptors && symbol.procedure_descriptor) {
+					print_procedure_descriptor(out, *symbol.procedure_descriptor);
+				}
+			}
+		}
+	}
+	
+	if(print_externals) {
+		fprintf(out, "EXTERNAL SYMBOLS:\n");
+		Result<std::vector<Symbol>> external_symbols = parse_external_symbols();
+		CCC_RETURN_IF_ERROR(external_symbols);
+		for(const Symbol& symbol : *external_symbols) {
+			print_symbol(out, symbol);
+		}
+	}
+	
+	return Result<void>();
+}
+
+static void print_symbol(FILE* out, const Symbol& symbol)
+{
+	fprintf(out, "    %8x ", symbol.value);
+	
+	const char* symbol_type_str = symbol_type(symbol.symbol_type);
+	if(symbol_type_str) {
+		fprintf(out, "%-11s ", symbol_type_str);
+	} else {
+		fprintf(out, "ST(%7u) ", (u32) symbol.symbol_type);
+	}
+	
+	const char* symbol_class_str = symbol_class(symbol.symbol_class);
+	if(symbol_class_str) {
+		fprintf(out, "%-4s ", symbol_class_str);
+	} else if ((u32) symbol.symbol_class == 0) {
+		fprintf(out, "         ");
+	} else {
+		fprintf(out, "SC(%4u) ", (u32) symbol.symbol_class);
+	}
+	
+	if(symbol.is_stabs()) {
+		fprintf(out, "%-8s ", stabs_code_to_string(symbol.code()));
+	} else {
+		fprintf(out, "SI(%4u) ", symbol.index);
+	}
+	
+	fprintf(out, "%s\n", symbol.string);
+}
+
+static void print_procedure_descriptor(FILE* out, const ProcedureDescriptor& procedure_descriptor)
+{
+	fprintf(out, "                    Address                       0x%08x\n", procedure_descriptor.address);
+	fprintf(out, "                    Symbol Index                  %d\n", procedure_descriptor.symbol_index);
+	fprintf(out, "                    Line Number Entry Index       %d\n", procedure_descriptor.line_number_entry_index);
+	fprintf(out, "                    Saved Register Mask           0x%08x\n", procedure_descriptor.saved_register_mask);
+	fprintf(out, "                    Saved Register Offset         %d\n", procedure_descriptor.saved_register_offset);
+	fprintf(out, "                    Optimization Entry Index      %d\n", procedure_descriptor.optimization_entry_index);
+	fprintf(out, "                    Saved Float Register Mask     0x%08x\n", procedure_descriptor.saved_float_register_mask);
+	fprintf(out, "                    Saved Float Register Offset   %d\n", procedure_descriptor.saved_float_register_offset);
+	fprintf(out, "                    Frame Size                    %d\n", procedure_descriptor.frame_size);
+	fprintf(out, "                    Frame Pointer Register        %hd\n", procedure_descriptor.frame_pointer_register);
+	fprintf(out, "                    Return PC Register            %hd\n", procedure_descriptor.return_pc_register);
+	fprintf(out, "                    Line Number Low               %d\n", procedure_descriptor.line_number_low);
+	fprintf(out, "                    Line Number High              %d\n", procedure_descriptor.line_number_high);
+	fprintf(out, "                    Line Number Offset            %d\n", procedure_descriptor.line_number_offset);
+}
+
+static Result<s32> get_corruption_fixing_fudge_offset(s32 section_offset, const SymbolicHeader& hdrr)
+{
+	// GCC will always put the first part of the symbol table right after the
+	// header, so if the header says it's somewhere else we know the section has
+	// probably been moved without updating its contents.
+	s32 right_after_header = INT32_MAX;
+	if(hdrr.line_numbers_offset > 0) right_after_header = std::min(hdrr.line_numbers_offset, right_after_header);
+	if(hdrr.dense_numbers_offset > 0) right_after_header = std::min(hdrr.dense_numbers_offset, right_after_header);
+	if(hdrr.procedure_descriptors_offset > 0) right_after_header = std::min(hdrr.procedure_descriptors_offset, right_after_header);
+	if(hdrr.local_symbols_offset > 0) right_after_header = std::min(hdrr.local_symbols_offset, right_after_header);
+	if(hdrr.optimization_symbols_offset > 0) right_after_header = std::min(hdrr.optimization_symbols_offset, right_after_header);
+	if(hdrr.auxiliary_symbols_offset > 0) right_after_header = std::min(hdrr.auxiliary_symbols_offset, right_after_header);
+	if(hdrr.local_strings_offset > 0) right_after_header = std::min(hdrr.local_strings_offset, right_after_header);
+	if(hdrr.external_strings_offset > 0) right_after_header = std::min(hdrr.external_strings_offset, right_after_header);
+	if(hdrr.file_descriptors_offset > 0) right_after_header = std::min(hdrr.file_descriptors_offset, right_after_header);
+	if(hdrr.relative_file_descriptors_offset > 0) right_after_header = std::min(hdrr.relative_file_descriptors_offset, right_after_header);
+	if(hdrr.external_symbols_offset > 0) right_after_header = std::min(hdrr.external_symbols_offset, right_after_header);
+	
+	CCC_CHECK(right_after_header >= 0 && right_after_header < INT32_MAX, "Invalid symbolic header.");
+	
+	// Figure out how much we need to adjust all the file offsets by.
+	s32 fudge_offset = section_offset - (right_after_header - sizeof(SymbolicHeader));
+	if(fudge_offset != 0) {
+		CCC_WARN("The .mdebug section was moved without updating its contents. Adjusting file offsets by %d bytes.", fudge_offset);
+	}
+	
+	return fudge_offset;
+}
+
+static Result<Symbol> get_symbol(const SymbolHeader& header, std::span<const u8> elf, s32 strings_offset)
+{
+	Symbol symbol;
+	
+	const char* string = get_string(elf, strings_offset + header.iss);
+	CCC_CHECK(string, "Symbol has invalid string.");
+	symbol.string = string;
+	
+	symbol.value = header.value;
+	symbol.symbol_type = (SymbolType) header.st;
+	symbol.symbol_class = (SymbolClass) header.sc;
+	symbol.index = header.index;
+	
+	if(symbol.is_stabs()) {
+		CCC_CHECK(stabs_code_to_string(symbol.code()) != nullptr, "Bad stabs symbol code '%x'.", symbol.code());
+	}
+	
+	return symbol;
+}
+
+const char* symbol_type(SymbolType type)
+{
+	switch(type) {
+		case SymbolType::NIL: return "NIL";
+		case SymbolType::GLOBAL: return "GLOBAL";
+		case SymbolType::STATIC: return "STATIC";
+		case SymbolType::PARAM: return "PARAM";
+		case SymbolType::LOCAL: return "LOCAL";
+		case SymbolType::LABEL: return "LABEL";
+		case SymbolType::PROC: return "PROC";
+		case SymbolType::BLOCK: return "BLOCK";
+		case SymbolType::END: return "END";
+		case SymbolType::MEMBER: return "MEMBER";
+		case SymbolType::TYPEDEF: return "TYPEDEF";
+		case SymbolType::FILE_SYMBOL: return "FILE";
+		case SymbolType::STATICPROC: return "STATICPROC";
+		case SymbolType::CONSTANT: return "CONSTANT";
+	}
+	return nullptr;
+}
+
+const char* symbol_class(SymbolClass symbol_class)
+{
+	switch(symbol_class) {
+		case SymbolClass::NIL: return "NIL";
+		case SymbolClass::TEXT: return "TEXT";
+		case SymbolClass::DATA: return "DATA";
+		case SymbolClass::BSS: return "BSS";
+		case SymbolClass::REGISTER: return "REGISTER";
+		case SymbolClass::ABS: return "ABS";
+		case SymbolClass::UNDEFINED: return "UNDEFINED";
+		case SymbolClass::LOCAL: return "LOCAL";
+		case SymbolClass::BITS: return "BITS";
+		case SymbolClass::DBX: return "DBX";
+		case SymbolClass::REG_IMAGE: return "REG_IMAGE";
+		case SymbolClass::INFO: return "INFO";
+		case SymbolClass::USER_STRUCT: return "USER_STRUCT";
+		case SymbolClass::SDATA: return "SDATA";
+		case SymbolClass::SBSS: return "SBSS";
+		case SymbolClass::RDATA: return "RDATA";
+		case SymbolClass::VAR: return "VAR";
+		case SymbolClass::COMMON: return "COMMON";
+		case SymbolClass::SCOMMON: return "SCOMMON";
+		case SymbolClass::VAR_REGISTER: return "VAR_REGISTER";
+		case SymbolClass::VARIANT: return "VARIANT";
+		case SymbolClass::SUNDEFINED: return "SUNDEFINED";
+		case SymbolClass::INIT: return "INIT";
+		case SymbolClass::BASED_VAR: return "BASED_VAR";
+		case SymbolClass::XDATA: return "XDATA";
+		case SymbolClass::PDATA: return "PDATA";
+		case SymbolClass::FINI: return "FINI";
+		case SymbolClass::NONGP: return "NONGP";
+	}
+	return nullptr;
+}
+
+const char* stabs_code_to_string(StabsCode code)
+{
+	switch(code) {
+		case STAB: return "STAB";
+		case N_GSYM: return "GSYM";
+		case N_FNAME: return "FNAME";
+		case N_FUN: return "FUN";
+		case N_STSYM: return "STSYM";
+		case N_LCSYM: return "LCSYM";
+		case N_MAIN: return "MAIN";
+		case N_PC: return "PC";
+		case N_NSYMS: return "NSYMS";
+		case N_NOMAP: return "NOMAP";
+		case N_OBJ: return "OBJ";
+		case N_OPT: return "OPT";
+		case N_RSYM: return "RSYM";
+		case N_M2C: return "M2C";
+		case N_SLINE: return "SLINE";
+		case N_DSLINE: return "DSLINE";
+		case N_BSLINE: return "BSLINE";
+		case N_EFD: return "EFD";
+		case N_EHDECL: return "EHDECL";
+		case N_CATCH: return "CATCH";
+		case N_SSYM: return "SSYM";
+		case N_SO: return "SO";
+		case N_LSYM: return "LSYM";
+		case N_BINCL: return "BINCL";
+		case N_SOL: return "SOL";
+		case N_PSYM: return "PSYM";
+		case N_EINCL: return "EINCL";
+		case N_ENTRY: return "ENTRY";
+		case N_LBRAC: return "LBRAC";
+		case N_EXCL: return "EXCL";
+		case N_SCOPE: return "SCOPE";
+		case N_RBRAC: return "RBRAC";
+		case N_BCOMM: return "BCOMM";
+		case N_ECOMM: return "ECOMM";
+		case N_ECOML: return "ECOML";
+		case N_NBTEXT: return "NBTEXT";
+		case N_NBDATA: return "NBDATA";
+		case N_NBBSS: return "NBBSS";
+		case N_NBSTS: return "NBSTS";
+		case N_NBLCS: return "NBLCS";
+		case N_LENG: return "LENG";
+	}
+	return nullptr;
+}
+
+}

3rdparty/ccc/src/ccc/mdebug_section.h

@@ -0,0 +1,176 @@
+// This file is part of the Chaos Compiler Collection.
+// SPDX-License-Identifier: MIT
+
+#pragma once
+
+#include "util.h"
+
+namespace ccc::mdebug {
+
+struct SymbolicHeader;
+
+enum class SymbolType : u32 {
+	NIL = 0,
+	GLOBAL = 1,
+	STATIC = 2,
+	PARAM = 3,
+	LOCAL = 4,
+	LABEL = 5,
+	PROC = 6,
+	BLOCK = 7,
+	END = 8,
+	MEMBER = 9,
+	TYPEDEF = 10,
+	FILE_SYMBOL = 11,
+	STATICPROC = 14,
+	CONSTANT = 15
+};
+
+enum class SymbolClass : u32 {
+	NIL = 0,
+	TEXT = 1,
+	DATA = 2,
+	BSS = 3,
+	REGISTER = 4,
+	ABS = 5,
+	UNDEFINED = 6,
+	LOCAL = 7,
+	BITS = 8,
+	DBX = 9,
+	REG_IMAGE = 10,
+	INFO = 11,
+	USER_STRUCT = 12,
+	SDATA = 13,
+	SBSS = 14,
+	RDATA = 15,
+	VAR = 16,
+	COMMON = 17,
+	SCOMMON = 18,
+	VAR_REGISTER = 19,
+	VARIANT = 20,
+	SUNDEFINED = 21,
+	INIT = 22,
+	BASED_VAR = 23,
+	XDATA = 24,
+	PDATA = 25,
+	FINI = 26,
+	NONGP = 27
+};
+
+// See stab.def from gcc for documentation on what all these are.
+enum StabsCode {
+	STAB = 0x00,
+	N_GSYM = 0x20,
+	N_FNAME = 0x22,
+	N_FUN = 0x24,
+	N_STSYM = 0x26,
+	N_LCSYM = 0x28,
+	N_MAIN = 0x2a,
+	N_PC = 0x30,
+	N_NSYMS = 0x32,
+	N_NOMAP = 0x34,
+	N_OBJ = 0x38,
+	N_OPT = 0x3c,
+	N_RSYM = 0x40,
+	N_M2C = 0x42,
+	N_SLINE = 0x44,
+	N_DSLINE = 0x46,
+	N_BSLINE = 0x48,
+	N_EFD = 0x4a,
+	N_EHDECL = 0x50,
+	N_CATCH = 0x54,
+	N_SSYM = 0x60,
+	N_SO = 0x64,
+	N_LSYM = 0x80,
+	N_BINCL = 0x82,
+	N_SOL = 0x84,
+	N_PSYM = 0xa0,
+	N_EINCL = 0xa2,
+	N_ENTRY = 0xa4,
+	N_LBRAC = 0xc0,
+	N_EXCL = 0xc2,
+	N_SCOPE = 0xc4,
+	N_RBRAC = 0xe0,
+	N_BCOMM = 0xe2,
+	N_ECOMM = 0xe4,
+	N_ECOML = 0xe8,
+	N_NBTEXT = 0xf0,
+	N_NBDATA = 0xf2,
+	N_NBBSS = 0xf4,
+	N_NBSTS = 0xf6,
+	N_NBLCS = 0xf8,
+	N_LENG = 0xfe
+};
+
+CCC_PACKED_STRUCT(ProcedureDescriptor,
+	/* 0x00 */ u32 address;
+	/* 0x04 */ u32 symbol_index;
+	/* 0x08 */ s32 line_number_entry_index;
+	/* 0x0c */ s32 saved_register_mask;
+	/* 0x10 */ s32 saved_register_offset;
+	/* 0x14 */ s32 optimization_entry_index;
+	/* 0x18 */ s32 saved_float_register_mask;
+	/* 0x1c */ s32 saved_float_register_offset;
+	/* 0x20 */ s32 frame_size;
+	/* 0x24 */ s16 frame_pointer_register;
+	/* 0x26 */ s16 return_pc_register;
+	/* 0x28 */ s32 line_number_low;
+	/* 0x2c */ s32 line_number_high;
+	/* 0x30 */ u32 line_number_offset;
+)
+static_assert(sizeof(ProcedureDescriptor) == 0x34);
+
+struct Symbol {
+	u32 value;
+	SymbolType symbol_type;
+	SymbolClass symbol_class;
+	u32 index;
+	const char* string;
+	const ProcedureDescriptor* procedure_descriptor = nullptr;
+	
+	bool is_stabs() const {
+		return (index & 0xfff00) == 0x8f300;
+	}
+	
+	StabsCode code() const {
+		return (StabsCode) (index - 0x8f300);
+	}
+};
+
+struct File {
+	std::vector<Symbol> symbols;
+	u32 address = 0;
+	std::string working_dir; // The working directory of gcc.
+	std::string command_line_path; // The source file path passed on the command line to gcc.
+	std::string full_path; // The full combined path.
+};
+
+class SymbolTableReader {
+public:
+	Result<void> init(std::span<const u8> elf, s32 section_offset);
+	
+	s32 file_count() const;
+	Result<File> parse_file(s32 index) const;
+	Result<std::vector<Symbol>> parse_external_symbols() const;
+	
+	void print_header(FILE* out) const;
+	Result<void> print_symbols(FILE* out, bool print_locals, bool print_procedure_descriptors, bool print_externals) const;
+
+protected:
+	bool m_ready = false;
+	
+	std::span<const u8> m_elf;
+	s32 m_section_offset;
+	
+	// If the .mdebug section was moved without updating its contents all the
+	// absolute file offsets stored within will be incorrect by a fixed amount.
+	s32 m_fudge_offset;
+	
+	const SymbolicHeader* m_hdrr;
+};
+
+const char* symbol_type(SymbolType type);
+const char* symbol_class(SymbolClass symbol_class);
+const char* stabs_code_to_string(StabsCode code);
+
+}

3rdparty/ccc/src/ccc/mdebug_symbols.cpp

@@ -0,0 +1,220 @@
+// This file is part of the Chaos Compiler Collection.
+// SPDX-License-Identifier: MIT
+
+#include "mdebug_symbols.h"
+
+#include "importer_flags.h"
+
+namespace ccc::mdebug {
+
+static void mark_duplicate_symbols(std::vector<ParsedSymbol>& symbols);
+
+Result<std::vector<ParsedSymbol>> parse_symbols(const std::vector<mdebug::Symbol>& input, u32& importer_flags)
+{
+	std::vector<ParsedSymbol> output;
+	std::string prefix;
+	for(const mdebug::Symbol& symbol : input) {
+		if(symbol.is_stabs()) {
+			switch(symbol.code()) {
+				case mdebug::N_GSYM: // Global variable
+				case mdebug::N_FUN: // Function
+				case mdebug::N_STSYM: // Data section static global variable
+				case mdebug::N_LCSYM: // BSS section static global variable
+				case mdebug::N_RSYM: // Register variable
+				case mdebug::N_LSYM: // Automatic variable or type definition
+				case mdebug::N_PSYM: { // Parameter variable
+					// Some STABS symbols are split between multiple strings.
+					if(symbol.string[0] != '\0') {
+						if(symbol.string[strlen(symbol.string) - 1] == '\\') {
+							prefix += std::string(symbol.string, symbol.string + strlen(symbol.string) - 1);
+						} else {
+							std::string merged_string;
+							const char* string;
+							if(!prefix.empty()) {
+								merged_string = prefix + symbol.string;
+								string = merged_string.c_str();
+								prefix.clear();
+							} else {
+								string = symbol.string;
+							}
+							
+							const char* input = string;
+							Result<StabsSymbol> parse_result = parse_stabs_symbol(input);
+							if(parse_result.success()) {
+								if(*input != '\0') {
+									if(importer_flags & STRICT_PARSING) {
+										return CCC_FAILURE("Unknown data '%s' at the end of the '%s' stab.", input, parse_result->name.c_str());
+									} else {
+										CCC_WARN("Unknown data '%s' at the end of the '%s' stab.", input, parse_result->name.c_str());
+									}
+								}
+								
+								ParsedSymbol& parsed = output.emplace_back();
+								parsed.type = ParsedSymbolType::NAME_COLON_TYPE;
+								parsed.raw = &symbol;
+								parsed.name_colon_type = std::move(*parse_result);
+							} else if(parse_result.error().message == STAB_TRUNCATED_ERROR_MESSAGE) {
+								// Symbol truncated due to a GCC bug. Report a
+								// warning and try to tolerate further faults
+								// caused as a result of this.
+								CCC_WARN("%s Symbol string: %s", STAB_TRUNCATED_ERROR_MESSAGE, string);
+								importer_flags &= ~STRICT_PARSING;
+							} else {
+								return CCC_FAILURE("%s Symbol string: %s",
+									parse_result.error().message.c_str(), string);
+							}
+						}
+					} else {
+						CCC_CHECK(prefix.empty(), "Invalid STABS continuation.");
+						if(symbol.code() == mdebug::N_FUN) {
+							ParsedSymbol& func_end = output.emplace_back();
+							func_end.type = ParsedSymbolType::FUNCTION_END;
+							func_end.raw = &symbol;
+						}
+					}
+					break;
+				}
+				case mdebug::N_SOL: { // Sub-source file
+					ParsedSymbol& sub = output.emplace_back();
+					sub.type = ParsedSymbolType::SUB_SOURCE_FILE;
+					sub.raw = &symbol;
+					break;
+				}
+				case mdebug::N_LBRAC: { // Begin block
+					ParsedSymbol& begin_block = output.emplace_back();
+					begin_block.type = ParsedSymbolType::LBRAC;
+					begin_block.raw = &symbol;
+					break;
+				}
+				case mdebug::N_RBRAC: { // End block
+					ParsedSymbol& end_block = output.emplace_back();
+					end_block.type = ParsedSymbolType::RBRAC;
+					end_block.raw = &symbol;
+					break;
+				}
+				case mdebug::N_SO: { // Source filename
+					ParsedSymbol& so_symbol = output.emplace_back();
+					so_symbol.type = ParsedSymbolType::SOURCE_FILE;
+					so_symbol.raw = &symbol;
+					break;
+				}
+				case mdebug::STAB:
+				case mdebug::N_OPT:
+				case mdebug::N_BINCL:
+				case mdebug::N_EINCL: {
+					break;
+				}
+				case mdebug::N_FNAME:
+				case mdebug::N_MAIN:
+				case mdebug::N_PC:
+				case mdebug::N_NSYMS:
+				case mdebug::N_NOMAP:
+				case mdebug::N_OBJ:
+				case mdebug::N_M2C:
+				case mdebug::N_SLINE:
+				case mdebug::N_DSLINE:
+				case mdebug::N_BSLINE:
+				case mdebug::N_EFD:
+				case mdebug::N_EHDECL:
+				case mdebug::N_CATCH:
+				case mdebug::N_SSYM:
+				case mdebug::N_ENTRY:
+				case mdebug::N_EXCL:
+				case mdebug::N_SCOPE:
+				case mdebug::N_BCOMM:
+				case mdebug::N_ECOMM:
+				case mdebug::N_ECOML:
+				case mdebug::N_NBTEXT:
+				case mdebug::N_NBDATA:
+				case mdebug::N_NBBSS:
+				case mdebug::N_NBSTS:
+				case mdebug::N_NBLCS:
+				case mdebug::N_LENG: {
+					CCC_WARN("Unhandled N_%s symbol: %s", mdebug::stabs_code_to_string(symbol.code()), symbol.string);
+					break;
+				}
+			}
+		} else {
+			ParsedSymbol& non_stabs_symbol = output.emplace_back();
+			non_stabs_symbol.type = ParsedSymbolType::NON_STABS;
+			non_stabs_symbol.raw = &symbol;
+		}
+	}
+	
+	mark_duplicate_symbols(output);
+	
+	return output;
+}
+
+static void mark_duplicate_symbols(std::vector<ParsedSymbol>& symbols)
+{
+	std::map<StabsTypeNumber, size_t> stabs_type_number_to_symbol;
+	for(size_t i = 0; i < symbols.size(); i++) {
+		ParsedSymbol& symbol = symbols[i];
+		if(symbol.type == ParsedSymbolType::NAME_COLON_TYPE) {
+			StabsType& type = *symbol.name_colon_type.type;
+			if(type.type_number.valid() && type.descriptor.has_value()) {
+				stabs_type_number_to_symbol.emplace(type.type_number, i);
+			}
+		}
+	}
+	
+	for(ParsedSymbol& symbol : symbols) {
+		symbol.is_typedef =
+			symbol.type == ParsedSymbolType::NAME_COLON_TYPE &&
+			symbol.name_colon_type.descriptor == StabsSymbolDescriptor::TYPE_NAME &&
+			symbol.name_colon_type.type->descriptor != StabsTypeDescriptor::ENUM;
+	}
+	
+	for(size_t i = 0; i < symbols.size(); i++) {
+		ParsedSymbol& symbol = symbols[i];
+		if(symbol.type != ParsedSymbolType::NAME_COLON_TYPE) {
+			continue;
+		}
+		
+		bool is_type =
+			symbol.name_colon_type.descriptor == StabsSymbolDescriptor::TYPE_NAME ||
+			symbol.name_colon_type.descriptor == StabsSymbolDescriptor::ENUM_STRUCT_OR_TYPE_TAG;
+		if(!is_type) {
+			continue;
+		}
+		
+		StabsType& type = *symbol.name_colon_type.type;
+		
+		if(!type.descriptor.has_value()) {
+			auto referenced_index = stabs_type_number_to_symbol.find(type.type_number);
+			if(referenced_index != stabs_type_number_to_symbol.end()) {
+				ParsedSymbol& referenced = symbols[referenced_index->second];
+				if(referenced.name_colon_type.name == symbol.name_colon_type.name) {
+					// symbol:     "Struct:T(1,1)=s1;"
+					// referenced: "Struct:t(1,1)"
+					symbol.duplicate = true;
+				}
+			}
+		}
+		
+		if(type.descriptor.has_value() && type.descriptor == StabsTypeDescriptor::TYPE_REFERENCE) {
+			auto referenced_index = stabs_type_number_to_symbol.find(type.as<StabsTypeReferenceType>().type->type_number);
+			if(referenced_index != stabs_type_number_to_symbol.end() && referenced_index->second != i) {
+				ParsedSymbol& referenced = symbols[referenced_index->second];
+				
+				if(referenced.name_colon_type.name == " ") {
+					// referenced: " :T(1,1)=e;"
+					// symbol:     "ErraticEnum:t(1,2)=(1,1)"
+					referenced.name_colon_type.name = symbol.name_colon_type.name;
+					referenced.is_typedef = true;
+					symbol.duplicate = true;
+				}
+				
+				if(referenced.name_colon_type.name == symbol.name_colon_type.name) {
+					// referenced: "NamedTypedefedStruct:T(1,1)=s1;"
+					// symbol:     "NamedTypedefedStruct:t(1,2)=(1,1)"
+					referenced.is_typedef = true;
+					symbol.duplicate = true;
+				}
+			}
+		}
+	}
+}
+
+}

3rdparty/ccc/src/ccc/mdebug_symbols.h

@@ -0,0 +1,32 @@
+// This file is part of the Chaos Compiler Collection.
+// SPDX-License-Identifier: MIT
+
+#pragma once
+
+#include "util.h"
+#include "stabs.h"
+#include "mdebug_section.h"
+
+namespace ccc::mdebug {
+
+enum class ParsedSymbolType {
+	NAME_COLON_TYPE,
+	SOURCE_FILE,
+	SUB_SOURCE_FILE,
+	LBRAC,
+	RBRAC,
+	FUNCTION_END,
+	NON_STABS
+};
+
+struct ParsedSymbol {
+	ParsedSymbolType type;
+	const mdebug::Symbol* raw;
+	StabsSymbol name_colon_type;
+	bool duplicate = false;
+	bool is_typedef = false;
+};
+
+Result<std::vector<ParsedSymbol>> parse_symbols(const std::vector<mdebug::Symbol>& input, u32& importer_flags);
+
+}

3rdparty/ccc/src/ccc/sndll.cpp

@@ -0,0 +1,191 @@
+// This file is part of the Chaos Compiler Collection.
+// SPDX-License-Identifier: MIT
+
+#include "sndll.h"
+
+#include "importer_flags.h"
+
+namespace ccc {
+
+CCC_PACKED_STRUCT(SNDLLHeaderCommon,
+	/* 0x00 */ u32 magic;
+	/* 0x04 */ u32 relocations;
+	/* 0x08 */ u32 relocation_count;
+	/* 0x0c */ u32 symbols;
+	/* 0x10 */ u32 symbol_count;
+	/* 0x14 */ u32 elf_path;
+	/* 0x18 */ u32 load_func;
+	/* 0x1c */ u32 unload_func;
+	/* 0x20 */ u32 unknown_20;
+	/* 0x24 */ u32 unknown_24;
+	/* 0x28 */ u32 unknown_28;
+	/* 0x2c */ u32 file_size;
+	/* 0x30 */ u32 unknown_30;
+)
+
+CCC_PACKED_STRUCT(SNDLLHeaderV1,
+	/* 0x00 */ SNDLLHeaderCommon common;
+)
+
+CCC_PACKED_STRUCT(SNDLLHeaderV2,
+	/* 0x00 */ SNDLLHeaderCommon common;
+	/* 0x34 */ u32 unknown_34;
+	/* 0x38 */ u32 unknown_38;
+)
+
+CCC_PACKED_STRUCT(SNDLLRelocation,
+	/* 0x0 */ u32 unknown_0;
+	/* 0x4 */ u32 unknown_4;
+	/* 0x8 */ u32 unknown_8;
+)
+
+CCC_PACKED_STRUCT(SNDLLSymbolHeader,
+	/* 0x0 */ u32 string;
+	/* 0x4 */ u32 value;
+	/* 0x8 */ u8 unknown_8;
+	/* 0x9 */ u8 unknown_9;
+	/* 0xa */ SNDLLSymbolType type;
+	/* 0xb */ u8 processed;
+)
+
+static Result<SNDLLFile> parse_sndll_common(
+	std::span<const u8> image, Address address, SNDLLType type, const SNDLLHeaderCommon& common, SNDLLVersion version);
+static const char* sndll_symbol_type_to_string(SNDLLSymbolType type);
+
+Result<SNDLLFile> parse_sndll_file(std::span<const u8> image, Address address, SNDLLType type)
+{
+	const u32* magic = get_packed<u32>(image, 0);
+	CCC_CHECK((*magic & 0xffffff) == CCC_FOURCC("SNR\00"), "Not a SNDLL %s.", address.valid() ? "section" : "file");
+	
+	char version = *magic >> 24;
+	switch(version) {
+		case '1': {
+			const SNDLLHeaderV1* header = get_packed<SNDLLHeaderV1>(image, 0);
+			CCC_CHECK(header, "File too small to contain SNDLL V1 header.");
+			return parse_sndll_common(image, address, type, header->common, SNDLL_V1);
+		}
+		case '2': {
+			const SNDLLHeaderV2* header = get_packed<SNDLLHeaderV2>(image, 0);
+			CCC_CHECK(header, "File too small to contain SNDLL V2 header.");
+			return parse_sndll_common(image, address, type, header->common, SNDLL_V2);
+		}
+	}
+	
+	return CCC_FAILURE("Unknown SNDLL version '%c'.", version);
+}
+
+static Result<SNDLLFile> parse_sndll_common(
+	std::span<const u8> image, Address address, SNDLLType type, const SNDLLHeaderCommon& common, SNDLLVersion version)
+{
+	SNDLLFile sndll;
+	
+	sndll.address = address;
+	sndll.type = type;
+	sndll.version = version;
+	
+	if(common.elf_path) {
+		const char* elf_path = get_string(image, common.elf_path);
+		if(elf_path) {
+			sndll.elf_path = elf_path;
+		}
+	}
+	
+	CCC_CHECK(common.symbol_count < (32 * 1024 * 1024) / sizeof(SNDLLSymbol), "SNDLL symbol count is too high.");
+	sndll.symbols.reserve(common.symbol_count);
+	
+	for(u32 i = 0; i < common.symbol_count; i++) {
+		u32 symbol_offset = common.symbols - address.get_or_zero() + i * sizeof(SNDLLSymbolHeader);
+		const SNDLLSymbolHeader* symbol_header = get_packed<SNDLLSymbolHeader>(image, symbol_offset);
+		CCC_CHECK(symbol_header, "SNDLL symbol out of range.");
+		
+		const char* string = nullptr;
+		if(symbol_header->string) {
+			string = get_string(image, symbol_header->string - address.get_or_zero());
+		}
+		
+		SNDLLSymbol& symbol = sndll.symbols.emplace_back();
+		symbol.type = symbol_header->type;
+		symbol.value = symbol_header->value;
+		symbol.string = string;
+	}
+	
+	return sndll;
+}
+
+Result<void> import_sndll_symbols(
+	SymbolDatabase& database,
+	const SNDLLFile& sndll,
+	const SymbolGroup& group,
+	u32 importer_flags,
+	DemanglerFunctions demangler)
+{
+	for(const SNDLLSymbol& symbol : sndll.symbols) {
+		if(symbol.value == 0 || symbol.string.empty()) {
+			continue;
+		}
+		
+		u32 address = symbol.value;
+		if(symbol.type != SNDLL_ABSOLUTE && sndll.type == SNDLLType::DYNAMIC_LIBRARY) {
+			address += sndll.address.get_or_zero();
+		}
+		
+		if(!(importer_flags & DONT_DEDUPLICATE_SYMBOLS)) {
+			if(database.functions.first_handle_from_starting_address(address).valid()) {
+				continue;
+			}
+			
+			if(database.global_variables.first_handle_from_starting_address(address).valid()) {
+				continue;
+			}
+			
+			if(database.local_variables.first_handle_from_starting_address(address).valid()) {
+				continue;
+			}
+		}
+		
+		const Section* section = database.sections.symbol_overlapping_address(address);
+		if(section) {
+			if(section->contains_code()) {
+				Result<Function*> function = database.functions.create_symbol(
+					symbol.string, group.source, group.module_symbol, address, importer_flags, demangler);
+				CCC_RETURN_IF_ERROR(function);
+				continue;
+			} else if(section->contains_data()) {
+				Result<GlobalVariable*> global_variable = database.global_variables.create_symbol(
+					symbol.string, group.source, group.module_symbol, address, importer_flags, demangler);
+				CCC_RETURN_IF_ERROR(global_variable);
+				continue;
+			}
+		}
+		
+		Result<Label*> label = database.labels.create_symbol(
+			symbol.string, group.source, group.module_symbol, address, importer_flags, demangler);
+		CCC_RETURN_IF_ERROR(label);
+	}
+	
+	return Result<void>();
+}
+
+void print_sndll_symbols(FILE* out, const SNDLLFile& sndll)
+{
+	fprintf(out, "SNDLL SYMBOLS:\n");
+	for(const SNDLLSymbol& symbol : sndll.symbols) {
+		const char* type = sndll_symbol_type_to_string(symbol.type);
+		const char* string = !symbol.string.empty() ? symbol.string.c_str() : "(no string)";
+		fprintf(out, "%8s %08x %s\n", type, symbol.value, string);
+	}
+}
+
+static const char* sndll_symbol_type_to_string(SNDLLSymbolType type)
+{
+	switch(type) {
+		case SNDLL_NIL: return "NIL";
+		case SNDLL_EXTERNAL: return "EXTERNAL";
+		case SNDLL_RELATIVE: return "RELATIVE";
+		case SNDLL_WEAK: return "WEAK";
+		case SNDLL_ABSOLUTE: return "ABSOLUTE";
+	}
+	return "invalid";
+}
+
+}

3rdparty/ccc/src/ccc/sndll.h

@@ -0,0 +1,55 @@
+// This file is part of the Chaos Compiler Collection.
+// SPDX-License-Identifier: MIT
+
+#pragma once
+
+#include "symbol_database.h"
+
+namespace ccc {
+
+enum class SNDLLType {
+	SNDATA_SECTION,
+	DYNAMIC_LIBRARY
+};
+
+enum SNDLLVersion {
+	SNDLL_V1,
+	SNDLL_V2
+};
+
+enum SNDLLSymbolType : u8 {
+	SNDLL_NIL = 0, // I think this is just so that the first real symbol has an index of 1.
+	SNDLL_EXTERNAL = 1, // Symbol with an empty value, to be filled in from another module.
+	SNDLL_RELATIVE = 2, // Global symbol, value is relative to the start of the SNDLL file.
+	SNDLL_WEAK = 3, // Weak symbol, value is relative to the start of the SNDLL file.
+	SNDLL_ABSOLUTE = 4 // Global symbol, value is an absolute address.
+};
+
+struct SNDLLSymbol {
+	SNDLLSymbolType type = SNDLL_NIL;
+	u32 value = 0;
+	std::string string;
+};
+
+struct SNDLLFile {
+	Address address;
+	SNDLLType type;
+	SNDLLVersion version;
+	std::string elf_path;
+	std::vector<SNDLLSymbol> symbols;
+};
+
+// If a valid address is passed, the pointers in the header will be treated as
+// addresses, otherwise they will be treated as file offsets.
+Result<SNDLLFile> parse_sndll_file(std::span<const u8> image, Address address, SNDLLType type);
+
+Result<void> import_sndll_symbols(
+	SymbolDatabase& database,
+	const SNDLLFile& sndll,
+	const SymbolGroup& group,
+	u32 importer_flags,
+	DemanglerFunctions demangler);
+
+void print_sndll_symbols(FILE* out, const SNDLLFile& sndll);
+
+}

3rdparty/ccc/src/ccc/stabs.cpp

@@ -0,0 +1,835 @@
+// This file is part of the Chaos Compiler Collection.
+// SPDX-License-Identifier: MIT
+
+#include "stabs.h"
+
+namespace ccc {
+
+#define STABS_DEBUG(...) //__VA_ARGS__
+#define STABS_DEBUG_PRINTF(...) STABS_DEBUG(printf(__VA_ARGS__);)
+
+static bool validate_symbol_descriptor(StabsSymbolDescriptor descriptor);
+static Result<std::unique_ptr<StabsType>> parse_stabs_type(const char*& input);
+static Result<std::vector<StabsStructOrUnionType::Field>> parse_field_list(const char*& input);
+static Result<std::vector<StabsStructOrUnionType::MemberFunctionSet>> parse_member_functions(const char*& input);
+static Result<StabsStructOrUnionType::Visibility> parse_visibility_character(const char*& input);
+STABS_DEBUG(static void print_field(const StabsStructOrUnionType::Field& field);)
+
+const char* STAB_TRUNCATED_ERROR_MESSAGE =
+	"STABS symbol truncated. This was probably caused by a GCC bug. "
+	"Other symbols from the same translation unit may also be invalid.";
+
+Result<StabsSymbol> parse_stabs_symbol(const char*& input)
+{
+	STABS_DEBUG_PRINTF("PARSING %s\n", input);
+	
+	StabsSymbol symbol;
+	
+	Result<std::string> name = parse_dodgy_stabs_identifier(input, ':');
+	CCC_RETURN_IF_ERROR(name);
+	
+	symbol.name = *name;
+	
+	CCC_EXPECT_CHAR(input, ':', "identifier");
+	CCC_CHECK(*input != '\0', "Unexpected end of input.");
+	if((*input >= '0' && *input <= '9') || *input == '(') {
+		symbol.descriptor = StabsSymbolDescriptor::LOCAL_VARIABLE;
+	} else {
+		char symbol_descriptor = *(input++);
+		CCC_CHECK(symbol_descriptor != '\0', "Failed to parse symbol descriptor.");
+		symbol.descriptor = (StabsSymbolDescriptor) symbol_descriptor;
+	}
+	CCC_CHECK(validate_symbol_descriptor(symbol.descriptor),
+		"Invalid symbol descriptor '%c'.",
+		(char) symbol.descriptor);
+	CCC_CHECK(*input != '\0', "Unexpected end of input.");
+	if(*input == 't') {
+		input++;
+	}
+	
+	auto type = parse_top_level_stabs_type(input);
+	CCC_RETURN_IF_ERROR(type);
+	
+	// Handle nested functions.
+	bool is_function =
+		symbol.descriptor == StabsSymbolDescriptor::LOCAL_FUNCTION ||
+		symbol.descriptor == StabsSymbolDescriptor::GLOBAL_FUNCTION;
+	if(is_function && input[0] == ',') {
+		input++;
+		while(*input != ',' && *input != '\0') input++; // enclosing function
+		CCC_EXPECT_CHAR(input, ',', "nested function suffix");
+		while(*input != ',' && *input != '\0') input++; // function
+	}
+	
+	symbol.type = std::move(*type);
+	
+	// Make sure that variable names aren't used as type names e.g. the STABS
+	// symbol "somevar:P123=*456" may be referenced by the type number 123, but
+	// the type name is not "somevar".
+	bool is_type = symbol.descriptor == StabsSymbolDescriptor::TYPE_NAME
+		|| symbol.descriptor == StabsSymbolDescriptor::ENUM_STRUCT_OR_TYPE_TAG; 
+	if(is_type) {
+		symbol.type->name = symbol.name;
+	}
+	
+	symbol.type->is_typedef = symbol.descriptor == StabsSymbolDescriptor::TYPE_NAME;
+	symbol.type->is_root = true;
+	
+	return symbol;
+}
+
+static bool validate_symbol_descriptor(StabsSymbolDescriptor descriptor)
+{
+	bool valid;
+	switch(descriptor) {
+		case StabsSymbolDescriptor::LOCAL_VARIABLE:
+		case StabsSymbolDescriptor::REFERENCE_PARAMETER_A:
+		case StabsSymbolDescriptor::LOCAL_FUNCTION:
+		case StabsSymbolDescriptor::GLOBAL_FUNCTION:
+		case StabsSymbolDescriptor::GLOBAL_VARIABLE:
+		case StabsSymbolDescriptor::REGISTER_PARAMETER:
+		case StabsSymbolDescriptor::VALUE_PARAMETER:
+		case StabsSymbolDescriptor::REGISTER_VARIABLE:
+		case StabsSymbolDescriptor::STATIC_GLOBAL_VARIABLE:
+		case StabsSymbolDescriptor::TYPE_NAME:
+		case StabsSymbolDescriptor::ENUM_STRUCT_OR_TYPE_TAG:
+		case StabsSymbolDescriptor::STATIC_LOCAL_VARIABLE:
+		case StabsSymbolDescriptor::REFERENCE_PARAMETER_V:
+			valid = true;
+			break;
+		default:
+			valid = false;
+			break;
+	}
+	return valid;
+}
+
+Result<std::unique_ptr<StabsType>> parse_top_level_stabs_type(const char*& input)
+{
+	Result<std::unique_ptr<StabsType>> type = parse_stabs_type(input);
+	CCC_RETURN_IF_ERROR(type);
+	
+	// Handle first base class suffixes.
+	if((*type)->descriptor == StabsTypeDescriptor::STRUCT && input[0] == '~' && input[1] == '%') {
+		input += 2;
+		
+		Result<std::unique_ptr<StabsType>> first_base_class = parse_stabs_type(input);
+		CCC_RETURN_IF_ERROR(first_base_class);
+		(*type)->as<StabsStructType>().first_base_class = std::move(*first_base_class);
+		
+		CCC_EXPECT_CHAR(input, ';', "first base class suffix");
+	}
+	
+	// Handle extra live range information.
+	if(input[0] == ';' && input[1] == 'l') {
+		input += 2;
+		CCC_EXPECT_CHAR(input, '(', "live range suffix");
+		CCC_EXPECT_CHAR(input, '#', "live range suffix");
+		std::optional<s32> start = parse_number_s32(input);
+		CCC_CHECK(start.has_value(), "Failed to parse live range suffix.");
+		CCC_EXPECT_CHAR(input, ',', "live range suffix");
+		CCC_EXPECT_CHAR(input, '#', "live range suffix");
+		std::optional<s32> end = parse_number_s32(input);
+		CCC_CHECK(end.has_value(), "Failed to parse live range suffix.");
+		CCC_EXPECT_CHAR(input, ')', "live range suffix");
+	}
+	
+	return type;
+}
+
+static Result<std::unique_ptr<StabsType>> parse_stabs_type(const char*& input)
+{
+	StabsTypeNumber type_number;
+	
+	CCC_CHECK(*input != '\0', "Unexpected end of input.");
+	
+	if(*input == '(') {
+		// This file has type numbers made up of two pieces: an include file
+		// index and a type number.
+		
+		input++;
+		
+		std::optional<s32> file_index = parse_number_s32(input);
+		CCC_CHECK(file_index.has_value(), "Failed to parse type number (file index).");
+		
+		CCC_EXPECT_CHAR(input, ',', "type number");
+		
+		std::optional<s32> type_index = parse_number_s32(input);
+		CCC_CHECK(type_index.has_value(), "Failed to parse type number (type index).");
+		
+		CCC_EXPECT_CHAR(input, ')', "type number");
+		
+		type_number.file = *file_index;
+		type_number.type = *type_index;
+		
+		if(*input != '=') {
+			return std::make_unique<StabsType>(type_number);
+		}
+		input++;
+	} else if(*input >= '0' && *input <= '9') {
+		// This file has type numbers which are just a single number. This is
+		// the more common case for games.
+		
+		std::optional<s32> type_index = parse_number_s32(input);
+		CCC_CHECK(type_index.has_value(), "Failed to parse type number.");
+		type_number.type = *type_index;
+		
+		if(*input != '=') {
+			return std::make_unique<StabsType>(type_number);
+		}
+		input++;
+	}
+	
+	CCC_CHECK(*input != '\0', "Unexpected end of input.");
+	
+	StabsTypeDescriptor descriptor;
+	if((*input >= '0' && *input <= '9') || *input == '(') {
+		descriptor = StabsTypeDescriptor::TYPE_REFERENCE;
+	} else {
+		char descriptor_char = *(input++);
+		CCC_CHECK(descriptor_char != '\0', "Failed to parse type descriptor.");
+		descriptor = (StabsTypeDescriptor) descriptor_char;
+	}
+	
+	std::unique_ptr<StabsType> out_type;
+	
+	switch(descriptor) {
+		case StabsTypeDescriptor::TYPE_REFERENCE: { // 0..9
+			auto type_reference = std::make_unique<StabsTypeReferenceType>(type_number);
+			
+			auto type = parse_stabs_type(input);
+			CCC_RETURN_IF_ERROR(type);
+			type_reference->type = std::move(*type);
+			
+			out_type = std::move(type_reference);
+			break;
+		}
+		case StabsTypeDescriptor::ARRAY: { // a
+			auto array = std::make_unique<StabsArrayType>(type_number);
+			
+			auto index_type = parse_stabs_type(input);
+			CCC_RETURN_IF_ERROR(index_type);
+			array->index_type = std::move(*index_type);
+			
+			auto element_type = parse_stabs_type(input);
+			CCC_RETURN_IF_ERROR(element_type);
+			array->element_type = std::move(*element_type);
+			
+			out_type = std::move(array);
+			break;
+		}
+		case StabsTypeDescriptor::ENUM: { // e
+			auto enum_type = std::make_unique<StabsEnumType>(type_number);
+			STABS_DEBUG_PRINTF("enum {\n");
+			while(*input != ';') {
+				std::optional<std::string> name = parse_stabs_identifier(input, ':');
+				CCC_CHECK(name.has_value(), "Failed to parse enum field name.");
+				
+				CCC_EXPECT_CHAR(input, ':', "enum");
+				
+				std::optional<s32> value = parse_number_s32(input);
+				CCC_CHECK(value.has_value(), "Failed to parse enum value.");
+				
+				enum_type->fields.emplace_back(*value, std::move(*name));
+				
+				CCC_EXPECT_CHAR(input, ',', "enum");
+			}
+			input++;
+			STABS_DEBUG_PRINTF("}\n");
+			
+			out_type = std::move(enum_type);
+			break;
+		}
+		case StabsTypeDescriptor::FUNCTION: { // f
+			auto function = std::make_unique<StabsFunctionType>(type_number);
+			
+			auto return_type = parse_stabs_type(input);
+			CCC_RETURN_IF_ERROR(return_type);
+			function->return_type = std::move(*return_type);
+			
+			out_type = std::move(function);
+			break;
+		}
+		case StabsTypeDescriptor::VOLATILE_QUALIFIER: { // B
+			auto volatile_qualifier = std::make_unique<StabsVolatileQualifierType>(type_number);
+			
+			auto type = parse_stabs_type(input);
+			CCC_RETURN_IF_ERROR(type);
+			volatile_qualifier->type = std::move(*type);
+			
+			out_type = std::move(volatile_qualifier);
+			break;
+		}
+		case StabsTypeDescriptor::CONST_QUALIFIER: { // k
+			auto const_qualifier = std::make_unique<StabsConstQualifierType>(type_number);
+			
+			auto type = parse_stabs_type(input);
+			CCC_RETURN_IF_ERROR(type);
+			const_qualifier->type = std::move(*type);
+			
+			out_type = std::move(const_qualifier);
+			break;
+		}
+		case StabsTypeDescriptor::RANGE: { // r
+			auto range = std::make_unique<StabsRangeType>(type_number);
+			
+			auto type = parse_stabs_type(input);
+			CCC_RETURN_IF_ERROR(type);
+			range->type = std::move(*type);
+			
+			CCC_EXPECT_CHAR(input, ';', "range type descriptor");
+			
+			std::optional<std::string> low = parse_stabs_identifier(input, ';');
+			CCC_CHECK(low.has_value(), "Failed to parse low part of range.");
+			CCC_EXPECT_CHAR(input, ';', "low range value");
+			
+			std::optional<std::string> high = parse_stabs_identifier(input, ';');
+			CCC_CHECK(high.has_value(), "Failed to parse high part of range.");
+			CCC_EXPECT_CHAR(input, ';', "high range value");
+			
+			range->low = std::move(*low);
+			range->high = std::move(*high);
+			
+			out_type = std::move(range);
+			break;
+		}
+		case StabsTypeDescriptor::STRUCT: { // s
+			auto struct_type = std::make_unique<StabsStructType>(type_number);
+			STABS_DEBUG_PRINTF("struct {\n");
+			
+			std::optional<s64> struct_size = parse_number_s64(input);
+			CCC_CHECK(struct_size.has_value(), "Failed to parse struct size.");
+			struct_type->size = *struct_size;
+			
+			if(*input == '!') {
+				input++;
+				std::optional<s32> base_class_count = parse_number_s32(input);
+				CCC_CHECK(base_class_count.has_value(), "Failed to parse base class count.");
+				
+				CCC_EXPECT_CHAR(input, ',', "base class section");
+				
+				for(s64 i = 0; i < *base_class_count; i++) {
+					StabsStructOrUnionType::BaseClass base_class;
+					
+					char is_virtual = *(input++);
+					switch(is_virtual) {
+						case '0': base_class.is_virtual = false; break;
+						case '1': base_class.is_virtual = true; break;
+						default: return CCC_FAILURE("Failed to parse base class (virtual character).");
+					}
+					
+					Result<StabsStructOrUnionType::Visibility> visibility = parse_visibility_character(input);
+					CCC_RETURN_IF_ERROR(visibility);
+					base_class.visibility = *visibility;
+					
+					std::optional<s32> offset = parse_number_s32(input);
+					CCC_CHECK(offset.has_value(), "Failed to parse base class offset.");
+					base_class.offset = (s32) *offset;
+					
+					CCC_EXPECT_CHAR(input, ',', "base class section");
+					
+					auto base_class_type = parse_stabs_type(input);
+					CCC_RETURN_IF_ERROR(base_class_type);
+					base_class.type = std::move(*base_class_type);
+					
+					CCC_EXPECT_CHAR(input, ';', "base class section");
+					struct_type->base_classes.emplace_back(std::move(base_class));
+				}
+			}
+			
+			auto fields = parse_field_list(input);
+			CCC_RETURN_IF_ERROR(fields);
+			struct_type->fields = std::move(*fields);
+			
+			auto member_functions = parse_member_functions(input);
+			CCC_RETURN_IF_ERROR(member_functions);
+			struct_type->member_functions = std::move(*member_functions);
+			
+			STABS_DEBUG_PRINTF("}\n");
+			
+			out_type = std::move(struct_type);
+			break;
+		}
+		case StabsTypeDescriptor::UNION: { // u
+			auto union_type = std::make_unique<StabsUnionType>(type_number);
+			STABS_DEBUG_PRINTF("union {\n");
+			
+			std::optional<s64> union_size = parse_number_s64(input);
+			CCC_CHECK(union_size.has_value(), "Failed to parse struct size.");
+			union_type->size = *union_size;
+			
+			auto fields = parse_field_list(input);
+			CCC_RETURN_IF_ERROR(fields);
+			union_type->fields = std::move(*fields);
+			
+			auto member_functions = parse_member_functions(input);
+			CCC_RETURN_IF_ERROR(member_functions);
+			union_type->member_functions = std::move(*member_functions);
+			
+			STABS_DEBUG_PRINTF("}\n");
+			
+			out_type = std::move(union_type);
+			break;
+		}
+		case StabsTypeDescriptor::CROSS_REFERENCE: { // x
+			auto cross_reference = std::make_unique<StabsCrossReferenceType>(type_number);
+			
+			char cross_reference_type = *(input++);
+			CCC_CHECK(cross_reference_type != '\0', "Failed to parse cross reference type.");
+			
+			switch(cross_reference_type) {
+				case 'e': cross_reference->type = ast::ForwardDeclaredType::ENUM; break;
+				case 's': cross_reference->type = ast::ForwardDeclaredType::STRUCT; break;
+				case 'u': cross_reference->type = ast::ForwardDeclaredType::UNION; break;
+				default:
+					return CCC_FAILURE("Invalid cross reference type '%c'.", cross_reference->type);
+			}
+			
+			Result<std::string> identifier = parse_dodgy_stabs_identifier(input, ':');
+			CCC_RETURN_IF_ERROR(identifier);
+			cross_reference->identifier = std::move(*identifier);
+			
+			cross_reference->name = cross_reference->identifier;
+			CCC_EXPECT_CHAR(input, ':', "cross reference");
+			
+			out_type = std::move(cross_reference);
+			break;
+		}
+		case StabsTypeDescriptor::FLOATING_POINT_BUILTIN: { // R
+			auto fp_builtin = std::make_unique<StabsFloatingPointBuiltInType>(type_number);
+			
+			std::optional<s32> fpclass = parse_number_s32(input);
+			CCC_CHECK(fpclass.has_value(), "Failed to parse floating point built-in class.");
+			fp_builtin->fpclass = *fpclass;
+			
+			CCC_EXPECT_CHAR(input, ';', "floating point builtin");
+			
+			std::optional<s32> bytes = parse_number_s32(input);
+			CCC_CHECK(bytes.has_value(), "Failed to parse floating point built-in.");
+			fp_builtin->bytes = *bytes;
+			
+			CCC_EXPECT_CHAR(input, ';', "floating point builtin");
+			
+			std::optional<s32> value = parse_number_s32(input);
+			CCC_CHECK(value.has_value(), "Failed to parse floating point built-in.");
+			
+			CCC_EXPECT_CHAR(input, ';', "floating point builtin");
+			
+			out_type = std::move(fp_builtin);
+			break;
+		}
+		case StabsTypeDescriptor::METHOD: { // #
+			auto method = std::make_unique<StabsMethodType>(type_number);
+			
+			if(*input == '#') {
+				input++;
+				
+				auto return_type = parse_stabs_type(input);
+				CCC_RETURN_IF_ERROR(return_type);
+				method->return_type = std::move(*return_type);
+				
+				if(*input == ';') {
+					input++;
+				}
+			} else {
+				auto class_type = parse_stabs_type(input);
+				CCC_RETURN_IF_ERROR(class_type);
+				method->class_type = std::move(*class_type);
+				
+				CCC_EXPECT_CHAR(input, ',', "method");
+				
+				auto return_type = parse_stabs_type(input);
+				CCC_RETURN_IF_ERROR(return_type);
+				method->return_type = std::move(*return_type);
+				
+				while(*input != '\0') {
+					if(*input == ';') {
+						input++;
+						break;
+					}
+					
+					CCC_EXPECT_CHAR(input, ',', "method");
+					
+					auto parameter_type = parse_stabs_type(input);
+					CCC_RETURN_IF_ERROR(parameter_type);
+					method->parameter_types.emplace_back(std::move(*parameter_type));
+				}
+			}
+			
+			out_type = std::move(method);
+			break;
+		}
+		case StabsTypeDescriptor::REFERENCE: { // &
+			auto reference = std::make_unique<StabsReferenceType>(type_number);
+			
+			auto value_type = parse_stabs_type(input);
+			CCC_RETURN_IF_ERROR(value_type);
+			reference->value_type = std::move(*value_type);
+			
+			out_type = std::move(reference);
+			break;
+		}
+		case StabsTypeDescriptor::POINTER: { // *
+			auto pointer = std::make_unique<StabsPointerType>(type_number);
+			
+			auto value_type = parse_stabs_type(input);
+			CCC_RETURN_IF_ERROR(value_type);
+			pointer->value_type = std::move(*value_type);
+			
+			out_type = std::move(pointer);
+			break;
+		}
+		case StabsTypeDescriptor::TYPE_ATTRIBUTE: { // @
+			if((*input >= '0' && *input <= '9') || *input == '(') {
+				auto member_pointer = std::make_unique<StabsPointerToDataMemberType>(type_number);
+				
+				auto class_type = parse_stabs_type(input);
+				CCC_RETURN_IF_ERROR(class_type);
+				member_pointer->class_type = std::move(*class_type);
+				
+				CCC_EXPECT_CHAR(input, ',', "pointer to non-static data member");
+				
+				auto member_type = parse_stabs_type(input);
+				CCC_RETURN_IF_ERROR(member_type);
+				member_pointer->member_type = std::move(*member_type);
+				
+				out_type = std::move(member_pointer);
+			} else {
+				auto type_attribute = std::make_unique<StabsSizeTypeAttributeType>(type_number);
+				CCC_CHECK(*input == 's', "Weird value following '@' type descriptor.");
+				input++;
+				
+				std::optional<s64> size_bits = parse_number_s64(input);
+				CCC_CHECK(size_bits.has_value(), "Failed to parse type attribute.")
+				type_attribute->size_bits = *size_bits;
+				CCC_EXPECT_CHAR(input, ';', "type attribute");
+				
+				auto type = parse_stabs_type(input);
+				CCC_RETURN_IF_ERROR(type);
+				type_attribute->type = std::move(*type);
+				
+				out_type = std::move(type_attribute);
+			}
+			break;
+		}
+		case StabsTypeDescriptor::BUILTIN: { // -
+			auto built_in = std::make_unique<StabsBuiltInType>(type_number);
+			
+			std::optional<s64> type_id = parse_number_s64(input);
+			CCC_CHECK(type_id.has_value(), "Failed to parse built-in.");
+			built_in->type_id = *type_id;
+			
+			CCC_EXPECT_CHAR(input, ';', "builtin");
+			
+			out_type = std::move(built_in);
+			break;
+		}
+		default: {
+			return CCC_FAILURE(
+				"Invalid type descriptor '%c' (%02x).",
+				(u32) descriptor, (u32) descriptor);
+		}
+	}
+	
+	return out_type;
+}
+
+static Result<std::vector<StabsStructOrUnionType::Field>> parse_field_list(const char*& input)
+{
+	std::vector<StabsStructOrUnionType::Field> fields;
+	
+	while(*input != '\0') {
+		if(*input == ';') {
+			input++;
+			break;
+		}
+		
+		const char* before_field = input;
+		StabsStructOrUnionType::Field field;
+		
+		Result<std::string> name = parse_dodgy_stabs_identifier(input, ':');
+		CCC_RETURN_IF_ERROR(name);
+		field.name = std::move(*name);
+		
+		CCC_EXPECT_CHAR(input, ':', "identifier");
+		if(*input == '/') {
+			input++;
+			
+			Result<StabsStructOrUnionType::Visibility> visibility = parse_visibility_character(input);
+			CCC_RETURN_IF_ERROR(visibility);
+			field.visibility = *visibility;
+		}
+		if(*input == ':') {
+			input = before_field;
+			break;
+		}
+		auto type = parse_stabs_type(input);
+		CCC_RETURN_IF_ERROR(type);
+		field.type = std::move(*type);
+		
+		if(field.name.size() >= 1 && field.name[0] == '$') {
+			// Virtual function table pointers and virtual base class pointers.
+			CCC_EXPECT_CHAR(input, ',', "field type");
+			
+			std::optional<s32> offset_bits = parse_number_s32(input);
+			CCC_CHECK(offset_bits.has_value(), "Failed to parse field offset.");
+			field.offset_bits = *offset_bits;
+			
+			CCC_EXPECT_CHAR(input, ';', "field offset");
+		} else if(*input == ':') {
+			// Static fields.
+			input++;
+			field.is_static = true;
+			
+			std::optional<std::string> type_name = parse_stabs_identifier(input, ';');
+			CCC_CHECK(type_name.has_value(), "Failed to parse static field type name.");
+
+			field.type_name = std::move(*type_name);
+			
+			CCC_EXPECT_CHAR(input, ';', "identifier");
+		} else if(*input == ',') {
+			// Normal fields.
+			input++;
+			
+			std::optional<s32> offset_bits = parse_number_s32(input);
+			CCC_CHECK(offset_bits.has_value(), "Failed to parse field offset.");
+			field.offset_bits = *offset_bits;
+			
+			CCC_EXPECT_CHAR(input, ',', "field offset");
+			
+			std::optional<s32> size_bits = parse_number_s32(input);
+			CCC_CHECK(size_bits.has_value(), "Failed to parse field size.");
+			field.size_bits = *size_bits;
+			
+			CCC_EXPECT_CHAR(input, ';', "field size");
+		} else {
+			return CCC_FAILURE("Expected ':' or ',', got '%c' (%hhx).", *input, *input);
+		}
+
+		STABS_DEBUG(print_field(field);)
+
+		fields.emplace_back(std::move(field));
+	}
+	
+	return fields;
+}
+
+static Result<std::vector<StabsStructOrUnionType::MemberFunctionSet>> parse_member_functions(const char*& input)
+{
+	// Check for if the next character is from an enclosing field list. If this
+	// is the case, the next character will be ',' for normal fields and ':' for
+	// static fields (see above).
+	if(*input == ',' || *input == ':') {
+		return std::vector<StabsStructOrUnionType::MemberFunctionSet>();
+	}
+	
+	std::vector<StabsStructOrUnionType::MemberFunctionSet> member_functions;
+	while(*input != '\0') {
+		if(*input == ';') {
+			input++;
+			break;
+		}
+		StabsStructOrUnionType::MemberFunctionSet member_function_set;
+		
+		std::optional<std::string> name = parse_stabs_identifier(input, ':');
+		CCC_CHECK(name.has_value(), "Failed to parse member function name.");
+		member_function_set.name = std::move(*name);
+		
+		CCC_EXPECT_CHAR(input, ':', "member function");
+		CCC_EXPECT_CHAR(input, ':', "member function");
+		while(*input != '\0') {
+			if(*input == ';') {
+				input++;
+				break;
+			}
+			
+			StabsStructOrUnionType::MemberFunction function;
+			
+			auto type = parse_stabs_type(input);
+			CCC_RETURN_IF_ERROR(type);
+			function.type = std::move(*type);
+			
+			CCC_EXPECT_CHAR(input, ':', "member function");
+			std::optional<std::string> identifier = parse_stabs_identifier(input, ';');
+			CCC_CHECK(identifier.has_value(), "Invalid member function identifier.");
+			
+			CCC_EXPECT_CHAR(input, ';', "member function");
+			
+			Result<StabsStructOrUnionType::Visibility> visibility = parse_visibility_character(input);
+			CCC_RETURN_IF_ERROR(visibility);
+			function.visibility = *visibility;
+			
+			char modifiers = *(input++);
+			CCC_CHECK(modifiers != '\0', "Failed to parse member function modifiers.");
+			switch(modifiers) {
+				case 'A':
+					function.is_const = false;
+					function.is_volatile = false;
+					break;
+				case 'B':
+					function.is_const = true;
+					function.is_volatile = false;
+					break;
+				case 'C':
+					function.is_const = false;
+					function.is_volatile = true;
+					break;
+				case 'D':
+					function.is_const = true;
+					function.is_volatile = true;
+					break;
+				case '?':
+				case '.':
+					break;
+				default:
+					return CCC_FAILURE("Invalid member function modifiers.");
+			}
+			
+			char flag = *(input++);
+			CCC_CHECK(flag != '\0', "Failed to parse member function type.");
+			switch(flag) {
+				case '.': { // normal member function
+					function.modifier = ast::MemberFunctionModifier::NONE;
+					break;
+				}
+				case '?': { // static member function
+					function.modifier = ast::MemberFunctionModifier::STATIC;
+					break;
+				}
+				case '*': { // virtual member function
+					std::optional<s32> vtable_index = parse_number_s32(input);
+					CCC_CHECK(vtable_index.has_value(), "Failed to parse vtable index.");
+					function.vtable_index = *vtable_index;
+					
+					CCC_EXPECT_CHAR(input, ';', "virtual member function");
+					
+					auto virtual_type = parse_stabs_type(input);
+					CCC_RETURN_IF_ERROR(virtual_type);
+					function.virtual_type = std::move(*virtual_type);
+					
+					CCC_EXPECT_CHAR(input, ';', "virtual member function");
+					function.modifier = ast::MemberFunctionModifier::VIRTUAL;
+					break;
+				}
+				default:
+					return CCC_FAILURE("Invalid member function type.");
+			}
+			member_function_set.overloads.emplace_back(std::move(function));
+		}
+		STABS_DEBUG_PRINTF("member func: %s\n", member_function_set.name.c_str());
+		member_functions.emplace_back(std::move(member_function_set));
+	}
+	return member_functions;
+}
+
+static Result<StabsStructOrUnionType::Visibility> parse_visibility_character(const char*& input)
+{
+	char visibility = *(input++);
+	switch(visibility) {
+		case '0': return StabsStructOrUnionType::Visibility::PRIVATE;
+		case '1': return StabsStructOrUnionType::Visibility::PROTECTED;
+		case '2': return StabsStructOrUnionType::Visibility::PUBLIC;
+		case '9': return StabsStructOrUnionType::Visibility::PUBLIC_OPTIMIZED_OUT;
+		default: break;
+	}
+	
+	return CCC_FAILURE("Failed to parse visibility character.");
+}
+
+std::optional<s32> parse_number_s32(const char*& input)
+{
+	char* end;
+	s64 value = strtoll(input, &end, 10);
+	if(end == input) {
+		return std::nullopt;
+	}
+	input = end;
+	return (s32) value;
+}
+
+std::optional<s64> parse_number_s64(const char*& input)
+{
+	char* end;
+	s64 value = strtoll(input, &end, 10);
+	if(end == input) {
+		return std::nullopt;
+	}
+	input = end;
+	return value;
+}
+
+std::optional<std::string> parse_stabs_identifier(const char*& input, char terminator)
+{
+	const char* begin = input;
+	for(; *input != '\0'; input++) {
+		if(*input == terminator) {
+			return std::string(begin, input);
+		}
+	}
+	return std::nullopt;
+}
+
+// The complexity here is because the input may contain an unescaped namespace
+// separator '::' even if the field terminator is supposed to be a colon, as
+// well as the raw contents of character literals. See test/ccc/stabs_tests.cpp
+// for some examples.
+Result<std::string> parse_dodgy_stabs_identifier(const char*& input, char terminator)
+{
+	const char* begin = input;
+	s32 template_depth = 0;
+	
+	for(; *input != '\0'; input++) {
+		// Skip past character literals.
+		if(*input == '\'') {
+			input++;
+			if(*input == '\'') {
+				input++; // Handle character literals containing a single quote.
+			}
+			while(*input != '\'' && *input != '\0') {
+				input++;
+			}
+			if(*input == '\0') {
+				break;
+			}
+			input++;
+		}
+		
+		// Keep track of the template depth so we know when to expect the
+		// terminator character.
+		if(*input == '<') {
+			template_depth++;
+		}
+		if(*input == '>') {
+			template_depth--;
+		}
+		
+		if(*input == terminator && template_depth == 0) {
+			return std::string(begin, input);
+		}
+	}
+	
+	return CCC_FAILURE(STAB_TRUNCATED_ERROR_MESSAGE);
+}
+
+STABS_DEBUG(
+
+static void print_field(const StabsStructOrUnionType::Field& field)
+{
+	printf("\t%04x %04x %04x %04x %s\n", field.offset_bits / 8, field.size_bits / 8, field.offset_bits, field.size_bits, field.name.c_str());
+}
+
+)
+
+const char* stabs_field_visibility_to_string(StabsStructOrUnionType::Visibility visibility)
+{
+	switch(visibility) {
+		case StabsStructOrUnionType::Visibility::PRIVATE: return "private";
+		case StabsStructOrUnionType::Visibility::PROTECTED: return "protected";
+		case StabsStructOrUnionType::Visibility::PUBLIC: return "public";
+		case StabsStructOrUnionType::Visibility::PUBLIC_OPTIMIZED_OUT: return "public_optimizedout";
+		default: return "none";
+	}
+	return "";
+}
+
+}

3rdparty/ccc/src/ccc/stabs.h

@@ -0,0 +1,379 @@
+// This file is part of the Chaos Compiler Collection.
+// SPDX-License-Identifier: MIT
+
+#pragma once
+
+#include "ast.h"
+#include "util.h"
+
+namespace ccc {
+
+enum class StabsSymbolDescriptor : u8 {
+	LOCAL_VARIABLE = '_',
+	REFERENCE_PARAMETER_A = 'a',
+	LOCAL_FUNCTION = 'f',
+	GLOBAL_FUNCTION = 'F',
+	GLOBAL_VARIABLE = 'G',
+	REGISTER_PARAMETER = 'P',
+	VALUE_PARAMETER = 'p',
+	REGISTER_VARIABLE = 'r',
+	STATIC_GLOBAL_VARIABLE = 'S',
+	TYPE_NAME = 't',
+	ENUM_STRUCT_OR_TYPE_TAG = 'T',
+	STATIC_LOCAL_VARIABLE = 'V',
+	REFERENCE_PARAMETER_V = 'v'
+};
+
+struct StabsType;
+
+struct StabsSymbol {
+	StabsSymbolDescriptor descriptor;
+	std::string name;
+	std::unique_ptr<StabsType> type;
+};
+
+Result<StabsSymbol> parse_stabs_symbol(const char*& input);
+
+enum class StabsTypeDescriptor : u8 {
+	TYPE_REFERENCE = 0xef, // '0'..'9','('
+	ARRAY = 'a',
+	ENUM = 'e',
+	FUNCTION = 'f',
+	CONST_QUALIFIER = 'k',
+	RANGE = 'r',
+	STRUCT = 's',
+	UNION = 'u',
+	CROSS_REFERENCE = 'x',
+	VOLATILE_QUALIFIER = 'B',
+	FLOATING_POINT_BUILTIN = 'R',
+	METHOD = '#',
+	REFERENCE = '&',
+	POINTER = '*',
+	TYPE_ATTRIBUTE = '@',
+	POINTER_TO_DATA_MEMBER = 0xee, // also '@'
+	BUILTIN = '-'
+};
+
+struct StabsBaseClass;
+struct StabsField;
+struct StabsMemberFunctionSet;
+
+// e.g. for "123=*456" 123 would be the type_number, the type descriptor would
+// be of type POINTER and StabsPointerType::value_type would point to a type
+// with type_number = 456.
+struct StabsType {
+	StabsTypeNumber type_number;
+	// The name field is only populated for root types and cross references.
+	std::optional<std::string> name;
+	bool is_typedef = false;
+	bool is_root = false;
+	std::optional<StabsTypeDescriptor> descriptor;
+	
+	StabsType(StabsTypeNumber n) : type_number(n) {}
+	StabsType(StabsTypeDescriptor d) : descriptor(d) {}
+	StabsType(StabsTypeNumber n, StabsTypeDescriptor d) : type_number(n), descriptor(d) {}
+	virtual ~StabsType() {}
+	
+	template <typename SubType>
+	SubType& as()
+	{
+		CCC_ASSERT(descriptor == SubType::DESCRIPTOR);
+		return *static_cast<SubType*>(this);
+	}
+	
+	template <typename SubType>
+	const SubType& as() const
+	{
+		CCC_ASSERT(descriptor == SubType::DESCRIPTOR);
+		return *static_cast<const SubType*>(this);
+	}
+	
+	virtual void enumerate_numbered_types(std::map<StabsTypeNumber, const StabsType*>& output) const
+	{
+		if(type_number.valid() && descriptor.has_value()) {
+			output.emplace(type_number, this);
+		}
+	}
+};
+
+struct StabsTypeReferenceType : StabsType {
+	std::unique_ptr<StabsType> type;
+	
+	StabsTypeReferenceType(StabsTypeNumber n) : StabsType(n, DESCRIPTOR) {}
+	static const constexpr StabsTypeDescriptor DESCRIPTOR = StabsTypeDescriptor::TYPE_REFERENCE;
+	
+	void enumerate_numbered_types(std::map<StabsTypeNumber, const StabsType*>& output) const override
+	{
+		StabsType::enumerate_numbered_types(output);
+		type->enumerate_numbered_types(output);
+	}
+};
+
+struct StabsArrayType : StabsType {
+	std::unique_ptr<StabsType> index_type;
+	std::unique_ptr<StabsType> element_type;
+	
+	StabsArrayType(StabsTypeNumber n) : StabsType(n, DESCRIPTOR) {}
+	static const constexpr StabsTypeDescriptor DESCRIPTOR = StabsTypeDescriptor::ARRAY;
+	
+	void enumerate_numbered_types(std::map<StabsTypeNumber, const StabsType*>& output) const override
+	{
+		StabsType::enumerate_numbered_types(output);
+		index_type->enumerate_numbered_types(output);
+		element_type->enumerate_numbered_types(output);
+	}
+};
+
+struct StabsEnumType : StabsType {
+	std::vector<std::pair<s32, std::string>> fields;
+	
+	StabsEnumType(StabsTypeNumber n) : StabsType(n, DESCRIPTOR) {}
+	static const constexpr StabsTypeDescriptor DESCRIPTOR = StabsTypeDescriptor::ENUM;
+};
+
+struct StabsFunctionType : StabsType {
+	std::unique_ptr<StabsType> return_type;
+	
+	StabsFunctionType(StabsTypeNumber n) : StabsType(n, DESCRIPTOR) {}
+	static const constexpr StabsTypeDescriptor DESCRIPTOR = StabsTypeDescriptor::FUNCTION;
+	
+	void enumerate_numbered_types(std::map<StabsTypeNumber, const StabsType*>& output) const override
+	{
+		StabsType::enumerate_numbered_types(output);
+		return_type->enumerate_numbered_types(output);
+	}
+};
+
+struct StabsVolatileQualifierType : StabsType {
+	std::unique_ptr<StabsType> type;
+	
+	StabsVolatileQualifierType(StabsTypeNumber n) : StabsType(n, DESCRIPTOR) {}
+	static const constexpr StabsTypeDescriptor DESCRIPTOR = StabsTypeDescriptor::VOLATILE_QUALIFIER;
+	
+	void enumerate_numbered_types(std::map<StabsTypeNumber, const StabsType*>& output) const override
+	{
+		StabsType::enumerate_numbered_types(output);
+		type->enumerate_numbered_types(output);
+	}
+};
+
+struct StabsConstQualifierType : StabsType {
+	std::unique_ptr<StabsType> type;
+	
+	StabsConstQualifierType(StabsTypeNumber n) : StabsType(n, DESCRIPTOR) {}
+	static const constexpr StabsTypeDescriptor DESCRIPTOR = StabsTypeDescriptor::CONST_QUALIFIER;
+	
+	void enumerate_numbered_types(std::map<StabsTypeNumber, const StabsType*>& output) const override
+	{
+		StabsType::enumerate_numbered_types(output);
+		type->enumerate_numbered_types(output);
+	}
+};
+
+struct StabsRangeType : StabsType {
+	std::unique_ptr<StabsType> type;
+	std::string low;
+	std::string high; // Some compilers wrote out a wrapped around value here for zero (or variable?) length arrays.
+	
+	StabsRangeType(StabsTypeNumber n) : StabsType(n, DESCRIPTOR) {}
+	static const constexpr StabsTypeDescriptor DESCRIPTOR = StabsTypeDescriptor::RANGE;
+	
+	void enumerate_numbered_types(std::map<StabsTypeNumber, const StabsType*>& output) const override
+	{
+		StabsType::enumerate_numbered_types(output);
+		type->enumerate_numbered_types(output);
+	}
+};
+
+struct StabsStructOrUnionType : StabsType {
+	enum class Visibility : u8 {
+		NONE,
+		PRIVATE,
+		PROTECTED,
+		PUBLIC,
+		PUBLIC_OPTIMIZED_OUT
+	};
+
+	struct BaseClass {
+		bool is_virtual;
+		Visibility visibility;
+		s32 offset = -1;
+		std::unique_ptr<StabsType> type;
+	};
+
+	struct Field {
+		std::string name;
+		Visibility visibility = Visibility::NONE;
+		std::unique_ptr<StabsType> type;
+		bool is_static = false;
+		s32 offset_bits = 0;
+		s32 size_bits = 0;
+		std::string type_name;
+	};
+
+	struct MemberFunction {
+		std::unique_ptr<StabsType> type;
+		std::unique_ptr<StabsType> virtual_type;
+		Visibility visibility;
+		bool is_const = false;
+		bool is_volatile = false;
+		ast::MemberFunctionModifier modifier = ast::MemberFunctionModifier::NONE;
+		s32 vtable_index = -1;
+	};
+
+	struct MemberFunctionSet {
+		std::string name;
+		std::vector<MemberFunction> overloads;
+	};
+	
+	s64 size = -1;
+	std::vector<BaseClass> base_classes;
+	std::vector<Field> fields;
+	std::vector<MemberFunctionSet> member_functions;
+	std::unique_ptr<StabsType> first_base_class;
+	
+	StabsStructOrUnionType(StabsTypeNumber n, StabsTypeDescriptor d) : StabsType(n, d) {}
+	
+	void enumerate_numbered_types(std::map<StabsTypeNumber, const StabsType*>& output) const override
+	{
+		StabsType::enumerate_numbered_types(output);
+		for(const BaseClass& base_class : base_classes) {
+			base_class.type->enumerate_numbered_types(output);
+		}
+		for(const Field& field : fields) {
+			field.type->enumerate_numbered_types(output);
+		}
+		for(const MemberFunctionSet& member_function_set : member_functions) {
+			for(const MemberFunction& member_function : member_function_set.overloads) {
+				member_function.type->enumerate_numbered_types(output);
+				if(member_function.virtual_type.get()) {
+					member_function.virtual_type->enumerate_numbered_types(output);
+				}
+			}
+		}
+		if(first_base_class.get()) {
+			first_base_class->enumerate_numbered_types(output);
+		}
+	}
+};
+
+struct StabsStructType : StabsStructOrUnionType {
+	StabsStructType(StabsTypeNumber n) : StabsStructOrUnionType(n, DESCRIPTOR) {}
+	static const constexpr StabsTypeDescriptor DESCRIPTOR = StabsTypeDescriptor::STRUCT;
+};
+
+struct StabsUnionType : StabsStructOrUnionType {
+	StabsUnionType(StabsTypeNumber n) : StabsStructOrUnionType(n, DESCRIPTOR) {}
+	static const constexpr StabsTypeDescriptor DESCRIPTOR = StabsTypeDescriptor::UNION;
+};
+
+
+struct StabsCrossReferenceType : StabsType {
+	ast::ForwardDeclaredType type;
+	std::string identifier;
+	
+	StabsCrossReferenceType(StabsTypeNumber n) : StabsType(n, DESCRIPTOR) {}
+	static const constexpr StabsTypeDescriptor DESCRIPTOR = StabsTypeDescriptor::CROSS_REFERENCE;
+};
+
+struct StabsFloatingPointBuiltInType : StabsType {
+	s32 fpclass = -1;
+	s32 bytes = -1;
+	
+	StabsFloatingPointBuiltInType(StabsTypeNumber n) : StabsType(n, DESCRIPTOR) {}
+	static const constexpr StabsTypeDescriptor DESCRIPTOR = StabsTypeDescriptor::FLOATING_POINT_BUILTIN;
+};
+
+struct StabsMethodType : StabsType {
+	std::unique_ptr<StabsType> return_type;
+	std::optional<std::unique_ptr<StabsType>> class_type;
+	std::vector<std::unique_ptr<StabsType>> parameter_types;
+	
+	StabsMethodType(StabsTypeNumber n) : StabsType(n, DESCRIPTOR) {}
+	static const constexpr StabsTypeDescriptor DESCRIPTOR = StabsTypeDescriptor::METHOD;
+	
+	void enumerate_numbered_types(std::map<StabsTypeNumber, const StabsType*>& output) const override
+	{
+		StabsType::enumerate_numbered_types(output);
+		return_type->enumerate_numbered_types(output);
+		if(class_type.has_value()) {
+			(*class_type)->enumerate_numbered_types(output);
+		}
+		for(const std::unique_ptr<StabsType>& parameter_type : parameter_types) {
+			parameter_type->enumerate_numbered_types(output);
+		}
+	}
+};
+
+struct StabsReferenceType : StabsType {
+	std::unique_ptr<StabsType> value_type;
+	
+	StabsReferenceType(StabsTypeNumber n) : StabsType(n, DESCRIPTOR) {}
+	static const constexpr StabsTypeDescriptor DESCRIPTOR = StabsTypeDescriptor::REFERENCE;
+	
+	void enumerate_numbered_types(std::map<StabsTypeNumber, const StabsType*>& output) const override
+	{
+		StabsType::enumerate_numbered_types(output);
+		value_type->enumerate_numbered_types(output);
+	}
+};
+
+struct StabsPointerType : StabsType {
+	std::unique_ptr<StabsType> value_type;
+	
+	StabsPointerType(StabsTypeNumber n) : StabsType(n, DESCRIPTOR) {}
+	static const constexpr StabsTypeDescriptor DESCRIPTOR = StabsTypeDescriptor::POINTER;
+	
+	void enumerate_numbered_types(std::map<StabsTypeNumber, const StabsType*>& output) const override
+	{
+		StabsType::enumerate_numbered_types(output);
+		value_type->enumerate_numbered_types(output);
+	}
+};
+
+struct StabsSizeTypeAttributeType : StabsType {
+	s64 size_bits = -1;
+	std::unique_ptr<StabsType> type;
+	
+	StabsSizeTypeAttributeType(StabsTypeNumber n) : StabsType(n, DESCRIPTOR) {}
+	static const constexpr StabsTypeDescriptor DESCRIPTOR = StabsTypeDescriptor::TYPE_ATTRIBUTE;
+	
+	void enumerate_numbered_types(std::map<StabsTypeNumber, const StabsType*>& output) const override
+	{
+		StabsType::enumerate_numbered_types(output);
+		type->enumerate_numbered_types(output);
+	}
+};
+
+struct StabsPointerToDataMemberType : StabsType {
+	std::unique_ptr<StabsType> class_type;
+	std::unique_ptr<StabsType> member_type;
+	
+	StabsPointerToDataMemberType(StabsTypeNumber n) : StabsType(n, DESCRIPTOR) {}
+	static const constexpr StabsTypeDescriptor DESCRIPTOR = StabsTypeDescriptor::POINTER_TO_DATA_MEMBER;
+	
+	void enumerate_numbered_types(std::map<StabsTypeNumber, const StabsType*>& output) const override
+	{
+		StabsType::enumerate_numbered_types(output);
+		class_type->enumerate_numbered_types(output);
+		member_type->enumerate_numbered_types(output);
+	}
+};
+
+struct StabsBuiltInType : StabsType {
+	s64 type_id = -1;
+	
+	StabsBuiltInType(StabsTypeNumber n) : StabsType(n, DESCRIPTOR) {}
+	static const constexpr StabsTypeDescriptor DESCRIPTOR = StabsTypeDescriptor::BUILTIN;
+};
+
+extern const char* STAB_TRUNCATED_ERROR_MESSAGE;
+
+Result<std::unique_ptr<StabsType>> parse_top_level_stabs_type(const char*& input);
+std::optional<s32> parse_number_s32(const char*& input);
+std::optional<s64> parse_number_s64(const char*& input);
+std::optional<std::string> parse_stabs_identifier(const char*& input, char terminator);
+Result<std::string> parse_dodgy_stabs_identifier(const char*& input, char terminator);
+const char* stabs_field_visibility_to_string(StabsStructOrUnionType::Visibility visibility);
+
+}

3rdparty/ccc/src/ccc/stabs_to_ast.cpp

@@ -0,0 +1,834 @@
+// This file is part of the Chaos Compiler Collection.
+// SPDX-License-Identifier: MIT
+
+#include "stabs_to_ast.h"
+
+#include "importer_flags.h"
+
+#define AST_DEBUG(...) //__VA_ARGS__
+#define AST_DEBUG_PRINTF(...) AST_DEBUG(printf(__VA_ARGS__);)
+
+namespace ccc {
+
+struct MemberFunctionInfo {
+	std::string name;
+	bool is_constructor_or_destructor = false;
+	bool is_special_member_function = false;
+	bool is_operator_member_function = false;
+};
+
+static bool is_void_like(const StabsType& type);
+static Result<ast::BuiltInClass> classify_range(const StabsRangeType& type);
+static Result<std::unique_ptr<ast::Node>> field_to_ast(
+	const StabsStructOrUnionType::Field& field,
+	const StabsType& enclosing_struct,
+	const StabsToAstState& state,
+	s32 depth);
+static Result<bool> detect_bitfield(const StabsStructOrUnionType::Field& field, const StabsToAstState& state);
+static Result<std::vector<std::unique_ptr<ast::Node>>> member_functions_to_ast(
+	const StabsStructOrUnionType& type, const StabsToAstState& state, s32 depth);
+static MemberFunctionInfo check_member_function(
+	const std::string& mangled_name,
+	std::string_view type_name_no_template_args,
+	const DemanglerFunctions& demangler,
+	u32 importer_flags);
+
+Result<std::unique_ptr<ast::Node>> stabs_type_to_ast(
+	const StabsType& type,
+	const StabsType* enclosing_struct,
+	const StabsToAstState& state,
+	s32 depth,
+	bool substitute_type_name,
+	bool force_substitute)
+{
+	AST_DEBUG_PRINTF("%-*stype desc=%hhx '%c' num=(%d,%d) name=%s\n",
+		depth * 4, "",
+		type.descriptor.has_value() ? (u8) *type.descriptor : 'X',
+		(type.descriptor.has_value() && isprint((u8) *type.descriptor)) ? (u8) *type.descriptor : '!',
+		type.type_number.file, type.type_number.type,
+		type.name.has_value() ? type.name->c_str() : "");
+	
+	if(depth > 200) {
+		const char* error_message = "Call depth greater than 200 in stabs_type_to_ast, probably infinite recursion.";
+		if(state.importer_flags & STRICT_PARSING) {
+			return CCC_FAILURE(error_message);
+		} else {
+			CCC_WARN(error_message);
+			
+			auto error = std::make_unique<ast::Error>();
+			error->message = error_message;
+			return std::unique_ptr<ast::Node>(std::move(error));
+		}
+	}
+	
+	// This makes sure that types are replaced with their type name in cases
+	// where that would be more appropriate.
+	if(type.name.has_value()) {
+		bool try_substitute = depth > 0 && (type.is_root
+			|| type.descriptor == StabsTypeDescriptor::RANGE
+			|| type.descriptor == StabsTypeDescriptor::BUILTIN);
+		// GCC emits anonymous enums with a name of " " since apparently some
+		// debuggers can't handle zero-length names.
+		bool is_name_empty = type.name == "" || type.name == " ";
+		// Cross references will be handled below.
+		bool is_cross_reference = type.descriptor == StabsTypeDescriptor::CROSS_REFERENCE;
+		bool is_void = is_void_like(type);
+		if((substitute_type_name || try_substitute) && !is_name_empty && !is_cross_reference && !is_void) {
+			auto type_name = std::make_unique<ast::TypeName>();
+			type_name->source = ast::TypeNameSource::REFERENCE;
+			type_name->unresolved_stabs = std::make_unique<ast::TypeName::UnresolvedStabs>();
+			type_name->unresolved_stabs->type_name = *type.name;
+			type_name->unresolved_stabs->referenced_file_handle = state.file_handle;
+			type_name->unresolved_stabs->stabs_type_number = type.type_number;
+			return std::unique_ptr<ast::Node>(std::move(type_name));
+		}
+	}
+	
+	// This prevents infinite recursion when an automatically generated member
+	// function references an unnamed type.
+	bool can_compare_type_numbers = type.type_number.valid() && enclosing_struct && enclosing_struct->type_number.valid();
+	if(force_substitute && can_compare_type_numbers && type.type_number == enclosing_struct->type_number) {
+		// It's probably a this parameter (or return type) for an unnamed type.
+		auto type_name = std::make_unique<ast::TypeName>();
+		type_name->source = ast::TypeNameSource::UNNAMED_THIS;
+		type_name->unresolved_stabs = std::make_unique<ast::TypeName::UnresolvedStabs>();
+		type_name->unresolved_stabs->type_name = enclosing_struct->name.has_value() ? *enclosing_struct->name : "";
+		type_name->unresolved_stabs->referenced_file_handle = state.file_handle;
+		type_name->unresolved_stabs->stabs_type_number = type.type_number;
+		return std::unique_ptr<ast::Node>(std::move(type_name));
+	}
+	
+	if(!type.descriptor.has_value()) {
+		// The definition of the type has been defined previously, so we have to
+		// look it up by its type number.
+		CCC_CHECK(type.type_number.valid(), "Cannot lookup type (type is anonymous).");
+		auto stabs_type = state.stabs_types->find(type.type_number);
+		if(stabs_type == state.stabs_types->end()) {
+			std::string error_message = "Failed to lookup STABS type by its type number ("
+				+ std::to_string(type.type_number.file) + "," + std::to_string(type.type_number.type) + ").";
+			if(state.importer_flags & STRICT_PARSING) {
+				return CCC_FAILURE("%s", error_message.c_str());
+			} else {
+				CCC_WARN("%s", error_message.c_str());
+				std::unique_ptr<ast::Error> error = std::make_unique<ast::Error>();
+				error->message = std::move(error_message);
+				return std::unique_ptr<ast::Node>(std::move(error));
+			}
+		}
+		return stabs_type_to_ast(
+			*stabs_type->second,
+			enclosing_struct,
+			state,
+			depth + 1,
+			substitute_type_name,
+			force_substitute);
+	}
+	
+	std::unique_ptr<ast::Node> result;
+	
+	switch(*type.descriptor) {
+		case StabsTypeDescriptor::TYPE_REFERENCE: {
+			const auto& stabs_type_ref = type.as<StabsTypeReferenceType>();
+			if(!type.type_number.valid() || !stabs_type_ref.type->type_number.valid() || stabs_type_ref.type->type_number != type.type_number) {
+				auto node = stabs_type_to_ast(
+					*stabs_type_ref.type,
+					enclosing_struct,
+					state,
+					depth + 1,
+					substitute_type_name,
+					force_substitute);
+				CCC_RETURN_IF_ERROR(node);
+				result = std::move(*node);
+			} else {
+				// I still don't know why in STABS void is a reference to
+				// itself, maybe because I'm not a philosopher.
+				auto builtin = std::make_unique<ast::BuiltIn>();
+				builtin->bclass = ast::BuiltInClass::VOID_TYPE;
+				result = std::move(builtin);
+			}
+			break;
+		}
+		case StabsTypeDescriptor::ARRAY: {
+			auto array = std::make_unique<ast::Array>();
+			const auto& stabs_array = type.as<StabsArrayType>();
+			
+			auto element_node = stabs_type_to_ast(
+				*stabs_array.element_type,
+				enclosing_struct,
+				state,
+				depth + 1,
+				true,
+				force_substitute);
+			CCC_RETURN_IF_ERROR(element_node);
+			array->element_type = std::move(*element_node);
+			
+			const StabsRangeType& index = stabs_array.index_type->as<StabsRangeType>();
+			
+			char* end = nullptr;
+			
+			const char* low = index.low.c_str();
+			s64 low_value = strtoll(low, &end, 10);
+			CCC_CHECK(end != low, "Failed to parse low part of range as integer.");
+			CCC_CHECK(low_value == 0, "Invalid index type for array.");
+			
+			const char* high = index.high.c_str();
+			s64 high_value = strtoll(high, &end, 10);
+			CCC_CHECK(end != high, "Failed to parse low part of range as integer.");
+			
+			if(high_value == 4294967295) {
+				// Some compilers wrote out a wrapped around value here.
+				array->element_count = 0;
+			} else {
+				array->element_count = (s32) high_value + 1;
+			}
+			
+			result = std::move(array);
+			break;
+		}
+		case StabsTypeDescriptor::ENUM: {
+			auto inline_enum = std::make_unique<ast::Enum>();
+			const auto& stabs_enum = type.as<StabsEnumType>();
+			inline_enum->constants = stabs_enum.fields;
+			result = std::move(inline_enum);
+			break;
+		}
+		case StabsTypeDescriptor::FUNCTION: {
+			auto function = std::make_unique<ast::Function>();
+			
+			auto node = stabs_type_to_ast(
+				*type.as<StabsFunctionType>().return_type,
+				enclosing_struct,
+				state,
+				depth + 1,
+				true,
+				force_substitute);
+			CCC_RETURN_IF_ERROR(node);
+			function->return_type = std::move(*node);
+			
+			result = std::move(function);
+			break;
+		}
+		case StabsTypeDescriptor::VOLATILE_QUALIFIER: {
+			const auto& volatile_qualifier = type.as<StabsVolatileQualifierType>();
+			
+			auto node = stabs_type_to_ast(
+				*volatile_qualifier.type.get(),
+				enclosing_struct,
+				state,
+				depth + 1,
+				substitute_type_name,
+				force_substitute);
+			CCC_RETURN_IF_ERROR(node);
+			result = std::move(*node);
+			
+			result->is_volatile = true;
+			break;
+		}
+		case StabsTypeDescriptor::CONST_QUALIFIER: {
+			const auto& const_qualifier = type.as<StabsConstQualifierType>();
+			
+			auto node = stabs_type_to_ast(
+				*const_qualifier.type.get(),
+				enclosing_struct,
+				state,
+				depth + 1,
+				substitute_type_name,
+				force_substitute);
+			result = std::move(*node);
+			
+			result->is_const = true;
+			break;
+		}
+		case StabsTypeDescriptor::RANGE: {
+			auto builtin = std::make_unique<ast::BuiltIn>();
+			Result<ast::BuiltInClass> bclass = classify_range(type.as<StabsRangeType>());
+			CCC_RETURN_IF_ERROR(bclass);
+			builtin->bclass = *bclass;
+			result = std::move(builtin);
+			break;
+		}
+		case StabsTypeDescriptor::STRUCT:
+		case StabsTypeDescriptor::UNION: {
+			const StabsStructOrUnionType* stabs_struct_or_union;
+			if(type.descriptor == StabsTypeDescriptor::STRUCT) {
+				stabs_struct_or_union = &type.as<StabsStructType>();
+			} else {
+				stabs_struct_or_union = &type.as<StabsUnionType>();
+			}
+			
+			auto struct_or_union = std::make_unique<ast::StructOrUnion>();
+			struct_or_union->is_struct = type.descriptor == StabsTypeDescriptor::STRUCT;
+			struct_or_union->size_bits = (s32) stabs_struct_or_union->size * 8;
+			
+			for(const StabsStructOrUnionType::BaseClass& stabs_base_class : stabs_struct_or_union->base_classes) {
+				auto base_class = stabs_type_to_ast(
+					*stabs_base_class.type,
+					&type,
+					state,
+					depth + 1,
+					true,
+					force_substitute);
+				CCC_RETURN_IF_ERROR(base_class);
+				
+				(*base_class)->offset_bytes = stabs_base_class.offset;
+				(*base_class)->set_access_specifier(stabs_field_visibility_to_access_specifier(stabs_base_class.visibility), state.importer_flags);
+				
+				if(stabs_base_class.is_virtual) {
+					(*base_class)->is_virtual_base_class = true;
+				}
+				
+				struct_or_union->base_classes.emplace_back(std::move(*base_class));
+			}
+			
+			AST_DEBUG_PRINTF("%-*s beginfields\n", depth * 4, "");
+			for(const StabsStructOrUnionType::Field& field : stabs_struct_or_union->fields) {
+				auto node = field_to_ast(field, type, state, depth);
+				CCC_RETURN_IF_ERROR(node);
+				struct_or_union->fields.emplace_back(std::move(*node));
+			}
+			AST_DEBUG_PRINTF("%-*s endfields\n", depth * 4, "");
+			
+			AST_DEBUG_PRINTF("%-*s beginmemberfuncs\n", depth * 4, "");
+			Result<std::vector<std::unique_ptr<ast::Node>>> member_functions =
+				member_functions_to_ast(*stabs_struct_or_union, state, depth);
+			CCC_RETURN_IF_ERROR(member_functions);
+			struct_or_union->member_functions = std::move(*member_functions);
+			AST_DEBUG_PRINTF("%-*s endmemberfuncs\n", depth * 4, "");
+			
+			result = std::move(struct_or_union);
+			break;
+		}
+		case StabsTypeDescriptor::CROSS_REFERENCE: {
+			const auto& cross_reference = type.as<StabsCrossReferenceType>();
+			auto type_name = std::make_unique<ast::TypeName>();
+			type_name->source = ast::TypeNameSource::CROSS_REFERENCE;
+			type_name->unresolved_stabs = std::make_unique<ast::TypeName::UnresolvedStabs>();
+			type_name->unresolved_stabs->type_name = cross_reference.identifier;
+			type_name->unresolved_stabs->type = cross_reference.type;
+			result = std::move(type_name);
+			break;
+		}
+		case ccc::StabsTypeDescriptor::FLOATING_POINT_BUILTIN: {
+			const auto& fp_builtin = type.as<StabsFloatingPointBuiltInType>();
+			auto builtin = std::make_unique<ast::BuiltIn>();
+			switch(fp_builtin.bytes) {
+				case 1: builtin->bclass = ast::BuiltInClass::UNSIGNED_8; break;
+				case 2: builtin->bclass = ast::BuiltInClass::UNSIGNED_16; break;
+				case 4: builtin->bclass = ast::BuiltInClass::UNSIGNED_32; break;
+				case 8: builtin->bclass = ast::BuiltInClass::UNSIGNED_64; break;
+				case 16: builtin->bclass = ast::BuiltInClass::UNSIGNED_128; break;
+				default: builtin->bclass = ast::BuiltInClass::UNSIGNED_8; break;
+			}
+			result = std::move(builtin);
+			break;
+		}
+		case StabsTypeDescriptor::METHOD: {
+			const auto& stabs_method = type.as<StabsMethodType>();
+			auto function = std::make_unique<ast::Function>();
+			
+			auto return_node = stabs_type_to_ast(
+				*stabs_method.return_type.get(),
+				enclosing_struct,
+				state,
+				depth + 1,
+				true,
+				true);
+			CCC_RETURN_IF_ERROR(return_node);
+			function->return_type = std::move(*return_node);
+			
+			function->parameters.emplace();
+			for(const std::unique_ptr<StabsType>& parameter_type : stabs_method.parameter_types) {
+				auto parameter_node = stabs_type_to_ast(
+					*parameter_type,
+					enclosing_struct,
+					state,
+					depth + 1,
+					true,
+					true);
+				CCC_RETURN_IF_ERROR(parameter_node);
+				function->parameters->emplace_back(std::move(*parameter_node));
+			}
+			result = std::move(function);
+			break;
+		}
+		case StabsTypeDescriptor::POINTER: {
+			auto pointer = std::make_unique<ast::PointerOrReference>();
+			pointer->is_pointer = true;
+			
+			auto value_node = stabs_type_to_ast(
+				*type.as<StabsPointerType>().value_type,
+				enclosing_struct,
+				state,
+				depth + 1,
+				true,
+				force_substitute);
+			CCC_RETURN_IF_ERROR(value_node);
+			pointer->value_type = std::move(*value_node);
+			
+			result = std::move(pointer);
+			break;
+		}
+		case StabsTypeDescriptor::REFERENCE: {
+			auto reference = std::make_unique<ast::PointerOrReference>();
+			reference->is_pointer = false;
+			
+			auto value_node = stabs_type_to_ast(
+				*type.as<StabsReferenceType>().value_type,
+				enclosing_struct,
+				state,
+				depth + 1,
+				true,
+				force_substitute);
+			CCC_RETURN_IF_ERROR(value_node);
+			reference->value_type = std::move(*value_node);
+			
+			result = std::move(reference);
+			break;
+		}
+		case StabsTypeDescriptor::TYPE_ATTRIBUTE: {
+			const auto& stabs_type_attribute = type.as<StabsSizeTypeAttributeType>();
+			
+			auto node = stabs_type_to_ast(
+				*stabs_type_attribute.type,
+				enclosing_struct,
+				state,
+				depth + 1,
+				substitute_type_name,
+				force_substitute);
+			CCC_RETURN_IF_ERROR(node);
+			result = std::move(*node);
+			
+			result->size_bits = (s32) stabs_type_attribute.size_bits;
+			break;
+		}
+		case StabsTypeDescriptor::POINTER_TO_DATA_MEMBER: {
+			const auto& stabs_member_pointer = type.as<StabsPointerToDataMemberType>();
+			auto member_pointer = std::make_unique<ast::PointerToDataMember>();
+			
+			auto class_node = stabs_type_to_ast(
+				*stabs_member_pointer.class_type.get(),
+				enclosing_struct,
+				state,
+				depth + 1,
+				true,
+				true);
+			CCC_RETURN_IF_ERROR(class_node);
+			member_pointer->class_type = std::move(*class_node);
+			
+			auto member_node = stabs_type_to_ast(
+				*stabs_member_pointer.member_type.get(),
+				enclosing_struct,
+				state,
+				depth + 1,
+				true,
+				true);
+			CCC_RETURN_IF_ERROR(member_node);
+			member_pointer->member_type = std::move(*member_node);
+			
+			result = std::move(member_pointer);
+			break;
+		}
+		case StabsTypeDescriptor::BUILTIN: {
+			CCC_CHECK(type.as<StabsBuiltInType>().type_id == 16,
+				"Unknown built-in type!");
+			auto builtin = std::make_unique<ast::BuiltIn>();
+			builtin->bclass = ast::BuiltInClass::BOOL_8;
+			result = std::move(builtin);
+			break;
+		}
+	}
+	
+	CCC_CHECK(result, "Result of stabs_type_to_ast call is nullptr.");
+	return result;
+}
+
+static bool is_void_like(const StabsType& type)
+{
+	// Unfortunately, a common case seems to be that various types (most
+	// commonly __builtin_va_list) are indistinguishable from void or void*, so
+	// we have to output them as a void built-in.
+	if(type.descriptor.has_value()) {
+		switch(*type.descriptor) {
+			case StabsTypeDescriptor::POINTER: {
+				return is_void_like(*type.as<StabsPointerType>().value_type.get());
+			}
+			case StabsTypeDescriptor::TYPE_REFERENCE: {
+				return type.as<StabsTypeReferenceType>().type->type_number == type.type_number;
+			}
+			default: {
+				break;
+			}
+		}
+	}
+	
+	return false;
+}
+
+static Result<ast::BuiltInClass> classify_range(const StabsRangeType& type)
+{
+	const char* low = type.low.c_str();
+	const char* high = type.high.c_str();
+	
+	// Handle some special cases and values that are too large to easily store
+	// in a 64-bit integer.
+	static const struct { const char* low; const char* high; ast::BuiltInClass classification; } strings[] = {
+		{"4", "0", ast::BuiltInClass::FLOAT_32},
+		{"000000000000000000000000", "001777777777777777777777", ast::BuiltInClass::UNSIGNED_64},
+		{"00000000000000000000000000000000000000000000", "00000000000000000000001777777777777777777777", ast::BuiltInClass::UNSIGNED_64},
+		{"0000000000000", "01777777777777777777777", ast::BuiltInClass::UNSIGNED_64}, // IOP
+		{"0", "18446744073709551615", ast::BuiltInClass::UNSIGNED_64},
+		{"001000000000000000000000", "000777777777777777777777", ast::BuiltInClass::SIGNED_64},
+		{"00000000000000000000001000000000000000000000", "00000000000000000000000777777777777777777777", ast::BuiltInClass::SIGNED_64},
+		{"01000000000000000000000", "0777777777777777777777", ast::BuiltInClass::SIGNED_64}, // IOP
+		{"-9223372036854775808", "9223372036854775807", ast::BuiltInClass::SIGNED_64},
+		{"8", "0", ast::BuiltInClass::FLOAT_64},
+		{"00000000000000000000000000000000000000000000", "03777777777777777777777777777777777777777777", ast::BuiltInClass::UNSIGNED_128},
+		{"02000000000000000000000000000000000000000000", "01777777777777777777777777777777777777777777", ast::BuiltInClass::SIGNED_128},
+		{"000000000000000000000000", "0377777777777777777777777777777777", ast::BuiltInClass::UNQUALIFIED_128},
+		{"16", "0", ast::BuiltInClass::FLOAT_128},
+		{"0", "-1", ast::BuiltInClass::UNQUALIFIED_128} // Old homebrew toolchain
+	};
+	
+	for(const auto& range : strings) {
+		if(strcmp(range.low, low) == 0 && strcmp(range.high, high) == 0) {
+			return range.classification;
+		}
+	}
+	
+	// For smaller values we actually parse the bounds as integers.
+	char* end = nullptr;
+	s64 low_value = strtoll(type.low.c_str(), &end, low[0] == '0' ? 8 : 10);
+	CCC_CHECK(end != low, "Failed to parse low part of range as integer.");
+	s64 high_value = strtoll(type.high.c_str(), &end, high[0] == '0' ? 8 : 10);
+	CCC_CHECK(end != high, "Failed to parse high part of range as integer.");
+	
+	static const struct { s64 low; s64 high; ast::BuiltInClass classification; } integers[] = {
+		{0, 255, ast::BuiltInClass::UNSIGNED_8},
+		{-128, 127, ast::BuiltInClass::SIGNED_8},
+		{0, 127, ast::BuiltInClass::UNQUALIFIED_8},
+		{0, 65535, ast::BuiltInClass::UNSIGNED_16},
+		{-32768, 32767, ast::BuiltInClass::SIGNED_16},
+		{0, 4294967295, ast::BuiltInClass::UNSIGNED_32},
+		{-2147483648, 2147483647, ast::BuiltInClass::SIGNED_32},
+	};
+	
+	for(const auto& range : integers) {
+		if((range.low == low_value || range.low == -low_value) && range.high == high_value) {
+			return range.classification;
+		}
+	}
+	
+	return CCC_FAILURE("Failed to classify range.");
+}
+
+static Result<std::unique_ptr<ast::Node>> field_to_ast(
+	const StabsStructOrUnionType::Field& field,
+	const StabsType& enclosing_struct,
+	const StabsToAstState& state,
+	s32 depth)
+{
+	AST_DEBUG_PRINTF("%-*s  field %s\n", depth * 4, "", field.name.c_str());
+	
+	Result<bool> is_bitfield = detect_bitfield(field, state);
+	CCC_RETURN_IF_ERROR(is_bitfield);
+	
+	if(*is_bitfield) {
+		// Process bitfields.
+		auto bitfield_node = stabs_type_to_ast(
+			*field.type,
+			&enclosing_struct,
+			state,
+			depth + 1,
+			true,
+			false);
+		CCC_RETURN_IF_ERROR(bitfield_node);
+		
+		std::unique_ptr<ast::BitField> bitfield = std::make_unique<ast::BitField>();
+		bitfield->name = (field.name == " ") ? "" : field.name;
+		bitfield->offset_bytes = field.offset_bits / 8;
+		bitfield->size_bits = field.size_bits;
+		bitfield->underlying_type = std::move(*bitfield_node);
+		bitfield->bitfield_offset_bits = field.offset_bits % 8;
+		bitfield->set_access_specifier(stabs_field_visibility_to_access_specifier(field.visibility), state.importer_flags);
+		
+		return std::unique_ptr<ast::Node>(std::move(bitfield));
+	} else {
+		// Process a normal field.
+		Result<std::unique_ptr<ast::Node>> node = stabs_type_to_ast(
+			*field.type,
+			&enclosing_struct,
+			state,
+			depth + 1,
+			true,
+			false);
+		CCC_RETURN_IF_ERROR(node);
+		
+		(*node)->name = field.name;
+		(*node)->offset_bytes = field.offset_bits / 8;
+		(*node)->size_bits = field.size_bits;
+		(*node)->set_access_specifier(stabs_field_visibility_to_access_specifier(field.visibility), state.importer_flags);
+		
+		if(field.name.starts_with("$vf") || field.name.starts_with("_vptr$") || field.name.starts_with("_vptr.")) {
+			(*node)->is_vtable_pointer = true;
+		}
+		
+		if(field.is_static) {
+			(*node)->storage_class = STORAGE_CLASS_STATIC;
+		}
+		
+		return node;
+	}
+}
+
+static Result<bool> detect_bitfield(const StabsStructOrUnionType::Field& field, const StabsToAstState& state)
+{
+	// Static fields can't be bitfields.
+	if(field.is_static) {
+		return false;
+	}
+	
+	// Resolve type references.
+	const StabsType* type = field.type.get();
+	for(s32 i = 0; i < 50; i++) {
+		if(!type->descriptor.has_value()) {
+			if(!type->type_number.valid()) {
+				return false;
+			}
+			auto next_type = state.stabs_types->find(type->type_number);
+			if(next_type == state.stabs_types->end() || next_type->second == type) {
+				return false;
+			}
+			type = next_type->second;
+		} else if(type->descriptor == StabsTypeDescriptor::TYPE_REFERENCE) {
+			type = type->as<StabsTypeReferenceType>().type.get();
+		} else if(type->descriptor == StabsTypeDescriptor::CONST_QUALIFIER) {
+			type = type->as<StabsConstQualifierType>().type.get();
+		} else if(type->descriptor == StabsTypeDescriptor::VOLATILE_QUALIFIER) {
+			type = type->as<StabsVolatileQualifierType>().type.get();
+		} else {
+			break;
+		}
+		
+		// Prevent an infinite loop if there's a cycle (fatal frame).
+		if(i == 49) {
+			return false;
+		}
+	}
+	
+	// Determine the size of the underlying type.
+	s32 underlying_type_size_bits = 0;
+	switch(*type->descriptor) {
+		case ccc::StabsTypeDescriptor::RANGE: {
+			Result<ast::BuiltInClass> bclass = classify_range(type->as<StabsRangeType>());
+			CCC_RETURN_IF_ERROR(bclass);
+			underlying_type_size_bits = builtin_class_size(*bclass) * 8;
+			break;
+		}
+		case ccc::StabsTypeDescriptor::CROSS_REFERENCE: {
+			if(type->as<StabsCrossReferenceType>().type == ast::ForwardDeclaredType::ENUM) {
+				underlying_type_size_bits = 32;
+			} else {
+				return false;
+			}
+			break;
+		}
+		case ccc::StabsTypeDescriptor::TYPE_ATTRIBUTE: {
+			underlying_type_size_bits = (s32) type->as<StabsSizeTypeAttributeType>().size_bits;
+			break;
+		}
+		case ccc::StabsTypeDescriptor::BUILTIN: {
+			underlying_type_size_bits = 8; // bool
+			break;
+		}
+		default: {
+			return false;
+		}
+	}
+	
+	if(underlying_type_size_bits == 0) {
+		return false;
+	}
+	
+	return field.size_bits != underlying_type_size_bits;
+}
+
+static Result<std::vector<std::unique_ptr<ast::Node>>> member_functions_to_ast(
+	const StabsStructOrUnionType& type, const StabsToAstState& state, s32 depth)
+{
+	if(state.importer_flags & NO_MEMBER_FUNCTIONS) {
+		return std::vector<std::unique_ptr<ast::Node>>();
+	}
+	
+	std::string_view type_name_no_template_args;
+	if(type.name.has_value()) {
+		type_name_no_template_args =
+			std::string_view(*type.name).substr(0, type.name->find("<"));
+	}
+	
+	std::vector<std::unique_ptr<ast::Node>> member_functions;
+	bool only_special_functions = true;
+	
+	for(const StabsStructOrUnionType::MemberFunctionSet& function_set : type.member_functions) {
+		MemberFunctionInfo info = check_member_function(
+			function_set.name, type_name_no_template_args, state.demangler, state.importer_flags);
+		
+		if(!info.is_special_member_function) {
+			only_special_functions = false;
+		}
+		
+		for(const StabsStructOrUnionType::MemberFunction& stabs_func : function_set.overloads) {
+			auto node = stabs_type_to_ast(
+				*stabs_func.type,
+				&type,
+				state,
+				depth + 1,
+				true,
+				true);
+			CCC_RETURN_IF_ERROR(node);
+			
+			(*node)->is_constructor_or_destructor = info.is_constructor_or_destructor;
+			(*node)->is_special_member_function = info.is_special_member_function;
+			(*node)->is_operator_member_function = info.is_operator_member_function;
+			
+			(*node)->name = info.name;
+			(*node)->set_access_specifier(stabs_field_visibility_to_access_specifier(stabs_func.visibility), state.importer_flags);
+			
+			if((*node)->descriptor == ast::FUNCTION) {
+				ast::Function& function = (*node)->as<ast::Function>();
+				function.modifier = stabs_func.modifier;
+				function.vtable_index = stabs_func.vtable_index;
+			}
+			
+			member_functions.emplace_back(std::move(*node));
+		}
+	}
+	
+	if(only_special_functions && (state.importer_flags & INCLUDE_GENERATED_MEMBER_FUNCTIONS) == 0) {
+		return std::vector<std::unique_ptr<ast::Node>>();
+	}
+	
+	return member_functions;
+}
+
+static MemberFunctionInfo check_member_function(
+	const std::string& mangled_name,
+	std::string_view type_name_no_template_args,
+	const DemanglerFunctions& demangler,
+	u32 importer_flags)
+{
+	MemberFunctionInfo info;
+	
+	// Some compiler versions output gcc opnames for overloaded operators
+	// instead of their proper names.
+	if((importer_flags & DONT_DEMANGLE_NAMES) == 0 && demangler.cplus_demangle_opname) {
+		char* demangled_name = demangler.cplus_demangle_opname(mangled_name.c_str(), 0);
+		if(demangled_name) {
+			info.name = demangled_name;
+			free(reinterpret_cast<void*>(demangled_name));
+		}
+	}
+	if(info.name.empty()) {
+		info.name = mangled_name;
+	}
+	
+	bool is_constructor =
+		info.name == "__ct" || // Takes a parameter to decide whether or not to construct virtual base classes.
+		info.name == "__comp_ctor" || // Constructs virtual base classes.
+		info.name == "__base_ctor"; // Does not construct virtual base classes.
+	
+	if(!is_constructor && !type_name_no_template_args.empty()) {
+		is_constructor |= info.name == type_name_no_template_args; // Named constructor.
+	}
+	
+	bool is_destructor =
+		info.name == "__dt" || // Takes parameters to decide whether or not to construct virtual base classes and/or delete the object.
+		info.name == "__comp_dtor" || // Destructs virtual base classes.
+		info.name == "__base_dtor" || // Does not construct virtual base classes.
+		info.name == "__deleting_dtor"; // Destructs virtual base clases then deletes the entire object.
+	
+	if(!is_destructor && !info.name.empty()) {
+		is_destructor |= info.name[0] == '~' && std::string_view(info.name).substr(1) == type_name_no_template_args; // Named destructor.
+	}
+	
+	info.is_constructor_or_destructor = is_constructor || is_destructor || info.name.starts_with("$_");
+	info.is_special_member_function = info.is_constructor_or_destructor || info.name == "operator=";
+	
+	return info;
+}
+
+void fix_recursively_emitted_structures(
+	ast::StructOrUnion& outer_struct, const std::string& name, StabsTypeNumber type_number, SourceFileHandle file_handle)
+{
+	// This is a rather peculiar case. For some compiler versions, when a struct
+	// or a union defined using a typedef is being emitted and it needs to
+	// reference itself from a member function parameter, it will emit its
+	// entire definition again in the middle of the first definition, although
+	// thankfully it won't recurse more than once.
+	//
+	// The game Sega Soccer Slam is affected by this. See the PeculiarParameter
+	// test case in mdebug_importer_tests.cpp for a bare bones example.
+	
+	for(std::unique_ptr<ast::Node>& node : outer_struct.member_functions) {
+		if(node->descriptor != ast::FUNCTION) {
+			continue;
+		}
+		
+		ast::Function& function = node->as<ast::Function>();
+		if(!function.parameters.has_value()) {
+			continue;
+		}
+		
+		for(std::unique_ptr<ast::Node>& parameter : *function.parameters) {
+			if(parameter->descriptor != ast::POINTER_OR_REFERENCE) {
+				continue;
+			}
+			
+			ast::PointerOrReference& pointer_or_reference = parameter->as<ast::PointerOrReference>();
+			if(pointer_or_reference.value_type->descriptor != ast::STRUCT_OR_UNION) {
+				continue;
+			}
+			
+			ast::StructOrUnion& inner_struct = pointer_or_reference.value_type->as<ast::StructOrUnion>();
+			
+			// Since C++ doesn't allow struct definitions in function parameter
+			// lists normally, and most of the time the member function
+			// parameters aren't even filled in by GCC, this is a really rare
+			// case, so here we only bother to do some very basic checks to
+			// verify that the inner struct is similar to the outer struct.
+			if(inner_struct.base_classes.size() != outer_struct.base_classes.size()) {
+				continue;
+			}
+			
+			if(inner_struct.fields.size() != outer_struct.fields.size()) {
+				continue;
+			}
+			
+			if(inner_struct.member_functions.size() != outer_struct.member_functions.size()) {
+				continue;
+			}
+			
+			auto type_name = std::make_unique<ast::TypeName>();
+			type_name->source = ast::TypeNameSource::REFERENCE;
+			type_name->unresolved_stabs = std::make_unique<ast::TypeName::UnresolvedStabs>();
+			type_name->unresolved_stabs->type_name = name;
+			type_name->unresolved_stabs->referenced_file_handle = file_handle;
+			type_name->unresolved_stabs->stabs_type_number = type_number;
+			pointer_or_reference.value_type = std::move(type_name);
+		}
+	}
+}
+
+ast::AccessSpecifier stabs_field_visibility_to_access_specifier(StabsStructOrUnionType::Visibility visibility)
+{
+	ast::AccessSpecifier access_specifier = ast::AS_PUBLIC;
+	switch(visibility) {
+		case StabsStructOrUnionType::Visibility::NONE: access_specifier = ast::AS_PUBLIC; break;
+		case StabsStructOrUnionType::Visibility::PUBLIC: access_specifier = ast::AS_PUBLIC; break;
+		case StabsStructOrUnionType::Visibility::PROTECTED: access_specifier = ast::AS_PROTECTED; break;
+		case StabsStructOrUnionType::Visibility::PRIVATE: access_specifier = ast::AS_PRIVATE; break;
+		case StabsStructOrUnionType::Visibility::PUBLIC_OPTIMIZED_OUT: access_specifier = ast::AS_PUBLIC; break;
+	}
+	return access_specifier;
+}
+
+}

3rdparty/ccc/src/ccc/stabs_to_ast.h

@@ -0,0 +1,29 @@
+// This file is part of the Chaos Compiler Collection.
+// SPDX-License-Identifier: MIT
+
+#pragma once
+
+#include "ast.h"
+#include "stabs.h"
+
+namespace ccc {
+	
+struct StabsToAstState {
+	u32 file_handle;
+	std::map<StabsTypeNumber, const StabsType*>* stabs_types;
+	u32 importer_flags;
+	DemanglerFunctions demangler;
+};
+
+Result<std::unique_ptr<ast::Node>> stabs_type_to_ast(
+	const StabsType& type,
+	const StabsType* enclosing_struct,
+	const StabsToAstState& state,
+	s32 depth,
+	bool substitute_type_name,
+	bool force_substitute);
+void fix_recursively_emitted_structures(
+	ast::StructOrUnion& outer_struct, const std::string& name, StabsTypeNumber type_number, SourceFileHandle file_handle);
+ast::AccessSpecifier stabs_field_visibility_to_access_specifier(StabsStructOrUnionType::Visibility visibility);
+
+}

3rdparty/ccc/src/ccc/symbol_database.h

@@ -0,0 +1,721 @@
+// This file is part of the Chaos Compiler Collection.
+// SPDX-License-Identifier: MIT
+
+#pragma once
+
+#include <map>
+#include <atomic>
+#include <variant>
+
+#include "util.h"
+
+namespace ccc {
+
+// An X macro for all the symbol types.
+#define CCC_FOR_EACH_SYMBOL_TYPE_DO_X \
+	CCC_X(DataType, data_types) \
+	CCC_X(Function, functions) \
+	CCC_X(GlobalVariable, global_variables) \
+	CCC_X(Label, labels) \
+	CCC_X(LocalVariable, local_variables) \
+	CCC_X(Module, modules) \
+	CCC_X(ParameterVariable, parameter_variables) \
+	CCC_X(Section, sections) \
+	CCC_X(SourceFile, source_files) \
+	CCC_X(SymbolSource, symbol_sources)
+
+// An enum for all the symbol types.
+enum SymbolDescriptor {
+	DATA_TYPE          = 1 << 0,
+	FUNCTION           = 1 << 1,
+	GLOBAL_VARIABLE    = 1 << 2,
+	LABEL              = 1 << 3,
+	LOCAL_VARIABLE     = 1 << 4,
+	MODULE             = 1 << 5,
+	PARAMETER_VARIABLE = 1 << 6,
+	SECTION            = 1 << 7,
+	SOURCE_FILE        = 1 << 8,
+	SYMBOL_SOURCE      = 1 << 9
+};
+
+enum {
+	ALL_SYMBOL_TYPES = 0xffff
+};
+
+// Forward declare all the different types of symbol objects.
+#define CCC_X(SymbolType, symbol_list) class SymbolType;
+CCC_FOR_EACH_SYMBOL_TYPE_DO_X
+#undef CCC_X
+
+class SymbolDatabase;
+
+// Strongly typed handles for all of the symbol objects. These are here to solve
+// the problem of dangling references to symbols.
+template <typename SymbolType>
+struct SymbolHandle {
+	u32 value = (u32) -1;
+	
+	SymbolHandle() {}
+	SymbolHandle(u32 v) : value(v) {}
+	SymbolHandle(const SymbolType* symbol)
+		: value(symbol ? symbol->handle().value : (u32) -1) {}
+	
+	// Check if this symbol handle has been initialised. Note that this doesn't
+	// determine whether or not the symbol it points to has been deleted!
+	bool valid() const { return value != (u32) -1; }
+	
+	friend auto operator<=>(const SymbolHandle& lhs, const SymbolHandle& rhs) = default;
+};
+
+#define CCC_X(SymbolType, symbol_list) using SymbolType##Handle = SymbolHandle<SymbolType>;
+CCC_FOR_EACH_SYMBOL_TYPE_DO_X
+#undef CCC_X
+
+enum SymbolFlag {
+	NO_SYMBOL_FLAGS = 0,
+	WITH_ADDRESS_MAP = 1 << 0,
+	WITH_NAME_MAP = 1 << 1,
+	NAME_NEEDS_DEMANGLING = 1 << 2
+};
+
+// A container class for symbols of a given type that maintains maps of their
+// names and addresses depending on the value of SymbolType::FLAGS.
+template <typename SymbolType>
+class SymbolList {
+public:
+	// Lookup symbols from their handles using binary search.
+	SymbolType* symbol_from_handle(SymbolHandle<SymbolType> handle);
+	const SymbolType* symbol_from_handle(SymbolHandle<SymbolType> handle) const;
+	
+	// Lookup multiple symbols from their handles using binary search.
+	std::vector<SymbolType*> symbols_from_handles(const std::vector<SymbolHandle<SymbolType>>& handles);
+	std::vector<const SymbolType*> symbols_from_handles(const std::vector<SymbolHandle<SymbolType>>& handles) const;
+	std::vector<SymbolType*> optional_symbols_from_handles(const std::optional<std::vector<SymbolHandle<SymbolType>>>& handles);
+	std::vector<const SymbolType*> optional_symbols_from_handles(const std::optional<std::vector<SymbolHandle<SymbolType>>>& handles) const;
+	
+	using Iterator = typename std::vector<SymbolType>::iterator;
+	using ConstIterator = typename std::vector<SymbolType>::const_iterator;
+	
+	// For iterating over all the symbols.
+	Iterator begin();
+	ConstIterator begin() const;
+	Iterator end();
+	ConstIterator end() const;
+	
+	using AddressToHandleMap = std::multimap<u32, SymbolHandle<SymbolType>>;
+	using NameToHandleMap = std::multimap<std::string, SymbolHandle<SymbolType>>;
+	
+	template <typename Iterator>
+	class Iterators {
+	public:
+		Iterators(Iterator b, Iterator e)
+			: m_begin(b), m_end(e) {}
+		Iterator begin() const { return m_begin; }
+		Iterator end() const { return m_end; }
+	protected:
+		Iterator m_begin;
+		Iterator m_end;
+	};
+	
+	using AddressToHandleMapIterators = Iterators<typename AddressToHandleMap::const_iterator>;
+	using NameToHandleMapIterators = Iterators<typename NameToHandleMap::const_iterator>;
+	
+	// Lookup symbols by their address.
+	AddressToHandleMapIterators handles_from_starting_address(Address address) const;
+	AddressToHandleMapIterators handles_from_address_range(AddressRange range) const;
+	SymbolHandle<SymbolType> first_handle_from_starting_address(Address address) const;
+	SymbolHandle<SymbolType> first_handle_after_address(Address address) const;
+	
+	// Lookup symbols by their name.
+	NameToHandleMapIterators handles_from_name(const std::string& name) const;
+	SymbolHandle<SymbolType> first_handle_from_name(const std::string& name) const;
+	
+	// Find a symbol with an address range that contains the provided address.
+	// For example, to find which function an instruction belongs to.
+	SymbolType* symbol_overlapping_address(Address address);
+	const SymbolType* symbol_overlapping_address(Address address) const;
+	
+	// Convert handles to underlying array indices.
+	s32 index_from_handle(SymbolHandle<SymbolType> handle) const;
+	
+	// Index into the underlying array.
+	SymbolType& symbol_from_index(s32 index);
+	const SymbolType& symbol_from_index(s32 index) const;
+	
+	// Determine if any symbols are being stored.
+	bool empty() const;
+	
+	// Retrieve the number of symbols stored.
+	s32 size() const;
+	
+	// Create a new symbol. If it's a SymbolSource symbol, source can be left
+	// empty, otherwise it has to be valid.
+	Result<SymbolType*> create_symbol(
+		std::string name, Address address, SymbolSourceHandle source, const Module* module_symbol = nullptr);
+	
+	// Create a new symbol. Similar to above, but for symbols without addresses.
+	Result<SymbolType*> create_symbol(
+		std::string name, SymbolSourceHandle source, const Module* module_symbol = nullptr);
+	
+	// Create a new symbol. Similar to above, but unless DONT_DEMANGLE_NAMES is
+	// set, the name of the symbol will be demangled.
+	Result<SymbolType*> create_symbol(
+		std::string name,
+		SymbolSourceHandle source,
+		const Module* module_symbol,
+		Address address,
+		u32 importer_flags,
+		DemanglerFunctions demangler);
+	
+	// Update the address of a symbol without changing its handle.
+	bool move_symbol(SymbolHandle<SymbolType> handle, Address new_address);
+	
+	// Update the name of a symbol without changing its handle.
+	bool rename_symbol(SymbolHandle<SymbolType> handle, std::string new_name);
+	
+	// Move all the symbols from the passed list into this list.
+	void merge_from(SymbolList<SymbolType>& list);
+	
+	// Mark a symbol for destruction. If the correct symbol database pointer is
+	// passed, all descendants will also be marked. For example, marking a
+	// function will also mark its parameters and local variables.
+	bool mark_symbol_for_destruction(SymbolHandle<SymbolType> handle, SymbolDatabase* database);
+	
+	// Mark all the symbols from a given symbol source for destruction. For
+	// example you can use this to free a symbol table without destroying
+	// user-defined symbols. The behaviour for marking descendants is the same
+	// as destroy_symbol.
+	void mark_symbols_from_source_for_destruction(SymbolSourceHandle source, SymbolDatabase* database);
+	
+	// Mark all the symbols from a given module for destruction. The behaviour
+	// for marking descendants is the same as destroy_symbol.
+	void mark_symbols_from_module_for_destruction(ModuleHandle module_handle, SymbolDatabase* database);
+	
+	// Destroy all symbols that have previously been marked for destruction.
+	// This invalidates all pointers to symbols in this list.
+	void destroy_marked_symbols();
+	
+	// Destroy all symbols, but don't reset m_next_handle so we don't have to
+	// worry about dangling handles.
+	void clear();
+	
+protected:
+	// Do a binary search for a handle, and return either its index, or the
+	// index where it could be inserted.
+	size_t binary_search(SymbolHandle<SymbolType> handle) const;
+	
+	// Keep the address map in sync with the symbol list.
+	void link_address_map(SymbolType& symbol);
+	void unlink_address_map(SymbolType& symbol);
+	
+	// Keep the name map in sync with the symbol list.
+	void link_name_map(SymbolType& symbol);
+	void unlink_name_map(SymbolType& symbol);
+	
+	std::vector<SymbolType> m_symbols;
+	AddressToHandleMap m_address_to_handle;
+	NameToHandleMap m_name_to_handle;
+	
+	// We share this between symbol lists of the same type so that we can merge
+	// them without having to rewrite all the handles.
+	static std::atomic<u32> m_next_handle;
+};
+
+// Base class for all the symbols.
+class Symbol {
+	template <typename SymbolType>
+	friend class SymbolList;
+public:
+	const std::string& name() const { return m_name; }
+	u32 raw_handle() const { return m_handle; }
+	SymbolSourceHandle source() const { return m_source; }
+	ModuleHandle module_handle() const { return m_module; }
+	
+	Address address() const { return m_address; }
+	u32 size() const { return m_size; }
+	void set_size(u32 size) { m_size = size; }
+	AddressRange address_range() const { return AddressRange(m_address, m_address.get_or_zero() + m_size); }
+	
+	ast::Node* type() { return m_type.get(); }
+	const ast::Node* type() const { return m_type.get(); }
+	void set_type(std::unique_ptr<ast::Node> type);
+	
+	u32 generation() const { return m_generation; }
+	
+	// This MUST be called after any AST nodes have been created/deleted/moved.
+	// For the set_type function this is done for you.
+	void invalidate_node_handles() { m_generation++; }
+	
+	// Mark a single symbol for destruction, not including its descendants.
+	void mark_for_destruction() { m_marked_for_destruction = true; }
+	bool is_marked_for_destruction() { return m_marked_for_destruction; }
+	
+protected:
+	void on_create() {}
+	void on_destroy(SymbolDatabase* database) {}
+	
+	u32 m_handle = (u32) -1;
+	SymbolSourceHandle m_source;
+	Address m_address;
+	u32 m_size = 0;
+	std::string m_name;
+	std::unique_ptr<ast::Node> m_type;
+	u32 m_generation : 31 = 0;
+	u32 m_marked_for_destruction : 1 = false;
+	ModuleHandle m_module;
+};
+
+// Variable storage types. This is different to whether the variable is a
+// global, local or parameter. For example local variables can have global
+// storage (static locals).
+
+enum GlobalStorageLocation {
+	NIL,
+	DATA,
+	BSS,
+	ABS,
+	SDATA,
+	SBSS,
+	RDATA,
+	COMMON,
+	SCOMMON,
+	SUNDEFINED
+};
+
+const char* global_storage_location_to_string(GlobalStorageLocation location);
+
+struct GlobalStorage {
+	GlobalStorageLocation location = GlobalStorageLocation::NIL;
+	
+	GlobalStorage() {}
+	friend auto operator<=>(const GlobalStorage& lhs, const GlobalStorage& rhs) = default;
+};
+
+struct RegisterStorage {
+	s32 dbx_register_number = -1;
+	bool is_by_reference;
+	
+	RegisterStorage() {}
+	friend auto operator<=>(const RegisterStorage& lhs, const RegisterStorage& rhs) = default;
+};
+
+struct StackStorage {
+	s32 stack_pointer_offset = -1;
+	
+	StackStorage() {}
+	friend auto operator<=>(const StackStorage& lhs, const StackStorage& rhs) = default;
+};
+
+// The hashing algorithm for functions. If you change this algorithm make sure
+// to bump the version number for the JSON format so we can know if a hash was
+// generated using the new algorithm or not.
+class FunctionHash {
+public:
+	void update(u32 instruction)
+	{
+		// Separate out the opcode so that the hash remains the same regardless
+		// of if relocations are applied or not.
+		u32 opcode = instruction >> 26;
+		m_hash = m_hash * 31 + opcode;
+	}
+	
+	u32 get() const
+	{
+		return m_hash;
+	}
+	
+protected:
+	u32 m_hash = 0;
+};
+
+// All the different types of symbol objects.
+
+// A C/C++ data type.
+class DataType : public Symbol {
+	friend SourceFile;
+public:
+	static constexpr const SymbolDescriptor DESCRIPTOR = DATA_TYPE;
+	static constexpr const char* NAME = "Data Type";
+	static constexpr const u32 FLAGS = WITH_NAME_MAP;
+	
+	DataTypeHandle handle() const { return m_handle; }
+	
+	std::vector<SourceFileHandle> files; // List of files for which a given top-level type is present.
+	const char* compare_fail_reason = nullptr;
+	
+	bool not_defined_in_any_translation_unit : 1 = false;
+	bool only_defined_in_single_translation_unit : 1 = false;
+};
+
+// A function. The type stored is the return type.
+class Function : public Symbol {
+	friend SourceFile;
+	friend SymbolList<Function>;
+public:
+	static constexpr const SymbolDescriptor DESCRIPTOR = FUNCTION;
+	static constexpr const char* NAME = "Function";
+	static constexpr const u32 FLAGS = WITH_ADDRESS_MAP | WITH_NAME_MAP | NAME_NEEDS_DEMANGLING;
+	
+	FunctionHandle handle() const { return m_handle; }
+	SourceFileHandle source_file() const { return m_source_file; }
+	
+	const std::optional<std::vector<ParameterVariableHandle>>& parameter_variables() const;
+	void set_parameter_variables(std::optional<std::vector<ParameterVariableHandle>> parameter_variables, SymbolDatabase& database);
+	
+	const std::optional<std::vector<LocalVariableHandle>>& local_variables() const;
+	void set_local_variables(std::optional<std::vector<LocalVariableHandle>> local_variables, SymbolDatabase& database);
+	
+	const std::string& mangled_name() const;
+	void set_mangled_name(std::string mangled);
+	
+	// A hash of all the opcodes in the function, read from file.
+	u32 original_hash() const;
+	void set_original_hash(u32 hash);
+	
+	// A hash of all the opcodes in the function, read from memory.
+	u32 current_hash() const;
+	void set_current_hash(FunctionHash hash);
+	
+	struct LineNumberPair {
+		Address address;
+		s32 line_number;
+	};
+
+	struct SubSourceFile {
+		Address address;
+		std::string relative_path;
+	};
+	
+	std::string relative_path;
+	StorageClass storage_class;
+	s32 stack_frame_size = -1;
+	std::vector<LineNumberPair> line_numbers;
+	std::vector<SubSourceFile> sub_source_files;
+	bool is_member_function_ish = false; // Filled in by fill_in_pointers_to_member_function_definitions.
+	bool is_no_return = false;
+	
+protected:
+	void on_destroy(SymbolDatabase* database);
+	
+	SourceFileHandle m_source_file;
+	std::optional<std::vector<ParameterVariableHandle>> m_parameter_variables;
+	std::optional<std::vector<LocalVariableHandle>> m_local_variables;
+	
+	std::string m_mangled_name;
+	
+	u32 m_original_hash = 0;
+	u32 m_current_hash = 0;
+};
+
+// A global variable.
+class GlobalVariable : public Symbol {
+	friend SourceFile;
+public:
+	static constexpr const SymbolDescriptor DESCRIPTOR = GLOBAL_VARIABLE;
+	static constexpr const char* NAME = "Global Variable";
+	static constexpr u32 FLAGS = WITH_ADDRESS_MAP | WITH_NAME_MAP | NAME_NEEDS_DEMANGLING;
+	
+	GlobalVariableHandle handle() const { return m_handle; }
+	SourceFileHandle source_file() const { return m_source_file; };
+	
+	const std::string& mangled_name() const;
+	void set_mangled_name(std::string mangled);
+	
+	GlobalStorage storage;
+	StorageClass storage_class;
+	
+protected:
+	SourceFileHandle m_source_file;
+	std::string m_mangled_name;
+};
+
+// A label. This could be a label defined in assembly, C/C++, or just a symbol
+// that we can't automatically determine the type of (e.g. SNDLL symbols).
+class Label : public Symbol {
+public:
+	static constexpr const SymbolDescriptor DESCRIPTOR = LABEL;
+	static constexpr const char* NAME = "Label";
+	static constexpr u32 FLAGS = WITH_ADDRESS_MAP;
+	
+	LabelHandle handle() const { return m_handle; }
+	
+	// Indicates that this label should not be used as a function name.
+	bool is_junk = false;
+};
+
+// A local variable. This includes static local variables which have global
+// storage.
+class LocalVariable : public Symbol {
+	friend Function;
+public:
+	static constexpr const SymbolDescriptor DESCRIPTOR = LOCAL_VARIABLE;
+	static constexpr const char* NAME = "Local Variable";
+	static constexpr u32 FLAGS = WITH_ADDRESS_MAP;
+	
+	LocalVariableHandle handle() const { return m_handle; }
+	FunctionHandle function() const { return m_function; };
+	
+	std::variant<GlobalStorage, RegisterStorage, StackStorage> storage;
+	AddressRange live_range;
+	
+protected:
+	FunctionHandle m_function;
+};
+
+// A program module e.g. an ELF file or an SNDLL file. Every symbol has a module
+// field indicating what module the symbol belongs to. This can be used to
+// delete all the symbols associated with a given module. Additionally, when a
+// valid module pointer is passed to SymbolList<>::create_symbol, the address of
+// the symbol will be added to the address of the new symbol.
+class Module : public Symbol {
+	friend SymbolList<Module>;
+public:
+	static constexpr const SymbolDescriptor DESCRIPTOR = MODULE;
+	static constexpr const char* NAME = "Module";
+	static constexpr u32 FLAGS = WITH_NAME_MAP;
+	
+	ModuleHandle handle() const { return m_handle; }
+	
+	// These are used for IRX modules.
+	bool is_irx = false;
+	s32 version_major = -1;
+	s32 version_minor = -1;
+	
+protected:
+	void on_create();
+};
+
+// A parameter variable.
+class ParameterVariable : public Symbol {
+	friend Function;
+public:
+	static constexpr const SymbolDescriptor DESCRIPTOR = PARAMETER_VARIABLE;
+	static constexpr const char* NAME = "Parameter Variable";
+	static constexpr u32 FLAGS = NO_SYMBOL_FLAGS;
+	
+	ParameterVariableHandle handle() const { return m_handle; }
+	FunctionHandle function() const { return m_function; };
+	
+	std::variant<RegisterStorage, StackStorage> storage;
+	
+protected:
+	FunctionHandle m_function;
+};
+
+// An ELF section. These are created from the ELF section headers.
+class Section : public Symbol {
+public:
+	static constexpr const SymbolDescriptor DESCRIPTOR = SECTION;
+	static constexpr const char* NAME = "Section";
+	static constexpr u32 FLAGS = WITH_ADDRESS_MAP | WITH_NAME_MAP;
+	
+	SectionHandle handle() const { return m_handle; }
+	
+	// Check if the section name is ".text".
+	bool contains_code() const;
+	
+	// Check for known data section names.
+	bool contains_data() const;
+};
+
+// A source file (.c or .cpp file). One of these will be created for every
+// translation unit in the program (but only if debugging symbols are present).
+class SourceFile : public Symbol {
+	friend SymbolList<SourceFile>;
+public:
+	static constexpr const SymbolDescriptor DESCRIPTOR = SOURCE_FILE;
+	static constexpr const char* NAME = "Source File";
+	static constexpr u32 FLAGS = WITH_ADDRESS_MAP | WITH_NAME_MAP;
+	
+	SourceFileHandle handle() const { return m_handle; }
+	const std::string& full_path() const { return name(); }
+	
+	const std::vector<FunctionHandle>& functions() const;
+	void set_functions(std::vector<FunctionHandle> functions, SymbolDatabase& database);
+	
+	const std::vector<GlobalVariableHandle>& global_variables() const;
+	void set_global_variables(std::vector<GlobalVariableHandle> global_variables, SymbolDatabase& database);
+	
+	// Check whether at least half of the functions associated with the source
+	// file match their original hash (meaning they haven't been overwritten).
+	bool functions_match() const;
+	void check_functions_match(const SymbolDatabase& database);
+	
+	std::string working_dir;
+	std::string command_line_path;
+	std::map<StabsTypeNumber, DataTypeHandle> stabs_type_number_to_handle;
+	std::set<std::string> toolchain_version_info;
+	
+protected:
+	void on_destroy(SymbolDatabase* database);
+	
+	std::vector<FunctionHandle> m_functions;
+	std::vector<GlobalVariableHandle> m_global_variables;
+	bool m_functions_match = true;
+};
+
+// A symbol source. Every symbol has a symbol source field indicating how the
+// symbol was created. For example, the symbol table importers will each create
+// one of these (if it doesn't already exist).
+class SymbolSource : public Symbol {
+	friend SymbolList<SymbolSource>;
+public:
+	static constexpr const SymbolDescriptor DESCRIPTOR = SYMBOL_SOURCE;
+	static constexpr const char* NAME = "Symbol Source";
+	static constexpr u32 FLAGS = WITH_NAME_MAP;
+	
+	SymbolSourceHandle handle() const { return m_handle; }
+	
+protected:
+	void on_create();
+};
+
+// Bundles together all the information needed to identify if a symbol came from
+// a specific symbol table import operation. For example, this is used to make
+// sure that we don't reference symbols from another symbol table during the
+// import process.
+struct SymbolGroup {
+	SymbolSourceHandle source;
+	Module* module_symbol = nullptr;
+	
+	bool is_in_group(const Symbol& symbol) const;
+};
+
+// The symbol database itself. This owns all the symbols.
+class SymbolDatabase {
+public:
+	SymbolList<DataType> data_types;
+	SymbolList<Function> functions;
+	SymbolList<GlobalVariable> global_variables;
+	SymbolList<Label> labels;
+	SymbolList<LocalVariable> local_variables;
+	SymbolList<Module> modules;
+	SymbolList<ParameterVariable> parameter_variables;
+	SymbolList<Section> sections;
+	SymbolList<SourceFile> source_files;
+	SymbolList<SymbolSource> symbol_sources;
+	
+	// Sum up the symbol counts for each symbol list.
+	s32 symbol_count() const;
+	
+	// Find a symbol of any of the specified types given an address. Symbols of
+	// the types specified higher up in the CCC_FOR_EACH_SYMBOL_TYPE_DO_X macro
+	// are checked for first.
+	const Symbol* symbol_starting_at_address(
+		Address address, u32 descriptors = ALL_SYMBOL_TYPES, SymbolDescriptor* descriptor_out = nullptr) const;
+	const Symbol* symbol_after_address(
+		Address address, u32 descriptors = ALL_SYMBOL_TYPES, SymbolDescriptor* descriptor_out = nullptr) const;
+	const Symbol* symbol_overlapping_address(
+		Address address, u32 descriptors = ALL_SYMBOL_TYPES, SymbolDescriptor* descriptor_out = nullptr) const;
+	
+	// Find a symbol of any of the specified types given its name. Symbols of
+	// the types specified higher up in the CCC_FOR_EACH_SYMBOL_TYPE_DO_X macro
+	// are checked for first.
+	const Symbol* symbol_with_name(
+		const std::string& name, u32 descriptors = ALL_SYMBOL_TYPES, SymbolDescriptor* descriptor_out = nullptr) const;
+	
+	// Finds a symbol source object with the given name or creates one if it
+	// doesn't already exist.
+	Result<SymbolSourceHandle> get_symbol_source(const std::string& name);
+	
+	// Deduplicate matching data types with the same name. May replace the
+	// existing data type with the new one if the new one is better.
+	Result<DataType*> create_data_type_if_unique(
+		std::unique_ptr<ast::Node> node,
+		StabsTypeNumber number,
+		const char* name,
+		SourceFile& source_file,
+		const SymbolGroup& group);
+	
+	// Move all the symbols in the passed database into this database.
+	void merge_from(SymbolDatabase& database);
+	
+	// Destroy all the symbols from a given symbol source. For example you can
+	// use this to free a symbol table without destroying user-defined symbols.
+	void destroy_symbols_from_source(SymbolSourceHandle source, bool destroy_descendants);
+	
+	// Destroy all the symbols from a given module.
+	void destroy_symbols_from_module(ModuleHandle module_handle, bool destroy_descendants);
+	
+	// Destroy all the symbols that have previously been marked for destruction.
+	// This invalidates all pointers to symbols in this database.
+	void destroy_marked_symbols();
+	
+	// Destroy all the symbols in the symbol database.
+	void clear();
+	
+	template <typename Callback>
+	void for_each_symbol(Callback callback) {
+		// Use indices here to avoid iterator invalidation.
+		#define CCC_X(SymbolType, symbol_list) \
+			for(s32 i = 0; i < symbol_list.size(); i++) { \
+				callback(symbol_list.symbol_from_index(i)); \
+			}
+		CCC_FOR_EACH_SYMBOL_TYPE_DO_X
+		#undef CCC_X
+	}
+};
+
+// A handle to a symbol of any type.
+class MultiSymbolHandle {
+public:
+	// Create an empty multi symbol handle.
+	MultiSymbolHandle();
+	
+	// Create a multi symbol handle of the specified type.
+	template <typename SymbolType>
+	MultiSymbolHandle(const SymbolType& symbol);
+	MultiSymbolHandle(SymbolDescriptor descriptor, u32 handle);
+	
+	bool valid() const;
+	SymbolDescriptor descriptor() const;
+	u32 handle() const;
+	
+	Symbol* lookup_symbol(SymbolDatabase& database);
+	const Symbol* lookup_symbol(const SymbolDatabase& database) const;
+	
+	bool is_flag_set(SymbolFlag flag) const;
+	bool move_symbol(Address new_address, SymbolDatabase& database) const;
+	bool rename_symbol(std::string new_name, SymbolDatabase& database) const;
+	bool destroy_symbol(SymbolDatabase& database, bool destroy_descendants) const;
+	
+	friend auto operator<=>(const MultiSymbolHandle& lhs, const MultiSymbolHandle& rhs) = default;
+	
+protected:
+	SymbolDescriptor m_descriptor = DATA_TYPE;
+	u32 m_handle = (u32) -1;
+};
+
+// A handle to an AST node.
+class NodeHandle {
+	friend SymbolDatabase;
+public:
+	// Create an empty node handle.
+	NodeHandle();
+	
+	// Create a node handle that will always allow accesses to its node. You
+	// should only use this if you know the lifetime of the handle is a subset
+	// of the lifetime of the node.
+	NodeHandle(const ast::Node* node);
+	
+	// Create a node handle pointing to an AST node from a given symbol that
+	// will prevent accesses to the node if the symbol is deleted.
+	template <typename SymbolType>
+	NodeHandle(const SymbolType& symbol, const ast::Node* node);
+	NodeHandle(SymbolDescriptor descriptor, const Symbol& symbol, const ast::Node* node);
+	
+	bool valid() const;
+	const MultiSymbolHandle& symbol() const;
+	
+	const ast::Node* lookup_node(const SymbolDatabase& database) const;
+	NodeHandle handle_for_child(const ast::Node* child_node) const;
+	
+	friend auto operator<=>(const NodeHandle& lhs, const NodeHandle& rhs) = default;
+	
+protected:
+	MultiSymbolHandle m_symbol;
+	const ast::Node* m_node = nullptr;
+	u32 m_generation = 0;
+};
+
+}

3rdparty/ccc/src/ccc/symbol_file.cpp

@@ -0,0 +1,114 @@
+// This file is part of the Chaos Compiler Collection.
+// SPDX-License-Identifier: MIT
+
+#include "symbol_file.h"
+
+namespace ccc {
+
+Result<std::unique_ptr<SymbolFile>> parse_symbol_file(std::vector<u8> image, std::string file_name)
+{
+	const u32* magic = get_packed<u32>(image, 0);
+	CCC_CHECK(magic, "File too small.");
+	
+	std::unique_ptr<SymbolFile> symbol_file;
+	
+	switch(*magic) {
+		case CCC_FOURCC("\x7f""ELF"): {
+			Result<ElfFile> elf = ElfFile::parse(std::move(image));
+			CCC_RETURN_IF_ERROR(elf);
+			
+			symbol_file = std::make_unique<ElfSymbolFile>(std::move(*elf), std::move(file_name));
+			break;
+		}
+		case CCC_FOURCC("SNR1"):
+		case CCC_FOURCC("SNR2"): {
+			Result<SNDLLFile> sndll = parse_sndll_file(image, Address(), SNDLLType::DYNAMIC_LIBRARY);
+			CCC_RETURN_IF_ERROR(sndll);
+			
+			symbol_file = std::make_unique<SNDLLSymbolFile>(std::make_shared<SNDLLFile>(std::move(*sndll)));
+			break;
+		}
+		default: {
+			return CCC_FAILURE("Unknown file type.");
+		}
+	}
+	
+	return symbol_file;
+}
+
+ElfSymbolFile::ElfSymbolFile(ElfFile elf, std::string elf_name)
+	: m_elf(std::move(elf)), m_name(std::move(elf_name)) {}
+
+std::string ElfSymbolFile::name() const
+{
+	return m_name;
+}
+
+Result<std::vector<std::unique_ptr<SymbolTable>>> ElfSymbolFile::get_all_symbol_tables() const
+{
+	std::vector<std::unique_ptr<SymbolTable>> symbol_tables;
+	
+	symbol_tables.emplace_back(std::make_unique<ElfSectionHeadersSymbolTable>(m_elf));
+	
+	for(size_t i = 0; i < SYMBOL_TABLE_FORMATS.size(); i++) {
+		const SymbolTableFormatInfo& info = SYMBOL_TABLE_FORMATS[i];
+		
+		const ElfSection* section = m_elf.lookup_section(info.section_name);
+		if(section) {
+			Result<std::unique_ptr<SymbolTable>> symbol_table = create_elf_symbol_table(*section, m_elf, info.format);
+			CCC_RETURN_IF_ERROR(symbol_table);
+			if(*symbol_table) {
+				symbol_tables.emplace_back(std::move(*symbol_table));
+			}
+		}
+	}
+	
+	return symbol_tables;
+}
+
+Result<std::vector<std::unique_ptr<SymbolTable>>> ElfSymbolFile::get_symbol_tables_from_sections(
+	const std::vector<SymbolTableLocation>& sections) const
+{
+	std::vector<std::unique_ptr<SymbolTable>> symbol_tables;
+	
+	for(const SymbolTableLocation& location : sections) {
+		const ElfSection* section = m_elf.lookup_section(location.section_name.c_str());
+		CCC_CHECK(section, "No '%s' section.", location.section_name.c_str());
+		
+		Result<std::unique_ptr<SymbolTable>> symbol_table = create_elf_symbol_table(*section, m_elf, location.format);
+		CCC_RETURN_IF_ERROR(symbol_table);
+		if(*symbol_table) {
+			symbol_tables.emplace_back(std::move(*symbol_table));
+		}
+	}
+	
+	return symbol_tables;
+}
+
+const ElfFile& ElfSymbolFile::elf() const
+{
+	return m_elf;
+}
+
+SNDLLSymbolFile::SNDLLSymbolFile(std::shared_ptr<SNDLLFile> sndll)
+	: m_sndll(std::move(sndll)) {}
+
+std::string SNDLLSymbolFile::name() const
+{
+	return m_sndll->elf_path;
+}
+
+Result<std::vector<std::unique_ptr<SymbolTable>>> SNDLLSymbolFile::get_all_symbol_tables() const
+{
+	std::vector<std::unique_ptr<SymbolTable>> symbol_tables;
+	symbol_tables.emplace_back(std::make_unique<SNDLLSymbolTable>(m_sndll));
+	return symbol_tables;
+}
+
+Result<std::vector<std::unique_ptr<SymbolTable>>> SNDLLSymbolFile::get_symbol_tables_from_sections(
+	const std::vector<SymbolTableLocation>& sections) const
+{
+	return CCC_FAILURE("An SNDLL file is not composed of sections.");
+}
+
+}

3rdparty/ccc/src/ccc/symbol_file.h

@@ -0,0 +1,62 @@
+// This file is part of the Chaos Compiler Collection.
+// SPDX-License-Identifier: MIT
+
+#pragma once
+
+#include "elf.h"
+#include "sndll.h"
+#include "symbol_table.h"
+
+namespace ccc {
+
+struct SymbolTableLocation {
+	std::string section_name;
+	SymbolTableFormat format;
+};
+
+class SymbolFile {
+public:
+	virtual ~SymbolFile() {}
+	
+	virtual std::string name() const = 0;
+	
+	virtual Result<std::vector<std::unique_ptr<SymbolTable>>> get_all_symbol_tables() const = 0;
+	virtual Result<std::vector<std::unique_ptr<SymbolTable>>> get_symbol_tables_from_sections(
+		const std::vector<SymbolTableLocation>& sections) const = 0;
+};
+
+// Determine the type of the input file and parse it.
+Result<std::unique_ptr<SymbolFile>> parse_symbol_file(std::vector<u8> image, std::string file_name);
+
+class ElfSymbolFile : public SymbolFile {
+public:
+	ElfSymbolFile(ElfFile elf, std::string elf_name);
+	
+	std::string name() const override;
+	
+	Result<std::vector<std::unique_ptr<SymbolTable>>> get_all_symbol_tables() const override;
+	Result<std::vector<std::unique_ptr<SymbolTable>>> get_symbol_tables_from_sections(
+		const std::vector<SymbolTableLocation>& sections) const override;
+	
+	const ElfFile& elf() const;
+	
+protected:
+	ElfFile m_elf;
+	std::string m_name;
+};
+
+class SNDLLSymbolFile : public SymbolFile {
+public:
+	SNDLLSymbolFile(std::shared_ptr<SNDLLFile> sndll);
+	
+	std::string name() const override;
+	
+	Result<std::vector<std::unique_ptr<SymbolTable>>> get_all_symbol_tables() const override;
+	Result<std::vector<std::unique_ptr<SymbolTable>>> get_symbol_tables_from_sections(
+		const std::vector<SymbolTableLocation>& sections) const override;
+	
+protected:
+	std::shared_ptr<SNDLLFile> m_sndll;
+};
+
+}

3rdparty/ccc/src/ccc/symbol_table.cpp

@@ -0,0 +1,283 @@
+// This file is part of the Chaos Compiler Collection.
+// SPDX-License-Identifier: MIT
+
+#include "symbol_table.h"
+
+#include "elf.h"
+#include "elf_symtab.h"
+#include "mdebug_importer.h"
+#include "mdebug_section.h"
+#include "sndll.h"
+
+namespace ccc {
+
+const std::vector<SymbolTableFormatInfo> SYMBOL_TABLE_FORMATS = {
+	{MDEBUG, "mdebug", ".mdebug"}, // The infamous Third Eye symbol table.
+	{SYMTAB, "symtab", ".symtab"}, // The standard ELF symbol table.
+	{SNDLL, "sndll", ".sndata"}    // The SNDLL symbol table.
+};
+
+const SymbolTableFormatInfo* symbol_table_format_from_enum(SymbolTableFormat format)
+{
+	for(size_t i = 0; i < SYMBOL_TABLE_FORMATS.size(); i++) {
+		if(SYMBOL_TABLE_FORMATS[i].format == format) {
+			return &SYMBOL_TABLE_FORMATS[i];
+		}
+	}
+	return nullptr;
+}
+
+const SymbolTableFormatInfo* symbol_table_format_from_name(const char* format_name)
+{
+	for(size_t i = 0; i < SYMBOL_TABLE_FORMATS.size(); i++) {
+		if(strcmp(SYMBOL_TABLE_FORMATS[i].format_name, format_name) == 0) {
+			return &SYMBOL_TABLE_FORMATS[i];
+		}
+	}
+	return nullptr;
+}
+
+const SymbolTableFormatInfo* symbol_table_format_from_section(const char* section_name)
+{
+	for(size_t i = 0; i < SYMBOL_TABLE_FORMATS.size(); i++) {
+		if(strcmp(SYMBOL_TABLE_FORMATS[i].section_name, section_name) == 0) {
+			return &SYMBOL_TABLE_FORMATS[i];
+		}
+	}
+	return nullptr;
+}
+
+// *****************************************************************************
+
+Result<std::unique_ptr<SymbolTable>> create_elf_symbol_table(
+	const ElfSection& section, const ElfFile& elf, SymbolTableFormat format)
+{
+	std::unique_ptr<SymbolTable> symbol_table;
+	switch(format) {
+		case MDEBUG: {
+			symbol_table = std::make_unique<MdebugSymbolTable>(elf.image, (s32) section.header.offset);
+			break;
+		}
+		case SYMTAB: {
+			CCC_CHECK(section.header.offset + section.header.size <= elf.image.size(),
+				"Section '%s' out of range.", section.name.c_str());
+			std::span<const u8> data = std::span(elf.image).subspan(section.header.offset, section.header.size);
+			
+			CCC_CHECK(section.header.link != 0, "Section '%s' has no linked string table.", section.name.c_str());
+			CCC_CHECK(section.header.link < elf.sections.size(),
+				"Section '%s' has out of range link field.", section.name.c_str());
+			const ElfSection& linked_section = elf.sections[section.header.link];
+			
+			CCC_CHECK(linked_section.header.offset + linked_section.header.size <= elf.image.size(),
+				"Linked section '%s' out of range.", linked_section.name.c_str());
+			std::span<const u8> linked_data = std::span(elf.image).subspan(
+				linked_section.header.offset, linked_section.header.size);
+			
+			symbol_table = std::make_unique<SymtabSymbolTable>(data, linked_data);
+			
+			break;
+		}
+		case SNDLL: {
+			CCC_CHECK(section.header.offset + section.header.size <= elf.image.size(),
+				"Section '%s' out of range.", section.name.c_str());
+			std::span<const u8> data = std::span(elf.image).subspan(section.header.offset, section.header.size);
+			
+			if(data.size() >= 4 && data[0] != '\0') {
+				Result<SNDLLFile> file = parse_sndll_file(data, Address::non_zero(section.header.addr), SNDLLType::SNDATA_SECTION);
+				CCC_RETURN_IF_ERROR(file);
+				
+				symbol_table = std::make_unique<SNDLLSymbolTable>(std::make_shared<SNDLLFile>(std::move(*file)));
+			} else {
+				CCC_WARN("Invalid SNDLL section.");
+			}
+			
+			break;
+		}
+	}
+	
+	return symbol_table;
+}
+
+Result<ModuleHandle> import_symbol_tables(
+	SymbolDatabase& database,
+	std::string module_name,
+	const std::vector<std::unique_ptr<SymbolTable>>& symbol_tables,
+	u32 importer_flags,
+	DemanglerFunctions demangler,
+	const std::atomic_bool* interrupt)
+{
+	Result<SymbolSourceHandle> module_source = database.get_symbol_source("Symbol Table Importer");
+	CCC_RETURN_IF_ERROR(module_source);
+	
+	Result<Module*> module_symbol = database.modules.create_symbol(std::move(module_name), *module_source, nullptr);
+	CCC_RETURN_IF_ERROR(module_symbol);
+	
+	ModuleHandle module_handle = (*module_symbol)->handle();
+	
+	for(const std::unique_ptr<SymbolTable>& symbol_table : symbol_tables) {
+		// Find a symbol source object with the right name, or create one if one
+		// doesn't already exist.
+		Result<SymbolSourceHandle> source = database.get_symbol_source(symbol_table->name());
+		if(!source.success()) {
+			database.destroy_symbols_from_module(module_handle, false);
+			return source;
+		}
+		
+		// Import the symbol table.
+		SymbolGroup group;
+		group.source = *source;
+		group.module_symbol = database.modules.symbol_from_handle(module_handle);
+		
+		Result<void> result = symbol_table->import(
+			database, group, importer_flags, demangler, interrupt);
+		if(!result.success()) {
+			database.destroy_symbols_from_module(module_handle, false);
+			return result;
+		}
+	}
+	
+	return module_handle;
+}
+
+// *****************************************************************************
+
+MdebugSymbolTable::MdebugSymbolTable(std::span<const u8> image, s32 section_offset)
+	: m_image(image), m_section_offset(section_offset) {}
+
+const char* MdebugSymbolTable::name() const
+{
+	return "MIPS Debug Symbol Table";
+}
+
+Result<void> MdebugSymbolTable::import(
+	SymbolDatabase& database,
+	const SymbolGroup& group,
+	u32 importer_flags,
+	DemanglerFunctions demangler,
+	const std::atomic_bool* interrupt) const
+{
+	return mdebug::import_symbol_table(
+		database, m_image, m_section_offset, group, importer_flags, demangler, interrupt);
+}
+
+Result<void> MdebugSymbolTable::print_headers(FILE* out) const
+{
+	mdebug::SymbolTableReader reader;
+	
+	Result<void> reader_result = reader.init(m_image, m_section_offset);
+	CCC_RETURN_IF_ERROR(reader_result);
+	
+	reader.print_header(out);
+	
+	return Result<void>();
+}
+
+Result<void> MdebugSymbolTable::print_symbols(FILE* out, u32 flags) const
+{
+	mdebug::SymbolTableReader reader;
+	Result<void> reader_result = reader.init(m_image, m_section_offset);
+	CCC_RETURN_IF_ERROR(reader_result);
+	
+	Result<void> print_result = reader.print_symbols(
+		out, flags & PRINT_LOCALS, flags & PRINT_PROCEDURE_DESCRIPTORS, flags & PRINT_EXTERNALS);
+	CCC_RETURN_IF_ERROR(print_result);
+	
+	return Result<void>();
+}
+
+// *****************************************************************************
+
+SymtabSymbolTable::SymtabSymbolTable(std::span<const u8> symtab, std::span<const u8> strtab)
+	: m_symtab(symtab), m_strtab(strtab) {}
+
+const char* SymtabSymbolTable::name() const
+{
+	return "ELF Symbol Table";
+}
+
+Result<void> SymtabSymbolTable::import(
+	SymbolDatabase& database,
+	const SymbolGroup& group,
+	u32 importer_flags,
+	DemanglerFunctions demangler,
+	const std::atomic_bool* interrupt) const
+{
+	return elf::import_symbols(database, group, m_symtab, m_strtab, importer_flags, demangler);
+}
+
+Result<void> SymtabSymbolTable::print_headers(FILE* out) const
+{
+	return Result<void>();
+}
+
+Result<void> SymtabSymbolTable::print_symbols(FILE* out, u32 flags) const
+{
+	Result<void> symbtab_result = elf::print_symbol_table(out, m_symtab, m_strtab);
+	CCC_RETURN_IF_ERROR(symbtab_result);
+	
+	return Result<void>();
+}
+
+// *****************************************************************************
+
+SNDLLSymbolTable::SNDLLSymbolTable(std::shared_ptr<SNDLLFile> sndll)
+	: m_sndll(std::move(sndll)) {}
+
+const char* SNDLLSymbolTable::name() const
+{
+	return "SNDLL Symbol Table";
+}
+
+Result<void> SNDLLSymbolTable::import(
+	SymbolDatabase& database,
+	const SymbolGroup& group,
+	u32 importer_flags,
+	DemanglerFunctions demangler,
+	const std::atomic_bool* interrupt) const
+{
+	return import_sndll_symbols(database, *m_sndll, group, importer_flags, demangler);
+}
+
+Result<void> SNDLLSymbolTable::print_headers(FILE* out) const
+{
+	return Result<void>();
+}
+
+Result<void> SNDLLSymbolTable::print_symbols(FILE* out, u32 flags) const
+{
+	print_sndll_symbols(out, *m_sndll);
+	
+	return Result<void>();
+}
+
+// *****************************************************************************
+
+ElfSectionHeadersSymbolTable::ElfSectionHeadersSymbolTable(const ElfFile& elf)
+	: m_elf(elf) {}
+
+const char* ElfSectionHeadersSymbolTable::name() const
+{
+	return "ELF Section Headers";
+}
+
+Result<void> ElfSectionHeadersSymbolTable::import(
+	SymbolDatabase& database,
+	const SymbolGroup& group,
+	u32 importer_flags,
+	DemanglerFunctions demangler,
+	const std::atomic_bool* interrupt) const
+{
+	return m_elf.create_section_symbols(database, group);
+}
+
+Result<void> ElfSectionHeadersSymbolTable::print_headers(FILE* out) const
+{
+	return Result<void>();
+}
+
+Result<void> ElfSectionHeadersSymbolTable::print_symbols(FILE* out, u32 flags) const
+{
+	return Result<void>();
+}
+
+}

3rdparty/ccc/src/ccc/symbol_table.h

@@ -0,0 +1,163 @@
+// This file is part of the Chaos Compiler Collection.
+// SPDX-License-Identifier: MIT
+
+#pragma once
+
+#include <atomic>
+
+#include "symbol_database.h"
+
+namespace ccc {
+
+// Determine which symbol tables are present in a given file.
+
+enum SymbolTableFormat {
+	MDEBUG = 0, // The infamous Third Eye symbol table
+	SYMTAB = 1, // Standard ELF symbol table
+	SNDLL  = 2  // SNDLL section
+};
+
+struct SymbolTableFormatInfo {
+	SymbolTableFormat format;
+	const char* format_name;
+	const char* section_name;
+};
+
+// All the supported symbol table formats, sorted from best to worst.
+extern const std::vector<SymbolTableFormatInfo> SYMBOL_TABLE_FORMATS;
+
+const SymbolTableFormatInfo* symbol_table_format_from_enum(SymbolTableFormat format);
+const SymbolTableFormatInfo* symbol_table_format_from_name(const char* format_name);
+const SymbolTableFormatInfo* symbol_table_format_from_section(const char* section_name);
+
+enum SymbolPrintFlags {
+	PRINT_LOCALS = 1 << 0,
+	PRINT_PROCEDURE_DESCRIPTORS = 1 << 1,
+	PRINT_EXTERNALS = 1 << 2
+};
+
+class SymbolTable {
+public:
+	virtual ~SymbolTable() {}
+	
+	virtual const char* name() const = 0;
+	
+	// Imports this symbol table into the passed database.
+	virtual Result<void> import(
+		SymbolDatabase& database,
+		const SymbolGroup& group,
+		u32 importer_flags,
+		DemanglerFunctions demangler,
+		const std::atomic_bool* interrupt) const = 0;
+	
+	// Print out all the field in the header structure if one exists.
+	virtual Result<void> print_headers(FILE* out) const = 0;
+	
+	// Print out all the symbols in the symbol table. For .mdebug symbol tables
+	// the symbols are split between those that are local to a specific
+	// translation unit and those that are external, which is what the
+	// print_locals and print_externals parameters control.
+	virtual Result<void> print_symbols(FILE* out, u32 flags) const = 0;
+};
+
+struct ElfSection;
+struct ElfFile;
+
+// Create a symbol table from an ELF section. The return value may be null.
+Result<std::unique_ptr<SymbolTable>> create_elf_symbol_table(
+	const ElfSection& section, const ElfFile& elf, SymbolTableFormat format);
+
+// Utility function to call import_symbol_table on all the passed symbol tables
+// and to generate a module handle.
+Result<ModuleHandle> import_symbol_tables(
+	SymbolDatabase& database,
+	std::string module_name,
+	const std::vector<std::unique_ptr<SymbolTable>>& symbol_tables,
+	u32 importer_flags,
+	DemanglerFunctions demangler,
+	const std::atomic_bool* interrupt);
+
+class MdebugSymbolTable : public SymbolTable {
+public:
+	MdebugSymbolTable(std::span<const u8> image, s32 section_offset);
+	
+	const char* name() const override;
+	
+	Result<void> import(
+		SymbolDatabase& database,
+		const SymbolGroup& group,
+		u32 importer_flags,
+		DemanglerFunctions demangler,
+		const std::atomic_bool* interrupt) const override;
+	
+	Result<void> print_headers(FILE* out) const override;
+	Result<void> print_symbols(FILE* out, u32 flags) const override;
+	
+protected:
+	std::span<const u8> m_image;
+	s32 m_section_offset;
+};
+
+class SymtabSymbolTable : public SymbolTable {
+public:
+	SymtabSymbolTable(std::span<const u8> symtab, std::span<const u8> strtab);
+	
+	const char* name() const override;
+	
+	Result<void> import(
+		SymbolDatabase& database,
+		const SymbolGroup& group,
+		u32 importer_flags,
+		DemanglerFunctions demangler,
+		const std::atomic_bool* interrupt) const override;
+	
+	Result<void> print_headers(FILE* out) const override;
+	Result<void> print_symbols(FILE* out, u32 flags) const override;
+	
+protected:
+	std::span<const u8> m_symtab;
+	std::span<const u8> m_strtab;
+};
+
+struct SNDLLFile;
+
+class SNDLLSymbolTable : public SymbolTable {
+public:
+	SNDLLSymbolTable(std::shared_ptr<SNDLLFile> sndll);
+	
+	const char* name() const override;
+	
+	Result<void> import(
+		SymbolDatabase& database,
+		const SymbolGroup& group,
+		u32 importer_flags,
+		DemanglerFunctions demangler,
+		const std::atomic_bool* interrupt) const override;
+	
+	Result<void> print_headers(FILE* out) const override;
+	Result<void> print_symbols(FILE* out, u32 flags) const override;
+	
+protected:
+	std::shared_ptr<SNDLLFile> m_sndll;
+};
+
+class ElfSectionHeadersSymbolTable : public SymbolTable {
+public:
+	ElfSectionHeadersSymbolTable(const ElfFile& elf);
+	
+	const char* name() const override;
+	
+	Result<void> import(
+		SymbolDatabase& database,
+		const SymbolGroup& group,
+		u32 importer_flags,
+		DemanglerFunctions demangler,
+		const std::atomic_bool* interrupt) const override;
+	
+	Result<void> print_headers(FILE* out) const override;
+	Result<void> print_symbols(FILE* out, u32 flags) const override;
+protected:
+	const ElfFile& m_elf;
+};
+
+}

3rdparty/ccc/src/ccc/util.cpp

@@ -0,0 +1,173 @@
+// This file is part of the Chaos Compiler Collection.
+// SPDX-License-Identifier: MIT
+
+#include "util.h"
+
+namespace ccc {
+
+static CustomErrorCallback custom_error_callback = nullptr;
+
+Error format_error(const char* source_file, int source_line, const char* format, ...)
+{
+	va_list args;
+	va_start(args, format);
+	
+	char message[4096];
+	if(vsnprintf(message, sizeof(message), format, args) < 0) {
+		strncpy(message, "Failed to generate error message.", sizeof(message));
+	}
+	
+	Error error;
+	error.message = message;
+	error.source_file = source_file;
+	error.source_line = source_line;
+	
+	va_end(args);
+	return error;
+}
+
+void report_error(const Error& error)
+{
+	if(custom_error_callback) {
+		custom_error_callback(error, ERROR_LEVEL_ERROR);
+	} else {
+		fprintf(stderr, "[%s:%d] " CCC_ANSI_COLOUR_RED "error:" CCC_ANSI_COLOUR_OFF " %s\n",
+			error.source_file, error.source_line, error.message.c_str());
+	}
+}
+
+void report_warning(const Error& warning)
+{
+	if(custom_error_callback) {
+		custom_error_callback(warning, ERROR_LEVEL_WARNING);
+	} else {
+		fprintf(stderr, "[%s:%d] " CCC_ANSI_COLOUR_MAGENTA "warning:" CCC_ANSI_COLOUR_OFF " %s\n",
+			warning.source_file, warning.source_line, warning.message.c_str());
+	}
+}
+
+void set_custom_error_callback(CustomErrorCallback callback)
+{
+	custom_error_callback = callback;
+}
+
+const char* get_string(std::span<const u8> bytes, u64 offset)
+{
+	for(const unsigned char* c = bytes.data() + offset; c < bytes.data() + bytes.size(); c++) {
+		if(*c == '\0') {
+			return (const char*) &bytes[offset];
+		}
+	}
+	return nullptr;
+}
+
+std::string merge_paths(const std::string& base, const std::string& path)
+{
+	// Try to figure out if we're dealing with a Windows path of a UNIX path.
+	bool is_windows_path = false;
+	if(base.empty()) {
+		is_windows_path = guess_is_windows_path(path.c_str());
+	} else {
+		is_windows_path = guess_is_windows_path(base.c_str());
+	}
+	
+	// Actually merge the paths. If path is the entire path, we don't need to
+	// append base onto the front, so check for that now.
+	bool is_absolute_unix = (path.size() >= 1) && (path[0] == '/' || path[0] == '\\');
+	bool is_absolute_windows = (path.size() >= 3) && path[1] == ':' && (path[2] == '/' || path[2] == '\\');
+	if(base.empty() || is_absolute_unix || is_absolute_windows) {
+		return normalise_path(path.c_str(), is_windows_path);
+	}
+	return normalise_path((base + "/" + path).c_str(), is_windows_path);
+}
+
+std::string normalise_path(const char* input, bool use_backslashes_as_path_separators)
+{
+	bool is_absolute = false;
+	std::optional<char> drive_letter;
+	std::vector<std::string> parts;
+	
+	// Parse the beginning of the path.
+	if(*input == '/' || *input == '\\') { // UNIX path, drive relative Windows path or UNC Windows path.
+		is_absolute = true;
+	} else if(isalpha(*input) && input[1] == ':' && (input[2] == '/' || input[2] == '\\')) { // Absolute Windows path.
+		is_absolute = true;
+		drive_letter = toupper(*input);
+		input += 2;
+	} else {
+		parts.emplace_back();
+	}
+	
+	// Parse the rest of the path.
+	while(*input != 0) {
+		if(*input == '/' || *input == '\\') {
+			while(*input == '/' || *input == '\\') input++;
+			parts.emplace_back();
+		} else {
+			parts.back() += *(input++);
+		}
+	}
+	
+	// Remove "." and ".." parts.
+	for(s32 i = 0; i < (s32) parts.size(); i++) {
+		if(parts[i] == ".") {
+			parts.erase(parts.begin() + i);
+			i--;
+		} else if(parts[i] == ".." && i > 0 && parts[i - 1] != "..") {
+			parts.erase(parts.begin() + i);
+			parts.erase(parts.begin() + i - 1);
+			i -= 2;
+		}
+	}
+	
+	// Output the path in a normal form.
+	std::string output;
+	if(is_absolute) {
+		if(drive_letter.has_value()) {
+			output += *drive_letter;
+			output += ":";
+		}
+		output += use_backslashes_as_path_separators ? '\\' : '/';
+	}
+	for(size_t i = 0; i < parts.size(); i++) {
+		output += parts[i];
+		if(i != parts.size() - 1) {
+			output += use_backslashes_as_path_separators ? '\\' : '/';
+		}
+	}
+	
+	return output;
+}
+
+bool guess_is_windows_path(const char* path)
+{
+	for(const char* ptr = path; *ptr != 0; ptr++) {
+		if(*ptr == '\\') {
+			return true;
+		} else if(*ptr == '/') {
+			return false;
+		}
+	}
+	return false;
+}
+
+std::string extract_file_name(const std::string& path)
+{
+	std::string::size_type forward_pos = path.find_last_of('/');
+	std::string::size_type backward_pos = path.find_last_of('\\');
+	std::string::size_type pos;
+	if(forward_pos == std::string::npos) {
+		pos = backward_pos;
+	} else if(backward_pos == std::string::npos) {
+		pos = forward_pos;
+	} else {
+		pos = std::max(forward_pos, backward_pos);
+	}
+	if(pos + 1 != path.size() && pos != std::string::npos) {
+		return path.substr(pos + 1);
+	} else {
+		return path;
+	}
+}
+
+}

3rdparty/ccc/src/ccc/util.h

@@ -0,0 +1,312 @@
+// This file is part of the Chaos Compiler Collection.
+// SPDX-License-Identifier: MIT
+
+#pragma once
+
+#include <set>
+#include <span>
+#include <cstdio>
+#include <vector>
+#include <memory>
+#include <string>
+#include <cstdint>
+#include <cstdarg>
+#include <cstdlib>
+#include <cstring>
+#include <optional>
+
+namespace ccc {
+
+using u8 = unsigned char;
+using u16 = uint16_t;
+using u32 = uint32_t;
+using u64 = uint64_t;
+
+using s8 = signed char;
+using s16 = int16_t;
+using s32 = int32_t;
+using s64 = int64_t;
+
+#ifdef _WIN32
+	#define CCC_ANSI_COLOUR_OFF ""
+	#define CCC_ANSI_COLOUR_RED ""
+	#define CCC_ANSI_COLOUR_MAGENTA ""
+	#define CCC_ANSI_COLOUR_GRAY ""
+#else
+	#define CCC_ANSI_COLOUR_OFF "\033[0m"
+	#define CCC_ANSI_COLOUR_RED "\033[31m"
+	#define CCC_ANSI_COLOUR_MAGENTA "\033[35m"
+	#define CCC_ANSI_COLOUR_GRAY "\033[90m"
+#endif
+
+struct Error {
+	std::string message;
+	const char* source_file;
+	s32 source_line;
+};
+
+enum ErrorLevel {
+	ERROR_LEVEL_ERROR,
+	ERROR_LEVEL_WARNING
+};
+
+typedef void (*CustomErrorCallback)(const Error& error, ErrorLevel level);
+
+Error format_error(const char* source_file, int source_line, const char* format, ...);
+void report_error(const Error& error);
+void report_warning(const Error& warning);
+void set_custom_error_callback(CustomErrorCallback callback);
+
+#define CCC_FATAL(...) \
+	{ \
+		ccc::Error error = ccc::format_error(__FILE__, __LINE__, __VA_ARGS__); \
+		ccc::report_error(error); \
+		exit(1); \
+	}
+	
+#define CCC_CHECK_FATAL(condition, ...) \
+	if(!(condition)) { \
+		ccc::Error error = ccc::format_error(__FILE__, __LINE__, __VA_ARGS__); \
+		ccc::report_error(error); \
+		exit(1); \
+	}
+
+#define CCC_ASSERT(condition) \
+	CCC_CHECK_FATAL(condition, #condition)
+
+// The main error handling construct in CCC. This class is used to bundle
+// together a return value and a pointer to error information, so that errors
+// can be propagated up the stack.
+template <typename Value>
+class [[nodiscard]] Result {
+	template <typename OtherValue>
+	friend class Result;
+protected:
+	Value m_value;
+	std::unique_ptr<Error> m_error;
+	
+	Result() {}
+	
+public:
+	Result(Value value) : m_value(std::move(value)), m_error(nullptr) {}
+	
+	// Used to propagate errors up the call stack.
+	template <typename OtherValue>
+	Result(Result<OtherValue>&& rhs)
+	{
+		CCC_ASSERT(rhs.m_error != nullptr);
+		m_error = std::move(rhs.m_error);
+	}
+	
+	static Result<Value> failure(Error error)
+	{
+		Result<Value> result;
+		result.m_error = std::make_unique<Error>(std::move(error));
+		return result;
+	}
+	
+	bool success() const
+	{
+		return m_error == nullptr;
+	}
+	
+	const Error& error() const
+	{
+		CCC_ASSERT(m_error != nullptr);
+		return *m_error;
+	}
+	
+	Value& operator*()
+	{
+		CCC_ASSERT(m_error == nullptr);
+		return m_value;
+	}
+	
+	const Value& operator*() const
+	{
+		CCC_ASSERT(m_error == nullptr);
+		return m_value;
+	}
+	
+	Value* operator->()
+	{
+		CCC_ASSERT(m_error == nullptr);
+		return &m_value;
+	}
+	
+	const Value* operator->() const
+	{
+		CCC_ASSERT(m_error == nullptr);
+		return &m_value;
+	}
+};
+
+template <>
+class [[nodiscard]] Result<void> : public Result<int> {
+public:
+	Result() : Result<int>(0) {}
+	
+	// Used to propagate errors up the call stack.
+	template <typename OtherValue>
+	Result(Result<OtherValue>&& rhs)
+	{
+		CCC_ASSERT(rhs.m_error != nullptr);
+		m_error = std::move(rhs.m_error);
+	}
+};
+
+#define CCC_FAILURE(...) ccc::Result<int>::failure(ccc::format_error(__FILE__, __LINE__, __VA_ARGS__))
+
+#define CCC_CHECK(condition, ...) \
+	if(!(condition)) { \
+		return CCC_FAILURE(__VA_ARGS__); \
+	}
+
+#define CCC_EXPECT_CHAR(input, c, context) \
+	CCC_CHECK(*(input++) == c, \
+		"Expected '%c' in %s, got '%c' (%02hhx)", \
+		c, context, *(input - 1), *(input - 1))
+
+#define CCC_RETURN_IF_ERROR(result) \
+	if(!(result).success()) { \
+		return (result); \
+	}
+
+#define CCC_EXIT_IF_ERROR(result) \
+	if(!(result).success()) { \
+		ccc::report_error((result).error()); \
+		exit(1); \
+	}
+
+#define CCC_GTEST_FAIL_IF_ERROR(result) \
+	if(!(result).success()) { \
+		FAIL() << (result).error().message; \
+	}
+
+template <typename... Args>
+void warn_impl(const char* source_file, int source_line, const char* format, Args... args)
+{
+	Error warning = format_error(source_file, source_line, format, args...);
+	report_warning(warning);
+}
+#define CCC_WARN(...) \
+	ccc::warn_impl(__FILE__, __LINE__, __VA_ARGS__)
+
+#ifdef _MSC_VER
+	#define CCC_PACKED_STRUCT(name, ...) \
+		__pragma(pack(push, 1)) struct name { __VA_ARGS__ } __pragma(pack(pop));
+#else
+	#define CCC_PACKED_STRUCT(name, ...) \
+		struct __attribute__((__packed__)) name { __VA_ARGS__ };
+#endif
+
+template <typename T>
+const T* get_packed(std::span<const u8> bytes, u64 offset)
+{
+	if(offset + sizeof(T) <= bytes.size()) {
+		return reinterpret_cast<const T*>(&bytes[offset]);
+	} else {
+		return nullptr;
+	}
+}
+
+const char* get_string(std::span<const u8> bytes, u64 offset);
+
+#define CCC_BEGIN_END(x) (x).begin(), (x).end()
+#define CCC_ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
+
+#define CCC_FOURCC(string) ((string)[0] | (string)[1] << 8 | (string)[2] << 16 | (string)[3] << 24)
+
+struct Address {
+	u32 value = (u32) -1;
+	
+	Address() {}
+	Address(u32 v) : value(v) {}
+	
+	bool valid() const
+	{
+		return value != (u32) -1;
+	}
+	
+	u32 get_or_zero() const
+	{
+		if(valid()) {
+			return value;
+		} else {
+			return 0;
+		}
+	}
+	
+	Address add_base_address(Address base_address) const
+	{
+		if(valid()) {
+			return base_address.get_or_zero() + value;
+		} else {
+			return Address();
+		}
+	}
+	
+	static Address non_zero(u32 address)
+	{
+		Address result;
+		if(address != 0) {
+			result = address;
+		}
+		return result;
+	}
+	
+	friend auto operator<=>(const Address& lhs, const Address& rhs) = default;
+};
+
+struct AddressRange {
+	Address low;
+	Address high;
+	
+	AddressRange() {}
+	AddressRange(Address address) : low(address), high(address) {}
+	AddressRange(Address l, Address h) : low(l), high(h) {}
+	
+	friend auto operator<=>(const AddressRange& lhs, const AddressRange& rhs) = default;
+};
+
+// These functions are to be used only for source file paths present in the
+// symbol table, since we want them to be handled consistently across different
+// platforms, which with std::filesystem::path doesn't seem to be possible.
+std::string merge_paths(const std::string& base, const std::string& path);
+std::string normalise_path(const char* input, bool use_backslashes_as_path_separators);
+bool guess_is_windows_path(const char* path);
+std::string extract_file_name(const std::string& path);
+
+namespace ast { struct Node; }
+
+// These are used to reference STABS types from other types within a single
+// translation unit. For most games these will just be a single number, the type
+// number. In some cases, for example with the homebrew SDK, type numbers are a
+// pair of two numbers surrounded by round brackets e.g. (1,23) where the first
+// number is the index of the include file to use (includes are listed for each
+// translation unit separately), and the second number is the type number.
+struct StabsTypeNumber {
+	s32 file = -1;
+	s32 type = -1;
+	
+	friend auto operator<=>(const StabsTypeNumber& lhs, const StabsTypeNumber& rhs) = default;
+	bool valid() const { return type > -1; }
+};
+
+enum StorageClass {
+	STORAGE_CLASS_NONE = 0,
+	STORAGE_CLASS_TYPEDEF = 1,
+	STORAGE_CLASS_EXTERN = 2,
+	STORAGE_CLASS_STATIC = 3,
+	STORAGE_CLASS_AUTO = 4,
+	STORAGE_CLASS_REGISTER = 5
+};
+
+// Function pointers for the GNU demangler functions, so we can build CCC as a
+// library without linking against the demangler.
+struct DemanglerFunctions {
+	char* (*cplus_demangle)(const char *mangled, int options) = nullptr;
+	char* (*cplus_demangle_opname)(const char *opname, int options) = nullptr;
+};
+
+}

3rdparty/cpuinfo/CMakeLists.txt

@@ -67,6 +67,9 @@ ENDIF()
 
 # -- [ Determine target processor
 SET(CPUINFO_TARGET_PROCESSOR "${CMAKE_SYSTEM_PROCESSOR}")
+IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" AND CPUINFO_TARGET_PROCESSOR STREQUAL "amd64")
+  SET(CPUINFO_TARGET_PROCESSOR "AMD64")
+ENDIF()
 IF(IS_APPLE_OS AND CMAKE_OSX_ARCHITECTURES MATCHES "^(x86_64|arm64.*)$")
   SET(CPUINFO_TARGET_PROCESSOR "${CMAKE_OSX_ARCHITECTURES}")
 ELSEIF(CMAKE_GENERATOR MATCHES "^Visual Studio " AND CMAKE_VS_PLATFORM_NAME)
@@ -105,7 +108,7 @@ IF(NOT CMAKE_SYSTEM_NAME)
       "Target operating system is not specified. "
       "cpuinfo will compile, but cpuinfo_initialize() will always fail.")
   SET(CPUINFO_SUPPORTED_PLATFORM FALSE)
-ELSEIF(NOT CMAKE_SYSTEM_NAME MATCHES "^(Windows|WindowsStore|CYGWIN|MSYS|Darwin|Linux|Android)$")
+ELSEIF(NOT CMAKE_SYSTEM_NAME MATCHES "^(Windows|WindowsStore|CYGWIN|MSYS|Darwin|Linux|Android|FreeBSD)$")
   IF(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.14" AND NOT IS_APPLE_OS)
     MESSAGE(WARNING
       "Target operating system \"${CMAKE_SYSTEM_NAME}\" is not supported in cpuinfo. "
@@ -178,6 +181,8 @@ IF(CPUINFO_SUPPORTED_PLATFORM)
       LIST(APPEND CPUINFO_SRCS src/x86/mach/init.c)
     ELSEIF(CMAKE_SYSTEM_NAME MATCHES "^(Windows|WindowsStore|CYGWIN|MSYS)$")
       LIST(APPEND CPUINFO_SRCS src/x86/windows/init.c)
+    ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+      LIST(APPEND CPUINFO_SRCS src/x86/freebsd/init.c)
     ENDIF()
   ELSEIF(CMAKE_SYSTEM_NAME MATCHES "^Windows" AND CPUINFO_TARGET_PROCESSOR MATCHES "^(ARM64|arm64)$")
     LIST(APPEND CPUINFO_SRCS
@@ -234,9 +239,11 @@ IF(CPUINFO_SUPPORTED_PLATFORM)
       src/linux/processors.c)
   ELSEIF(IS_APPLE_OS)
     LIST(APPEND CPUINFO_SRCS src/mach/topology.c)
+  ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+    LIST(APPEND CPUINFO_SRCS src/freebsd/topology.c)
   ENDIF()
 
-  IF(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "Android")
+  IF(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "Android" OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
     SET(CMAKE_THREAD_PREFER_PTHREAD TRUE)
     SET(THREADS_PREFER_PTHREAD_FLAG TRUE)
     FIND_PACKAGE(Threads REQUIRED)
@@ -301,6 +308,9 @@ IF(CPUINFO_SUPPORTED_PLATFORM)
     TARGET_LINK_LIBRARIES(cpuinfo_internals PUBLIC ${CMAKE_THREAD_LIBS_INIT})
     TARGET_COMPILE_DEFINITIONS(cpuinfo PRIVATE _GNU_SOURCE=1)
     TARGET_COMPILE_DEFINITIONS(cpuinfo_internals PRIVATE _GNU_SOURCE=1)
+  ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+    TARGET_LINK_LIBRARIES(cpuinfo PUBLIC ${CMAKE_THREAD_LIBS_INIT})
+    TARGET_LINK_LIBRARIES(cpuinfo_internals PUBLIC ${CMAKE_THREAD_LIBS_INIT})
   ENDIF()
 ELSE()
   TARGET_COMPILE_DEFINITIONS(cpuinfo INTERFACE CPUINFO_SUPPORTED_PLATFORM=0)

3rdparty/cpuinfo/cpuinfo.vcxproj

@@ -30,32 +30,81 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
+    <ClCompile Include="src\arm\cache.c">
+      <ExcludedFromBuild Condition="'$(Platform)'!='ARM64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="src\arm\uarch.c">
+      <ExcludedFromBuild Condition="'$(Platform)'!='ARM64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="src\arm\windows\init-by-logical-sys-info.c">
+      <ExcludedFromBuild Condition="'$(Platform)'!='ARM64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="src\arm\windows\init.c">
+      <ExcludedFromBuild Condition="'$(Platform)'!='ARM64'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="deps\clog\src\clog.c" />
     <ClCompile Include="src\api.c" />
     <ClCompile Include="src\cache.c" />
     <ClCompile Include="src\init.c" />
-    <ClCompile Include="src\x86\cache\descriptor.c" />
-    <ClCompile Include="src\x86\cache\deterministic.c" />
-    <ClCompile Include="src\x86\cache\init.c" />
-    <ClCompile Include="src\x86\info.c" />
-    <ClCompile Include="src\x86\init.c" />
-    <ClCompile Include="src\x86\isa.c" />
-    <ClCompile Include="src\x86\name.c" />
-    <ClCompile Include="src\x86\topology.c" />
-    <ClCompile Include="src\x86\uarch.c" />
-    <ClCompile Include="src\x86\vendor.c" />
-    <ClCompile Include="src\x86\windows\init.c" />
+    <ClCompile Include="src\x86\cache\descriptor.c">
+      <ExcludedFromBuild Condition="'$(Platform)'!='x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="src\x86\cache\deterministic.c">
+      <ExcludedFromBuild Condition="'$(Platform)'!='x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="src\x86\cache\init.c">
+      <ExcludedFromBuild Condition="'$(Platform)'!='x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="src\x86\info.c">
+      <ExcludedFromBuild Condition="'$(Platform)'!='x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="src\x86\init.c">
+      <ExcludedFromBuild Condition="'$(Platform)'!='x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="src\x86\isa.c">
+      <ExcludedFromBuild Condition="'$(Platform)'!='x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="src\x86\name.c">
+      <ExcludedFromBuild Condition="'$(Platform)'!='x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="src\x86\topology.c">
+      <ExcludedFromBuild Condition="'$(Platform)'!='x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="src\x86\uarch.c">
+      <ExcludedFromBuild Condition="'$(Platform)'!='x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="src\x86\vendor.c">
+      <ExcludedFromBuild Condition="'$(Platform)'!='x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="src\x86\windows\init.c">
+      <ExcludedFromBuild Condition="'$(Platform)'!='x64'">true</ExcludedFromBuild>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="src\arm\api.h">
+      <ExcludedFromBuild Condition="'$(Platform)'!='ARM64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="src\arm\midr.h">
+      <ExcludedFromBuild Condition="'$(Platform)'!='ARM64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="src\arm\windows\windows-arm-init.h">
+      <ExcludedFromBuild Condition="'$(Platform)'!='ARM64'">true</ExcludedFromBuild>
+    </ClInclude>
     <ClInclude Include="deps\clog\include\clog.h" />
     <ClInclude Include="include\cpuinfo.h" />
     <ClInclude Include="src\cpuinfo\common.h" />
     <ClInclude Include="src\cpuinfo\internal-api.h" />
     <ClInclude Include="src\cpuinfo\log.h" />
     <ClInclude Include="src\cpuinfo\utils.h" />
-    <ClInclude Include="src\x86\api.h" />
-    <ClInclude Include="src\x86\cpuid.h" />
-    <ClInclude Include="src\x86\windows\api.h" />
+    <ClInclude Include="src\x86\api.h">
+      <ExcludedFromBuild Condition="'$(Platform)'!='x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="src\x86\cpuid.h">
+      <ExcludedFromBuild Condition="'$(Platform)'!='x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="src\x86\windows\api.h">
+      <ExcludedFromBuild Condition="'$(Platform)'!='x64'">true</ExcludedFromBuild>
+    </ClInclude>
   </ItemGroup>
   <ItemDefinitionGroup>
     <ClCompile>

3rdparty/cpuinfo/cpuinfo.vcxproj.filters

@@ -16,6 +16,12 @@
     <Filter Include="clog">
       <UniqueIdentifier>{7f0aba4c-ca06-4a7b-aed1-4f1e6976e839}</UniqueIdentifier>
     </Filter>
+    <Filter Include="arm">
+      <UniqueIdentifier>{ac4549d3-f60f-4e60-bf43-86d1c253cf3f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="arm\windows">
+      <UniqueIdentifier>{41fcb23a-e77b-4b5c-8238-e9b92bf1f3c6}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\x86\isa.c">
@@ -57,6 +63,18 @@
     <ClCompile Include="deps\clog\src\clog.c">
       <Filter>clog</Filter>
     </ClCompile>
+    <ClCompile Include="src\arm\cache.c">
+      <Filter>arm</Filter>
+    </ClCompile>
+    <ClCompile Include="src\arm\uarch.c">
+      <Filter>arm</Filter>
+    </ClCompile>
+    <ClCompile Include="src\arm\windows\init.c">
+      <Filter>arm\windows</Filter>
+    </ClCompile>
+    <ClCompile Include="src\arm\windows\init-by-logical-sys-info.c">
+      <Filter>arm\windows</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\x86\api.h">
@@ -84,5 +102,14 @@
     <ClInclude Include="deps\clog\include\clog.h">
       <Filter>clog</Filter>
     </ClInclude>
+    <ClInclude Include="src\arm\api.h">
+      <Filter>arm</Filter>
+    </ClInclude>
+    <ClInclude Include="src\arm\midr.h">
+      <Filter>arm</Filter>
+    </ClInclude>
+    <ClInclude Include="src\arm\windows\windows-arm-init.h">
+      <Filter>arm\windows</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

3rdparty/cpuinfo/include/cpuinfo-mock.h

@@ -7,37 +7,35 @@
 
 #include <cpuinfo.h>
 #if defined(__linux__)
-	#include <sys/types.h>
+#include <sys/types.h>
 #endif
 
 #if !defined(CPUINFO_MOCK) || !(CPUINFO_MOCK)
-	#error This header is intended only for test use
+#error This header is intended only for test use
 #endif
 
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-
 #if CPUINFO_ARCH_ARM
-	void CPUINFO_ABI cpuinfo_set_fpsid(uint32_t fpsid);
-	void CPUINFO_ABI cpuinfo_set_wcid(uint32_t wcid);
+void CPUINFO_ABI cpuinfo_set_fpsid(uint32_t fpsid);
+void CPUINFO_ABI cpuinfo_set_wcid(uint32_t wcid);
 #endif /* CPUINFO_ARCH_ARM */
 
 #if CPUINFO_ARCH_X86 || CPUINFO_ARCH_X86_64
-	struct cpuinfo_mock_cpuid {
-		uint32_t input_eax;
-		uint32_t input_ecx;
-		uint32_t eax;
-		uint32_t ebx;
-		uint32_t ecx;
-		uint32_t edx;
-	};
+struct cpuinfo_mock_cpuid {
+	uint32_t input_eax;
+	uint32_t input_ecx;
+	uint32_t eax;
+	uint32_t ebx;
+	uint32_t ecx;
+	uint32_t edx;
+};
 
-	void CPUINFO_ABI cpuinfo_mock_set_cpuid(struct cpuinfo_mock_cpuid* dump, size_t entries);
-	void CPUINFO_ABI cpuinfo_mock_get_cpuid(uint32_t eax, uint32_t regs[4]);
-	void CPUINFO_ABI cpuinfo_mock_get_cpuidex(uint32_t eax, uint32_t ecx, uint32_t regs[4]);
+void CPUINFO_ABI cpuinfo_mock_set_cpuid(struct cpuinfo_mock_cpuid* dump, size_t entries);
+void CPUINFO_ABI cpuinfo_mock_get_cpuid(uint32_t eax, uint32_t regs[4]);
+void CPUINFO_ABI cpuinfo_mock_get_cpuidex(uint32_t eax, uint32_t ecx, uint32_t regs[4]);
 #endif /* CPUINFO_ARCH_X86 || CPUINFO_ARCH_X86_64 */
 
 struct cpuinfo_mock_file {
@@ -53,22 +51,22 @@ struct cpuinfo_mock_property {
 };
 
 #if defined(__linux__)
-	void CPUINFO_ABI cpuinfo_mock_filesystem(struct cpuinfo_mock_file* files);
-	int CPUINFO_ABI cpuinfo_mock_open(const char* path, int oflag);
-	int CPUINFO_ABI cpuinfo_mock_close(int fd);
-	ssize_t CPUINFO_ABI cpuinfo_mock_read(int fd, void* buffer, size_t capacity);
+void CPUINFO_ABI cpuinfo_mock_filesystem(struct cpuinfo_mock_file* files);
+int CPUINFO_ABI cpuinfo_mock_open(const char* path, int oflag);
+int CPUINFO_ABI cpuinfo_mock_close(int fd);
+ssize_t CPUINFO_ABI cpuinfo_mock_read(int fd, void* buffer, size_t capacity);
 
-	#if CPUINFO_ARCH_ARM || CPUINFO_ARCH_ARM64
-		void CPUINFO_ABI cpuinfo_set_hwcap(uint32_t hwcap);
-	#endif
-	#if CPUINFO_ARCH_ARM
-		void CPUINFO_ABI cpuinfo_set_hwcap2(uint32_t hwcap2);
-	#endif
+#if CPUINFO_ARCH_ARM || CPUINFO_ARCH_ARM64
+void CPUINFO_ABI cpuinfo_set_hwcap(uint32_t hwcap);
+#endif
+#if CPUINFO_ARCH_ARM
+void CPUINFO_ABI cpuinfo_set_hwcap2(uint32_t hwcap2);
+#endif
 #endif
 
 #if defined(__ANDROID__)
-	void CPUINFO_ABI cpuinfo_mock_android_properties(struct cpuinfo_mock_property* properties);
-	void CPUINFO_ABI cpuinfo_mock_gl_renderer(const char* renderer);
+void CPUINFO_ABI cpuinfo_mock_android_properties(struct cpuinfo_mock_property* properties);
+void CPUINFO_ABI cpuinfo_mock_gl_renderer(const char* renderer);
 #endif
 
 #ifdef __cplusplus

3rdparty/cpuinfo/src/api.c

@@ -6,13 +6,13 @@
 #include <cpuinfo/log.h>
 
 #ifdef __linux__
-	#include <linux/api.h>
+#include <linux/api.h>
 
-	#include <unistd.h>
-	#include <sys/syscall.h>
-	#if !defined(__NR_getcpu)
-		#include <asm-generic/unistd.h>
-	#endif
+#include <sys/syscall.h>
+#include <unistd.h>
+#if !defined(__NR_getcpu)
+#include <asm-generic/unistd.h>
+#endif
 #endif
 
 bool cpuinfo_is_initialized = false;
@@ -21,57 +21,54 @@ struct cpuinfo_processor* cpuinfo_processors = NULL;
 struct cpuinfo_core* cpuinfo_cores = NULL;
 struct cpuinfo_cluster* cpuinfo_clusters = NULL;
 struct cpuinfo_package* cpuinfo_packages = NULL;
-struct cpuinfo_cache* cpuinfo_cache[cpuinfo_cache_level_max] = { NULL };
+struct cpuinfo_cache* cpuinfo_cache[cpuinfo_cache_level_max] = {NULL};
 
 uint32_t cpuinfo_processors_count = 0;
 uint32_t cpuinfo_cores_count = 0;
 uint32_t cpuinfo_clusters_count = 0;
 uint32_t cpuinfo_packages_count = 0;
-uint32_t cpuinfo_cache_count[cpuinfo_cache_level_max] = { 0 };
+uint32_t cpuinfo_cache_count[cpuinfo_cache_level_max] = {0};
 uint32_t cpuinfo_max_cache_size = 0;
 
-#if CPUINFO_ARCH_ARM || CPUINFO_ARCH_ARM64 \
-    || CPUINFO_ARCH_RISCV32 || CPUINFO_ARCH_RISCV64
-	struct cpuinfo_uarch_info* cpuinfo_uarchs = NULL;
-	uint32_t cpuinfo_uarchs_count = 0;
+#if CPUINFO_ARCH_ARM || CPUINFO_ARCH_ARM64 || CPUINFO_ARCH_RISCV32 || CPUINFO_ARCH_RISCV64
+struct cpuinfo_uarch_info* cpuinfo_uarchs = NULL;
+uint32_t cpuinfo_uarchs_count = 0;
 #else
-	struct cpuinfo_uarch_info cpuinfo_global_uarch = { cpuinfo_uarch_unknown };
+struct cpuinfo_uarch_info cpuinfo_global_uarch = {cpuinfo_uarch_unknown};
 #endif
 
 #ifdef __linux__
-	uint32_t cpuinfo_linux_cpu_max = 0;
-	const struct cpuinfo_processor** cpuinfo_linux_cpu_to_processor_map = NULL;
-	const struct cpuinfo_core** cpuinfo_linux_cpu_to_core_map = NULL;
-	#if CPUINFO_ARCH_ARM || CPUINFO_ARCH_ARM64 \
-            || CPUINFO_ARCH_RISCV32 || CPUINFO_ARCH_RISCV64
-		const uint32_t* cpuinfo_linux_cpu_to_uarch_index_map = NULL;
-	#endif
+uint32_t cpuinfo_linux_cpu_max = 0;
+const struct cpuinfo_processor** cpuinfo_linux_cpu_to_processor_map = NULL;
+const struct cpuinfo_core** cpuinfo_linux_cpu_to_core_map = NULL;
+#if CPUINFO_ARCH_ARM || CPUINFO_ARCH_ARM64 || CPUINFO_ARCH_RISCV32 || CPUINFO_ARCH_RISCV64
+const uint32_t* cpuinfo_linux_cpu_to_uarch_index_map = NULL;
+#endif
 #endif
 
-
 const struct cpuinfo_processor* cpuinfo_get_processors(void) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "processors");
 	}
 	return cpuinfo_processors;
 }
 
 const struct cpuinfo_core* cpuinfo_get_cores(void) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "core");
 	}
 	return cpuinfo_cores;
 }
 
 const struct cpuinfo_cluster* cpuinfo_get_clusters(void) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "clusters");
 	}
 	return cpuinfo_clusters;
 }
 
 const struct cpuinfo_package* cpuinfo_get_packages(void) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "packages");
 	}
 	return cpuinfo_packages;
@@ -81,49 +78,48 @@ const struct cpuinfo_uarch_info* cpuinfo_get_uarchs() {
 	if (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "uarchs");
 	}
-	#if CPUINFO_ARCH_ARM || CPUINFO_ARCH_ARM64 \
-		|| CPUINFO_ARCH_RISCV32 || CPUINFO_ARCH_RISCV64
-		return cpuinfo_uarchs;
-	#else
-		return &cpuinfo_global_uarch;
-	#endif
+#if CPUINFO_ARCH_ARM || CPUINFO_ARCH_ARM64 || CPUINFO_ARCH_RISCV32 || CPUINFO_ARCH_RISCV64
+	return cpuinfo_uarchs;
+#else
+	return &cpuinfo_global_uarch;
+#endif
 }
 
 const struct cpuinfo_processor* cpuinfo_get_processor(uint32_t index) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "processor");
 	}
-	if CPUINFO_UNLIKELY(index >= cpuinfo_processors_count) {
+	if CPUINFO_UNLIKELY (index >= cpuinfo_processors_count) {
 		return NULL;
 	}
 	return &cpuinfo_processors[index];
 }
 
 const struct cpuinfo_core* cpuinfo_get_core(uint32_t index) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "core");
 	}
-	if CPUINFO_UNLIKELY(index >= cpuinfo_cores_count) {
+	if CPUINFO_UNLIKELY (index >= cpuinfo_cores_count) {
 		return NULL;
 	}
 	return &cpuinfo_cores[index];
 }
 
 const struct cpuinfo_cluster* cpuinfo_get_cluster(uint32_t index) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "cluster");
 	}
-	if CPUINFO_UNLIKELY(index >= cpuinfo_clusters_count) {
+	if CPUINFO_UNLIKELY (index >= cpuinfo_clusters_count) {
 		return NULL;
 	}
 	return &cpuinfo_clusters[index];
 }
 
 const struct cpuinfo_package* cpuinfo_get_package(uint32_t index) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "package");
 	}
-	if CPUINFO_UNLIKELY(index >= cpuinfo_packages_count) {
+	if CPUINFO_UNLIKELY (index >= cpuinfo_packages_count) {
 		return NULL;
 	}
 	return &cpuinfo_packages[index];
@@ -133,43 +129,42 @@ const struct cpuinfo_uarch_info* cpuinfo_get_uarch(uint32_t index) {
 	if (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "uarch");
 	}
-	#if CPUINFO_ARCH_ARM || CPUINFO_ARCH_ARM64 \
-		|| CPUINFO_ARCH_RISCV32 || CPUINFO_ARCH_RISCV64
-		if CPUINFO_UNLIKELY(index >= cpuinfo_uarchs_count) {
-			return NULL;
-		}
-		return &cpuinfo_uarchs[index];
-	#else
-		if CPUINFO_UNLIKELY(index != 0) {
-			return NULL;
-		}
-		return &cpuinfo_global_uarch;
-	#endif
+#if CPUINFO_ARCH_ARM || CPUINFO_ARCH_ARM64 || CPUINFO_ARCH_RISCV32 || CPUINFO_ARCH_RISCV64
+	if CPUINFO_UNLIKELY (index >= cpuinfo_uarchs_count) {
+		return NULL;
+	}
+	return &cpuinfo_uarchs[index];
+#else
+	if CPUINFO_UNLIKELY (index != 0) {
+		return NULL;
+	}
+	return &cpuinfo_global_uarch;
+#endif
 }
 
 uint32_t cpuinfo_get_processors_count(void) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "processors_count");
 	}
 	return cpuinfo_processors_count;
 }
 
 uint32_t cpuinfo_get_cores_count(void) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "cores_count");
 	}
 	return cpuinfo_cores_count;
 }
 
 uint32_t cpuinfo_get_clusters_count(void) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "clusters_count");
 	}
 	return cpuinfo_clusters_count;
 }
 
 uint32_t cpuinfo_get_packages_count(void) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "packages_count");
 	}
 	return cpuinfo_packages_count;
@@ -179,239 +174,243 @@ uint32_t cpuinfo_get_uarchs_count(void) {
 	if (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "uarchs_count");
 	}
-	#if CPUINFO_ARCH_ARM || CPUINFO_ARCH_ARM64 \
-		|| CPUINFO_ARCH_RISCV32 || CPUINFO_ARCH_RISCV64
-		return cpuinfo_uarchs_count;
-	#else
-		return 1;
-	#endif
+#if CPUINFO_ARCH_ARM || CPUINFO_ARCH_ARM64 || CPUINFO_ARCH_RISCV32 || CPUINFO_ARCH_RISCV64
+	return cpuinfo_uarchs_count;
+#else
+	return 1;
+#endif
 }
 
 const struct cpuinfo_cache* CPUINFO_ABI cpuinfo_get_l1i_caches(void) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "l1i_caches");
 	}
 	return cpuinfo_cache[cpuinfo_cache_level_1i];
 }
 
 const struct cpuinfo_cache* CPUINFO_ABI cpuinfo_get_l1d_caches(void) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "l1d_caches");
 	}
 	return cpuinfo_cache[cpuinfo_cache_level_1d];
 }
 
 const struct cpuinfo_cache* CPUINFO_ABI cpuinfo_get_l2_caches(void) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "l2_caches");
 	}
 	return cpuinfo_cache[cpuinfo_cache_level_2];
 }
 
 const struct cpuinfo_cache* CPUINFO_ABI cpuinfo_get_l3_caches(void) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "l3_caches");
 	}
 	return cpuinfo_cache[cpuinfo_cache_level_3];
 }
 
 const struct cpuinfo_cache* CPUINFO_ABI cpuinfo_get_l4_caches(void) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "l4_caches");
 	}
 	return cpuinfo_cache[cpuinfo_cache_level_4];
 }
 
 const struct cpuinfo_cache* CPUINFO_ABI cpuinfo_get_l1i_cache(uint32_t index) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "l1i_cache");
 	}
-	if CPUINFO_UNLIKELY(index >= cpuinfo_cache_count[cpuinfo_cache_level_1i]) {
+	if CPUINFO_UNLIKELY (index >= cpuinfo_cache_count[cpuinfo_cache_level_1i]) {
 		return NULL;
 	}
 	return &cpuinfo_cache[cpuinfo_cache_level_1i][index];
 }
 
 const struct cpuinfo_cache* CPUINFO_ABI cpuinfo_get_l1d_cache(uint32_t index) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "l1d_cache");
 	}
-	if CPUINFO_UNLIKELY(index >= cpuinfo_cache_count[cpuinfo_cache_level_1d]) {
+	if CPUINFO_UNLIKELY (index >= cpuinfo_cache_count[cpuinfo_cache_level_1d]) {
 		return NULL;
 	}
 	return &cpuinfo_cache[cpuinfo_cache_level_1d][index];
 }
 
 const struct cpuinfo_cache* CPUINFO_ABI cpuinfo_get_l2_cache(uint32_t index) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "l2_cache");
 	}
-	if CPUINFO_UNLIKELY(index >= cpuinfo_cache_count[cpuinfo_cache_level_2]) {
+	if CPUINFO_UNLIKELY (index >= cpuinfo_cache_count[cpuinfo_cache_level_2]) {
 		return NULL;
 	}
 	return &cpuinfo_cache[cpuinfo_cache_level_2][index];
 }
 
 const struct cpuinfo_cache* CPUINFO_ABI cpuinfo_get_l3_cache(uint32_t index) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "l3_cache");
 	}
-	if CPUINFO_UNLIKELY(index >= cpuinfo_cache_count[cpuinfo_cache_level_3]) {
+	if CPUINFO_UNLIKELY (index >= cpuinfo_cache_count[cpuinfo_cache_level_3]) {
 		return NULL;
 	}
 	return &cpuinfo_cache[cpuinfo_cache_level_3][index];
 }
 
 const struct cpuinfo_cache* CPUINFO_ABI cpuinfo_get_l4_cache(uint32_t index) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "l4_cache");
 	}
-	if CPUINFO_UNLIKELY(index >= cpuinfo_cache_count[cpuinfo_cache_level_4]) {
+	if CPUINFO_UNLIKELY (index >= cpuinfo_cache_count[cpuinfo_cache_level_4]) {
 		return NULL;
 	}
 	return &cpuinfo_cache[cpuinfo_cache_level_4][index];
 }
 
 uint32_t CPUINFO_ABI cpuinfo_get_l1i_caches_count(void) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "l1i_caches_count");
 	}
 	return cpuinfo_cache_count[cpuinfo_cache_level_1i];
 }
 
 uint32_t CPUINFO_ABI cpuinfo_get_l1d_caches_count(void) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "l1d_caches_count");
 	}
 	return cpuinfo_cache_count[cpuinfo_cache_level_1d];
 }
 
 uint32_t CPUINFO_ABI cpuinfo_get_l2_caches_count(void) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "l2_caches_count");
 	}
 	return cpuinfo_cache_count[cpuinfo_cache_level_2];
 }
 
 uint32_t CPUINFO_ABI cpuinfo_get_l3_caches_count(void) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "l3_caches_count");
 	}
 	return cpuinfo_cache_count[cpuinfo_cache_level_3];
 }
 
 uint32_t CPUINFO_ABI cpuinfo_get_l4_caches_count(void) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "l4_caches_count");
 	}
 	return cpuinfo_cache_count[cpuinfo_cache_level_4];
 }
 
 uint32_t CPUINFO_ABI cpuinfo_get_max_cache_size(void) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "max_cache_size");
 	}
 	return cpuinfo_max_cache_size;
 }
 
 const struct cpuinfo_processor* CPUINFO_ABI cpuinfo_get_current_processor(void) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "current_processor");
 	}
-	#ifdef __linux__
-		/* Initializing this variable silences a MemorySanitizer error. */
-		unsigned cpu = 0;
-		if CPUINFO_UNLIKELY(syscall(__NR_getcpu, &cpu, NULL, NULL) != 0) {
-			return 0;
-		}
-		if CPUINFO_UNLIKELY((uint32_t) cpu >= cpuinfo_linux_cpu_max) {
-			return 0;
-		}
-		return cpuinfo_linux_cpu_to_processor_map[cpu];
-	#else
-		return NULL;
-	#endif
+#ifdef __linux__
+	/* Initializing this variable silences a MemorySanitizer error. */
+	unsigned cpu = 0;
+	if CPUINFO_UNLIKELY (syscall(__NR_getcpu, &cpu, NULL, NULL) != 0) {
+		return 0;
+	}
+	if CPUINFO_UNLIKELY ((uint32_t)cpu >= cpuinfo_linux_cpu_max) {
+		return 0;
+	}
+	return cpuinfo_linux_cpu_to_processor_map[cpu];
+#else
+	return NULL;
+#endif
 }
 
 const struct cpuinfo_core* CPUINFO_ABI cpuinfo_get_current_core(void) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "current_core");
 	}
-	#ifdef __linux__
-		/* Initializing this variable silences a MemorySanitizer error. */
-		unsigned cpu = 0;
-		if CPUINFO_UNLIKELY(syscall(__NR_getcpu, &cpu, NULL, NULL) != 0) {
-			return 0;
-		}
-		if CPUINFO_UNLIKELY((uint32_t) cpu >= cpuinfo_linux_cpu_max) {
-			return 0;
-		}
-		return cpuinfo_linux_cpu_to_core_map[cpu];
-	#else
-		return NULL;
-	#endif
+#ifdef __linux__
+	/* Initializing this variable silences a MemorySanitizer error. */
+	unsigned cpu = 0;
+	if CPUINFO_UNLIKELY (syscall(__NR_getcpu, &cpu, NULL, NULL) != 0) {
+		return 0;
+	}
+	if CPUINFO_UNLIKELY ((uint32_t)cpu >= cpuinfo_linux_cpu_max) {
+		return 0;
+	}
+	return cpuinfo_linux_cpu_to_core_map[cpu];
+#else
+	return NULL;
+#endif
 }
 
 uint32_t CPUINFO_ABI cpuinfo_get_current_uarch_index(void) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "current_uarch_index");
 	}
-	#if CPUINFO_ARCH_ARM || CPUINFO_ARCH_ARM64 \
-		|| CPUINFO_ARCH_RISCV32 || CPUINFO_ARCH_RISCV64
-		#ifdef __linux__
-			if (cpuinfo_linux_cpu_to_uarch_index_map == NULL) {
-				/* Special case: avoid syscall on systems with only a single type of cores */
-				return 0;
-			}
-
-			/* General case */
-			/* Initializing this variable silences a MemorySanitizer error. */
-			unsigned cpu = 0;
-			if CPUINFO_UNLIKELY(syscall(__NR_getcpu, &cpu, NULL, NULL) != 0) {
-				return 0;
-			}
-			if CPUINFO_UNLIKELY((uint32_t) cpu >= cpuinfo_linux_cpu_max) {
-				return 0;
-			}
-			return cpuinfo_linux_cpu_to_uarch_index_map[cpu];
-		#else
-			/* Fallback: pretend to be on the big core. */
-			return 0;
-		#endif
-	#else
-		/* Only ARM/ARM64/RISCV processors may include cores of different types in the same package. */
+#if CPUINFO_ARCH_ARM || CPUINFO_ARCH_ARM64 || CPUINFO_ARCH_RISCV32 || CPUINFO_ARCH_RISCV64
+#ifdef __linux__
+	if (cpuinfo_linux_cpu_to_uarch_index_map == NULL) {
+		/* Special case: avoid syscall on systems with only a single
+		 * type of cores
+		 */
 		return 0;
-	#endif
+	}
+
+	/* General case */
+	/* Initializing this variable silences a MemorySanitizer error. */
+	unsigned cpu = 0;
+	if CPUINFO_UNLIKELY (syscall(__NR_getcpu, &cpu, NULL, NULL) != 0) {
+		return 0;
+	}
+	if CPUINFO_UNLIKELY ((uint32_t)cpu >= cpuinfo_linux_cpu_max) {
+		return 0;
+	}
+	return cpuinfo_linux_cpu_to_uarch_index_map[cpu];
+#else
+	/* Fallback: pretend to be on the big core. */
+	return 0;
+#endif
+#else
+	/* Only ARM/ARM64/RISCV processors may include cores of different types
+	 * in the same package. */
+	return 0;
+#endif
 }
 
 uint32_t CPUINFO_ABI cpuinfo_get_current_uarch_index_with_default(uint32_t default_uarch_index) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
-		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "current_uarch_index_with_default");
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
+		cpuinfo_log_fatal(
+			"cpuinfo_get_%s called before cpuinfo is initialized", "current_uarch_index_with_default");
 	}
-	#if CPUINFO_ARCH_ARM || CPUINFO_ARCH_ARM64 \
-		|| CPUINFO_ARCH_RISCV32 || CPUINFO_ARCH_RISCV64
-		#ifdef __linux__
-			if (cpuinfo_linux_cpu_to_uarch_index_map == NULL) {
-				/* Special case: avoid syscall on systems with only a single type of cores */
-				return 0;
-			}
-
-			/* General case */
-			/* Initializing this variable silences a MemorySanitizer error. */
-			unsigned cpu = 0;
-			if CPUINFO_UNLIKELY(syscall(__NR_getcpu, &cpu, NULL, NULL) != 0) {
-				return default_uarch_index;
-			}
-			if CPUINFO_UNLIKELY((uint32_t) cpu >= cpuinfo_linux_cpu_max) {
-				return default_uarch_index;
-			}
-			return cpuinfo_linux_cpu_to_uarch_index_map[cpu];
-		#else
-			/* Fallback: no API to query current core, use default uarch index. */
-			return default_uarch_index;
-		#endif
-	#else
-		/* Only ARM/ARM64/RISCV processors may include cores of different types in the same package. */
+#if CPUINFO_ARCH_ARM || CPUINFO_ARCH_ARM64 || CPUINFO_ARCH_RISCV32 || CPUINFO_ARCH_RISCV64
+#ifdef __linux__
+	if (cpuinfo_linux_cpu_to_uarch_index_map == NULL) {
+		/* Special case: avoid syscall on systems with only a single
+		 * type of cores
+		 */
 		return 0;
-	#endif
+	}
+
+	/* General case */
+	/* Initializing this variable silences a MemorySanitizer error. */
+	unsigned cpu = 0;
+	if CPUINFO_UNLIKELY (syscall(__NR_getcpu, &cpu, NULL, NULL) != 0) {
+		return default_uarch_index;
+	}
+	if CPUINFO_UNLIKELY ((uint32_t)cpu >= cpuinfo_linux_cpu_max) {
+		return default_uarch_index;
+	}
+	return cpuinfo_linux_cpu_to_uarch_index_map[cpu];
+#else
+	/* Fallback: no API to query current core, use default uarch index. */
+	return default_uarch_index;
+#endif
+#else
+	/* Only ARM/ARM64/RISCV processors may include cores of different types
+	 * in the same package. */
+	return 0;
+#endif
 }

3rdparty/cpuinfo/src/arm/android/api.h

@@ -1,9 +1,9 @@
 #pragma once
 
-#include <cpuinfo.h>
-#include <cpuinfo/common.h>
 #include <arm/api.h>
 #include <arm/linux/api.h>
+#include <cpuinfo.h>
+#include <cpuinfo/common.h>
 
 enum cpuinfo_android_chipset_property {
 	cpuinfo_android_chipset_property_proc_cpuinfo_hardware = 0,

3rdparty/cpuinfo/src/arm/android/properties.c

@@ -1,42 +1,42 @@
 #include <stdbool.h>
+#include <stddef.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <stddef.h>
 #include <string.h>
 
 #include <sys/system_properties.h>
 
-#include <linux/api.h>
 #include <arm/android/api.h>
 #include <arm/linux/api.h>
 #include <cpuinfo/log.h>
+#include <linux/api.h>
 
 #if CPUINFO_MOCK
-	#include <cpuinfo-mock.h>
+#include <cpuinfo-mock.h>
 
-	static struct cpuinfo_mock_property* cpuinfo_mock_properties = NULL;
+static struct cpuinfo_mock_property* cpuinfo_mock_properties = NULL;
 
-	void CPUINFO_ABI cpuinfo_mock_android_properties(struct cpuinfo_mock_property* properties) {
-		cpuinfo_log_info("Android properties mocking enabled");
-		cpuinfo_mock_properties = properties;
-	}
+void CPUINFO_ABI cpuinfo_mock_android_properties(struct cpuinfo_mock_property* properties) {
+	cpuinfo_log_info("Android properties mocking enabled");
+	cpuinfo_mock_properties = properties;
+}
 
-	static int cpuinfo_android_property_get(const char* key, char* value) {
-		if (cpuinfo_mock_properties != NULL) {
-			for (const struct cpuinfo_mock_property* prop = cpuinfo_mock_properties; prop->key != NULL; prop++) {
-				if (strncmp(key, prop->key, CPUINFO_BUILD_PROP_NAME_MAX) == 0) {
-					strncpy(value, prop->value, CPUINFO_BUILD_PROP_VALUE_MAX);
-					return (int) strnlen(prop->value, CPUINFO_BUILD_PROP_VALUE_MAX);
-				}
+static int cpuinfo_android_property_get(const char* key, char* value) {
+	if (cpuinfo_mock_properties != NULL) {
+		for (const struct cpuinfo_mock_property* prop = cpuinfo_mock_properties; prop->key != NULL; prop++) {
+			if (strncmp(key, prop->key, CPUINFO_BUILD_PROP_NAME_MAX) == 0) {
+				strncpy(value, prop->value, CPUINFO_BUILD_PROP_VALUE_MAX);
+				return (int)strnlen(prop->value, CPUINFO_BUILD_PROP_VALUE_MAX);
 			}
 		}
-		*value = '\0';
-		return 0;
 	}
+	*value = '\0';
+	return 0;
+}
 #else
-	static inline int cpuinfo_android_property_get(const char* key, char* value) {
-		return __system_property_get(key, value);
-	}
+static inline int cpuinfo_android_property_get(const char* key, char* value) {
+	return __system_property_get(key, value);
+}
 #endif
 
 void cpuinfo_arm_android_parse_properties(struct cpuinfo_android_properties properties[restrict static 1]) {
@@ -50,18 +50,17 @@ void cpuinfo_arm_android_parse_properties(struct cpuinfo_android_properties prop
 
 	const int ro_mediatek_platform_length =
 		cpuinfo_android_property_get("ro.mediatek.platform", properties->ro_mediatek_platform);
-	cpuinfo_log_debug("read ro.mediatek.platform = \"%.*s\"",
-		ro_mediatek_platform_length, properties->ro_mediatek_platform);
+	cpuinfo_log_debug(
+		"read ro.mediatek.platform = \"%.*s\"", ro_mediatek_platform_length, properties->ro_mediatek_platform);
 
-	const int ro_arch_length =
-		cpuinfo_android_property_get("ro.arch", properties->ro_arch);
+	const int ro_arch_length = cpuinfo_android_property_get("ro.arch", properties->ro_arch);
 	cpuinfo_log_debug("read ro.arch = \"%.*s\"", ro_arch_length, properties->ro_arch);
 
-	const int ro_chipname_length =
-		cpuinfo_android_property_get("ro.chipname", properties->ro_chipname);
+	const int ro_chipname_length = cpuinfo_android_property_get("ro.chipname", properties->ro_chipname);
 	cpuinfo_log_debug("read ro.chipname = \"%.*s\"", ro_chipname_length, properties->ro_chipname);
 
 	const int ro_hardware_chipname_length =
 		cpuinfo_android_property_get("ro.hardware.chipname", properties->ro_hardware_chipname);
-	cpuinfo_log_debug("read ro.hardware.chipname = \"%.*s\"", ro_hardware_chipname_length, properties->ro_hardware_chipname);
+	cpuinfo_log_debug(
+		"read ro.hardware.chipname = \"%.*s\"", ro_hardware_chipname_length, properties->ro_hardware_chipname);
 }

3rdparty/cpuinfo/src/arm/api.h

@@ -80,45 +80,47 @@ struct cpuinfo_arm_chipset {
 #define CPUINFO_ARM_CHIPSET_NAME_MAX CPUINFO_PACKAGE_NAME_MAX
 
 #ifndef __cplusplus
-	CPUINFO_INTERNAL void cpuinfo_arm_chipset_to_string(
-		const struct cpuinfo_arm_chipset chipset[restrict static 1],
-		char name[restrict static CPUINFO_ARM_CHIPSET_NAME_MAX]);
+CPUINFO_INTERNAL void cpuinfo_arm_chipset_to_string(
+	const struct cpuinfo_arm_chipset chipset[restrict static 1],
+	char name[restrict static CPUINFO_ARM_CHIPSET_NAME_MAX]);
 
-	CPUINFO_INTERNAL void cpuinfo_arm_fixup_chipset(
-		struct cpuinfo_arm_chipset chipset[restrict static 1], uint32_t cores, uint32_t max_cpu_freq_max);
+CPUINFO_INTERNAL void cpuinfo_arm_fixup_chipset(
+	struct cpuinfo_arm_chipset chipset[restrict static 1],
+	uint32_t cores,
+	uint32_t max_cpu_freq_max);
 
-	CPUINFO_INTERNAL void cpuinfo_arm_decode_vendor_uarch(
-		uint32_t midr,
-	#if CPUINFO_ARCH_ARM
-		bool has_vfpv4,
-	#endif
-		enum cpuinfo_vendor vendor[restrict static 1],
-		enum cpuinfo_uarch uarch[restrict static 1]);
-
-	CPUINFO_INTERNAL void cpuinfo_arm_decode_cache(
-		enum cpuinfo_uarch uarch,
-		uint32_t cluster_cores,
-		uint32_t midr,
-		const struct cpuinfo_arm_chipset chipset[restrict static 1],
-		uint32_t cluster_id,
-		uint32_t arch_version,
-		struct cpuinfo_cache l1i[restrict static 1],
-		struct cpuinfo_cache l1d[restrict static 1],
-		struct cpuinfo_cache l2[restrict static 1],
-		struct cpuinfo_cache l3[restrict static 1]);
-
-	CPUINFO_INTERNAL uint32_t cpuinfo_arm_compute_max_cache_size(
-		const struct cpuinfo_processor processor[restrict static 1]);
-#else /* defined(__cplusplus) */
-	CPUINFO_INTERNAL void cpuinfo_arm_decode_cache(
-		enum cpuinfo_uarch uarch,
-		uint32_t cluster_cores,
-		uint32_t midr,
-		const struct cpuinfo_arm_chipset chipset[1],
-		uint32_t cluster_id,
-		uint32_t arch_version,
-		struct cpuinfo_cache l1i[1],
-		struct cpuinfo_cache l1d[1],
-		struct cpuinfo_cache l2[1],
-		struct cpuinfo_cache l3[1]);
+CPUINFO_INTERNAL void cpuinfo_arm_decode_vendor_uarch(
+	uint32_t midr,
+#if CPUINFO_ARCH_ARM
+	bool has_vfpv4,
+#endif
+	enum cpuinfo_vendor vendor[restrict static 1],
+	enum cpuinfo_uarch uarch[restrict static 1]);
+
+CPUINFO_INTERNAL void cpuinfo_arm_decode_cache(
+	enum cpuinfo_uarch uarch,
+	uint32_t cluster_cores,
+	uint32_t midr,
+	const struct cpuinfo_arm_chipset chipset[restrict static 1],
+	uint32_t cluster_id,
+	uint32_t arch_version,
+	struct cpuinfo_cache l1i[restrict static 1],
+	struct cpuinfo_cache l1d[restrict static 1],
+	struct cpuinfo_cache l2[restrict static 1],
+	struct cpuinfo_cache l3[restrict static 1]);
+
+CPUINFO_INTERNAL uint32_t
+cpuinfo_arm_compute_max_cache_size(const struct cpuinfo_processor processor[restrict static 1]);
+#else /* defined(__cplusplus) */
+CPUINFO_INTERNAL void cpuinfo_arm_decode_cache(
+	enum cpuinfo_uarch uarch,
+	uint32_t cluster_cores,
+	uint32_t midr,
+	const struct cpuinfo_arm_chipset chipset[1],
+	uint32_t cluster_id,
+	uint32_t arch_version,
+	struct cpuinfo_cache l1i[1],
+	struct cpuinfo_cache l1d[1],
+	struct cpuinfo_cache l2[1],
+	struct cpuinfo_cache l3[1]);
 #endif

3rdparty/cpuinfo/src/arm/linux/aarch32-isa.c

@@ -1,29 +1,27 @@
 #include <stdint.h>
 
 #if CPUINFO_MOCK
-	#include <cpuinfo-mock.h>
+#include <cpuinfo-mock.h>
 #endif
 #include <arm/linux/api.h>
 #include <arm/linux/cp.h>
 #include <arm/midr.h>
 #include <cpuinfo/log.h>
 
-
 #if CPUINFO_MOCK
-	uint32_t cpuinfo_arm_fpsid = 0;
-	uint32_t cpuinfo_arm_mvfr0 = 0;
-	uint32_t cpuinfo_arm_wcid = 0;
+uint32_t cpuinfo_arm_fpsid = 0;
+uint32_t cpuinfo_arm_mvfr0 = 0;
+uint32_t cpuinfo_arm_wcid = 0;
 
-	void cpuinfo_set_fpsid(uint32_t fpsid) {
-		cpuinfo_arm_fpsid = fpsid;
-	}
+void cpuinfo_set_fpsid(uint32_t fpsid) {
+	cpuinfo_arm_fpsid = fpsid;
+}
 
-	void cpuinfo_set_wcid(uint32_t wcid) {
-		cpuinfo_arm_wcid = wcid;
-	}
+void cpuinfo_set_wcid(uint32_t wcid) {
+	cpuinfo_arm_wcid = wcid;
+}
 #endif
 
-
 void cpuinfo_arm_linux_decode_isa_from_proc_cpuinfo(
 	uint32_t features,
 	uint32_t features2,
@@ -31,27 +29,27 @@ void cpuinfo_arm_linux_decode_isa_from_proc_cpuinfo(
 	uint32_t architecture_version,
 	uint32_t architecture_flags,
 	const struct cpuinfo_arm_chipset chipset[restrict static 1],
-	struct cpuinfo_arm_isa isa[restrict static 1])
-{
+	struct cpuinfo_arm_isa isa[restrict static 1]) {
 	if (architecture_version < 8) {
-		const uint32_t armv8_features2_mask = CPUINFO_ARM_LINUX_FEATURE2_AES | CPUINFO_ARM_LINUX_FEATURE2_PMULL |
-			CPUINFO_ARM_LINUX_FEATURE2_SHA1 | CPUINFO_ARM_LINUX_FEATURE2_SHA2 | CPUINFO_ARM_LINUX_FEATURE2_CRC32;
+		const uint32_t armv8_features2_mask = CPUINFO_ARM_LINUX_FEATURE2_AES |
+			CPUINFO_ARM_LINUX_FEATURE2_PMULL | CPUINFO_ARM_LINUX_FEATURE2_SHA1 |
+			CPUINFO_ARM_LINUX_FEATURE2_SHA2 | CPUINFO_ARM_LINUX_FEATURE2_CRC32;
 		if (features2 & armv8_features2_mask) {
 			architecture_version = 8;
 		}
 	}
 	if (architecture_version >= 8) {
 		/*
-		 * ARMv7 code running on ARMv8: IDIV, VFP, NEON are always supported,
-		 * but may be not reported in /proc/cpuinfo features.
+		 * ARMv7 code running on ARMv8: IDIV, VFP, NEON are always
+		 * supported, but may be not reported in /proc/cpuinfo features.
 		 */
-		isa->armv5e  = true;
-		isa->armv6   = true;
-		isa->armv6k  = true;
-		isa->armv7   = true;
+		isa->armv5e = true;
+		isa->armv6 = true;
+		isa->armv6k = true;
+		isa->armv7 = true;
 		isa->armv7mp = true;
-		isa->armv8   = true;
-		isa->thumb  = true;
+		isa->armv8 = true;
+		isa->thumb = true;
 		isa->thumb2 = true;
 		isa->idiv = true;
 		isa->vfpv3 = true;
@@ -61,8 +59,10 @@ void cpuinfo_arm_linux_decode_isa_from_proc_cpuinfo(
 		isa->neon = true;
 
 		/*
-		 * NEON FP16 compute extension and VQRDMLAH/VQRDMLSH instructions are not indicated in /proc/cpuinfo.
-		 * Use a MIDR-based heuristic to whitelist processors known to support it:
+		 * NEON FP16 compute extension and VQRDMLAH/VQRDMLSH
+		 * instructions are not indicated in /proc/cpuinfo. Use a
+		 * MIDR-based heuristic to whitelist processors known to support
+		 * it:
 		 * - Processors with Cortex-A55 cores
 		 * - Processors with Cortex-A75 cores
 		 * - Processors with Cortex-A76 cores
@@ -82,8 +82,10 @@ void cpuinfo_arm_linux_decode_isa_from_proc_cpuinfo(
 		 * - Neoverse V2 cores
 		 */
 		if (chipset->series == cpuinfo_arm_chipset_series_samsung_exynos && chipset->model == 9810) {
-			/* Only little cores of Exynos 9810 support FP16 & RDM */
-			cpuinfo_log_warning("FP16 arithmetics and RDM disabled: only little cores in Exynos 9810 support these extensions");
+			/* Only little cores of Exynos 9810 support FP16 & RDM
+			 */
+			cpuinfo_log_warning(
+				"FP16 arithmetics and RDM disabled: only little cores in Exynos 9810 support these extensions");
 		} else {
 			switch (midr & (CPUINFO_ARM_MIDR_IMPLEMENTER_MASK | CPUINFO_ARM_MIDR_PART_MASK)) {
 				case UINT32_C(0x4100D050): /* Cortex-A55 */
@@ -102,11 +104,16 @@ void cpuinfo_arm_linux_decode_isa_from_proc_cpuinfo(
 				case UINT32_C(0x4100D4D0): /* Cortex-A715 */
 				case UINT32_C(0x4100D4E0): /* Cortex-X3 */
 				case UINT32_C(0x4100D4F0): /* Neoverse V2 */
-				case UINT32_C(0x4800D400): /* Cortex-A76 (HiSilicon) */
-				case UINT32_C(0x51008020): /* Kryo 385 Gold (Cortex-A75) */
-				case UINT32_C(0x51008030): /* Kryo 385 Silver (Cortex-A55) */
-				case UINT32_C(0x51008040): /* Kryo 485 Gold (Cortex-A76) */
-				case UINT32_C(0x51008050): /* Kryo 485 Silver (Cortex-A55) */
+				case UINT32_C(0x4800D400): /* Cortex-A76
+							      (HiSilicon) */
+				case UINT32_C(0x51008020): /* Kryo 385 Gold
+							      (Cortex-A75) */
+				case UINT32_C(0x51008030): /* Kryo 385 Silver
+							      (Cortex-A55) */
+				case UINT32_C(0x51008040): /* Kryo 485 Gold
+							      (Cortex-A76) */
+				case UINT32_C(0x51008050): /* Kryo 485 Silver
+							      (Cortex-A55) */
 				case UINT32_C(0x53000030): /* Exynos M4 */
 				case UINT32_C(0x53000040): /* Exynos M5 */
 					isa->fp16arith = true;
@@ -117,7 +124,8 @@ void cpuinfo_arm_linux_decode_isa_from_proc_cpuinfo(
 
 		/*
 		 * NEON VDOT instructions are not indicated in /proc/cpuinfo.
-		 * Use a MIDR-based heuristic to whitelist processors known to support it:
+		 * Use a MIDR-based heuristic to whitelist processors known to
+		 * support it:
 		 * - Processors with Cortex-A76 cores
 		 * - Processors with Cortex-A77 cores
 		 * - Processors with Cortex-A78 cores
@@ -135,7 +143,8 @@ void cpuinfo_arm_linux_decode_isa_from_proc_cpuinfo(
 		 * - Neoverse V2 cores
 		 */
 		if (chipset->series == cpuinfo_arm_chipset_series_spreadtrum_sc && chipset->model == 9863) {
-			cpuinfo_log_warning("VDOT instructions disabled: cause occasional SIGILL on Spreadtrum SC9863A");
+			cpuinfo_log_warning(
+				"VDOT instructions disabled: cause occasional SIGILL on Spreadtrum SC9863A");
 		} else if (chipset->series == cpuinfo_arm_chipset_series_unisoc_t && chipset->model == 310) {
 			cpuinfo_log_warning("VDOT instructions disabled: cause occasional SIGILL on Unisoc T310");
 		} else {
@@ -154,41 +163,52 @@ void cpuinfo_arm_linux_decode_isa_from_proc_cpuinfo(
 				case UINT32_C(0x4100D4D0): /* Cortex-A715 */
 				case UINT32_C(0x4100D4E0): /* Cortex-X3 */
 				case UINT32_C(0x4100D4F0): /* Neoverse V2 */
-				case UINT32_C(0x4800D400): /* Cortex-A76 (HiSilicon) */
-				case UINT32_C(0x51008040): /* Kryo 485 Gold (Cortex-A76) */
-				case UINT32_C(0x51008050): /* Kryo 485 Silver (Cortex-A55) */
+				case UINT32_C(0x4800D400): /* Cortex-A76
+							      (HiSilicon) */
+				case UINT32_C(0x51008040): /* Kryo 485 Gold
+							      (Cortex-A76) */
+				case UINT32_C(0x51008050): /* Kryo 485 Silver
+							      (Cortex-A55) */
 				case UINT32_C(0x53000030): /* Exynos M4 */
 				case UINT32_C(0x53000040): /* Exynos M5 */
 					isa->dot = true;
 					break;
-				case UINT32_C(0x4100D050): /* Cortex A55: revision 1 or later only */
+				case UINT32_C(0x4100D050): /* Cortex A55: revision 1
+							      or later only */
 					isa->dot = !!(midr_get_variant(midr) >= 1);
 					break;
-				case UINT32_C(0x4100D0A0): /* Cortex A75: revision 2 or later only */
+				case UINT32_C(0x4100D0A0): /* Cortex A75: revision 2
+							      or later only */
 					isa->dot = !!(midr_get_variant(midr) >= 2);
 					break;
 			}
 		}
 	} else {
-		/* ARMv7 or lower: use feature flags to detect optional features */
+		/* ARMv7 or lower: use feature flags to detect optional features
+		 */
 
 		/*
-		 * ARM11 (ARM 1136/1156/1176/11 MPCore) processors can report v7 architecture
-		 * even though they support only ARMv6 instruction set.
+		 * ARM11 (ARM 1136/1156/1176/11 MPCore) processors can report v7
+		 * architecture even though they support only ARMv6 instruction
+		 * set.
 		 */
 		if (architecture_version == 7 && midr_is_arm11(midr)) {
-			cpuinfo_log_warning("kernel-reported architecture ARMv7 ignored due to mismatch with processor microarchitecture (ARM11)");
+			cpuinfo_log_warning(
+				"kernel-reported architecture ARMv7 ignored due to mismatch with processor microarchitecture (ARM11)");
 			architecture_version = 6;
 		}
 
 		if (architecture_version < 7) {
-			const uint32_t armv7_features_mask = CPUINFO_ARM_LINUX_FEATURE_VFPV3 | CPUINFO_ARM_LINUX_FEATURE_VFPV3D16 | CPUINFO_ARM_LINUX_FEATURE_VFPD32 |
-				CPUINFO_ARM_LINUX_FEATURE_VFPV4 | CPUINFO_ARM_LINUX_FEATURE_NEON | CPUINFO_ARM_LINUX_FEATURE_IDIVT | CPUINFO_ARM_LINUX_FEATURE_IDIVA;
+			const uint32_t armv7_features_mask = CPUINFO_ARM_LINUX_FEATURE_VFPV3 |
+				CPUINFO_ARM_LINUX_FEATURE_VFPV3D16 | CPUINFO_ARM_LINUX_FEATURE_VFPD32 |
+				CPUINFO_ARM_LINUX_FEATURE_VFPV4 | CPUINFO_ARM_LINUX_FEATURE_NEON |
+				CPUINFO_ARM_LINUX_FEATURE_IDIVT | CPUINFO_ARM_LINUX_FEATURE_IDIVA;
 			if (features & armv7_features_mask) {
 				architecture_version = 7;
 			}
 		}
-		if ((architecture_version >= 6) || (features & CPUINFO_ARM_LINUX_FEATURE_EDSP) || (architecture_flags & CPUINFO_ARM_LINUX_ARCH_E)) {
+		if ((architecture_version >= 6) || (features & CPUINFO_ARM_LINUX_FEATURE_EDSP) ||
+		    (architecture_flags & CPUINFO_ARM_LINUX_ARCH_E)) {
 			isa->armv5e = true;
 		}
 		if (architecture_version >= 6) {
@@ -199,13 +219,16 @@ void cpuinfo_arm_linux_decode_isa_from_proc_cpuinfo(
 			isa->armv7 = true;
 
 			/*
-			 * ARMv7 MP extension (PLDW instruction) is not indicated in /proc/cpuinfo.
-			 * Use heuristic list of supporting processors:
-			 * - Processors supporting UDIV/SDIV instructions ("idiva" + "idivt" features in /proc/cpuinfo)
+			 * ARMv7 MP extension (PLDW instruction) is not
+			 * indicated in /proc/cpuinfo. Use heuristic list of
+			 * supporting processors:
+			 * - Processors supporting UDIV/SDIV instructions
+			 * ("idiva" + "idivt" features in /proc/cpuinfo)
 			 * - Cortex-A5
 			 * - Cortex-A9
 			 * - Dual-Core Scorpion
-			 * - Krait (supports UDIV/SDIV, but kernels may not report it in /proc/cpuinfo)
+			 * - Krait (supports UDIV/SDIV, but kernels may not
+			 * report it in /proc/cpuinfo)
 			 *
 			 * TODO: check single-core Qualcomm Scorpion.
 			 */
@@ -218,31 +241,35 @@ void cpuinfo_arm_linux_decode_isa_from_proc_cpuinfo(
 					isa->armv7mp = true;
 					break;
 				default:
-					/* In practice IDIV instruction implies ARMv7+MP ISA */
-					isa->armv7mp = (features & CPUINFO_ARM_LINUX_FEATURE_IDIV) == CPUINFO_ARM_LINUX_FEATURE_IDIV;
+					/* In practice IDIV instruction implies
+					 * ARMv7+MP ISA */
+					isa->armv7mp = (features & CPUINFO_ARM_LINUX_FEATURE_IDIV) ==
+						CPUINFO_ARM_LINUX_FEATURE_IDIV;
 					break;
 			}
 		}
 
 		if (features & CPUINFO_ARM_LINUX_FEATURE_IWMMXT) {
-			#if !defined(__ARM_ARCH_8A__) && !(defined(__ARM_ARCH) && (__ARM_ARCH >= 8))
-				const uint32_t wcid = read_wcid();
-				cpuinfo_log_debug("WCID = 0x%08"PRIx32, wcid);
-				const uint32_t coprocessor_type = (wcid >> 8) & UINT32_C(0xFF);
-				if (coprocessor_type >= 0x10) {
-					isa->wmmx = true;
-					if (coprocessor_type >= 0x20) {
-						isa->wmmx2 = true;
-					}
-				} else {
-					cpuinfo_log_warning("WMMX ISA disabled: OS reported iwmmxt feature, "
-						"but WCID coprocessor type 0x%"PRIx32" indicates no WMMX support",
-						coprocessor_type);
+#if !defined(__ARM_ARCH_8A__) && !(defined(__ARM_ARCH) && (__ARM_ARCH >= 8))
+			const uint32_t wcid = read_wcid();
+			cpuinfo_log_debug("WCID = 0x%08" PRIx32, wcid);
+			const uint32_t coprocessor_type = (wcid >> 8) & UINT32_C(0xFF);
+			if (coprocessor_type >= 0x10) {
+				isa->wmmx = true;
+				if (coprocessor_type >= 0x20) {
+					isa->wmmx2 = true;
 				}
-			#else
-				cpuinfo_log_warning("WMMX ISA disabled: OS reported iwmmxt feature, "
-					"but there is no iWMMXt coprocessor");
-			#endif
+			} else {
+				cpuinfo_log_warning(
+					"WMMX ISA disabled: OS reported iwmmxt feature, "
+					"but WCID coprocessor type 0x%" PRIx32 " indicates no WMMX support",
+					coprocessor_type);
+			}
+#else
+			cpuinfo_log_warning(
+				"WMMX ISA disabled: OS reported iwmmxt feature, "
+				"but there is no iWMMXt coprocessor");
+#endif
 		}
 
 		if ((features & CPUINFO_ARM_LINUX_FEATURE_THUMB) || (architecture_flags & CPUINFO_ARM_LINUX_ARCH_T)) {
@@ -263,35 +290,39 @@ void cpuinfo_arm_linux_decode_isa_from_proc_cpuinfo(
 			isa->jazelle = true;
 		}
 
-		/* Qualcomm Krait may have buggy kernel configuration that doesn't report IDIV */
-		if ((features & CPUINFO_ARM_LINUX_FEATURE_IDIV) == CPUINFO_ARM_LINUX_FEATURE_IDIV || midr_is_krait(midr)) {
+		/* Qualcomm Krait may have buggy kernel configuration that
+		 * doesn't report IDIV */
+		if ((features & CPUINFO_ARM_LINUX_FEATURE_IDIV) == CPUINFO_ARM_LINUX_FEATURE_IDIV ||
+		    midr_is_krait(midr)) {
 			isa->idiv = true;
 		}
 
-		const uint32_t vfp_mask = \
-			CPUINFO_ARM_LINUX_FEATURE_VFP | CPUINFO_ARM_LINUX_FEATURE_VFPV3 | CPUINFO_ARM_LINUX_FEATURE_VFPV3D16 | \
-			CPUINFO_ARM_LINUX_FEATURE_VFPD32 | CPUINFO_ARM_LINUX_FEATURE_VFPV4 | CPUINFO_ARM_LINUX_FEATURE_NEON;
+		const uint32_t vfp_mask = CPUINFO_ARM_LINUX_FEATURE_VFP | CPUINFO_ARM_LINUX_FEATURE_VFPV3 |
+			CPUINFO_ARM_LINUX_FEATURE_VFPV3D16 | CPUINFO_ARM_LINUX_FEATURE_VFPD32 |
+			CPUINFO_ARM_LINUX_FEATURE_VFPV4 | CPUINFO_ARM_LINUX_FEATURE_NEON;
 		if (features & vfp_mask) {
-			const uint32_t vfpv3_mask = CPUINFO_ARM_LINUX_FEATURE_VFPV3 | CPUINFO_ARM_LINUX_FEATURE_VFPV3D16 | \
-				CPUINFO_ARM_LINUX_FEATURE_VFPD32 | CPUINFO_ARM_LINUX_FEATURE_VFPV4 | CPUINFO_ARM_LINUX_FEATURE_NEON;
+			const uint32_t vfpv3_mask = CPUINFO_ARM_LINUX_FEATURE_VFPV3 |
+				CPUINFO_ARM_LINUX_FEATURE_VFPV3D16 | CPUINFO_ARM_LINUX_FEATURE_VFPD32 |
+				CPUINFO_ARM_LINUX_FEATURE_VFPV4 | CPUINFO_ARM_LINUX_FEATURE_NEON;
 			if ((architecture_version >= 7) || (features & vfpv3_mask)) {
 				isa->vfpv3 = true;
 
-				const uint32_t d32_mask = CPUINFO_ARM_LINUX_FEATURE_VFPD32 | CPUINFO_ARM_LINUX_FEATURE_NEON;
+				const uint32_t d32_mask =
+					CPUINFO_ARM_LINUX_FEATURE_VFPD32 | CPUINFO_ARM_LINUX_FEATURE_NEON;
 				if (features & d32_mask) {
 					isa->d32 = true;
 				}
 			} else {
-				#if defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_8A__) || defined(__ARM_ARCH) && (__ARM_ARCH >= 7)
-					isa->vfpv3 = true;
-				#else
-					const uint32_t fpsid = read_fpsid();
-					cpuinfo_log_debug("FPSID = 0x%08"PRIx32, fpsid);
-					const uint32_t subarchitecture = (fpsid >> 16) & UINT32_C(0x7F);
-					if (subarchitecture >= 0x01) {
-						isa->vfpv2 = true;
-					}
-				#endif
+#if defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_8A__) || defined(__ARM_ARCH) && (__ARM_ARCH >= 7)
+				isa->vfpv3 = true;
+#else
+				const uint32_t fpsid = read_fpsid();
+				cpuinfo_log_debug("FPSID = 0x%08" PRIx32, fpsid);
+				const uint32_t subarchitecture = (fpsid >> 16) & UINT32_C(0x7F);
+				if (subarchitecture >= 0x01) {
+					isa->vfpv2 = true;
+				}
+#endif
 			}
 		}
 		if (features & CPUINFO_ARM_LINUX_FEATURE_NEON) {
@@ -300,8 +331,9 @@ void cpuinfo_arm_linux_decode_isa_from_proc_cpuinfo(
 
 		/*
 		 * There is no separate feature flag for FP16 support.
-		 * VFPv4 implies VFPv3-FP16 support (and in practice, NEON-HP as well).
-		 * Additionally, ARM Cortex-A9 and Qualcomm Scorpion support FP16.
+		 * VFPv4 implies VFPv3-FP16 support (and in practice, NEON-HP as
+		 * well). Additionally, ARM Cortex-A9 and Qualcomm Scorpion
+		 * support FP16.
 		 */
 		if ((features & CPUINFO_ARM_LINUX_FEATURE_VFPV4) || midr_is_cortex_a9(midr) || midr_is_scorpion(midr)) {
 			isa->fp16 = true;

3rdparty/cpuinfo/src/arm/linux/aarch64-isa.c

@@ -3,14 +3,12 @@
 #include <arm/linux/api.h>
 #include <cpuinfo/log.h>
 
-
 void cpuinfo_arm64_linux_decode_isa_from_proc_cpuinfo(
 	uint32_t features,
 	uint32_t features2,
 	uint32_t midr,
 	const struct cpuinfo_arm_chipset chipset[restrict static 1],
-	struct cpuinfo_arm_isa isa[restrict static 1])
-{
+	struct cpuinfo_arm_isa isa[restrict static 1]) {
 	if (features & CPUINFO_ARM_LINUX_FEATURE_AES) {
 		isa->aes = true;
 	}
@@ -31,8 +29,10 @@ void cpuinfo_arm64_linux_decode_isa_from_proc_cpuinfo(
 	}
 
 	/*
-	 * Some phones ship with an old kernel configuration that doesn't report NEON FP16 compute extension and SQRDMLAH/SQRDMLSH/UQRDMLAH/UQRDMLSH instructions.
-	 * Use a MIDR-based heuristic to whitelist processors known to support it:
+	 * Some phones ship with an old kernel configuration that doesn't report
+	 * NEON FP16 compute extension and SQRDMLAH/SQRDMLSH/UQRDMLAH/UQRDMLSH
+	 * instructions. Use a MIDR-based heuristic to whitelist processors
+	 * known to support it:
 	 * - Processors with Cortex-A55 cores
 	 * - Processors with Cortex-A65 cores
 	 * - Processors with Cortex-A75 cores
@@ -46,8 +46,10 @@ void cpuinfo_arm64_linux_decode_isa_from_proc_cpuinfo(
 	 * - Neoverse V2 cores
 	 */
 	if (chipset->series == cpuinfo_arm_chipset_series_samsung_exynos && chipset->model == 9810) {
-		/* Exynos 9810 reports that it supports FP16 compute, but in fact only little cores do */
-		cpuinfo_log_warning("FP16 arithmetics and RDM disabled: only little cores in Exynos 9810 support these extensions");
+		/* Exynos 9810 reports that it supports FP16 compute, but in
+		 * fact only little cores do */
+		cpuinfo_log_warning(
+			"FP16 arithmetics and RDM disabled: only little cores in Exynos 9810 support these extensions");
 	} else {
 		const uint32_t fp16arith_mask = CPUINFO_ARM_LINUX_FEATURE_FPHP | CPUINFO_ARM_LINUX_FEATURE_ASIMDHP;
 		switch (midr & (CPUINFO_ARM_MIDR_IMPLEMENTER_MASK | CPUINFO_ARM_MIDR_PART_MASK)) {
@@ -75,9 +77,11 @@ void cpuinfo_arm64_linux_decode_isa_from_proc_cpuinfo(
 				if ((features & fp16arith_mask) == fp16arith_mask) {
 					isa->fp16arith = true;
 				} else if (features & CPUINFO_ARM_LINUX_FEATURE_FPHP) {
-					cpuinfo_log_warning("FP16 arithmetics disabled: detected support only for scalar operations");
+					cpuinfo_log_warning(
+						"FP16 arithmetics disabled: detected support only for scalar operations");
 				} else if (features & CPUINFO_ARM_LINUX_FEATURE_ASIMDHP) {
-					cpuinfo_log_warning("FP16 arithmetics disabled: detected support only for SIMD operations");
+					cpuinfo_log_warning(
+						"FP16 arithmetics disabled: detected support only for SIMD operations");
 				}
 				if (features & CPUINFO_ARM_LINUX_FEATURE_ASIMDRDM) {
 					isa->rdm = true;
@@ -90,8 +94,9 @@ void cpuinfo_arm64_linux_decode_isa_from_proc_cpuinfo(
 	}
 
 	/*
-	 * Many phones ship with an old kernel configuration that doesn't report UDOT/SDOT instructions.
-	 * Use a MIDR-based heuristic to whitelist processors known to support it.
+	 * Many phones ship with an old kernel configuration that doesn't report
+	 * UDOT/SDOT instructions. Use a MIDR-based heuristic to whitelist
+	 * processors known to support it.
 	 */
 	switch (midr & (CPUINFO_ARM_MIDR_IMPLEMENTER_MASK | CPUINFO_ARM_MIDR_PART_MASK)) {
 		case UINT32_C(0x4100D060): /* Cortex-A65 */
@@ -137,8 +142,9 @@ void cpuinfo_arm64_linux_decode_isa_from_proc_cpuinfo(
 	if (features2 & CPUINFO_ARM_LINUX_FEATURE2_SVE2) {
 		isa->sve2 = true;
 	}
-	// SVEBF16 is set iff SVE and BF16 are both supported, but the SVEBF16 feature flag
-	// was added in Linux kernel before the BF16 feature flag, so we check for either.
+	// SVEBF16 is set iff SVE and BF16 are both supported, but the SVEBF16
+	// feature flag was added in Linux kernel before the BF16 feature flag,
+	// so we check for either.
 	if (features2 & (CPUINFO_ARM_LINUX_FEATURE2_BF16 | CPUINFO_ARM_LINUX_FEATURE2_SVEBF16)) {
 		isa->bf16 = true;
 	}
@@ -146,4 +152,3 @@ void cpuinfo_arm64_linux_decode_isa_from_proc_cpuinfo(
 		isa->fhm = true;
 	}
 }
-

3rdparty/cpuinfo/src/arm/linux/api.h

@@ -3,38 +3,40 @@
 #include <stdbool.h>
 #include <stdint.h>
 
+#include <arm/api.h>
+#include <arm/midr.h>
 #include <cpuinfo.h>
 #include <cpuinfo/common.h>
-#include <arm/midr.h>
-#include <arm/api.h>
 #include <linux/api.h>
 
-/* No hard limit in the kernel, maximum length observed on non-rogue kernels is 64 */
+/* No hard limit in the kernel, maximum length observed on non-rogue kernels is
+ * 64 */
 #define CPUINFO_HARDWARE_VALUE_MAX 64
-/* No hard limit in the kernel, maximum length on Raspberry Pi is 8. Add 1 symbol to detect overly large revision strings */
+/* No hard limit in the kernel, maximum length on Raspberry Pi is 8. Add 1
+ * symbol to detect overly large revision strings */
 #define CPUINFO_REVISION_VALUE_MAX 9
 
 #ifdef __ANDROID__
-	/* As per include/sys/system_properties.h in Android NDK */
-	#define CPUINFO_BUILD_PROP_NAME_MAX  32
-	#define CPUINFO_BUILD_PROP_VALUE_MAX 92
+/* As per include/sys/system_properties.h in Android NDK */
+#define CPUINFO_BUILD_PROP_NAME_MAX 32
+#define CPUINFO_BUILD_PROP_VALUE_MAX 92
 
-	struct cpuinfo_android_properties {
-		char proc_cpuinfo_hardware[CPUINFO_HARDWARE_VALUE_MAX];
-		char ro_product_board[CPUINFO_BUILD_PROP_VALUE_MAX];
-		char ro_board_platform[CPUINFO_BUILD_PROP_VALUE_MAX];
-		char ro_mediatek_platform[CPUINFO_BUILD_PROP_VALUE_MAX];
-		char ro_arch[CPUINFO_BUILD_PROP_VALUE_MAX];
-		char ro_chipname[CPUINFO_BUILD_PROP_VALUE_MAX];
-		char ro_hardware_chipname[CPUINFO_BUILD_PROP_VALUE_MAX];
-	};
+struct cpuinfo_android_properties {
+	char proc_cpuinfo_hardware[CPUINFO_HARDWARE_VALUE_MAX];
+	char ro_product_board[CPUINFO_BUILD_PROP_VALUE_MAX];
+	char ro_board_platform[CPUINFO_BUILD_PROP_VALUE_MAX];
+	char ro_mediatek_platform[CPUINFO_BUILD_PROP_VALUE_MAX];
+	char ro_arch[CPUINFO_BUILD_PROP_VALUE_MAX];
+	char ro_chipname[CPUINFO_BUILD_PROP_VALUE_MAX];
+	char ro_hardware_chipname[CPUINFO_BUILD_PROP_VALUE_MAX];
+};
 #endif
 
-#define CPUINFO_ARM_LINUX_ARCH_T   UINT32_C(0x00000001)
-#define CPUINFO_ARM_LINUX_ARCH_E   UINT32_C(0x00000002)
-#define CPUINFO_ARM_LINUX_ARCH_J   UINT32_C(0x00000004)
+#define CPUINFO_ARM_LINUX_ARCH_T UINT32_C(0x00000001)
+#define CPUINFO_ARM_LINUX_ARCH_E UINT32_C(0x00000002)
+#define CPUINFO_ARM_LINUX_ARCH_J UINT32_C(0x00000004)
 
-#define CPUINFO_ARM_LINUX_ARCH_TE  UINT32_C(0x00000003)
+#define CPUINFO_ARM_LINUX_ARCH_TE UINT32_C(0x00000003)
 #define CPUINFO_ARM_LINUX_ARCH_TEJ UINT32_C(0x00000007)
 
 struct cpuinfo_arm_linux_proc_cpuinfo_cache {
@@ -49,116 +51,118 @@ struct cpuinfo_arm_linux_proc_cpuinfo_cache {
 };
 
 #if CPUINFO_ARCH_ARM
-	/* arch/arm/include/uapi/asm/hwcap.h */
+/* arch/arm/include/uapi/asm/hwcap.h */
 
-	#define CPUINFO_ARM_LINUX_FEATURE_SWP      UINT32_C(0x00000001)
-	#define CPUINFO_ARM_LINUX_FEATURE_HALF     UINT32_C(0x00000002)
-	#define CPUINFO_ARM_LINUX_FEATURE_THUMB    UINT32_C(0x00000004)
-	#define CPUINFO_ARM_LINUX_FEATURE_26BIT    UINT32_C(0x00000008)
-	#define CPUINFO_ARM_LINUX_FEATURE_FASTMULT UINT32_C(0x00000010)
-	#define CPUINFO_ARM_LINUX_FEATURE_FPA      UINT32_C(0x00000020)
-	#define CPUINFO_ARM_LINUX_FEATURE_VFP      UINT32_C(0x00000040)
-	#define CPUINFO_ARM_LINUX_FEATURE_EDSP     UINT32_C(0x00000080)
-	#define CPUINFO_ARM_LINUX_FEATURE_JAVA     UINT32_C(0x00000100)
-	#define CPUINFO_ARM_LINUX_FEATURE_IWMMXT   UINT32_C(0x00000200)
-	#define CPUINFO_ARM_LINUX_FEATURE_CRUNCH   UINT32_C(0x00000400)
-	#define CPUINFO_ARM_LINUX_FEATURE_THUMBEE  UINT32_C(0x00000800)
-	#define CPUINFO_ARM_LINUX_FEATURE_NEON     UINT32_C(0x00001000)
-	#define CPUINFO_ARM_LINUX_FEATURE_VFPV3    UINT32_C(0x00002000)
-	#define CPUINFO_ARM_LINUX_FEATURE_VFPV3D16 UINT32_C(0x00004000) /* Also set for VFPv4 with 16 double-precision registers */
-	#define CPUINFO_ARM_LINUX_FEATURE_TLS      UINT32_C(0x00008000)
-	#define CPUINFO_ARM_LINUX_FEATURE_VFPV4    UINT32_C(0x00010000)
-	#define CPUINFO_ARM_LINUX_FEATURE_IDIVA    UINT32_C(0x00020000)
-	#define CPUINFO_ARM_LINUX_FEATURE_IDIVT    UINT32_C(0x00040000)
-	#define CPUINFO_ARM_LINUX_FEATURE_IDIV     UINT32_C(0x00060000)
-	#define CPUINFO_ARM_LINUX_FEATURE_VFPD32   UINT32_C(0x00080000)
-	#define CPUINFO_ARM_LINUX_FEATURE_LPAE     UINT32_C(0x00100000)
-	#define CPUINFO_ARM_LINUX_FEATURE_EVTSTRM  UINT32_C(0x00200000)
+#define CPUINFO_ARM_LINUX_FEATURE_SWP UINT32_C(0x00000001)
+#define CPUINFO_ARM_LINUX_FEATURE_HALF UINT32_C(0x00000002)
+#define CPUINFO_ARM_LINUX_FEATURE_THUMB UINT32_C(0x00000004)
+#define CPUINFO_ARM_LINUX_FEATURE_26BIT UINT32_C(0x00000008)
+#define CPUINFO_ARM_LINUX_FEATURE_FASTMULT UINT32_C(0x00000010)
+#define CPUINFO_ARM_LINUX_FEATURE_FPA UINT32_C(0x00000020)
+#define CPUINFO_ARM_LINUX_FEATURE_VFP UINT32_C(0x00000040)
+#define CPUINFO_ARM_LINUX_FEATURE_EDSP UINT32_C(0x00000080)
+#define CPUINFO_ARM_LINUX_FEATURE_JAVA UINT32_C(0x00000100)
+#define CPUINFO_ARM_LINUX_FEATURE_IWMMXT UINT32_C(0x00000200)
+#define CPUINFO_ARM_LINUX_FEATURE_CRUNCH UINT32_C(0x00000400)
+#define CPUINFO_ARM_LINUX_FEATURE_THUMBEE UINT32_C(0x00000800)
+#define CPUINFO_ARM_LINUX_FEATURE_NEON UINT32_C(0x00001000)
+#define CPUINFO_ARM_LINUX_FEATURE_VFPV3 UINT32_C(0x00002000)
+#define CPUINFO_ARM_LINUX_FEATURE_VFPV3D16                                  \
+	UINT32_C(0x00004000) /* Also set for VFPv4 with 16 double-precision \
+				registers */
+#define CPUINFO_ARM_LINUX_FEATURE_TLS UINT32_C(0x00008000)
+#define CPUINFO_ARM_LINUX_FEATURE_VFPV4 UINT32_C(0x00010000)
+#define CPUINFO_ARM_LINUX_FEATURE_IDIVA UINT32_C(0x00020000)
+#define CPUINFO_ARM_LINUX_FEATURE_IDIVT UINT32_C(0x00040000)
+#define CPUINFO_ARM_LINUX_FEATURE_IDIV UINT32_C(0x00060000)
+#define CPUINFO_ARM_LINUX_FEATURE_VFPD32 UINT32_C(0x00080000)
+#define CPUINFO_ARM_LINUX_FEATURE_LPAE UINT32_C(0x00100000)
+#define CPUINFO_ARM_LINUX_FEATURE_EVTSTRM UINT32_C(0x00200000)
 
-	#define CPUINFO_ARM_LINUX_FEATURE2_AES   UINT32_C(0x00000001)
-	#define CPUINFO_ARM_LINUX_FEATURE2_PMULL UINT32_C(0x00000002)
-	#define CPUINFO_ARM_LINUX_FEATURE2_SHA1  UINT32_C(0x00000004)
-	#define CPUINFO_ARM_LINUX_FEATURE2_SHA2  UINT32_C(0x00000008)
-	#define CPUINFO_ARM_LINUX_FEATURE2_CRC32 UINT32_C(0x00000010)
+#define CPUINFO_ARM_LINUX_FEATURE2_AES UINT32_C(0x00000001)
+#define CPUINFO_ARM_LINUX_FEATURE2_PMULL UINT32_C(0x00000002)
+#define CPUINFO_ARM_LINUX_FEATURE2_SHA1 UINT32_C(0x00000004)
+#define CPUINFO_ARM_LINUX_FEATURE2_SHA2 UINT32_C(0x00000008)
+#define CPUINFO_ARM_LINUX_FEATURE2_CRC32 UINT32_C(0x00000010)
 #elif CPUINFO_ARCH_ARM64
-	/* arch/arm64/include/uapi/asm/hwcap.h */
-	#define CPUINFO_ARM_LINUX_FEATURE_FP       UINT32_C(0x00000001)
-	#define CPUINFO_ARM_LINUX_FEATURE_ASIMD    UINT32_C(0x00000002)
-	#define CPUINFO_ARM_LINUX_FEATURE_EVTSTRM  UINT32_C(0x00000004)
-	#define CPUINFO_ARM_LINUX_FEATURE_AES      UINT32_C(0x00000008)
-	#define CPUINFO_ARM_LINUX_FEATURE_PMULL    UINT32_C(0x00000010)
-	#define CPUINFO_ARM_LINUX_FEATURE_SHA1     UINT32_C(0x00000020)
-	#define CPUINFO_ARM_LINUX_FEATURE_SHA2     UINT32_C(0x00000040)
-	#define CPUINFO_ARM_LINUX_FEATURE_CRC32    UINT32_C(0x00000080)
-	#define CPUINFO_ARM_LINUX_FEATURE_ATOMICS  UINT32_C(0x00000100)
-	#define CPUINFO_ARM_LINUX_FEATURE_FPHP     UINT32_C(0x00000200)
-	#define CPUINFO_ARM_LINUX_FEATURE_ASIMDHP  UINT32_C(0x00000400)
-	#define CPUINFO_ARM_LINUX_FEATURE_CPUID    UINT32_C(0x00000800)
-	#define CPUINFO_ARM_LINUX_FEATURE_ASIMDRDM UINT32_C(0x00001000)
-	#define CPUINFO_ARM_LINUX_FEATURE_JSCVT    UINT32_C(0x00002000)
-	#define CPUINFO_ARM_LINUX_FEATURE_FCMA     UINT32_C(0x00004000)
-	#define CPUINFO_ARM_LINUX_FEATURE_LRCPC    UINT32_C(0x00008000)
-	#define CPUINFO_ARM_LINUX_FEATURE_DCPOP    UINT32_C(0x00010000)
-	#define CPUINFO_ARM_LINUX_FEATURE_SHA3     UINT32_C(0x00020000)
-	#define CPUINFO_ARM_LINUX_FEATURE_SM3      UINT32_C(0x00040000)
-	#define CPUINFO_ARM_LINUX_FEATURE_SM4      UINT32_C(0x00080000)
-	#define CPUINFO_ARM_LINUX_FEATURE_ASIMDDP  UINT32_C(0x00100000)
-	#define CPUINFO_ARM_LINUX_FEATURE_SHA512   UINT32_C(0x00200000)
-	#define CPUINFO_ARM_LINUX_FEATURE_SVE      UINT32_C(0x00400000)
-	#define CPUINFO_ARM_LINUX_FEATURE_ASIMDFHM UINT32_C(0x00800000)
-	#define CPUINFO_ARM_LINUX_FEATURE_DIT      UINT32_C(0x01000000)
-	#define CPUINFO_ARM_LINUX_FEATURE_USCAT    UINT32_C(0x02000000)
-	#define CPUINFO_ARM_LINUX_FEATURE_ILRCPC   UINT32_C(0x04000000)
-	#define CPUINFO_ARM_LINUX_FEATURE_FLAGM    UINT32_C(0x08000000)
-	#define CPUINFO_ARM_LINUX_FEATURE_SSBS     UINT32_C(0x10000000)
-	#define CPUINFO_ARM_LINUX_FEATURE_SB       UINT32_C(0x20000000)
-	#define CPUINFO_ARM_LINUX_FEATURE_PACA     UINT32_C(0x40000000)
-	#define CPUINFO_ARM_LINUX_FEATURE_PACG     UINT32_C(0x80000000)
+/* arch/arm64/include/uapi/asm/hwcap.h */
+#define CPUINFO_ARM_LINUX_FEATURE_FP UINT32_C(0x00000001)
+#define CPUINFO_ARM_LINUX_FEATURE_ASIMD UINT32_C(0x00000002)
+#define CPUINFO_ARM_LINUX_FEATURE_EVTSTRM UINT32_C(0x00000004)
+#define CPUINFO_ARM_LINUX_FEATURE_AES UINT32_C(0x00000008)
+#define CPUINFO_ARM_LINUX_FEATURE_PMULL UINT32_C(0x00000010)
+#define CPUINFO_ARM_LINUX_FEATURE_SHA1 UINT32_C(0x00000020)
+#define CPUINFO_ARM_LINUX_FEATURE_SHA2 UINT32_C(0x00000040)
+#define CPUINFO_ARM_LINUX_FEATURE_CRC32 UINT32_C(0x00000080)
+#define CPUINFO_ARM_LINUX_FEATURE_ATOMICS UINT32_C(0x00000100)
+#define CPUINFO_ARM_LINUX_FEATURE_FPHP UINT32_C(0x00000200)
+#define CPUINFO_ARM_LINUX_FEATURE_ASIMDHP UINT32_C(0x00000400)
+#define CPUINFO_ARM_LINUX_FEATURE_CPUID UINT32_C(0x00000800)
+#define CPUINFO_ARM_LINUX_FEATURE_ASIMDRDM UINT32_C(0x00001000)
+#define CPUINFO_ARM_LINUX_FEATURE_JSCVT UINT32_C(0x00002000)
+#define CPUINFO_ARM_LINUX_FEATURE_FCMA UINT32_C(0x00004000)
+#define CPUINFO_ARM_LINUX_FEATURE_LRCPC UINT32_C(0x00008000)
+#define CPUINFO_ARM_LINUX_FEATURE_DCPOP UINT32_C(0x00010000)
+#define CPUINFO_ARM_LINUX_FEATURE_SHA3 UINT32_C(0x00020000)
+#define CPUINFO_ARM_LINUX_FEATURE_SM3 UINT32_C(0x00040000)
+#define CPUINFO_ARM_LINUX_FEATURE_SM4 UINT32_C(0x00080000)
+#define CPUINFO_ARM_LINUX_FEATURE_ASIMDDP UINT32_C(0x00100000)
+#define CPUINFO_ARM_LINUX_FEATURE_SHA512 UINT32_C(0x00200000)
+#define CPUINFO_ARM_LINUX_FEATURE_SVE UINT32_C(0x00400000)
+#define CPUINFO_ARM_LINUX_FEATURE_ASIMDFHM UINT32_C(0x00800000)
+#define CPUINFO_ARM_LINUX_FEATURE_DIT UINT32_C(0x01000000)
+#define CPUINFO_ARM_LINUX_FEATURE_USCAT UINT32_C(0x02000000)
+#define CPUINFO_ARM_LINUX_FEATURE_ILRCPC UINT32_C(0x04000000)
+#define CPUINFO_ARM_LINUX_FEATURE_FLAGM UINT32_C(0x08000000)
+#define CPUINFO_ARM_LINUX_FEATURE_SSBS UINT32_C(0x10000000)
+#define CPUINFO_ARM_LINUX_FEATURE_SB UINT32_C(0x20000000)
+#define CPUINFO_ARM_LINUX_FEATURE_PACA UINT32_C(0x40000000)
+#define CPUINFO_ARM_LINUX_FEATURE_PACG UINT32_C(0x80000000)
 
-	#define CPUINFO_ARM_LINUX_FEATURE2_DCPODP     UINT32_C(0x00000001)
-	#define CPUINFO_ARM_LINUX_FEATURE2_SVE2       UINT32_C(0x00000002)
-	#define CPUINFO_ARM_LINUX_FEATURE2_SVEAES     UINT32_C(0x00000004)
-	#define CPUINFO_ARM_LINUX_FEATURE2_SVEPMULL   UINT32_C(0x00000008)
-	#define CPUINFO_ARM_LINUX_FEATURE2_SVEBITPERM UINT32_C(0x00000010)
-	#define CPUINFO_ARM_LINUX_FEATURE2_SVESHA3    UINT32_C(0x00000020)
-	#define CPUINFO_ARM_LINUX_FEATURE2_SVESM4     UINT32_C(0x00000040)
-	#define CPUINFO_ARM_LINUX_FEATURE2_FLAGM2     UINT32_C(0x00000080)
-	#define CPUINFO_ARM_LINUX_FEATURE2_FRINT      UINT32_C(0x00000100)
-	#define CPUINFO_ARM_LINUX_FEATURE2_SVEI8MM    UINT32_C(0x00000200)
-	#define CPUINFO_ARM_LINUX_FEATURE2_SVEF32MM   UINT32_C(0x00000400)
-	#define CPUINFO_ARM_LINUX_FEATURE2_SVEF64MM   UINT32_C(0x00000800)
-	#define CPUINFO_ARM_LINUX_FEATURE2_SVEBF16    UINT32_C(0x00001000)
-	#define CPUINFO_ARM_LINUX_FEATURE2_I8MM       UINT32_C(0x00002000)
-	#define CPUINFO_ARM_LINUX_FEATURE2_BF16       UINT32_C(0x00004000)
-	#define CPUINFO_ARM_LINUX_FEATURE2_DGH        UINT32_C(0x00008000)
-	#define CPUINFO_ARM_LINUX_FEATURE2_RNG        UINT32_C(0x00010000)
-	#define CPUINFO_ARM_LINUX_FEATURE2_BTI        UINT32_C(0x00020000)
+#define CPUINFO_ARM_LINUX_FEATURE2_DCPODP UINT32_C(0x00000001)
+#define CPUINFO_ARM_LINUX_FEATURE2_SVE2 UINT32_C(0x00000002)
+#define CPUINFO_ARM_LINUX_FEATURE2_SVEAES UINT32_C(0x00000004)
+#define CPUINFO_ARM_LINUX_FEATURE2_SVEPMULL UINT32_C(0x00000008)
+#define CPUINFO_ARM_LINUX_FEATURE2_SVEBITPERM UINT32_C(0x00000010)
+#define CPUINFO_ARM_LINUX_FEATURE2_SVESHA3 UINT32_C(0x00000020)
+#define CPUINFO_ARM_LINUX_FEATURE2_SVESM4 UINT32_C(0x00000040)
+#define CPUINFO_ARM_LINUX_FEATURE2_FLAGM2 UINT32_C(0x00000080)
+#define CPUINFO_ARM_LINUX_FEATURE2_FRINT UINT32_C(0x00000100)
+#define CPUINFO_ARM_LINUX_FEATURE2_SVEI8MM UINT32_C(0x00000200)
+#define CPUINFO_ARM_LINUX_FEATURE2_SVEF32MM UINT32_C(0x00000400)
+#define CPUINFO_ARM_LINUX_FEATURE2_SVEF64MM UINT32_C(0x00000800)
+#define CPUINFO_ARM_LINUX_FEATURE2_SVEBF16 UINT32_C(0x00001000)
+#define CPUINFO_ARM_LINUX_FEATURE2_I8MM UINT32_C(0x00002000)
+#define CPUINFO_ARM_LINUX_FEATURE2_BF16 UINT32_C(0x00004000)
+#define CPUINFO_ARM_LINUX_FEATURE2_DGH UINT32_C(0x00008000)
+#define CPUINFO_ARM_LINUX_FEATURE2_RNG UINT32_C(0x00010000)
+#define CPUINFO_ARM_LINUX_FEATURE2_BTI UINT32_C(0x00020000)
 #endif
 
 #define CPUINFO_ARM_LINUX_VALID_ARCHITECTURE UINT32_C(0x00010000)
-#define CPUINFO_ARM_LINUX_VALID_IMPLEMENTER  UINT32_C(0x00020000)
-#define CPUINFO_ARM_LINUX_VALID_VARIANT      UINT32_C(0x00040000)
-#define CPUINFO_ARM_LINUX_VALID_PART         UINT32_C(0x00080000)
-#define CPUINFO_ARM_LINUX_VALID_REVISION     UINT32_C(0x00100000)
-#define CPUINFO_ARM_LINUX_VALID_PROCESSOR    UINT32_C(0x00200000)
-#define CPUINFO_ARM_LINUX_VALID_FEATURES     UINT32_C(0x00400000)
+#define CPUINFO_ARM_LINUX_VALID_IMPLEMENTER UINT32_C(0x00020000)
+#define CPUINFO_ARM_LINUX_VALID_VARIANT UINT32_C(0x00040000)
+#define CPUINFO_ARM_LINUX_VALID_PART UINT32_C(0x00080000)
+#define CPUINFO_ARM_LINUX_VALID_REVISION UINT32_C(0x00100000)
+#define CPUINFO_ARM_LINUX_VALID_PROCESSOR UINT32_C(0x00200000)
+#define CPUINFO_ARM_LINUX_VALID_FEATURES UINT32_C(0x00400000)
 #if CPUINFO_ARCH_ARM
-	#define CPUINFO_ARM_LINUX_VALID_ICACHE_SIZE UINT32_C(0x01000000)
-	#define CPUINFO_ARM_LINUX_VALID_ICACHE_SETS UINT32_C(0x02000000)
-	#define CPUINFO_ARM_LINUX_VALID_ICACHE_WAYS UINT32_C(0x04000000)
-	#define CPUINFO_ARM_LINUX_VALID_ICACHE_LINE UINT32_C(0x08000000)
-	#define CPUINFO_ARM_LINUX_VALID_DCACHE_SIZE UINT32_C(0x10000000)
-	#define CPUINFO_ARM_LINUX_VALID_DCACHE_SETS UINT32_C(0x20000000)
-	#define CPUINFO_ARM_LINUX_VALID_DCACHE_WAYS UINT32_C(0x40000000)
-	#define CPUINFO_ARM_LINUX_VALID_DCACHE_LINE UINT32_C(0x80000000)
+#define CPUINFO_ARM_LINUX_VALID_ICACHE_SIZE UINT32_C(0x01000000)
+#define CPUINFO_ARM_LINUX_VALID_ICACHE_SETS UINT32_C(0x02000000)
+#define CPUINFO_ARM_LINUX_VALID_ICACHE_WAYS UINT32_C(0x04000000)
+#define CPUINFO_ARM_LINUX_VALID_ICACHE_LINE UINT32_C(0x08000000)
+#define CPUINFO_ARM_LINUX_VALID_DCACHE_SIZE UINT32_C(0x10000000)
+#define CPUINFO_ARM_LINUX_VALID_DCACHE_SETS UINT32_C(0x20000000)
+#define CPUINFO_ARM_LINUX_VALID_DCACHE_WAYS UINT32_C(0x40000000)
+#define CPUINFO_ARM_LINUX_VALID_DCACHE_LINE UINT32_C(0x80000000)
 #endif
 
-#define CPUINFO_ARM_LINUX_VALID_INFO          UINT32_C(0x007F0000)
-#define CPUINFO_ARM_LINUX_VALID_MIDR          UINT32_C(0x003F0000)
+#define CPUINFO_ARM_LINUX_VALID_INFO UINT32_C(0x007F0000)
+#define CPUINFO_ARM_LINUX_VALID_MIDR UINT32_C(0x003F0000)
 #if CPUINFO_ARCH_ARM
-	#define CPUINFO_ARM_LINUX_VALID_ICACHE     UINT32_C(0x0F000000)
-	#define CPUINFO_ARM_LINUX_VALID_DCACHE     UINT32_C(0xF0000000)
-	#define CPUINFO_ARM_LINUX_VALID_CACHE_LINE UINT32_C(0x88000000)
+#define CPUINFO_ARM_LINUX_VALID_ICACHE UINT32_C(0x0F000000)
+#define CPUINFO_ARM_LINUX_VALID_DCACHE UINT32_C(0xF0000000)
+#define CPUINFO_ARM_LINUX_VALID_CACHE_LINE UINT32_C(0x88000000)
 #endif
 
 struct cpuinfo_arm_linux_processor {
@@ -178,13 +182,15 @@ struct cpuinfo_arm_linux_processor {
 	uint32_t uarch_index;
 	/**
 	 * ID of the physical package which includes this logical processor.
-	 * The value is parsed from /sys/devices/system/cpu/cpu<N>/topology/physical_package_id
+	 * The value is parsed from
+	 * /sys/devices/system/cpu/cpu<N>/topology/physical_package_id
 	 */
 	uint32_t package_id;
 	/**
-	 * Minimum processor ID on the package which includes this logical processor.
-	 * This value can serve as an ID for the cluster of logical processors: it is the
-	 * same for all logical processors on the same package.
+	 * Minimum processor ID on the package which includes this logical
+	 * processor. This value can serve as an ID for the cluster of logical
+	 * processors: it is the same for all logical processors on the same
+	 * package.
 	 */
 	uint32_t package_leader_id;
 	/**
@@ -193,14 +199,16 @@ struct cpuinfo_arm_linux_processor {
 	uint32_t package_processor_count;
 	/**
 	 * Maximum frequency, in kHZ.
-	 * The value is parsed from /sys/devices/system/cpu/cpu<N>/cpufreq/cpuinfo_max_freq
-	 * If failed to read or parse the file, the value is 0.
+	 * The value is parsed from
+	 * /sys/devices/system/cpu/cpu<N>/cpufreq/cpuinfo_max_freq If failed to
+	 * read or parse the file, the value is 0.
 	 */
 	uint32_t max_frequency;
 	/**
 	 * Minimum frequency, in kHZ.
-	 * The value is parsed from /sys/devices/system/cpu/cpu<N>/cpufreq/cpuinfo_min_freq
-	 * If failed to read or parse the file, the value is 0.
+	 * The value is parsed from
+	 * /sys/devices/system/cpu/cpu<N>/cpufreq/cpuinfo_min_freq If failed to
+	 * read or parse the file, the value is 0.
 	 */
 	uint32_t min_frequency;
 	/** Linux processor ID */
@@ -216,8 +224,7 @@ struct cpuinfo_arm_linux_cluster {
 /* Returns true if the two processors do belong to the same cluster */
 static inline bool cpuinfo_arm_linux_processor_equals(
 	struct cpuinfo_arm_linux_processor processor_i[restrict static 1],
-	struct cpuinfo_arm_linux_processor processor_j[restrict static 1])
-{
+	struct cpuinfo_arm_linux_processor processor_j[restrict static 1]) {
 	const uint32_t joint_flags = processor_i->flags & processor_j->flags;
 
 	bool same_max_frequency = false;
@@ -251,11 +258,11 @@ static inline bool cpuinfo_arm_linux_processor_equals(
 	return same_max_frequency && same_min_frequency;
 }
 
-/* Returns true if the two processors certainly don't belong to the same cluster */
+/* Returns true if the two processors certainly don't belong to the same cluster
+ */
 static inline bool cpuinfo_arm_linux_processor_not_equals(
 	struct cpuinfo_arm_linux_processor processor_i[restrict static 1],
-	struct cpuinfo_arm_linux_processor processor_j[restrict static 1])
-{
+	struct cpuinfo_arm_linux_processor processor_j[restrict static 1]) {
 	const uint32_t joint_flags = processor_i->flags & processor_j->flags;
 
 	if (joint_flags & CPUINFO_LINUX_FLAG_MAX_FREQUENCY) {
@@ -286,79 +293,73 @@ CPUINFO_INTERNAL bool cpuinfo_arm_linux_parse_proc_cpuinfo(
 	struct cpuinfo_arm_linux_processor processors[restrict static max_processors_count]);
 
 #if CPUINFO_ARCH_ARM
-	CPUINFO_INTERNAL bool cpuinfo_arm_linux_hwcap_from_getauxval(
-		uint32_t hwcap[restrict static 1],
-		uint32_t hwcap2[restrict static 1]);
-	CPUINFO_INTERNAL bool cpuinfo_arm_linux_hwcap_from_procfs(
-		uint32_t hwcap[restrict static 1],
-		uint32_t hwcap2[restrict static 1]);
+CPUINFO_INTERNAL bool cpuinfo_arm_linux_hwcap_from_getauxval(
+	uint32_t hwcap[restrict static 1],
+	uint32_t hwcap2[restrict static 1]);
+CPUINFO_INTERNAL bool cpuinfo_arm_linux_hwcap_from_procfs(
+	uint32_t hwcap[restrict static 1],
+	uint32_t hwcap2[restrict static 1]);
 
-	CPUINFO_INTERNAL void cpuinfo_arm_linux_decode_isa_from_proc_cpuinfo(
-		uint32_t features,
-		uint32_t features2,
-		uint32_t midr,
-		uint32_t architecture_version,
-		uint32_t architecture_flags,
-		const struct cpuinfo_arm_chipset chipset[restrict static 1],
-		struct cpuinfo_arm_isa isa[restrict static 1]);
+CPUINFO_INTERNAL void cpuinfo_arm_linux_decode_isa_from_proc_cpuinfo(
+	uint32_t features,
+	uint32_t features2,
+	uint32_t midr,
+	uint32_t architecture_version,
+	uint32_t architecture_flags,
+	const struct cpuinfo_arm_chipset chipset[restrict static 1],
+	struct cpuinfo_arm_isa isa[restrict static 1]);
 #elif CPUINFO_ARCH_ARM64
-	CPUINFO_INTERNAL void cpuinfo_arm_linux_hwcap_from_getauxval(
-		uint32_t hwcap[restrict static 1],
-		uint32_t hwcap2[restrict static 1]);
+CPUINFO_INTERNAL void cpuinfo_arm_linux_hwcap_from_getauxval(
+	uint32_t hwcap[restrict static 1],
+	uint32_t hwcap2[restrict static 1]);
 
-	CPUINFO_INTERNAL void cpuinfo_arm64_linux_decode_isa_from_proc_cpuinfo(
-		uint32_t features,
-		uint32_t features2,
-		uint32_t midr,
-		const struct cpuinfo_arm_chipset chipset[restrict static 1],
-		struct cpuinfo_arm_isa isa[restrict static 1]);
+CPUINFO_INTERNAL void cpuinfo_arm64_linux_decode_isa_from_proc_cpuinfo(
+	uint32_t features,
+	uint32_t features2,
+	uint32_t midr,
+	const struct cpuinfo_arm_chipset chipset[restrict static 1],
+	struct cpuinfo_arm_isa isa[restrict static 1]);
 #endif
 
 #if defined(__ANDROID__)
-	CPUINFO_INTERNAL struct cpuinfo_arm_chipset
-		cpuinfo_arm_android_decode_chipset(
-			const struct cpuinfo_android_properties properties[restrict static 1],
-			uint32_t cores,
-			uint32_t max_cpu_freq_max);
+CPUINFO_INTERNAL struct cpuinfo_arm_chipset cpuinfo_arm_android_decode_chipset(
+	const struct cpuinfo_android_properties properties[restrict static 1],
+	uint32_t cores,
+	uint32_t max_cpu_freq_max);
 #else
-	CPUINFO_INTERNAL struct cpuinfo_arm_chipset
-		cpuinfo_arm_linux_decode_chipset(
-			const char hardware[restrict static CPUINFO_HARDWARE_VALUE_MAX],
-			const char revision[restrict static CPUINFO_REVISION_VALUE_MAX],
-			uint32_t cores,
-			uint32_t max_cpu_freq_max);
+CPUINFO_INTERNAL struct cpuinfo_arm_chipset cpuinfo_arm_linux_decode_chipset(
+	const char hardware[restrict static CPUINFO_HARDWARE_VALUE_MAX],
+	const char revision[restrict static CPUINFO_REVISION_VALUE_MAX],
+	uint32_t cores,
+	uint32_t max_cpu_freq_max);
 #endif
 
-CPUINFO_INTERNAL struct cpuinfo_arm_chipset
-	cpuinfo_arm_linux_decode_chipset_from_proc_cpuinfo_hardware(
-		const char proc_cpuinfo_hardware[restrict static CPUINFO_HARDWARE_VALUE_MAX],
-		uint32_t cores, uint32_t max_cpu_freq_max, bool is_tegra);
+CPUINFO_INTERNAL struct cpuinfo_arm_chipset cpuinfo_arm_linux_decode_chipset_from_proc_cpuinfo_hardware(
+	const char proc_cpuinfo_hardware[restrict static CPUINFO_HARDWARE_VALUE_MAX],
+	uint32_t cores,
+	uint32_t max_cpu_freq_max,
+	bool is_tegra);
 
 #ifdef __ANDROID__
-	CPUINFO_INTERNAL struct cpuinfo_arm_chipset
-		cpuinfo_arm_android_decode_chipset_from_ro_product_board(
-			const char ro_product_board[restrict static CPUINFO_BUILD_PROP_VALUE_MAX],
-			uint32_t cores, uint32_t max_cpu_freq_max);
-	CPUINFO_INTERNAL struct cpuinfo_arm_chipset
-		cpuinfo_arm_android_decode_chipset_from_ro_board_platform(
-			const char ro_board_platform[restrict static CPUINFO_BUILD_PROP_VALUE_MAX],
-			uint32_t cores, uint32_t max_cpu_freq_max);
-	CPUINFO_INTERNAL struct cpuinfo_arm_chipset
-		cpuinfo_arm_android_decode_chipset_from_ro_mediatek_platform(
-			const char ro_mediatek_platform[restrict static CPUINFO_BUILD_PROP_VALUE_MAX]);
-	CPUINFO_INTERNAL struct cpuinfo_arm_chipset
-		cpuinfo_arm_android_decode_chipset_from_ro_arch(
-			const char ro_arch[restrict static CPUINFO_BUILD_PROP_VALUE_MAX]);
-	CPUINFO_INTERNAL struct cpuinfo_arm_chipset
-		cpuinfo_arm_android_decode_chipset_from_ro_chipname(
-			const char ro_chipname[restrict static CPUINFO_BUILD_PROP_VALUE_MAX]);
-	CPUINFO_INTERNAL struct cpuinfo_arm_chipset
-		cpuinfo_arm_android_decode_chipset_from_ro_hardware_chipname(
-			const char ro_hardware_chipname[restrict static CPUINFO_BUILD_PROP_VALUE_MAX]);
+CPUINFO_INTERNAL struct cpuinfo_arm_chipset cpuinfo_arm_android_decode_chipset_from_ro_product_board(
+	const char ro_product_board[restrict static CPUINFO_BUILD_PROP_VALUE_MAX],
+	uint32_t cores,
+	uint32_t max_cpu_freq_max);
+CPUINFO_INTERNAL struct cpuinfo_arm_chipset cpuinfo_arm_android_decode_chipset_from_ro_board_platform(
+	const char ro_board_platform[restrict static CPUINFO_BUILD_PROP_VALUE_MAX],
+	uint32_t cores,
+	uint32_t max_cpu_freq_max);
+CPUINFO_INTERNAL struct cpuinfo_arm_chipset cpuinfo_arm_android_decode_chipset_from_ro_mediatek_platform(
+	const char ro_mediatek_platform[restrict static CPUINFO_BUILD_PROP_VALUE_MAX]);
+CPUINFO_INTERNAL struct cpuinfo_arm_chipset cpuinfo_arm_android_decode_chipset_from_ro_arch(
+	const char ro_arch[restrict static CPUINFO_BUILD_PROP_VALUE_MAX]);
+CPUINFO_INTERNAL struct cpuinfo_arm_chipset cpuinfo_arm_android_decode_chipset_from_ro_chipname(
+	const char ro_chipname[restrict static CPUINFO_BUILD_PROP_VALUE_MAX]);
+CPUINFO_INTERNAL struct cpuinfo_arm_chipset cpuinfo_arm_android_decode_chipset_from_ro_hardware_chipname(
+	const char ro_hardware_chipname[restrict static CPUINFO_BUILD_PROP_VALUE_MAX]);
 #else
-	CPUINFO_INTERNAL struct cpuinfo_arm_chipset
-		cpuinfo_arm_linux_decode_chipset_from_proc_cpuinfo_revision(
-			const char proc_cpuinfo_revision[restrict static CPUINFO_REVISION_VALUE_MAX]);
+CPUINFO_INTERNAL struct cpuinfo_arm_chipset cpuinfo_arm_linux_decode_chipset_from_proc_cpuinfo_revision(
+	const char proc_cpuinfo_revision[restrict static CPUINFO_REVISION_VALUE_MAX]);
 #endif
 
 CPUINFO_INTERNAL bool cpuinfo_arm_linux_detect_core_clusters_by_heuristic(

3rdparty/cpuinfo/src/arm/linux/clusters.c

@@ -1,63 +1,74 @@
-#include <stdint.h>
 #include <stddef.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include <cpuinfo.h>
 #include <arm/linux/api.h>
+#include <cpuinfo.h>
 #if defined(__ANDROID__)
-	#include <arm/android/api.h>
+#include <arm/android/api.h>
 #endif
 #include <arm/api.h>
 #include <arm/midr.h>
-#include <linux/api.h>
 #include <cpuinfo/internal-api.h>
 #include <cpuinfo/log.h>
+#include <linux/api.h>
 
 static inline bool bitmask_all(uint32_t bitfield, uint32_t mask) {
 	return (bitfield & mask) == mask;
 }
 
 /*
- * Assigns logical processors to clusters of cores using heuristic based on the typical configuration of clusters for
- * 5, 6, 8, and 10 cores:
+ * Assigns logical processors to clusters of cores using heuristic based on the
+ * typical configuration of clusters for 5, 6, 8, and 10 cores:
  * - 5 cores (ARM32 Android only): 2 clusters of 4+1 cores
  * - 6 cores: 2 clusters of 4+2 cores
  * - 8 cores: 2 clusters of 4+4 cores
  * - 10 cores: 3 clusters of 4+4+2 cores
  *
- * The function must be called after parsing OS-provided information on core clusters.
- * Its purpose is to detect clusters of cores when OS-provided information is lacking or incomplete, i.e.
- * - Linux kernel is not configured to report information in sysfs topology leaf.
- * - Linux kernel reports topology information only for online cores, and only cores on one cluster are online, e.g.:
- *   - Exynos 8890 has 8 cores in 4+4 clusters, but only the first cluster of 4 cores is reported, and cluster
- *     configuration of logical processors 4-7 is not reported (all remaining processors 4-7 form cluster 1)
- *   - MT6797 has 10 cores in 4+4+2, but only the first cluster of 4 cores is reported, and cluster configuration
- *     of logical processors 4-9 is not reported (processors 4-7 form cluster 1, and processors 8-9 form cluster 2).
+ * The function must be called after parsing OS-provided information on core
+ * clusters. Its purpose is to detect clusters of cores when OS-provided
+ * information is lacking or incomplete, i.e.
+ * - Linux kernel is not configured to report information in sysfs topology
+ * leaf.
+ * - Linux kernel reports topology information only for online cores, and only
+ * cores on one cluster are online, e.g.:
+ *   - Exynos 8890 has 8 cores in 4+4 clusters, but only the first cluster of 4
+ * cores is reported, and cluster configuration of logical processors 4-7 is not
+ * reported (all remaining processors 4-7 form cluster 1)
+ *   - MT6797 has 10 cores in 4+4+2, but only the first cluster of 4 cores is
+ * reported, and cluster configuration of logical processors 4-9 is not reported
+ * (processors 4-7 form cluster 1, and processors 8-9 form cluster 2).
  *
- * Heuristic assignment of processors to the above pre-defined clusters fails if such assignment would contradict
- * information provided by the operating system:
- * - Any of the OS-reported processor clusters is different than the corresponding heuristic cluster.
- * - Processors in a heuristic cluster have no OS-provided cluster siblings information, but have known and different
- *   minimum/maximum frequency.
- * - Processors in a heuristic cluster have no OS-provided cluster siblings information, but have known and different
- *   MIDR components.
+ * Heuristic assignment of processors to the above pre-defined clusters fails if
+ * such assignment would contradict information provided by the operating
+ * system:
+ * - Any of the OS-reported processor clusters is different than the
+ * corresponding heuristic cluster.
+ * - Processors in a heuristic cluster have no OS-provided cluster siblings
+ * information, but have known and different minimum/maximum frequency.
+ * - Processors in a heuristic cluster have no OS-provided cluster siblings
+ * information, but have known and different MIDR components.
  *
- * If the heuristic assignment of processors to clusters of cores fails, all processors' clusters are unchanged.
+ * If the heuristic assignment of processors to clusters of cores fails, all
+ * processors' clusters are unchanged.
  *
- * @param usable_processors - number of processors in the @p processors array with CPUINFO_LINUX_FLAG_VALID flags.
+ * @param usable_processors - number of processors in the @p processors array
+ * with CPUINFO_LINUX_FLAG_VALID flags.
  * @param max_processors - number of elements in the @p processors array.
- * @param[in,out] processors - processor descriptors with pre-parsed POSSIBLE and PRESENT flags, minimum/maximum
- *                             frequency, MIDR information, and core cluster (package siblings list) information.
+ * @param[in,out] processors - processor descriptors with pre-parsed POSSIBLE
+ * and PRESENT flags, minimum/maximum frequency, MIDR information, and core
+ * cluster (package siblings list) information.
  *
- * @retval true if the heuristic successfully assigned all processors into clusters of cores.
- * @retval false if known details about processors contradict the heuristic configuration of core clusters.
+ * @retval true if the heuristic successfully assigned all processors into
+ * clusters of cores.
+ * @retval false if known details about processors contradict the heuristic
+ * configuration of core clusters.
  */
 bool cpuinfo_arm_linux_detect_core_clusters_by_heuristic(
 	uint32_t usable_processors,
 	uint32_t max_processors,
-	struct cpuinfo_arm_linux_processor processors[restrict static max_processors])
-{
+	struct cpuinfo_arm_linux_processor processors[restrict static max_processors]) {
 	uint32_t cluster_processors[3];
 	switch (usable_processors) {
 		case 10:
@@ -76,8 +87,9 @@ bool cpuinfo_arm_linux_detect_core_clusters_by_heuristic(
 #if defined(__ANDROID__) && CPUINFO_ARCH_ARM
 		case 5:
 			/*
-			 * The only processor with 5 cores is Leadcore L1860C (ARMv7, mobile),
-			 * but this configuration is not too unreasonable for a virtualized ARM server.
+			 * The only processor with 5 cores is Leadcore L1860C
+			 * (ARMv7, mobile), but this configuration is not too
+			 * unreasonable for a virtualized ARM server.
 			 */
 			cluster_processors[0] = 4;
 			cluster_processors[1] = 1;
@@ -89,7 +101,8 @@ bool cpuinfo_arm_linux_detect_core_clusters_by_heuristic(
 
 	/*
 	 * Assignment of processors to core clusters is done in two passes:
-	 * 1. Verify that the clusters proposed by heuristic are compatible with known details about processors.
+	 * 1. Verify that the clusters proposed by heuristic are compatible with
+	 * known details about processors.
 	 * 2. If verification passed, update core clusters for the processors.
 	 */
 
@@ -100,16 +113,22 @@ bool cpuinfo_arm_linux_detect_core_clusters_by_heuristic(
 	for (uint32_t i = 0; i < max_processors; i++) {
 		if (bitmask_all(processors[i].flags, CPUINFO_LINUX_FLAG_VALID)) {
 			if (expected_cluster_processors == 0) {
-				/* Expect this processor to start a new cluster */
+				/* Expect this processor to start a new cluster
+				 */
 
 				expected_cluster_exists = !!(processors[i].flags & CPUINFO_LINUX_FLAG_PACKAGE_CLUSTER);
 				if (expected_cluster_exists) {
 					if (processors[i].package_leader_id != i) {
 						cpuinfo_log_debug(
 							"heuristic detection of core clusters failed: "
-							"processor %"PRIu32" is expected to start a new cluster #%"PRIu32" with %"PRIu32" cores, "
-							"but system siblings lists reported it as a sibling of processor %"PRIu32,
-							i, cluster, cluster_processors[cluster], processors[i].package_leader_id);
+							"processor %" PRIu32
+							" is expected to start a new cluster #%" PRIu32 " with %" PRIu32
+							" cores, "
+							"but system siblings lists reported it as a sibling of processor %" PRIu32,
+							i,
+							cluster,
+							cluster_processors[cluster],
+							processors[i].package_leader_id);
 						return false;
 					}
 				} else {
@@ -119,48 +138,73 @@ bool cpuinfo_arm_linux_detect_core_clusters_by_heuristic(
 				cluster_start = i;
 				expected_cluster_processors = cluster_processors[cluster++];
 			} else {
-				/* Expect this processor to belong to the same cluster as processor */
+				/* Expect this processor to belong to the same
+				 * cluster as processor */
 
 				if (expected_cluster_exists) {
 					/*
-					 * The cluster suggested by the heuristic was already parsed from system siblings lists.
-					 * For all processors we expect in the cluster, check that:
-					 * - They have pre-assigned cluster from siblings lists (CPUINFO_LINUX_FLAG_PACKAGE_CLUSTER flag).
-					 * - They were assigned to the same cluster based on siblings lists
-					 *   (package_leader_id points to the first processor in the cluster).
+					 * The cluster suggested by the
+					 * heuristic was already parsed from
+					 * system siblings lists. For all
+					 * processors we expect in the cluster,
+					 * check that:
+					 * - They have pre-assigned cluster from
+					 * siblings lists
+					 * (CPUINFO_LINUX_FLAG_PACKAGE_CLUSTER
+					 * flag).
+					 * - They were assigned to the same
+					 * cluster based on siblings lists
+					 *   (package_leader_id points to the
+					 * first processor in the cluster).
 					 */
 
 					if ((processors[i].flags & CPUINFO_LINUX_FLAG_PACKAGE_CLUSTER) == 0) {
 						cpuinfo_log_debug(
 							"heuristic detection of core clusters failed: "
-							"processor %"PRIu32" is expected to belong to the cluster of processor %"PRIu32", "
-							"but system siblings lists did not report it as a sibling of processor %"PRIu32,
-							i, cluster_start, cluster_start);
+							"processor %" PRIu32
+							" is expected to belong to the cluster of processor %" PRIu32
+							", "
+							"but system siblings lists did not report it as a sibling of processor %" PRIu32,
+							i,
+							cluster_start,
+							cluster_start);
 						return false;
 					}
 					if (processors[i].package_leader_id != cluster_start) {
 						cpuinfo_log_debug(
 							"heuristic detection of core clusters failed: "
-							"processor %"PRIu32" is expected to belong to the cluster of processor %"PRIu32", "
-							"but system siblings lists reported it to belong to the cluster of processor %"PRIu32,
-							i, cluster_start, cluster_start);
+							"processor %" PRIu32
+							" is expected to belong to the cluster of processor %" PRIu32
+							", "
+							"but system siblings lists reported it to belong to the cluster of processor %" PRIu32,
+							i,
+							cluster_start,
+							cluster_start);
 						return false;
 					}
 				} else {
 					/*
-					 * The cluster suggest by the heuristic was not parsed from system siblings lists.
-					 * For all processors we expect in the cluster, check that:
-					 * - They have no pre-assigned cluster from siblings lists.
-					 * - If their min/max CPU frequency is known, it is the same.
-					 * - If any part of their MIDR (Implementer, Variant, Part, Revision) is known, it is the same.
+					 * The cluster suggest by the heuristic
+					 * was not parsed from system siblings
+					 * lists. For all processors we expect
+					 * in the cluster, check that:
+					 * - They have no pre-assigned cluster
+					 * from siblings lists.
+					 * - If their min/max CPU frequency is
+					 * known, it is the same.
+					 * - If any part of their MIDR
+					 * (Implementer, Variant, Part,
+					 * Revision) is known, it is the same.
 					 */
 
 					if (processors[i].flags & CPUINFO_LINUX_FLAG_PACKAGE_CLUSTER) {
 						cpuinfo_log_debug(
 							"heuristic detection of core clusters failed: "
-							"processor %"PRIu32" is expected to be unassigned to any cluster, "
-							"but system siblings lists reported it to belong to the cluster of processor %"PRIu32,
-							i, processors[i].package_leader_id);
+							"processor %" PRIu32
+							" is expected to be unassigned to any cluster, "
+							"but system siblings lists reported it to belong to the cluster of processor %" PRIu32,
+							i,
+							processors[i].package_leader_id);
 						return false;
 					}
 
@@ -169,8 +213,13 @@ bool cpuinfo_arm_linux_detect_core_clusters_by_heuristic(
 							if (cluster_min_frequency != processors[i].min_frequency) {
 								cpuinfo_log_debug(
 									"heuristic detection of core clusters failed: "
-									"minimum frequency of processor %"PRIu32" (%"PRIu32" KHz) is different than of its expected cluster (%"PRIu32" KHz)",
-									i, processors[i].min_frequency, cluster_min_frequency);
+									"minimum frequency of processor %" PRIu32
+									" (%" PRIu32
+									" KHz) is different than of its expected cluster (%" PRIu32
+									" KHz)",
+									i,
+									processors[i].min_frequency,
+									cluster_min_frequency);
 								return false;
 							}
 						} else {
@@ -184,8 +233,13 @@ bool cpuinfo_arm_linux_detect_core_clusters_by_heuristic(
 							if (cluster_max_frequency != processors[i].max_frequency) {
 								cpuinfo_log_debug(
 									"heuristic detection of core clusters failed: "
-									"maximum frequency of processor %"PRIu32" (%"PRIu32" KHz) is different than of its expected cluster (%"PRIu32" KHz)",
-									i, processors[i].max_frequency, cluster_max_frequency);
+									"maximum frequency of processor %" PRIu32
+									" (%" PRIu32
+									" KHz) is different than of its expected cluster (%" PRIu32
+									" KHz)",
+									i,
+									processors[i].max_frequency,
+									cluster_max_frequency);
 								return false;
 							}
 						} else {
@@ -196,41 +250,61 @@ bool cpuinfo_arm_linux_detect_core_clusters_by_heuristic(
 
 					if (processors[i].flags & CPUINFO_ARM_LINUX_VALID_IMPLEMENTER) {
 						if (cluster_flags & CPUINFO_ARM_LINUX_VALID_IMPLEMENTER) {
-							if ((cluster_midr & CPUINFO_ARM_MIDR_IMPLEMENTER_MASK) != (processors[i].midr & CPUINFO_ARM_MIDR_IMPLEMENTER_MASK)) {
+							if ((cluster_midr & CPUINFO_ARM_MIDR_IMPLEMENTER_MASK) !=
+							    (processors[i].midr & CPUINFO_ARM_MIDR_IMPLEMENTER_MASK)) {
 								cpuinfo_log_debug(
 									"heuristic detection of core clusters failed: "
-									"CPU Implementer of processor %"PRIu32" (0x%02"PRIx32") is different than of its expected cluster (0x%02"PRIx32")",
-									i, midr_get_implementer(processors[i].midr), midr_get_implementer(cluster_midr));
+									"CPU Implementer of processor %" PRIu32
+									" (0x%02" PRIx32
+									") is different than of its expected cluster (0x%02" PRIx32
+									")",
+									i,
+									midr_get_implementer(processors[i].midr),
+									midr_get_implementer(cluster_midr));
 								return false;
 							}
 						} else {
-							cluster_midr = midr_copy_implementer(cluster_midr, processors[i].midr);
+							cluster_midr =
+								midr_copy_implementer(cluster_midr, processors[i].midr);
 							cluster_flags |= CPUINFO_ARM_LINUX_VALID_IMPLEMENTER;
 						}
 					}
 
 					if (processors[i].flags & CPUINFO_ARM_LINUX_VALID_VARIANT) {
 						if (cluster_flags & CPUINFO_ARM_LINUX_VALID_VARIANT) {
-							if ((cluster_midr & CPUINFO_ARM_MIDR_VARIANT_MASK) != (processors[i].midr & CPUINFO_ARM_MIDR_VARIANT_MASK)) {
+							if ((cluster_midr & CPUINFO_ARM_MIDR_VARIANT_MASK) !=
+							    (processors[i].midr & CPUINFO_ARM_MIDR_VARIANT_MASK)) {
 								cpuinfo_log_debug(
 									"heuristic detection of core clusters failed: "
-									"CPU Variant of processor %"PRIu32" (0x%"PRIx32") is different than of its expected cluster (0x%"PRIx32")",
-									i, midr_get_variant(processors[i].midr), midr_get_variant(cluster_midr));
+									"CPU Variant of processor %" PRIu32
+									" (0x%" PRIx32
+									") is different than of its expected cluster (0x%" PRIx32
+									")",
+									i,
+									midr_get_variant(processors[i].midr),
+									midr_get_variant(cluster_midr));
 								return false;
 							}
 						} else {
-							cluster_midr = midr_copy_variant(cluster_midr, processors[i].midr);
+							cluster_midr =
+								midr_copy_variant(cluster_midr, processors[i].midr);
 							cluster_flags |= CPUINFO_ARM_LINUX_VALID_VARIANT;
 						}
 					}
 
 					if (processors[i].flags & CPUINFO_ARM_LINUX_VALID_PART) {
 						if (cluster_flags & CPUINFO_ARM_LINUX_VALID_PART) {
-							if ((cluster_midr & CPUINFO_ARM_MIDR_PART_MASK) != (processors[i].midr & CPUINFO_ARM_MIDR_PART_MASK)) {
+							if ((cluster_midr & CPUINFO_ARM_MIDR_PART_MASK) !=
+							    (processors[i].midr & CPUINFO_ARM_MIDR_PART_MASK)) {
 								cpuinfo_log_debug(
 									"heuristic detection of core clusters failed: "
-									"CPU Part of processor %"PRIu32" (0x%03"PRIx32") is different than of its expected cluster (0x%03"PRIx32")",
-									i, midr_get_part(processors[i].midr), midr_get_part(cluster_midr));
+									"CPU Part of processor %" PRIu32
+									" (0x%03" PRIx32
+									") is different than of its expected cluster (0x%03" PRIx32
+									")",
+									i,
+									midr_get_part(processors[i].midr),
+									midr_get_part(cluster_midr));
 								return false;
 							}
 						} else {
@@ -241,15 +315,22 @@ bool cpuinfo_arm_linux_detect_core_clusters_by_heuristic(
 
 					if (processors[i].flags & CPUINFO_ARM_LINUX_VALID_REVISION) {
 						if (cluster_flags & CPUINFO_ARM_LINUX_VALID_REVISION) {
-							if ((cluster_midr & CPUINFO_ARM_MIDR_REVISION_MASK) != (processors[i].midr & CPUINFO_ARM_MIDR_REVISION_MASK)) {
+							if ((cluster_midr & CPUINFO_ARM_MIDR_REVISION_MASK) !=
+							    (processors[i].midr & CPUINFO_ARM_MIDR_REVISION_MASK)) {
 								cpuinfo_log_debug(
 									"heuristic detection of core clusters failed: "
-									"CPU Revision of processor %"PRIu32" (0x%"PRIx32") is different than of its expected cluster (0x%"PRIx32")",
-									i, midr_get_revision(cluster_midr), midr_get_revision(processors[i].midr));
+									"CPU Revision of processor %" PRIu32
+									" (0x%" PRIx32
+									") is different than of its expected cluster (0x%" PRIx32
+									")",
+									i,
+									midr_get_revision(cluster_midr),
+									midr_get_revision(processors[i].midr));
 								return false;
 							}
 						} else {
-							cluster_midr = midr_copy_revision(cluster_midr, processors[i].midr);
+							cluster_midr =
+								midr_copy_revision(cluster_midr, processors[i].midr);
 							cluster_flags |= CPUINFO_ARM_LINUX_VALID_REVISION;
 						}
 					}
@@ -265,16 +346,21 @@ bool cpuinfo_arm_linux_detect_core_clusters_by_heuristic(
 	for (uint32_t i = 0; i < max_processors; i++) {
 		if (bitmask_all(processors[i].flags, CPUINFO_LINUX_FLAG_VALID)) {
 			if (expected_cluster_processors == 0) {
-				/* Expect this processor to start a new cluster */
+				/* Expect this processor to start a new cluster
+				 */
 
 				cluster_start = i;
 				expected_cluster_processors = cluster_processors[cluster++];
 			} else {
-				/* Expect this processor to belong to the same cluster as processor */
+				/* Expect this processor to belong to the same
+				 * cluster as processor */
 
 				if (!(processors[i].flags & CPUINFO_LINUX_FLAG_PACKAGE_CLUSTER)) {
-					cpuinfo_log_debug("assigned processor %"PRIu32" to cluster of processor %"PRIu32" based on heuristic",
-						i, cluster_start);
+					cpuinfo_log_debug(
+						"assigned processor %" PRIu32 " to cluster of processor %" PRIu32
+						" based on heuristic",
+						i,
+						cluster_start);
 				}
 
 				processors[i].package_leader_id = cluster_start;
@@ -291,38 +377,49 @@ bool cpuinfo_arm_linux_detect_core_clusters_by_heuristic(
  * - Clusters detected from OS-provided information are unchanged:
  *   - Processors assigned to these clusters stay assigned to the same clusters
  *   - No new processors are added to these clusters
- * - Processors without pre-assigned cluster are clustered in one sequential scan:
- *   - If known details (min/max frequency, MIDR components) of a processor are compatible with a preceding
- *     processor, without pre-assigned cluster, the processor is assigned to the cluster of the preceding processor.
- *   - If known details (min/max frequency, MIDR components) of a processor are not compatible with a preceding
- *     processor, the processor is assigned to a newly created cluster.
+ * - Processors without pre-assigned cluster are clustered in one sequential
+ * scan:
+ *   - If known details (min/max frequency, MIDR components) of a processor are
+ * compatible with a preceding processor, without pre-assigned cluster, the
+ * processor is assigned to the cluster of the preceding processor.
+ *   - If known details (min/max frequency, MIDR components) of a processor are
+ * not compatible with a preceding processor, the processor is assigned to a
+ * newly created cluster.
  *
- * The function must be called after parsing OS-provided information on core clusters, and usually is called only
- * if heuristic assignment of processors to clusters (cpuinfo_arm_linux_cluster_processors_by_heuristic) failed.
+ * The function must be called after parsing OS-provided information on core
+ * clusters, and usually is called only if heuristic assignment of processors to
+ * clusters (cpuinfo_arm_linux_cluster_processors_by_heuristic) failed.
  *
- * Its purpose is to detect clusters of cores when OS-provided information is lacking or incomplete, i.e.
- * - Linux kernel is not configured to report information in sysfs topology leaf.
- * - Linux kernel reports topology information only for online cores, and all cores on some of the clusters are offline.
+ * Its purpose is to detect clusters of cores when OS-provided information is
+ * lacking or incomplete, i.e.
+ * - Linux kernel is not configured to report information in sysfs topology
+ * leaf.
+ * - Linux kernel reports topology information only for online cores, and all
+ * cores on some of the clusters are offline.
  *
- * Sequential assignment of processors to clusters always succeeds, and upon exit, all usable processors in the
+ * Sequential assignment of processors to clusters always succeeds, and upon
+ * exit, all usable processors in the
  * @p processors array have cluster information.
  *
  * @param max_processors - number of elements in the @p processors array.
- * @param[in,out] processors - processor descriptors with pre-parsed POSSIBLE and PRESENT flags, minimum/maximum
- *                             frequency, MIDR information, and core cluster (package siblings list) information.
+ * @param[in,out] processors - processor descriptors with pre-parsed POSSIBLE
+ * and PRESENT flags, minimum/maximum frequency, MIDR information, and core
+ * cluster (package siblings list) information.
  *
- * @retval true if the heuristic successfully assigned all processors into clusters of cores.
- * @retval false if known details about processors contradict the heuristic configuration of core clusters.
+ * @retval true if the heuristic successfully assigned all processors into
+ * clusters of cores.
+ * @retval false if known details about processors contradict the heuristic
+ * configuration of core clusters.
  */
 void cpuinfo_arm_linux_detect_core_clusters_by_sequential_scan(
 	uint32_t max_processors,
-	struct cpuinfo_arm_linux_processor processors[restrict static max_processors])
-{
+	struct cpuinfo_arm_linux_processor processors[restrict static max_processors]) {
 	uint32_t cluster_flags = 0;
 	uint32_t cluster_processors = 0;
 	uint32_t cluster_start, cluster_midr, cluster_max_frequency, cluster_min_frequency;
 	for (uint32_t i = 0; i < max_processors; i++) {
-		if ((processors[i].flags & (CPUINFO_LINUX_FLAG_VALID | CPUINFO_LINUX_FLAG_PACKAGE_CLUSTER)) == CPUINFO_LINUX_FLAG_VALID) {
+		if ((processors[i].flags & (CPUINFO_LINUX_FLAG_VALID | CPUINFO_LINUX_FLAG_PACKAGE_CLUSTER)) ==
+		    CPUINFO_LINUX_FLAG_VALID) {
 			if (cluster_processors == 0) {
 				goto new_cluster;
 			}
@@ -331,9 +428,14 @@ void cpuinfo_arm_linux_detect_core_clusters_by_sequential_scan(
 				if (cluster_flags & CPUINFO_LINUX_FLAG_MIN_FREQUENCY) {
 					if (cluster_min_frequency != processors[i].min_frequency) {
 						cpuinfo_log_info(
-							"minimum frequency of processor %"PRIu32" (%"PRIu32" KHz) is different than of preceding cluster (%"PRIu32" KHz); "
-							"processor %"PRIu32" starts to a new cluster",
-							i, processors[i].min_frequency, cluster_min_frequency, i);
+							"minimum frequency of processor %" PRIu32 " (%" PRIu32
+							" KHz) is different than of preceding cluster (%" PRIu32
+							" KHz); "
+							"processor %" PRIu32 " starts to a new cluster",
+							i,
+							processors[i].min_frequency,
+							cluster_min_frequency,
+							i);
 						goto new_cluster;
 					}
 				} else {
@@ -346,9 +448,14 @@ void cpuinfo_arm_linux_detect_core_clusters_by_sequential_scan(
 				if (cluster_flags & CPUINFO_LINUX_FLAG_MAX_FREQUENCY) {
 					if (cluster_max_frequency != processors[i].max_frequency) {
 						cpuinfo_log_debug(
-							"maximum frequency of processor %"PRIu32" (%"PRIu32" KHz) is different than of preceding cluster (%"PRIu32" KHz); "
-							"processor %"PRIu32" starts a new cluster",
-							i, processors[i].max_frequency, cluster_max_frequency, i);
+							"maximum frequency of processor %" PRIu32 " (%" PRIu32
+							" KHz) is different than of preceding cluster (%" PRIu32
+							" KHz); "
+							"processor %" PRIu32 " starts a new cluster",
+							i,
+							processors[i].max_frequency,
+							cluster_max_frequency,
+							i);
 						goto new_cluster;
 					}
 				} else {
@@ -359,11 +466,17 @@ void cpuinfo_arm_linux_detect_core_clusters_by_sequential_scan(
 
 			if (processors[i].flags & CPUINFO_ARM_LINUX_VALID_IMPLEMENTER) {
 				if (cluster_flags & CPUINFO_ARM_LINUX_VALID_IMPLEMENTER) {
-					if ((cluster_midr & CPUINFO_ARM_MIDR_IMPLEMENTER_MASK) != (processors[i].midr & CPUINFO_ARM_MIDR_IMPLEMENTER_MASK)) {
+					if ((cluster_midr & CPUINFO_ARM_MIDR_IMPLEMENTER_MASK) !=
+					    (processors[i].midr & CPUINFO_ARM_MIDR_IMPLEMENTER_MASK)) {
 						cpuinfo_log_debug(
-							"CPU Implementer of processor %"PRIu32" (0x%02"PRIx32") is different than of preceding cluster (0x%02"PRIx32"); "
-							"processor %"PRIu32" starts to a new cluster",
-							i, midr_get_implementer(processors[i].midr), midr_get_implementer(cluster_midr), i);
+							"CPU Implementer of processor %" PRIu32 " (0x%02" PRIx32
+							") is different than of preceding cluster (0x%02" PRIx32
+							"); "
+							"processor %" PRIu32 " starts to a new cluster",
+							i,
+							midr_get_implementer(processors[i].midr),
+							midr_get_implementer(cluster_midr),
+							i);
 						goto new_cluster;
 					}
 				} else {
@@ -374,11 +487,17 @@ void cpuinfo_arm_linux_detect_core_clusters_by_sequential_scan(
 
 			if (processors[i].flags & CPUINFO_ARM_LINUX_VALID_VARIANT) {
 				if (cluster_flags & CPUINFO_ARM_LINUX_VALID_VARIANT) {
-					if ((cluster_midr & CPUINFO_ARM_MIDR_VARIANT_MASK) != (processors[i].midr & CPUINFO_ARM_MIDR_VARIANT_MASK)) {
+					if ((cluster_midr & CPUINFO_ARM_MIDR_VARIANT_MASK) !=
+					    (processors[i].midr & CPUINFO_ARM_MIDR_VARIANT_MASK)) {
 						cpuinfo_log_debug(
-							"CPU Variant of processor %"PRIu32" (0x%"PRIx32") is different than of its expected cluster (0x%"PRIx32")"
-							"processor %"PRIu32" starts to a new cluster",
-							i, midr_get_variant(processors[i].midr), midr_get_variant(cluster_midr), i);
+							"CPU Variant of processor %" PRIu32 " (0x%" PRIx32
+							") is different than of its expected cluster (0x%" PRIx32
+							")"
+							"processor %" PRIu32 " starts to a new cluster",
+							i,
+							midr_get_variant(processors[i].midr),
+							midr_get_variant(cluster_midr),
+							i);
 						goto new_cluster;
 					}
 				} else {
@@ -389,11 +508,17 @@ void cpuinfo_arm_linux_detect_core_clusters_by_sequential_scan(
 
 			if (processors[i].flags & CPUINFO_ARM_LINUX_VALID_PART) {
 				if (cluster_flags & CPUINFO_ARM_LINUX_VALID_PART) {
-					if ((cluster_midr & CPUINFO_ARM_MIDR_PART_MASK) != (processors[i].midr & CPUINFO_ARM_MIDR_PART_MASK)) {
+					if ((cluster_midr & CPUINFO_ARM_MIDR_PART_MASK) !=
+					    (processors[i].midr & CPUINFO_ARM_MIDR_PART_MASK)) {
 						cpuinfo_log_debug(
-							"CPU Part of processor %"PRIu32" (0x%03"PRIx32") is different than of its expected cluster (0x%03"PRIx32")"
-							"processor %"PRIu32" starts to a new cluster",
-							i, midr_get_part(processors[i].midr), midr_get_part(cluster_midr), i);
+							"CPU Part of processor %" PRIu32 " (0x%03" PRIx32
+							") is different than of its expected cluster (0x%03" PRIx32
+							")"
+							"processor %" PRIu32 " starts to a new cluster",
+							i,
+							midr_get_part(processors[i].midr),
+							midr_get_part(cluster_midr),
+							i);
 						goto new_cluster;
 					}
 				} else {
@@ -404,11 +529,17 @@ void cpuinfo_arm_linux_detect_core_clusters_by_sequential_scan(
 
 			if (processors[i].flags & CPUINFO_ARM_LINUX_VALID_REVISION) {
 				if (cluster_flags & CPUINFO_ARM_LINUX_VALID_REVISION) {
-					if ((cluster_midr & CPUINFO_ARM_MIDR_REVISION_MASK) != (processors[i].midr & CPUINFO_ARM_MIDR_REVISION_MASK)) {
+					if ((cluster_midr & CPUINFO_ARM_MIDR_REVISION_MASK) !=
+					    (processors[i].midr & CPUINFO_ARM_MIDR_REVISION_MASK)) {
 						cpuinfo_log_debug(
-							"CPU Revision of processor %"PRIu32" (0x%"PRIx32") is different than of its expected cluster (0x%"PRIx32")"
-							"processor %"PRIu32" starts to a new cluster",
-							i, midr_get_revision(cluster_midr), midr_get_revision(processors[i].midr), i);
+							"CPU Revision of processor %" PRIu32 " (0x%" PRIx32
+							") is different than of its expected cluster (0x%" PRIx32
+							")"
+							"processor %" PRIu32 " starts to a new cluster",
+							i,
+							midr_get_revision(cluster_midr),
+							midr_get_revision(processors[i].midr),
+							i);
 						goto new_cluster;
 					}
 				} else {
@@ -417,21 +548,26 @@ void cpuinfo_arm_linux_detect_core_clusters_by_sequential_scan(
 				}
 			}
 
-			/* All checks passed, attach processor to the preceding cluster */
+			/* All checks passed, attach processor to the preceding
+			 * cluster */
 			cluster_processors++;
 			processors[i].package_leader_id = cluster_start;
 			processors[i].flags |= CPUINFO_LINUX_FLAG_PACKAGE_CLUSTER;
-			cpuinfo_log_debug("assigned processor %"PRIu32" to preceding cluster of processor %"PRIu32, i, cluster_start);
+			cpuinfo_log_debug(
+				"assigned processor %" PRIu32 " to preceding cluster of processor %" PRIu32,
+				i,
+				cluster_start);
 			continue;
 
-new_cluster:
+		new_cluster:
 			/* Create a new cluster starting with processor i */
 			cluster_start = i;
 			processors[i].package_leader_id = i;
 			processors[i].flags |= CPUINFO_LINUX_FLAG_PACKAGE_CLUSTER;
 			cluster_processors = 1;
 
-			/* Copy known information from processor to cluster, and set the flags accordingly */
+			/* Copy known information from processor to cluster, and
+			 * set the flags accordingly */
 			cluster_flags = 0;
 			if (processors[i].flags & CPUINFO_LINUX_FLAG_MIN_FREQUENCY) {
 				cluster_min_frequency = processors[i].min_frequency;
@@ -463,27 +599,30 @@ new_cluster:
 
 /*
  * Counts the number of logical processors in each core cluster.
- * This function should be called after all processors are assigned to core clusters.
+ * This function should be called after all processors are assigned to core
+ * clusters.
  *
  * @param max_processors - number of elements in the @p processors array.
- * @param[in,out] processors - processor descriptors with pre-parsed POSSIBLE and PRESENT flags,
- *                             and decoded core cluster (package_leader_id) information.
- *                             The function expects the value of processors[i].package_processor_count to be zero.
- *                             Upon return, processors[i].package_processor_count will contain the number of logical
+ * @param[in,out] processors - processor descriptors with pre-parsed POSSIBLE
+ * and PRESENT flags, and decoded core cluster (package_leader_id) information.
+ *                             The function expects the value of
+ * processors[i].package_processor_count to be zero. Upon return,
+ * processors[i].package_processor_count will contain the number of logical
  *                             processors in the respective core cluster.
  */
 void cpuinfo_arm_linux_count_cluster_processors(
 	uint32_t max_processors,
-	struct cpuinfo_arm_linux_processor processors[restrict static max_processors])
-{
-	/* First pass: accumulate the number of processors at the group leader's package_processor_count */
+	struct cpuinfo_arm_linux_processor processors[restrict static max_processors]) {
+	/* First pass: accumulate the number of processors at the group leader's
+	 * package_processor_count */
 	for (uint32_t i = 0; i < max_processors; i++) {
 		if (bitmask_all(processors[i].flags, CPUINFO_LINUX_FLAG_VALID)) {
 			const uint32_t package_leader_id = processors[i].package_leader_id;
 			processors[package_leader_id].package_processor_count += 1;
 		}
 	}
-	/* Second pass: copy the package_processor_count from the group leader processor */
+	/* Second pass: copy the package_processor_count from the group leader
+	 * processor */
 	for (uint32_t i = 0; i < max_processors; i++) {
 		if (bitmask_all(processors[i].flags, CPUINFO_LINUX_FLAG_VALID)) {
 			const uint32_t package_leader_id = processors[i].package_leader_id;

3rdparty/cpuinfo/src/arm/linux/cp.h

@@ -1,50 +1,49 @@
 #include <stdint.h>
 
-
 #if CPUINFO_MOCK
-	extern uint32_t cpuinfo_arm_fpsid;
-	extern uint32_t cpuinfo_arm_mvfr0;
-	extern uint32_t cpuinfo_arm_wcid;
+extern uint32_t cpuinfo_arm_fpsid;
+extern uint32_t cpuinfo_arm_mvfr0;
+extern uint32_t cpuinfo_arm_wcid;
 
-	static inline uint32_t read_fpsid(void) {
-		return cpuinfo_arm_fpsid;
-	}
+static inline uint32_t read_fpsid(void) {
+	return cpuinfo_arm_fpsid;
+}
 
-	static inline uint32_t read_mvfr0(void) {
-		return cpuinfo_arm_mvfr0;
-	}
+static inline uint32_t read_mvfr0(void) {
+	return cpuinfo_arm_mvfr0;
+}
 
-	static inline uint32_t read_wcid(void) {
-		return cpuinfo_arm_wcid;
-	}
+static inline uint32_t read_wcid(void) {
+	return cpuinfo_arm_wcid;
+}
 #else
-	#if !defined(__ARM_ARCH_7A__) && !defined(__ARM_ARCH_8A__) && !(defined(__ARM_ARCH) && (__ARM_ARCH >= 7))
-		/*
-		 * CoProcessor 10 is inaccessible from user mode since ARMv7,
-		 * and clang refuses to compile inline assembly when targeting ARMv7+
-		 */
-		static inline uint32_t read_fpsid(void) {
-			uint32_t fpsid;
-			__asm__ __volatile__("MRC p10, 0x7, %[fpsid], cr0, cr0, 0" : [fpsid] "=r" (fpsid));
-			return fpsid;
-		}
+#if !defined(__ARM_ARCH_7A__) && !defined(__ARM_ARCH_8A__) && !(defined(__ARM_ARCH) && (__ARM_ARCH >= 7))
+/*
+ * CoProcessor 10 is inaccessible from user mode since ARMv7,
+ * and clang refuses to compile inline assembly when targeting ARMv7+
+ */
+static inline uint32_t read_fpsid(void) {
+	uint32_t fpsid;
+	__asm__ __volatile__("MRC p10, 0x7, %[fpsid], cr0, cr0, 0" : [fpsid] "=r"(fpsid));
+	return fpsid;
+}
 
-		static inline uint32_t read_mvfr0(void) {
-			uint32_t mvfr0;
-			__asm__ __volatile__("MRC p10, 0x7, %[mvfr0], cr7, cr0, 0" : [mvfr0] "=r" (mvfr0));
-			return mvfr0;
-		}
-	#endif
-	#if !defined(__ARM_ARCH_8A__) && !(defined(__ARM_ARCH) && (__ARM_ARCH >= 8))
-		/*
-		 * In ARMv8, AArch32 state supports only conceptual coprocessors CP10, CP11, CP14, and CP15.
-		 * AArch64 does not support the concept of coprocessors.
-		 * and clang refuses to compile inline assembly when targeting ARMv8+
-		 */
-		static inline uint32_t read_wcid(void) {
-			uint32_t wcid;
-			__asm__ __volatile__("MRC p1, 0, %[wcid], c0, c0" : [wcid] "=r" (wcid));
-			return wcid;
-		}
-	#endif
+static inline uint32_t read_mvfr0(void) {
+	uint32_t mvfr0;
+	__asm__ __volatile__("MRC p10, 0x7, %[mvfr0], cr7, cr0, 0" : [mvfr0] "=r"(mvfr0));
+	return mvfr0;
+}
+#endif
+#if !defined(__ARM_ARCH_8A__) && !(defined(__ARM_ARCH) && (__ARM_ARCH >= 8))
+/*
+ * In ARMv8, AArch32 state supports only conceptual coprocessors CP10, CP11,
+ * CP14, and CP15. AArch64 does not support the concept of coprocessors. and
+ * clang refuses to compile inline assembly when targeting ARMv8+
+ */
+static inline uint32_t read_wcid(void) {
+	uint32_t wcid;
+	__asm__ __volatile__("MRC p1, 0, %[wcid], c0, c0" : [wcid] "=r"(wcid));
+	return wcid;
+}
+#endif
 #endif

3rdparty/cpuinfo/src/arm/linux/cpuinfo.c

@@ -1,26 +1,22 @@
 #include <stdbool.h>
+#include <stddef.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <stddef.h>
 #include <string.h>
 
-#include <linux/api.h>
 #include <arm/linux/api.h>
 #include <arm/midr.h>
 #include <cpuinfo/log.h>
+#include <linux/api.h>
 
 /*
- * Size, in chars, of the on-stack buffer used for parsing lines of /proc/cpuinfo.
- * This is also the limit on the length of a single line.
+ * Size, in chars, of the on-stack buffer used for parsing lines of
+ * /proc/cpuinfo. This is also the limit on the length of a single line.
  */
 #define BUFFER_SIZE 1024
 
-
-static uint32_t parse_processor_number(
-	const char* processor_start,
-	const char* processor_end)
-{
-	const size_t processor_length = (size_t) (processor_end - processor_start);
+static uint32_t parse_processor_number(const char* processor_start, const char* processor_end) {
+	const size_t processor_length = (size_t)(processor_end - processor_start);
 
 	if (processor_length == 0) {
 		cpuinfo_log_warning("Processor number in /proc/cpuinfo is ignored: string is empty");
@@ -29,10 +25,12 @@ static uint32_t parse_processor_number(
 
 	uint32_t processor_number = 0;
 	for (const char* digit_ptr = processor_start; digit_ptr != processor_end; digit_ptr++) {
-		const uint32_t digit = (uint32_t) (*digit_ptr - '0');
+		const uint32_t digit = (uint32_t)(*digit_ptr - '0');
 		if (digit > 10) {
-			cpuinfo_log_warning("non-decimal suffix %.*s in /proc/cpuinfo processor number is ignored",
-				(int) (processor_end - digit_ptr), digit_ptr);
+			cpuinfo_log_warning(
+				"non-decimal suffix %.*s in /proc/cpuinfo processor number is ignored",
+				(int)(processor_end - digit_ptr),
+				digit_ptr);
 			break;
 		}
 
@@ -45,42 +43,48 @@ static uint32_t parse_processor_number(
 /*
  *	Full list of ARM features reported in /proc/cpuinfo:
  *
- *	* swp - support for SWP instruction (deprecated in ARMv7, can be removed in future)
- *	* half - support for half-word loads and stores. These instruction are part of ARMv4,
- *	         so no need to check it on supported CPUs.
- *	* thumb - support for 16-bit Thumb instruction set. Note that BX instruction is detected
- *	          by ARMv4T architecture, not by this flag.
- *	* 26bit - old CPUs merged 26-bit PC and program status register (flags) into 32-bit PC
- *	          and had special instructions for working with packed PC. Now it is all deprecated.
- *	* fastmult - most old ARM CPUs could only compute 2 bits of multiplication result per clock
- *	             cycle, but CPUs with M suffix (e.g. ARM7TDMI) could compute 4 bits per cycle.
- *	             Of course, now it makes no sense.
- *	* fpa - floating point accelerator available. On original ARM ABI all floating-point operations
- *	        generated FPA instructions. If FPA was not available, these instructions generated
- *	        "illegal operation" interrupts, and the OS processed them by emulating the FPA instructions.
- *	        Debian used this ABI before it switched to EABI. Now FPA is deprecated.
- *	* vfp - vector floating point instructions. Available on most modern CPUs (as part of VFPv3).
- *	        Required by Android ARMv7A ABI and by Ubuntu on ARM.
+ *	* swp - support for SWP instruction (deprecated in ARMv7, can be removed
+ *in future)
+ *	* half - support for half-word loads and stores. These instruction are
+ *part of ARMv4, so no need to check it on supported CPUs.
+ *	* thumb - support for 16-bit Thumb instruction set. Note that BX
+ *instruction is detected by ARMv4T architecture, not by this flag.
+ *	* 26bit - old CPUs merged 26-bit PC and program status register (flags)
+ *into 32-bit PC and had special instructions for working with packed PC. Now it
+ *is all deprecated.
+ *	* fastmult - most old ARM CPUs could only compute 2 bits of
+ *multiplication result per clock cycle, but CPUs with M suffix (e.g. ARM7TDMI)
+ *could compute 4 bits per cycle. Of course, now it makes no sense.
+ *	* fpa - floating point accelerator available. On original ARM ABI all
+ *floating-point operations generated FPA instructions. If FPA was not
+ *available, these instructions generated "illegal operation" interrupts, and
+ *the OS processed them by emulating the FPA instructions. Debian used this ABI
+ *before it switched to EABI. Now FPA is deprecated.
+ *	* vfp - vector floating point instructions. Available on most modern
+ *CPUs (as part of VFPv3). Required by Android ARMv7A ABI and by Ubuntu on ARM.
  *              Note: there is no flag for VFPv2.
- *	* edsp - V5E instructions: saturating add/sub and 16-bit x 16-bit -> 32/64-bit multiplications.
- *	         Required on Android, supported by all CPUs in production.
+ *	* edsp - V5E instructions: saturating add/sub and 16-bit x 16-bit ->
+ *32/64-bit multiplications. Required on Android, supported by all CPUs in
+ *production.
  *	* java - Jazelle extension. Supported on most CPUs.
  *	* iwmmxt - Intel/Marvell Wireless MMX instructions. 64-bit integer SIMD.
- *	           Supported on XScale (Since PXA270) and Sheeva (PJ1, PJ4) architectures.
- *	           Note that there is no flag for WMMX2 instructions.
+ *	           Supported on XScale (Since PXA270) and Sheeva (PJ1, PJ4)
+ *architectures. Note that there is no flag for WMMX2 instructions.
  *	* crunch - Maverick Crunch instructions. Junk.
  *	* thumbee - ThumbEE instructions. Almost no documentation is available.
- *	* neon - NEON instructions (aka Advanced SIMD). MVFR1 register gives more
- *	         fine-grained information on particular supported features, but
- *	         the Linux kernel exports only a single flag for all of them.
- *	         According to ARMv7A docs it also implies the availability of VFPv3
- *	         (with 32 double-precision registers d0-d31).
- *	* vfpv3 - VFPv3 instructions. Available on most modern CPUs. Augment VFPv2 by
- *	          conversion to/from integers and load constant instructions.
- *	          Required by Android ARMv7A ABI and by Ubuntu on ARM.
- *	* vfpv3d16 - VFPv3 instructions with only 16 double-precision registers (d0-d15).
+ *	* neon - NEON instructions (aka Advanced SIMD). MVFR1 register gives
+ *more fine-grained information on particular supported features, but the Linux
+ *kernel exports only a single flag for all of them. According to ARMv7A docs it
+ *also implies the availability of VFPv3 (with 32 double-precision registers
+ *d0-d31).
+ *	* vfpv3 - VFPv3 instructions. Available on most modern CPUs. Augment
+ *VFPv2 by conversion to/from integers and load constant instructions. Required
+ *by Android ARMv7A ABI and by Ubuntu on ARM.
+ *	* vfpv3d16 - VFPv3 instructions with only 16 double-precision registers
+ *(d0-d15).
  *	* tls - software thread ID registers.
- *	        Used by kernel (and likely libc) for efficient implementation of TLS.
+ *	        Used by kernel (and likely libc) for efficient implementation of
+ *TLS.
  *	* vfpv4 - fused multiply-add instructions.
  *	* idiva - DIV instructions available in ARM mode.
  *	* idivt - DIV instructions available in Thumb mode.
@@ -93,15 +97,15 @@ static uint32_t parse_processor_number(
  *  * sha2 - SHA2 instructions.
  *  * crc32 - CRC32 instructions.
  *
- *	/proc/cpuinfo on ARM is populated in file arch/arm/kernel/setup.c in Linux kernel
- *	Note that some devices may use patched Linux kernels with different feature names.
- *	However, the names above were checked on a large number of /proc/cpuinfo listings.
+ *	/proc/cpuinfo on ARM is populated in file arch/arm/kernel/setup.c in
+ *Linux kernel Note that some devices may use patched Linux kernels with
+ *different feature names. However, the names above were checked on a large
+ *number of /proc/cpuinfo listings.
  */
 static void parse_features(
 	const char* features_start,
 	const char* features_end,
-	struct cpuinfo_arm_linux_processor processor[restrict static 1])
-{
+	struct cpuinfo_arm_linux_processor processor[restrict static 1]) {
 	const char* feature_start = features_start;
 	const char* feature_end;
 
@@ -115,7 +119,7 @@ static void parse_features(
 				break;
 			}
 		}
-		const size_t feature_length = (size_t) (feature_end - feature_start);
+		const size_t feature_length = (size_t)(feature_end - feature_start);
 
 		switch (feature_length) {
 			case 2:
@@ -126,8 +130,9 @@ static void parse_features(
 #if CPUINFO_ARCH_ARM
 				} else if (memcmp(feature_start, "wp", feature_length) == 0) {
 					/*
-					 * Some AArch64 kernels, including the one on Nexus 5X,
-					 * erroneously report "swp" as "wp" to AArch32 programs
+					 * Some AArch64 kernels, including the
+					 * one on Nexus 5X, erroneously report
+					 * "swp" as "wp" to AArch32 programs
 					 */
 					processor->features |= CPUINFO_ARM_LINUX_FEATURE_SWP;
 #endif
@@ -137,11 +142,11 @@ static void parse_features(
 				break;
 			case 3:
 				if (memcmp(feature_start, "aes", feature_length) == 0) {
-					#if CPUINFO_ARCH_ARM
-						processor->features2 |= CPUINFO_ARM_LINUX_FEATURE2_AES;
-					#elif CPUINFO_ARCH_ARM64
-						processor->features |= CPUINFO_ARM_LINUX_FEATURE_AES;
-					#endif
+#if CPUINFO_ARCH_ARM
+					processor->features2 |= CPUINFO_ARM_LINUX_FEATURE2_AES;
+#elif CPUINFO_ARCH_ARM64
+					processor->features |= CPUINFO_ARM_LINUX_FEATURE_AES;
+#endif
 #if CPUINFO_ARCH_ARM
 				} else if (memcmp(feature_start, "swp", feature_length) == 0) {
 					processor->features |= CPUINFO_ARM_LINUX_FEATURE_SWP;
@@ -158,29 +163,29 @@ static void parse_features(
 				break;
 			case 4:
 				if (memcmp(feature_start, "sha1", feature_length) == 0) {
-					#if CPUINFO_ARCH_ARM
-						processor->features2 |= CPUINFO_ARM_LINUX_FEATURE2_SHA1;
-					#elif CPUINFO_ARCH_ARM64
-						processor->features |= CPUINFO_ARM_LINUX_FEATURE_SHA1;
-					#endif
+#if CPUINFO_ARCH_ARM
+					processor->features2 |= CPUINFO_ARM_LINUX_FEATURE2_SHA1;
+#elif CPUINFO_ARCH_ARM64
+					processor->features |= CPUINFO_ARM_LINUX_FEATURE_SHA1;
+#endif
 				} else if (memcmp(feature_start, "sha2", feature_length) == 0) {
-					#if CPUINFO_ARCH_ARM
-						processor->features2 |= CPUINFO_ARM_LINUX_FEATURE2_SHA2;
-					#elif CPUINFO_ARCH_ARM64
-						processor->features |= CPUINFO_ARM_LINUX_FEATURE_SHA2;
-					#endif
+#if CPUINFO_ARCH_ARM
+					processor->features2 |= CPUINFO_ARM_LINUX_FEATURE2_SHA2;
+#elif CPUINFO_ARCH_ARM64
+					processor->features |= CPUINFO_ARM_LINUX_FEATURE_SHA2;
+#endif
 				} else if (memcmp(feature_start, "fphp", feature_length) == 0) {
-					#if CPUINFO_ARCH_ARM64
-						processor->features |= CPUINFO_ARM_LINUX_FEATURE_FPHP;
-					#endif
+#if CPUINFO_ARCH_ARM64
+					processor->features |= CPUINFO_ARM_LINUX_FEATURE_FPHP;
+#endif
 				} else if (memcmp(feature_start, "fcma", feature_length) == 0) {
-					#if CPUINFO_ARCH_ARM64
-						processor->features |= CPUINFO_ARM_LINUX_FEATURE_FCMA;
-					#endif
+#if CPUINFO_ARCH_ARM64
+					processor->features |= CPUINFO_ARM_LINUX_FEATURE_FCMA;
+#endif
 				} else if (memcmp(feature_start, "i8mm", feature_length) == 0) {
-					#if CPUINFO_ARCH_ARM64
-						processor->features2 |= CPUINFO_ARM_LINUX_FEATURE2_I8MM;
-					#endif
+#if CPUINFO_ARCH_ARM64
+					processor->features2 |= CPUINFO_ARM_LINUX_FEATURE2_I8MM;
+#endif
 #if CPUINFO_ARCH_ARM
 				} else if (memcmp(feature_start, "half", feature_length) == 0) {
 					processor->features |= CPUINFO_ARM_LINUX_FEATURE_HALF;
@@ -194,8 +199,9 @@ static void parse_features(
 					processor->features |= CPUINFO_ARM_LINUX_FEATURE_LPAE;
 				} else if (memcmp(feature_start, "tlsi", feature_length) == 0) {
 					/*
-					 * Some AArch64 kernels, including the one on Nexus 5X,
-					 * erroneously report "tls" as "tlsi" to AArch32 programs
+					 * Some AArch64 kernels, including the
+					 * one on Nexus 5X, erroneously report
+					 * "tls" as "tlsi" to AArch32 programs
 					 */
 					processor->features |= CPUINFO_ARM_LINUX_FEATURE_TLS;
 #endif /* CPUINFO_ARCH_ARM */
@@ -205,33 +211,33 @@ static void parse_features(
 				break;
 			case 5:
 				if (memcmp(feature_start, "pmull", feature_length) == 0) {
-					#if CPUINFO_ARCH_ARM
-						processor->features2 |= CPUINFO_ARM_LINUX_FEATURE2_PMULL;
-					#elif CPUINFO_ARCH_ARM64
-						processor->features |= CPUINFO_ARM_LINUX_FEATURE_PMULL;
-					#endif
+#if CPUINFO_ARCH_ARM
+					processor->features2 |= CPUINFO_ARM_LINUX_FEATURE2_PMULL;
+#elif CPUINFO_ARCH_ARM64
+					processor->features |= CPUINFO_ARM_LINUX_FEATURE_PMULL;
+#endif
 				} else if (memcmp(feature_start, "crc32", feature_length) == 0) {
-					#if CPUINFO_ARCH_ARM
-						processor->features2 |= CPUINFO_ARM_LINUX_FEATURE2_CRC32;
-					#elif CPUINFO_ARCH_ARM64
-						processor->features |= CPUINFO_ARM_LINUX_FEATURE_CRC32;
-					#endif
+#if CPUINFO_ARCH_ARM
+					processor->features2 |= CPUINFO_ARM_LINUX_FEATURE2_CRC32;
+#elif CPUINFO_ARCH_ARM64
+					processor->features |= CPUINFO_ARM_LINUX_FEATURE_CRC32;
+#endif
 				} else if (memcmp(feature_start, "asimd", feature_length) == 0) {
-					#if CPUINFO_ARCH_ARM64
-						processor->features |= CPUINFO_ARM_LINUX_FEATURE_ASIMD;
-					#endif
+#if CPUINFO_ARCH_ARM64
+					processor->features |= CPUINFO_ARM_LINUX_FEATURE_ASIMD;
+#endif
 				} else if (memcmp(feature_start, "cpuid", feature_length) == 0) {
-					#if CPUINFO_ARCH_ARM64
-						processor->features |= CPUINFO_ARM_LINUX_FEATURE_CPUID;
-					#endif
+#if CPUINFO_ARCH_ARM64
+					processor->features |= CPUINFO_ARM_LINUX_FEATURE_CPUID;
+#endif
 				} else if (memcmp(feature_start, "jscvt", feature_length) == 0) {
-					#if CPUINFO_ARCH_ARM64
-						processor->features |= CPUINFO_ARM_LINUX_FEATURE_JSCVT;
-					#endif
+#if CPUINFO_ARCH_ARM64
+					processor->features |= CPUINFO_ARM_LINUX_FEATURE_JSCVT;
+#endif
 				} else if (memcmp(feature_start, "lrcpc", feature_length) == 0) {
-					#if CPUINFO_ARCH_ARM64
-						processor->features |= CPUINFO_ARM_LINUX_FEATURE_LRCPC;
-					#endif
+#if CPUINFO_ARCH_ARM64
+					processor->features |= CPUINFO_ARM_LINUX_FEATURE_LRCPC;
+#endif
 #if CPUINFO_ARCH_ARM
 				} else if (memcmp(feature_start, "thumb", feature_length) == 0) {
 					processor->features |= CPUINFO_ARM_LINUX_FEATURE_THUMB;
@@ -249,7 +255,7 @@ static void parse_features(
 				} else {
 					goto unexpected;
 				}
- 				break;
+				break;
 #if CPUINFO_ARCH_ARM
 			case 6:
 				if (memcmp(feature_start, "iwmmxt", feature_length) == 0) {
@@ -267,13 +273,13 @@ static void parse_features(
 				if (memcmp(feature_start, "evtstrm", feature_length) == 0) {
 					processor->features |= CPUINFO_ARM_LINUX_FEATURE_EVTSTRM;
 				} else if (memcmp(feature_start, "atomics", feature_length) == 0) {
-					#if CPUINFO_ARCH_ARM64
-						processor->features |= CPUINFO_ARM_LINUX_FEATURE_ATOMICS;
-					#endif
+#if CPUINFO_ARCH_ARM64
+					processor->features |= CPUINFO_ARM_LINUX_FEATURE_ATOMICS;
+#endif
 				} else if (memcmp(feature_start, "asimdhp", feature_length) == 0) {
-					#if CPUINFO_ARCH_ARM64
-						processor->features |= CPUINFO_ARM_LINUX_FEATURE_ASIMDHP;
-					#endif
+#if CPUINFO_ARCH_ARM64
+					processor->features |= CPUINFO_ARM_LINUX_FEATURE_ASIMDHP;
+#endif
 #if CPUINFO_ARCH_ARM
 				} else if (memcmp(feature_start, "thumbee", feature_length) == 0) {
 					processor->features |= CPUINFO_ARM_LINUX_FEATURE_THUMBEE;
@@ -284,13 +290,13 @@ static void parse_features(
 				break;
 			case 8:
 				if (memcmp(feature_start, "asimdrdm", feature_length) == 0) {
-					#if CPUINFO_ARCH_ARM64
-						processor->features |= CPUINFO_ARM_LINUX_FEATURE_ASIMDRDM;
-					#endif
+#if CPUINFO_ARCH_ARM64
+					processor->features |= CPUINFO_ARM_LINUX_FEATURE_ASIMDRDM;
+#endif
 				} else if (memcmp(feature_start, "asimdfhm", feature_length) == 0) {
-					#if CPUINFO_ARCH_ARM64
-						processor->features |= CPUINFO_ARM_LINUX_FEATURE_ASIMDFHM;
-					#endif
+#if CPUINFO_ARCH_ARM64
+					processor->features |= CPUINFO_ARM_LINUX_FEATURE_ASIMDFHM;
+#endif
 #if CPUINFO_ARCH_ARM
 				} else if (memcmp(feature_start, "fastmult", feature_length) == 0) {
 					processor->features |= CPUINFO_ARM_LINUX_FEATURE_FASTMULT;
@@ -303,8 +309,10 @@ static void parse_features(
 				break;
 			default:
 			unexpected:
-				cpuinfo_log_warning("unexpected /proc/cpuinfo feature \"%.*s\" is ignored",
-					(int) feature_length, feature_start);
+				cpuinfo_log_warning(
+					"unexpected /proc/cpuinfo feature \"%.*s\" is ignored",
+					(int)feature_length,
+					feature_start);
 				break;
 		}
 		feature_start = feature_end;
@@ -319,10 +327,10 @@ static void parse_features(
 static void parse_cpu_architecture(
 	const char* cpu_architecture_start,
 	const char* cpu_architecture_end,
-	struct cpuinfo_arm_linux_processor processor[restrict static 1])
-{
-	const size_t cpu_architecture_length = (size_t) (cpu_architecture_end - cpu_architecture_start);
-	/* Early AArch64 kernels report "CPU architecture: AArch64" instead of a numeric value 8 */
+	struct cpuinfo_arm_linux_processor processor[restrict static 1]) {
+	const size_t cpu_architecture_length = (size_t)(cpu_architecture_end - cpu_architecture_start);
+	/* Early AArch64 kernels report "CPU architecture: AArch64" instead of a
+	 * numeric value 8 */
 	if (cpu_architecture_length == 7) {
 		if (memcmp(cpu_architecture_start, "AArch64", cpu_architecture_length) == 0) {
 			processor->midr = midr_set_architecture(processor->midr, UINT32_C(0xF));
@@ -332,7 +340,6 @@ static void parse_cpu_architecture(
 		}
 	}
 
-
 	uint32_t architecture = 0;
 	const char* cpu_architecture_ptr = cpu_architecture_start;
 	for (; cpu_architecture_ptr != cpu_architecture_end; cpu_architecture_ptr++) {
@@ -347,8 +354,10 @@ static void parse_cpu_architecture(
 	}
 
 	if (cpu_architecture_ptr == cpu_architecture_start) {
-		cpuinfo_log_warning("CPU architecture %.*s in /proc/cpuinfo is ignored due to non-digit at the beginning of the string",
-			(int) cpu_architecture_length, cpu_architecture_start);
+		cpuinfo_log_warning(
+			"CPU architecture %.*s in /proc/cpuinfo is ignored due to non-digit at the beginning of the string",
+			(int)cpu_architecture_length,
+			cpu_architecture_start);
 	} else {
 		if (architecture != 0) {
 			processor->architecture_version = architecture;
@@ -370,17 +379,22 @@ static void parse_cpu_architecture(
 #endif /* CPUINFO_ARCH_ARM */
 					case ' ':
 					case '\t':
-						/* Ignore whitespace at the end */
+						/* Ignore whitespace at the end
+						 */
 						break;
 					default:
-						cpuinfo_log_warning("skipped unknown architectural feature '%c' for ARMv%"PRIu32,
-							feature, architecture);
+						cpuinfo_log_warning(
+							"skipped unknown architectural feature '%c' for ARMv%" PRIu32,
+							feature,
+							architecture);
 						break;
 				}
 			}
 		} else {
-			cpuinfo_log_warning("CPU architecture %.*s in /proc/cpuinfo is ignored due to invalid value (0)",
-				(int) cpu_architecture_length, cpu_architecture_start);
+			cpuinfo_log_warning(
+				"CPU architecture %.*s in /proc/cpuinfo is ignored due to invalid value (0)",
+				(int)cpu_architecture_length,
+				cpu_architecture_start);
 		}
 	}
 
@@ -391,9 +405,12 @@ static void parse_cpu_architecture(
 			midr_architecture = UINT32_C(0x7); /* ARMv6 */
 			break;
 		case 5:
-			if ((processor->architecture_flags & CPUINFO_ARM_LINUX_ARCH_TEJ) == CPUINFO_ARM_LINUX_ARCH_TEJ) {
+			if ((processor->architecture_flags & CPUINFO_ARM_LINUX_ARCH_TEJ) ==
+			    CPUINFO_ARM_LINUX_ARCH_TEJ) {
 				midr_architecture = UINT32_C(0x6); /* ARMv5TEJ */
-			} else if ((processor->architecture_flags & CPUINFO_ARM_LINUX_ARCH_TE) == CPUINFO_ARM_LINUX_ARCH_TE) {
+			} else if (
+				(processor->architecture_flags & CPUINFO_ARM_LINUX_ARCH_TE) ==
+				CPUINFO_ARM_LINUX_ARCH_TE) {
 				midr_architecture = UINT32_C(0x5); /* ARMv5TE */
 			} else {
 				midr_architecture = UINT32_C(0x4); /* ARMv5T */
@@ -407,9 +424,8 @@ static void parse_cpu_architecture(
 static void parse_cpu_part(
 	const char* cpu_part_start,
 	const char* cpu_part_end,
-	struct cpuinfo_arm_linux_processor processor[restrict static 1])
-{
-	const size_t cpu_part_length = (size_t) (cpu_part_end - cpu_part_start);
+	struct cpuinfo_arm_linux_processor processor[restrict static 1]) {
+	const size_t cpu_part_length = (size_t)(cpu_part_end - cpu_part_start);
 
 	/*
 	 * CPU part should contain hex prefix (0x) and one to three hex digits.
@@ -419,32 +435,42 @@ static void parse_cpu_part(
 	 * Main ID Register (MIDR) assigns only a 12-bit value for CPU part.
 	 */
 	if (cpu_part_length < 3 || cpu_part_length > 5) {
-		cpuinfo_log_warning("CPU part %.*s in /proc/cpuinfo is ignored due to unexpected length (%zu)",
-			(int) cpu_part_length, cpu_part_start, cpu_part_length);
+		cpuinfo_log_warning(
+			"CPU part %.*s in /proc/cpuinfo is ignored due to unexpected length (%zu)",
+			(int)cpu_part_length,
+			cpu_part_start,
+			cpu_part_length);
 		return;
 	}
 
 	/* Verify the presence of hex prefix */
 	if (cpu_part_start[0] != '0' || cpu_part_start[1] != 'x') {
-		cpuinfo_log_warning("CPU part %.*s in /proc/cpuinfo is ignored due to lack of 0x prefix",
-			(int) cpu_part_length, cpu_part_start);
+		cpuinfo_log_warning(
+			"CPU part %.*s in /proc/cpuinfo is ignored due to lack of 0x prefix",
+			(int)cpu_part_length,
+			cpu_part_start);
 		return;
 	}
 
-	/* Verify that characters after hex prefix are hexadecimal digits and decode them */
+	/* Verify that characters after hex prefix are hexadecimal digits and
+	 * decode them */
 	uint32_t cpu_part = 0;
 	for (const char* digit_ptr = cpu_part_start + 2; digit_ptr != cpu_part_end; digit_ptr++) {
 		const char digit_char = *digit_ptr;
 		uint32_t digit;
 		if (digit_char >= '0' && digit_char <= '9') {
 			digit = digit_char - '0';
-		} else if ((uint32_t) (digit_char - 'A') < 6) {
+		} else if ((uint32_t)(digit_char - 'A') < 6) {
 			digit = 10 + (digit_char - 'A');
-		} else if ((uint32_t) (digit_char - 'a') < 6) {
+		} else if ((uint32_t)(digit_char - 'a') < 6) {
 			digit = 10 + (digit_char - 'a');
 		} else {
-			cpuinfo_log_warning("CPU part %.*s in /proc/cpuinfo is ignored due to unexpected non-hex character %c at offset %zu",
-				(int) cpu_part_length, cpu_part_start, digit_char, (size_t) (digit_ptr - cpu_part_start));
+			cpuinfo_log_warning(
+				"CPU part %.*s in /proc/cpuinfo is ignored due to unexpected non-hex character %c at offset %zu",
+				(int)cpu_part_length,
+				cpu_part_start,
+				digit_char,
+				(size_t)(digit_ptr - cpu_part_start));
 			return;
 		}
 		cpu_part = cpu_part * 16 + digit;
@@ -457,8 +483,7 @@ static void parse_cpu_part(
 static void parse_cpu_implementer(
 	const char* cpu_implementer_start,
 	const char* cpu_implementer_end,
-	struct cpuinfo_arm_linux_processor processor[restrict static 1])
-{
+	struct cpuinfo_arm_linux_processor processor[restrict static 1]) {
 	const size_t cpu_implementer_length = cpu_implementer_end - cpu_implementer_start;
 
 	/*
@@ -466,39 +491,50 @@ static void parse_cpu_implementer(
 	 * I have never seen single hex digit as a value of this field,
 	 * but I don't think it is impossible in future.
 	 * Value can not contain more than two hex digits since
-	 * Main ID Register (MIDR) assigns only an 8-bit value for CPU implementer.
+	 * Main ID Register (MIDR) assigns only an 8-bit value for CPU
+	 * implementer.
 	 */
 	switch (cpu_implementer_length) {
 		case 3:
 		case 4:
 			break;
 		default:
-		cpuinfo_log_warning("CPU implementer %.*s in /proc/cpuinfo is ignored due to unexpected length (%zu)",
-			(int) cpu_implementer_length, cpu_implementer_start, cpu_implementer_length);
-		return;
+			cpuinfo_log_warning(
+				"CPU implementer %.*s in /proc/cpuinfo is ignored due to unexpected length (%zu)",
+				(int)cpu_implementer_length,
+				cpu_implementer_start,
+				cpu_implementer_length);
+			return;
 	}
 
 	/* Verify the presence of hex prefix */
 	if (cpu_implementer_start[0] != '0' || cpu_implementer_start[1] != 'x') {
-		cpuinfo_log_warning("CPU implementer %.*s in /proc/cpuinfo is ignored due to lack of 0x prefix",
-			(int) cpu_implementer_length, cpu_implementer_start);
+		cpuinfo_log_warning(
+			"CPU implementer %.*s in /proc/cpuinfo is ignored due to lack of 0x prefix",
+			(int)cpu_implementer_length,
+			cpu_implementer_start);
 		return;
 	}
 
-	/* Verify that characters after hex prefix are hexadecimal digits and decode them */
+	/* Verify that characters after hex prefix are hexadecimal digits and
+	 * decode them */
 	uint32_t cpu_implementer = 0;
 	for (const char* digit_ptr = cpu_implementer_start + 2; digit_ptr != cpu_implementer_end; digit_ptr++) {
 		const char digit_char = *digit_ptr;
 		uint32_t digit;
 		if (digit_char >= '0' && digit_char <= '9') {
 			digit = digit_char - '0';
-		} else if ((uint32_t) (digit_char - 'A') < 6) {
+		} else if ((uint32_t)(digit_char - 'A') < 6) {
 			digit = 10 + (digit_char - 'A');
-		} else if ((uint32_t) (digit_char - 'a') < 6) {
+		} else if ((uint32_t)(digit_char - 'a') < 6) {
 			digit = 10 + (digit_char - 'a');
 		} else {
-			cpuinfo_log_warning("CPU implementer %.*s in /proc/cpuinfo is ignored due to unexpected non-hex character '%c' at offset %zu",
-				(int) cpu_implementer_length, cpu_implementer_start, digit_char, (size_t) (digit_ptr - cpu_implementer_start));
+			cpuinfo_log_warning(
+				"CPU implementer %.*s in /proc/cpuinfo is ignored due to unexpected non-hex character '%c' at offset %zu",
+				(int)cpu_implementer_length,
+				cpu_implementer_start,
+				digit_char,
+				(size_t)(digit_ptr - cpu_implementer_start));
 			return;
 		}
 		cpu_implementer = cpu_implementer * 16 + digit;
@@ -511,8 +547,7 @@ static void parse_cpu_implementer(
 static void parse_cpu_variant(
 	const char* cpu_variant_start,
 	const char* cpu_variant_end,
-	struct cpuinfo_arm_linux_processor processor[restrict static 1])
-{
+	struct cpuinfo_arm_linux_processor processor[restrict static 1]) {
 	const size_t cpu_variant_length = cpu_variant_end - cpu_variant_start;
 
 	/*
@@ -521,30 +556,39 @@ static void parse_cpu_variant(
 	 * Main ID Register (MIDR) assigns only a 4-bit value for CPU variant.
 	 */
 	if (cpu_variant_length != 3) {
-		cpuinfo_log_warning("CPU variant %.*s in /proc/cpuinfo is ignored due to unexpected length (%zu)",
-			(int) cpu_variant_length, cpu_variant_start, cpu_variant_length);
+		cpuinfo_log_warning(
+			"CPU variant %.*s in /proc/cpuinfo is ignored due to unexpected length (%zu)",
+			(int)cpu_variant_length,
+			cpu_variant_start,
+			cpu_variant_length);
 		return;
 	}
 
 	/* Skip if there is no hex prefix (0x) */
 	if (cpu_variant_start[0] != '0' || cpu_variant_start[1] != 'x') {
-		cpuinfo_log_warning("CPU variant %.*s in /proc/cpuinfo is ignored due to lack of 0x prefix",
-			(int) cpu_variant_length, cpu_variant_start);
+		cpuinfo_log_warning(
+			"CPU variant %.*s in /proc/cpuinfo is ignored due to lack of 0x prefix",
+			(int)cpu_variant_length,
+			cpu_variant_start);
 		return;
 	}
 
-	/* Check if the value after hex prefix is indeed a hex digit and decode it. */
+	/* Check if the value after hex prefix is indeed a hex digit and decode
+	 * it. */
 	const char digit_char = cpu_variant_start[2];
 	uint32_t cpu_variant;
-	if ((uint32_t) (digit_char - '0') < 10) {
-		cpu_variant = (uint32_t) (digit_char - '0');
-	} else if ((uint32_t) (digit_char - 'A') < 6) {
-		cpu_variant = 10 + (uint32_t) (digit_char - 'A');
-	} else if ((uint32_t) (digit_char - 'a') < 6) {
-		cpu_variant = 10 + (uint32_t) (digit_char - 'a');
+	if ((uint32_t)(digit_char - '0') < 10) {
+		cpu_variant = (uint32_t)(digit_char - '0');
+	} else if ((uint32_t)(digit_char - 'A') < 6) {
+		cpu_variant = 10 + (uint32_t)(digit_char - 'A');
+	} else if ((uint32_t)(digit_char - 'a') < 6) {
+		cpu_variant = 10 + (uint32_t)(digit_char - 'a');
 	} else {
-		cpuinfo_log_warning("CPU variant %.*s in /proc/cpuinfo is ignored due to unexpected non-hex character '%c'",
-			(int) cpu_variant_length, cpu_variant_start, digit_char);
+		cpuinfo_log_warning(
+			"CPU variant %.*s in /proc/cpuinfo is ignored due to unexpected non-hex character '%c'",
+			(int)cpu_variant_length,
+			cpu_variant_start,
+			digit_char);
 		return;
 	}
 
@@ -555,17 +599,20 @@ static void parse_cpu_variant(
 static void parse_cpu_revision(
 	const char* cpu_revision_start,
 	const char* cpu_revision_end,
-	struct cpuinfo_arm_linux_processor processor[restrict static 1])
-{
+	struct cpuinfo_arm_linux_processor processor[restrict static 1]) {
 	uint32_t cpu_revision = 0;
 	for (const char* digit_ptr = cpu_revision_start; digit_ptr != cpu_revision_end; digit_ptr++) {
-		const uint32_t digit = (uint32_t) (*digit_ptr - '0');
+		const uint32_t digit = (uint32_t)(*digit_ptr - '0');
 
-		/* Verify that the character in CPU revision is a decimal digit */
+		/* Verify that the character in CPU revision is a decimal digit
+		 */
 		if (digit >= 10) {
-			cpuinfo_log_warning("CPU revision %.*s in /proc/cpuinfo is ignored due to unexpected non-digit character '%c' at offset %zu",
-				(int) (cpu_revision_end - cpu_revision_start), cpu_revision_start,
-				*digit_ptr, (size_t) (digit_ptr - cpu_revision_start));
+			cpuinfo_log_warning(
+				"CPU revision %.*s in /proc/cpuinfo is ignored due to unexpected non-digit character '%c' at offset %zu",
+				(int)(cpu_revision_end - cpu_revision_start),
+				cpu_revision_start,
+				*digit_ptr,
+				(size_t)(digit_ptr - cpu_revision_start));
 			return;
 		}
 
@@ -598,15 +645,18 @@ static void parse_cache_number(
 	const char* number_name,
 	uint32_t number_ptr[restrict static 1],
 	uint32_t flags[restrict static 1],
-	uint32_t number_mask)
-{
+	uint32_t number_mask) {
 	uint32_t number = 0;
 	for (const char* digit_ptr = number_start; digit_ptr != number_end; digit_ptr++) {
 		const uint32_t digit = *digit_ptr - '0';
 		if (digit >= 10) {
-			cpuinfo_log_warning("%s %.*s in /proc/cpuinfo is ignored due to unexpected non-digit character '%c' at offset %zu",
-				number_name, (int) (number_end - number_start), number_start,
-				*digit_ptr, (size_t) (digit_ptr - number_start));
+			cpuinfo_log_warning(
+				"%s %.*s in /proc/cpuinfo is ignored due to unexpected non-digit character '%c' at offset %zu",
+				number_name,
+				(int)(number_end - number_start),
+				number_start,
+				*digit_ptr,
+				(size_t)(digit_ptr - number_start));
 			return;
 		}
 
@@ -614,11 +664,15 @@ static void parse_cache_number(
 	}
 
 	if (number == 0) {
-		cpuinfo_log_warning("%s %.*s in /proc/cpuinfo is ignored due to invalid value of zero reported by the kernel",
-			number_name, (int) (number_end - number_start), number_start);
+		cpuinfo_log_warning(
+			"%s %.*s in /proc/cpuinfo is ignored due to invalid value of zero reported by the kernel",
+			number_name,
+			(int)(number_end - number_start),
+			number_start);
 	}
 
-	/* If the number specifies a cache line size, verify that is a reasonable power of 2 */
+	/* If the number specifies a cache line size, verify that is a
+	 * reasonable power of 2 */
 	if (number_mask & CPUINFO_ARM_LINUX_VALID_CACHE_LINE) {
 		switch (number) {
 			case 16:
@@ -627,8 +681,11 @@ static void parse_cache_number(
 			case 128:
 				break;
 			default:
-				cpuinfo_log_warning("invalid %s %.*s is ignored: a value of 16, 32, 64, or 128 expected",
-					number_name, (int) (number_end - number_start), number_start);
+				cpuinfo_log_warning(
+					"invalid %s %.*s is ignored: a value of 16, 32, 64, or 128 expected",
+					number_name,
+					(int)(number_end - number_start),
+					number_start);
 		}
 	}
 
@@ -658,12 +715,9 @@ struct proc_cpuinfo_parser_state {
  *		processor       : 1
  *		BogoMIPS        : 1363.33
  *
- *		Features        : swp half thumb fastmult vfp edsp thumbee neon vfpv3
- *		CPU implementer : 0x41
- *		CPU architecture: 7
- *		CPU variant     : 0x2
- *		CPU part        : 0xc09
- *		CPU revision    : 10
+ *		Features        : swp half thumb fastmult vfp edsp thumbee neon
+ *vfpv3 CPU implementer : 0x41 CPU architecture: 7 CPU variant     : 0x2 CPU
+ *part        : 0xc09 CPU revision    : 10
  *
  *		Hardware        : OMAP4 Panda board
  *		Revision        : 0020
@@ -673,8 +727,7 @@ static bool parse_line(
 	const char* line_start,
 	const char* line_end,
 	struct proc_cpuinfo_parser_state state[restrict static 1],
-	uint64_t line_number)
-{
+	uint64_t line_number) {
 	/* Empty line. Skip. */
 	if (line_start == line_end) {
 		return true;
@@ -689,8 +742,10 @@ static bool parse_line(
 	}
 	/* Skip line if no ':' separator was found. */
 	if (separator == line_end) {
-		cpuinfo_log_info("Line %.*s in /proc/cpuinfo is ignored: key/value separator ':' not found",
-			(int) (line_end - line_start), line_start);
+		cpuinfo_log_debug(
+			"Line %.*s in /proc/cpuinfo is ignored: key/value separator ':' not found",
+			(int)(line_end - line_start),
+			line_start);
 		return true;
 	}
 
@@ -703,8 +758,10 @@ static bool parse_line(
 	}
 	/* Skip line if key contains nothing but spaces. */
 	if (key_end == line_start) {
-		cpuinfo_log_info("Line %.*s in /proc/cpuinfo is ignored: key contains only spaces",
-			(int) (line_end - line_start), line_start);
+		cpuinfo_log_debug(
+			"Line %.*s in /proc/cpuinfo is ignored: key contains only spaces",
+			(int)(line_end - line_start),
+			line_start);
 		return true;
 	}
 
@@ -717,8 +774,10 @@ static bool parse_line(
 	}
 	/* Value part contains nothing but spaces. Skip line. */
 	if (value_start == line_end) {
-		cpuinfo_log_info("Line %.*s in /proc/cpuinfo is ignored: value contains only spaces",
-			(int) (line_end - line_start), line_start);
+		cpuinfo_log_debug(
+			"Line %.*s in /proc/cpuinfo is ignored: value contains only spaces",
+			(int)(line_end - line_start),
+			line_start);
 		return true;
 	}
 
@@ -730,10 +789,10 @@ static bool parse_line(
 		}
 	}
 
-	const uint32_t processor_index      = state->processor_index;
+	const uint32_t processor_index = state->processor_index;
 	const uint32_t max_processors_count = state->max_processors_count;
 	struct cpuinfo_arm_linux_processor* processors = state->processors;
-	struct cpuinfo_arm_linux_processor* processor  = &state->dummy_processor;
+	struct cpuinfo_arm_linux_processor* processor = &state->dummy_processor;
 	if (processor_index < max_processors_count) {
 		processor = &processors[processor_index];
 	}
@@ -745,21 +804,37 @@ static bool parse_line(
 				/* Usually contains just zeros, useless */
 #if CPUINFO_ARCH_ARM
 			} else if (memcmp(line_start, "I size", key_length) == 0) {
-				parse_cache_number(value_start, value_end,
-					"instruction cache size", &processor->proc_cpuinfo_cache.i_size,
-					&processor->flags, CPUINFO_ARM_LINUX_VALID_ICACHE_SIZE);
+				parse_cache_number(
+					value_start,
+					value_end,
+					"instruction cache size",
+					&processor->proc_cpuinfo_cache.i_size,
+					&processor->flags,
+					CPUINFO_ARM_LINUX_VALID_ICACHE_SIZE);
 			} else if (memcmp(line_start, "I sets", key_length) == 0) {
-				parse_cache_number(value_start, value_end,
-					"instruction cache sets", &processor->proc_cpuinfo_cache.i_sets,
-					&processor->flags, CPUINFO_ARM_LINUX_VALID_ICACHE_SETS);
+				parse_cache_number(
+					value_start,
+					value_end,
+					"instruction cache sets",
+					&processor->proc_cpuinfo_cache.i_sets,
+					&processor->flags,
+					CPUINFO_ARM_LINUX_VALID_ICACHE_SETS);
 			} else if (memcmp(line_start, "D size", key_length) == 0) {
-				parse_cache_number(value_start, value_end,
-					"data cache size", &processor->proc_cpuinfo_cache.d_size,
-					&processor->flags, CPUINFO_ARM_LINUX_VALID_DCACHE_SIZE);
+				parse_cache_number(
+					value_start,
+					value_end,
+					"data cache size",
+					&processor->proc_cpuinfo_cache.d_size,
+					&processor->flags,
+					CPUINFO_ARM_LINUX_VALID_DCACHE_SIZE);
 			} else if (memcmp(line_start, "D sets", key_length) == 0) {
-				parse_cache_number(value_start, value_end,
-					"data cache sets", &processor->proc_cpuinfo_cache.d_sets,
-					&processor->flags, CPUINFO_ARM_LINUX_VALID_DCACHE_SETS);
+				parse_cache_number(
+					value_start,
+					value_end,
+					"data cache sets",
+					&processor->proc_cpuinfo_cache.d_sets,
+					&processor->flags,
+					CPUINFO_ARM_LINUX_VALID_DCACHE_SETS);
 #endif /* CPUINFO_ARCH_ARM */
 			} else {
 				goto unknown;
@@ -768,13 +843,21 @@ static bool parse_line(
 #if CPUINFO_ARCH_ARM
 		case 7:
 			if (memcmp(line_start, "I assoc", key_length) == 0) {
-				parse_cache_number(value_start, value_end,
-					"instruction cache associativity", &processor->proc_cpuinfo_cache.i_assoc,
-					&processor->flags, CPUINFO_ARM_LINUX_VALID_ICACHE_WAYS);
+				parse_cache_number(
+					value_start,
+					value_end,
+					"instruction cache associativity",
+					&processor->proc_cpuinfo_cache.i_assoc,
+					&processor->flags,
+					CPUINFO_ARM_LINUX_VALID_ICACHE_WAYS);
 			} else if (memcmp(line_start, "D assoc", key_length) == 0) {
-				parse_cache_number(value_start, value_end,
-					"data cache associativity", &processor->proc_cpuinfo_cache.d_assoc,
-					&processor->flags, CPUINFO_ARM_LINUX_VALID_DCACHE_WAYS);
+				parse_cache_number(
+					value_start,
+					value_end,
+					"data cache associativity",
+					&processor->proc_cpuinfo_cache.d_assoc,
+					&processor->flags,
+					CPUINFO_ARM_LINUX_VALID_DCACHE_WAYS);
 			} else {
 				goto unknown;
 			}
@@ -790,27 +873,33 @@ static bool parse_line(
 			} else if (memcmp(line_start, "Hardware", key_length) == 0) {
 				size_t value_length = value_end - value_start;
 				if (value_length > CPUINFO_HARDWARE_VALUE_MAX) {
-					cpuinfo_log_info(
+					cpuinfo_log_warning(
 						"length of Hardware value \"%.*s\" in /proc/cpuinfo exceeds limit (%d): truncating to the limit",
-						(int) value_length, value_start, CPUINFO_HARDWARE_VALUE_MAX);
+						(int)value_length,
+						value_start,
+						CPUINFO_HARDWARE_VALUE_MAX);
 					value_length = CPUINFO_HARDWARE_VALUE_MAX;
 				} else {
 					state->hardware[value_length] = '\0';
 				}
 				memcpy(state->hardware, value_start, value_length);
-				cpuinfo_log_debug("parsed /proc/cpuinfo Hardware = \"%.*s\"", (int) value_length, value_start);
+				cpuinfo_log_debug(
+					"parsed /proc/cpuinfo Hardware = \"%.*s\"", (int)value_length, value_start);
 			} else if (memcmp(line_start, "Revision", key_length) == 0) {
 				size_t value_length = value_end - value_start;
 				if (value_length > CPUINFO_REVISION_VALUE_MAX) {
-					cpuinfo_log_info(
+					cpuinfo_log_warning(
 						"length of Revision value \"%.*s\" in /proc/cpuinfo exceeds limit (%d): truncating to the limit",
-						(int) value_length, value_start, CPUINFO_REVISION_VALUE_MAX);
+						(int)value_length,
+						value_start,
+						CPUINFO_REVISION_VALUE_MAX);
 					value_length = CPUINFO_REVISION_VALUE_MAX;
 				} else {
 					state->revision[value_length] = '\0';
 				}
 				memcpy(state->revision, value_start, value_length);
-				cpuinfo_log_debug("parsed /proc/cpuinfo Revision = \"%.*s\"", (int) value_length, value_start);
+				cpuinfo_log_debug(
+					"parsed /proc/cpuinfo Revision = \"%.*s\"", (int)value_length, value_start);
 			} else {
 				goto unknown;
 			}
@@ -819,28 +908,39 @@ static bool parse_line(
 			if (memcmp(line_start, "processor", key_length) == 0) {
 				const uint32_t new_processor_index = parse_processor_number(value_start, value_end);
 				if (new_processor_index < processor_index) {
-					/* Strange: decreasing processor number */
+					/* Strange: decreasing processor number
+					 */
 					cpuinfo_log_warning(
-						"unexpectedly low processor number %"PRIu32" following processor %"PRIu32" in /proc/cpuinfo",
-						new_processor_index, processor_index);
+						"unexpectedly low processor number %" PRIu32
+						" following processor %" PRIu32 " in /proc/cpuinfo",
+						new_processor_index,
+						processor_index);
 				} else if (new_processor_index > processor_index + 1) {
-					/* Strange, but common: skipped processor $(processor_index + 1) */
-					cpuinfo_log_info(
-						"unexpectedly high processor number %"PRIu32" following processor %"PRIu32" in /proc/cpuinfo",
-						new_processor_index, processor_index);
+					/* Strange, but common: skipped
+					 * processor $(processor_index + 1) */
+					cpuinfo_log_warning(
+						"unexpectedly high processor number %" PRIu32
+						" following processor %" PRIu32 " in /proc/cpuinfo",
+						new_processor_index,
+						processor_index);
 				}
 				if (new_processor_index < max_processors_count) {
-					/* Record that the processor was mentioned in /proc/cpuinfo */
+					/* Record that the processor was
+					 * mentioned in /proc/cpuinfo */
 					processors[new_processor_index].flags |= CPUINFO_ARM_LINUX_VALID_PROCESSOR;
 				} else {
 					/* Log and ignore processor */
-					cpuinfo_log_warning("processor %"PRIu32" in /proc/cpuinfo is ignored: index exceeds system limit %"PRIu32,
-						new_processor_index, max_processors_count - 1);
+					cpuinfo_log_warning(
+						"processor %" PRIu32
+						" in /proc/cpuinfo is ignored: index exceeds system limit %" PRIu32,
+						new_processor_index,
+						max_processors_count - 1);
 				}
 				state->processor_index = new_processor_index;
 				return true;
 			} else if (memcmp(line_start, "Processor", key_length) == 0) {
-				/* TODO: parse to fix misreported architecture, similar to Android's cpufeatures */
+				/* TODO: parse to fix misreported architecture,
+				 * similar to Android's cpufeatures */
 			} else {
 				goto unknown;
 			}
@@ -862,13 +962,21 @@ static bool parse_line(
 #if CPUINFO_ARCH_ARM
 		case 13:
 			if (memcmp(line_start, "I line length", key_length) == 0) {
-				parse_cache_number(value_start, value_end,
-					"instruction cache line size", &processor->proc_cpuinfo_cache.i_line_length,
-					&processor->flags, CPUINFO_ARM_LINUX_VALID_ICACHE_LINE);
+				parse_cache_number(
+					value_start,
+					value_end,
+					"instruction cache line size",
+					&processor->proc_cpuinfo_cache.i_line_length,
+					&processor->flags,
+					CPUINFO_ARM_LINUX_VALID_ICACHE_LINE);
 			} else if (memcmp(line_start, "D line length", key_length) == 0) {
-				parse_cache_number(value_start, value_end,
-					"data cache line size", &processor->proc_cpuinfo_cache.d_line_length,
-					&processor->flags, CPUINFO_ARM_LINUX_VALID_DCACHE_LINE);
+				parse_cache_number(
+					value_start,
+					value_end,
+					"data cache line size",
+					&processor->proc_cpuinfo_cache.d_line_length,
+					&processor->flags,
+					CPUINFO_ARM_LINUX_VALID_DCACHE_LINE);
 			} else {
 				goto unknown;
 			}
@@ -892,8 +1000,7 @@ static bool parse_line(
 			break;
 		default:
 		unknown:
-			cpuinfo_log_debug("unknown /proc/cpuinfo key: %.*s", (int) key_length, line_start);
-
+			cpuinfo_log_debug("unknown /proc/cpuinfo key: %.*s", (int)key_length, line_start);
 	}
 	return true;
 }
@@ -902,8 +1009,7 @@ bool cpuinfo_arm_linux_parse_proc_cpuinfo(
 	char hardware[restrict static CPUINFO_HARDWARE_VALUE_MAX],
 	char revision[restrict static CPUINFO_REVISION_VALUE_MAX],
 	uint32_t max_processors_count,
-	struct cpuinfo_arm_linux_processor processors[restrict static max_processors_count])
-{
+	struct cpuinfo_arm_linux_processor processors[restrict static max_processors_count]) {
 	hardware[0] = '\0';
 	struct proc_cpuinfo_parser_state state = {
 		.hardware = hardware,
@@ -912,6 +1018,6 @@ bool cpuinfo_arm_linux_parse_proc_cpuinfo(
 		.max_processors_count = max_processors_count,
 		.processors = processors,
 	};
-	return cpuinfo_linux_parse_multiline_file("/proc/cpuinfo", BUFFER_SIZE,
-		(cpuinfo_line_callback) parse_line, &state);
+	return cpuinfo_linux_parse_multiline_file(
+		"/proc/cpuinfo", BUFFER_SIZE, (cpuinfo_line_callback)parse_line, &state);
 }

3rdparty/cpuinfo/src/arm/linux/hwcap.c

@@ -1,163 +1,154 @@
 #include <limits.h>
 #include <string.h>
 
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
 #include <dlfcn.h>
 #include <elf.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
 
 #if CPUINFO_MOCK
-	#include <cpuinfo-mock.h>
+#include <cpuinfo-mock.h>
 #endif
-#include <cpuinfo.h>
 #include <arm/linux/api.h>
+#include <cpuinfo.h>
 #include <cpuinfo/log.h>
 
-#if CPUINFO_ARCH_ARM64 || CPUINFO_ARCH_ARM && \
-		defined(__GLIBC__) && defined(__GLIBC_MINOR__) && (__GLIBC__ > 2 || __GLIBC__ == 2 && __GLIBC_MINOR__ >= 16)
-	#include <sys/auxv.h>
+#if CPUINFO_ARCH_ARM64 ||                                                     \
+	CPUINFO_ARCH_ARM && defined(__GLIBC__) && defined(__GLIBC_MINOR__) && \
+		(__GLIBC__ > 2 || __GLIBC__ == 2 && __GLIBC_MINOR__ >= 16)
+#include <sys/auxv.h>
 #else
-	#define AT_HWCAP 16
-	#define AT_HWCAP2 26
+#define AT_HWCAP 16
+#define AT_HWCAP2 26
 #endif
 
-
 #if CPUINFO_MOCK
-	static uint32_t mock_hwcap = 0;
-	void cpuinfo_set_hwcap(uint32_t hwcap) {
-		mock_hwcap = hwcap;
-	}
+static uint32_t mock_hwcap = 0;
+void cpuinfo_set_hwcap(uint32_t hwcap) {
+	mock_hwcap = hwcap;
+}
 
-	static uint32_t mock_hwcap2 = 0;
-	void cpuinfo_set_hwcap2(uint32_t hwcap2) {
-		mock_hwcap2 = hwcap2;
-	}
+static uint32_t mock_hwcap2 = 0;
+void cpuinfo_set_hwcap2(uint32_t hwcap2) {
+	mock_hwcap2 = hwcap2;
+}
 #endif
 
-
 #if CPUINFO_ARCH_ARM
-	typedef unsigned long (*getauxval_function_t)(unsigned long);
+typedef unsigned long (*getauxval_function_t)(unsigned long);
 
-	bool cpuinfo_arm_linux_hwcap_from_getauxval(
-		uint32_t hwcap[restrict static 1],
-		uint32_t hwcap2[restrict static 1])
-	{
-		#if CPUINFO_MOCK
-			*hwcap  = mock_hwcap;
-			*hwcap2 = mock_hwcap2;
-			return true;
-		#elif defined(__ANDROID__)
-			/* Android: dynamically check if getauxval is supported */
-			void* libc = NULL;
-			getauxval_function_t getauxval = NULL;
+bool cpuinfo_arm_linux_hwcap_from_getauxval(uint32_t hwcap[restrict static 1], uint32_t hwcap2[restrict static 1]) {
+#if CPUINFO_MOCK
+	*hwcap = mock_hwcap;
+	*hwcap2 = mock_hwcap2;
+	return true;
+#elif defined(__ANDROID__)
+	/* Android: dynamically check if getauxval is supported */
+	void* libc = NULL;
+	getauxval_function_t getauxval = NULL;
 
-			dlerror();
-			libc = dlopen("libc.so", RTLD_LAZY);
-			if (libc == NULL) {
-				cpuinfo_log_warning("failed to load libc.so: %s", dlerror());
-				goto cleanup;
-			}
-
-			getauxval = (getauxval_function_t) dlsym(libc, "getauxval");
-			if (getauxval == NULL) {
-				cpuinfo_log_info("failed to locate getauxval in libc.so: %s", dlerror());
-				goto cleanup;
-			}
-
-			*hwcap  = getauxval(AT_HWCAP);
-			*hwcap2 = getauxval(AT_HWCAP2);
-
-		cleanup:
-			if (libc != NULL) {
-				dlclose(libc);
-				libc = NULL;
-			}
-			return getauxval != NULL;
-		#elif defined(__GLIBC__) && defined(__GLIBC_MINOR__) && (__GLIBC__ > 2 || __GLIBC__ == 2 && __GLIBC_MINOR__ >= 16)
-			/* GNU/Linux: getauxval is supported since glibc-2.16 */
-			*hwcap  = getauxval(AT_HWCAP);
-			*hwcap2 = getauxval(AT_HWCAP2);
-			return true;
-		#else
-			return false;
-		#endif
+	dlerror();
+	libc = dlopen("libc.so", RTLD_LAZY);
+	if (libc == NULL) {
+		cpuinfo_log_warning("failed to load libc.so: %s", dlerror());
+		goto cleanup;
 	}
 
-	#ifdef __ANDROID__
-		bool cpuinfo_arm_linux_hwcap_from_procfs(
-			uint32_t hwcap[restrict static 1],
-			uint32_t hwcap2[restrict static 1])
-		{
-			#if CPUINFO_MOCK
-				*hwcap  = mock_hwcap;
-				*hwcap2 = mock_hwcap2;
-				return true;
-			#else
-				uint32_t hwcaps[2] = { 0, 0 };
-				bool result = false;
-				int file = -1;
-
-				file = open("/proc/self/auxv", O_RDONLY);
-				if (file == -1) {
-					cpuinfo_log_warning("failed to open /proc/self/auxv: %s", strerror(errno));
-					goto cleanup;
-				}
-
-				ssize_t bytes_read;
-				do {
-					Elf32_auxv_t elf_auxv;
-					bytes_read = read(file, &elf_auxv, sizeof(Elf32_auxv_t));
-					if (bytes_read < 0) {
-						cpuinfo_log_warning("failed to read /proc/self/auxv: %s", strerror(errno));
-						goto cleanup;
-					} else if (bytes_read > 0) {
-						if (bytes_read == sizeof(elf_auxv)) {
-							switch (elf_auxv.a_type) {
-								case AT_HWCAP:
-									hwcaps[0] = (uint32_t) elf_auxv.a_un.a_val;
-									break;
-								case AT_HWCAP2:
-									hwcaps[1] = (uint32_t) elf_auxv.a_un.a_val;
-									break;
-							}
-						} else {
-							cpuinfo_log_warning(
-								"failed to read %zu bytes from /proc/self/auxv: %zu bytes available",
-								sizeof(elf_auxv), (size_t) bytes_read);
-							goto cleanup;
-						}
-					}
-				} while (bytes_read == sizeof(Elf32_auxv_t));
-
-				/* Success, commit results */
-				*hwcap  = hwcaps[0];
-				*hwcap2 = hwcaps[1];
-				result = true;
-
-			cleanup:
-				if (file != -1) {
-					close(file);
-					file = -1;
-				}
-				return result;
-			#endif
-		}
-	#endif /* __ANDROID__ */
-#elif CPUINFO_ARCH_ARM64
-	void cpuinfo_arm_linux_hwcap_from_getauxval(
-		uint32_t hwcap[restrict static 1],
-		uint32_t hwcap2[restrict static 1])
-	{
-		#if CPUINFO_MOCK
-			*hwcap  = mock_hwcap;
-			*hwcap2 = mock_hwcap2;
-		#else
-			*hwcap  = (uint32_t) getauxval(AT_HWCAP);
-			*hwcap2 = (uint32_t) getauxval(AT_HWCAP2);
-			return ;
-		#endif
+	getauxval = (getauxval_function_t)dlsym(libc, "getauxval");
+	if (getauxval == NULL) {
+		cpuinfo_log_info("failed to locate getauxval in libc.so: %s", dlerror());
+		goto cleanup;
 	}
+
+	*hwcap = getauxval(AT_HWCAP);
+	*hwcap2 = getauxval(AT_HWCAP2);
+
+cleanup:
+	if (libc != NULL) {
+		dlclose(libc);
+		libc = NULL;
+	}
+	return getauxval != NULL;
+#elif defined(__GLIBC__) && defined(__GLIBC_MINOR__) && (__GLIBC__ > 2 || __GLIBC__ == 2 && __GLIBC_MINOR__ >= 16)
+	/* GNU/Linux: getauxval is supported since glibc-2.16 */
+	*hwcap = getauxval(AT_HWCAP);
+	*hwcap2 = getauxval(AT_HWCAP2);
+	return true;
+#else
+	return false;
+#endif
+}
+
+#ifdef __ANDROID__
+bool cpuinfo_arm_linux_hwcap_from_procfs(uint32_t hwcap[restrict static 1], uint32_t hwcap2[restrict static 1]) {
+#if CPUINFO_MOCK
+	*hwcap = mock_hwcap;
+	*hwcap2 = mock_hwcap2;
+	return true;
+#else
+	uint32_t hwcaps[2] = {0, 0};
+	bool result = false;
+	int file = -1;
+
+	file = open("/proc/self/auxv", O_RDONLY);
+	if (file == -1) {
+		cpuinfo_log_warning("failed to open /proc/self/auxv: %s", strerror(errno));
+		goto cleanup;
+	}
+
+	ssize_t bytes_read;
+	do {
+		Elf32_auxv_t elf_auxv;
+		bytes_read = read(file, &elf_auxv, sizeof(Elf32_auxv_t));
+		if (bytes_read < 0) {
+			cpuinfo_log_warning("failed to read /proc/self/auxv: %s", strerror(errno));
+			goto cleanup;
+		} else if (bytes_read > 0) {
+			if (bytes_read == sizeof(elf_auxv)) {
+				switch (elf_auxv.a_type) {
+					case AT_HWCAP:
+						hwcaps[0] = (uint32_t)elf_auxv.a_un.a_val;
+						break;
+					case AT_HWCAP2:
+						hwcaps[1] = (uint32_t)elf_auxv.a_un.a_val;
+						break;
+				}
+			} else {
+				cpuinfo_log_warning(
+					"failed to read %zu bytes from /proc/self/auxv: %zu bytes available",
+					sizeof(elf_auxv),
+					(size_t)bytes_read);
+				goto cleanup;
+			}
+		}
+	} while (bytes_read == sizeof(Elf32_auxv_t));
+
+	/* Success, commit results */
+	*hwcap = hwcaps[0];
+	*hwcap2 = hwcaps[1];
+	result = true;
+
+cleanup:
+	if (file != -1) {
+		close(file);
+		file = -1;
+	}
+	return result;
+#endif
+}
+#endif /* __ANDROID__ */
+#elif CPUINFO_ARCH_ARM64
+void cpuinfo_arm_linux_hwcap_from_getauxval(uint32_t hwcap[restrict static 1], uint32_t hwcap2[restrict static 1]) {
+#if CPUINFO_MOCK
+	*hwcap = mock_hwcap;
+	*hwcap2 = mock_hwcap2;
+#else
+	*hwcap = (uint32_t)getauxval(AT_HWCAP);
+	*hwcap2 = (uint32_t)getauxval(AT_HWCAP2);
+	return;
+#endif
+}
 #endif

3rdparty/cpuinfo/src/arm/linux/init.c

@@ -1,23 +1,22 @@
-#include <stdint.h>
 #include <stddef.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include <cpuinfo.h>
 #include <arm/linux/api.h>
+#include <cpuinfo.h>
 #if defined(__ANDROID__)
-	#include <arm/android/api.h>
+#include <arm/android/api.h>
 #endif
 #include <arm/api.h>
 #include <arm/midr.h>
-#include <linux/api.h>
 #include <cpuinfo/internal-api.h>
 #include <cpuinfo/log.h>
+#include <linux/api.h>
 
+struct cpuinfo_arm_isa cpuinfo_isa = {0};
 
-struct cpuinfo_arm_isa cpuinfo_isa = { 0 };
-
-static struct cpuinfo_package package = { { 0 } };
+static struct cpuinfo_package package = {{0}};
 
 static inline bool bitmask_all(uint32_t bitfield, uint32_t mask) {
 	return (bitfield & mask) == mask;
@@ -32,16 +31,19 @@ static inline int cmp(uint32_t a, uint32_t b) {
 }
 
 static bool cluster_siblings_parser(
-	uint32_t processor, uint32_t siblings_start, uint32_t siblings_end,
-	struct cpuinfo_arm_linux_processor* processors)
-{
+	uint32_t processor,
+	uint32_t siblings_start,
+	uint32_t siblings_end,
+	struct cpuinfo_arm_linux_processor* processors) {
 	processors[processor].flags |= CPUINFO_LINUX_FLAG_PACKAGE_CLUSTER;
 	uint32_t package_leader_id = processors[processor].package_leader_id;
 
 	for (uint32_t sibling = siblings_start; sibling < siblings_end; sibling++) {
 		if (!bitmask_all(processors[sibling].flags, CPUINFO_LINUX_FLAG_VALID)) {
-			cpuinfo_log_info("invalid processor %"PRIu32" reported as a sibling for processor %"PRIu32,
-				sibling, processor);
+			cpuinfo_log_info(
+				"invalid processor %" PRIu32 " reported as a sibling for processor %" PRIu32,
+				sibling,
+				processor);
 			continue;
 		}
 
@@ -60,14 +62,14 @@ static bool cluster_siblings_parser(
 }
 
 static int cmp_arm_linux_processor(const void* ptr_a, const void* ptr_b) {
-	const struct cpuinfo_arm_linux_processor* processor_a = (const struct cpuinfo_arm_linux_processor*) ptr_a;
-	const struct cpuinfo_arm_linux_processor* processor_b = (const struct cpuinfo_arm_linux_processor*) ptr_b;
+	const struct cpuinfo_arm_linux_processor* processor_a = (const struct cpuinfo_arm_linux_processor*)ptr_a;
+	const struct cpuinfo_arm_linux_processor* processor_b = (const struct cpuinfo_arm_linux_processor*)ptr_b;
 
 	/* Move usable processors towards the start of the array */
 	const bool usable_a = bitmask_all(processor_a->flags, CPUINFO_LINUX_FLAG_VALID);
 	const bool usable_b = bitmask_all(processor_b->flags, CPUINFO_LINUX_FLAG_VALID);
 	if (usable_a != usable_b) {
-		return (int) usable_b - (int) usable_a;
+		return (int)usable_b - (int)usable_a;
 	}
 
 	/* Compare based on core type (e.g. Cortex-A57 < Cortex-A53) */
@@ -95,7 +97,8 @@ static int cmp_arm_linux_processor(const void* ptr_a, const void* ptr_b) {
 		return cluster_a > cluster_b ? -1 : 1;
 	}
 
-	/* Compare based on system processor id (i.e. processor 0 < processor 1) */
+	/* Compare based on system processor id (i.e. processor 0 < processor 1)
+	 */
 	const uint32_t id_a = processor_a->system_processor_id;
 	const uint32_t id_b = processor_b->system_processor_id;
 	return cmp(id_a, id_b);
@@ -116,14 +119,13 @@ void cpuinfo_arm_linux_init(void) {
 	uint32_t* linux_cpu_to_uarch_index_map = NULL;
 
 	const uint32_t max_processors_count = cpuinfo_linux_get_max_processors_count();
-	cpuinfo_log_debug("system maximum processors count: %"PRIu32, max_processors_count);
+	cpuinfo_log_debug("system maximum processors count: %" PRIu32, max_processors_count);
 
-	const uint32_t max_possible_processors_count = 1 +
-		cpuinfo_linux_get_max_possible_processor(max_processors_count);
-	cpuinfo_log_debug("maximum possible processors count: %"PRIu32, max_possible_processors_count);
-	const uint32_t max_present_processors_count = 1 +
-		cpuinfo_linux_get_max_present_processor(max_processors_count);
-	cpuinfo_log_debug("maximum present processors count: %"PRIu32, max_present_processors_count);
+	const uint32_t max_possible_processors_count =
+		1 + cpuinfo_linux_get_max_possible_processor(max_processors_count);
+	cpuinfo_log_debug("maximum possible processors count: %" PRIu32, max_possible_processors_count);
+	const uint32_t max_present_processors_count = 1 + cpuinfo_linux_get_max_present_processor(max_processors_count);
+	cpuinfo_log_debug("maximum present processors count: %" PRIu32, max_present_processors_count);
 
 	uint32_t valid_processor_mask = 0;
 	uint32_t arm_linux_processors_count = max_processors_count;
@@ -143,7 +145,7 @@ void cpuinfo_arm_linux_init(void) {
 	arm_linux_processors = calloc(arm_linux_processors_count, sizeof(struct cpuinfo_arm_linux_processor));
 	if (arm_linux_processors == NULL) {
 		cpuinfo_log_error(
-			"failed to allocate %zu bytes for descriptions of %"PRIu32" ARM logical processors",
+			"failed to allocate %zu bytes for descriptions of %" PRIu32 " ARM logical processors",
 			arm_linux_processors_count * sizeof(struct cpuinfo_arm_linux_processor),
 			arm_linux_processors_count);
 		return;
@@ -151,14 +153,16 @@ void cpuinfo_arm_linux_init(void) {
 
 	if (max_possible_processors_count) {
 		cpuinfo_linux_detect_possible_processors(
-			arm_linux_processors_count, &arm_linux_processors->flags,
+			arm_linux_processors_count,
+			&arm_linux_processors->flags,
 			sizeof(struct cpuinfo_arm_linux_processor),
 			CPUINFO_LINUX_FLAG_POSSIBLE);
 	}
 
 	if (max_present_processors_count) {
 		cpuinfo_linux_detect_present_processors(
-			arm_linux_processors_count, &arm_linux_processors->flags,
+			arm_linux_processors_count,
+			&arm_linux_processors->flags,
 			sizeof(struct cpuinfo_arm_linux_processor),
 			CPUINFO_LINUX_FLAG_PRESENT);
 	}
@@ -173,13 +177,13 @@ void cpuinfo_arm_linux_init(void) {
 
 	if (!cpuinfo_arm_linux_parse_proc_cpuinfo(
 #if defined(__ANDROID__)
-			android_properties.proc_cpuinfo_hardware,
+		    android_properties.proc_cpuinfo_hardware,
 #else
-			proc_cpuinfo_hardware,
+		    proc_cpuinfo_hardware,
 #endif
-			proc_cpuinfo_revision,
-			arm_linux_processors_count,
-			arm_linux_processors)) {
+		    proc_cpuinfo_revision,
+		    arm_linux_processors_count,
+		    arm_linux_processors)) {
 		cpuinfo_log_error("failed to parse processor information from /proc/cpuinfo");
 		return;
 	}
@@ -187,45 +191,49 @@ void cpuinfo_arm_linux_init(void) {
 	for (uint32_t i = 0; i < arm_linux_processors_count; i++) {
 		if (bitmask_all(arm_linux_processors[i].flags, valid_processor_mask)) {
 			arm_linux_processors[i].flags |= CPUINFO_LINUX_FLAG_VALID;
-			cpuinfo_log_debug("parsed processor %"PRIu32" MIDR 0x%08"PRIx32,
-				i, arm_linux_processors[i].midr);
+			cpuinfo_log_debug(
+				"parsed processor %" PRIu32 " MIDR 0x%08" PRIx32, i, arm_linux_processors[i].midr);
 		}
 	}
 
 	uint32_t valid_processors = 0, last_midr = 0;
-	#if CPUINFO_ARCH_ARM
+#if CPUINFO_ARCH_ARM
 	uint32_t last_architecture_version = 0, last_architecture_flags = 0;
-	#endif
+#endif
 	for (uint32_t i = 0; i < arm_linux_processors_count; i++) {
 		arm_linux_processors[i].system_processor_id = i;
 		if (bitmask_all(arm_linux_processors[i].flags, CPUINFO_LINUX_FLAG_VALID)) {
 			if (arm_linux_processors[i].flags & CPUINFO_ARM_LINUX_VALID_PROCESSOR) {
 				/*
-				 * Processor is in possible and present lists, and also reported in /proc/cpuinfo.
-				 * This processor is availble for compute.
+				 * Processor is in possible and present lists,
+				 * and also reported in /proc/cpuinfo. This
+				 * processor is availble for compute.
 				 */
 				valid_processors += 1;
 			} else {
 				/*
-				 * Processor is in possible and present lists, but not reported in /proc/cpuinfo.
-				 * This is fairly common: high-index processors can be not reported if they are offline.
+				 * Processor is in possible and present lists,
+				 * but not reported in /proc/cpuinfo. This is
+				 * fairly common: high-index processors can be
+				 * not reported if they are offline.
 				 */
-				cpuinfo_log_info("processor %"PRIu32" is not listed in /proc/cpuinfo", i);
+				cpuinfo_log_info("processor %" PRIu32 " is not listed in /proc/cpuinfo", i);
 			}
 
 			if (bitmask_all(arm_linux_processors[i].flags, CPUINFO_ARM_LINUX_VALID_MIDR)) {
 				last_midr = arm_linux_processors[i].midr;
 			}
-			#if CPUINFO_ARCH_ARM
-				if (bitmask_all(arm_linux_processors[i].flags, CPUINFO_ARM_LINUX_VALID_ARCHITECTURE)) {
-					last_architecture_version = arm_linux_processors[i].architecture_version;
-					last_architecture_flags   = arm_linux_processors[i].architecture_flags;
-				}
-			#endif
+#if CPUINFO_ARCH_ARM
+			if (bitmask_all(arm_linux_processors[i].flags, CPUINFO_ARM_LINUX_VALID_ARCHITECTURE)) {
+				last_architecture_version = arm_linux_processors[i].architecture_version;
+				last_architecture_flags = arm_linux_processors[i].architecture_flags;
+			}
+#endif
 		} else {
-			/* Processor reported in /proc/cpuinfo, but not in possible and/or present lists: log and ignore */
+			/* Processor reported in /proc/cpuinfo, but not in
+			 * possible and/or present lists: log and ignore */
 			if (!(arm_linux_processors[i].flags & CPUINFO_ARM_LINUX_VALID_PROCESSOR)) {
-				cpuinfo_log_warning("invalid processor %"PRIu32" reported in /proc/cpuinfo", i);
+				cpuinfo_log_warning("invalid processor %" PRIu32 " reported in /proc/cpuinfo", i);
 			}
 		}
 	}
@@ -238,55 +246,65 @@ void cpuinfo_arm_linux_init(void) {
 		cpuinfo_arm_linux_decode_chipset(proc_cpuinfo_hardware, proc_cpuinfo_revision, valid_processors, 0);
 #endif
 
-	#if CPUINFO_ARCH_ARM
-		uint32_t isa_features = 0, isa_features2 = 0;
-		#ifdef __ANDROID__
+#if CPUINFO_ARCH_ARM
+	uint32_t isa_features = 0, isa_features2 = 0;
+#ifdef __ANDROID__
+	/*
+	 * On Android before API 20, libc.so does not provide getauxval
+	 * function. Thus, we try to dynamically find it, or use two fallback
+	 * mechanisms:
+	 * 1. dlopen libc.so, and try to find getauxval
+	 * 2. Parse /proc/self/auxv procfs file
+	 * 3. Use features reported in /proc/cpuinfo
+	 */
+	if (!cpuinfo_arm_linux_hwcap_from_getauxval(&isa_features, &isa_features2)) {
+		/* getauxval can't be used, fall back to parsing /proc/self/auxv
+		 */
+		if (!cpuinfo_arm_linux_hwcap_from_procfs(&isa_features, &isa_features2)) {
 			/*
-			 * On Android before API 20, libc.so does not provide getauxval function.
-			 * Thus, we try to dynamically find it, or use two fallback mechanisms:
-			 * 1. dlopen libc.so, and try to find getauxval
-			 * 2. Parse /proc/self/auxv procfs file
-			 * 3. Use features reported in /proc/cpuinfo
+			 * Reading /proc/self/auxv failed, probably due to file
+			 * permissions. Use information from /proc/cpuinfo to
+			 * detect ISA.
+			 *
+			 * If different processors report different ISA
+			 * features, take the intersection.
 			 */
-			if (!cpuinfo_arm_linux_hwcap_from_getauxval(&isa_features, &isa_features2)) {
-				/* getauxval can't be used, fall back to parsing /proc/self/auxv */
-				if (!cpuinfo_arm_linux_hwcap_from_procfs(&isa_features, &isa_features2)) {
-					/*
-					 * Reading /proc/self/auxv failed, probably due to file permissions.
-					 * Use information from /proc/cpuinfo to detect ISA.
-					 *
-					 * If different processors report different ISA features, take the intersection.
-					 */
-					uint32_t processors_with_features = 0;
-					for (uint32_t i = 0; i < arm_linux_processors_count; i++) {
-						if (bitmask_all(arm_linux_processors[i].flags, CPUINFO_LINUX_FLAG_VALID | CPUINFO_ARM_LINUX_VALID_FEATURES)) {
-							if (processors_with_features == 0) {
-								isa_features = arm_linux_processors[i].features;
-								isa_features2 = arm_linux_processors[i].features2;
-							} else {
-								isa_features &= arm_linux_processors[i].features;
-								isa_features2 &= arm_linux_processors[i].features2;
-							}
-							processors_with_features += 1;
-						}
+			uint32_t processors_with_features = 0;
+			for (uint32_t i = 0; i < arm_linux_processors_count; i++) {
+				if (bitmask_all(
+					    arm_linux_processors[i].flags,
+					    CPUINFO_LINUX_FLAG_VALID | CPUINFO_ARM_LINUX_VALID_FEATURES)) {
+					if (processors_with_features == 0) {
+						isa_features = arm_linux_processors[i].features;
+						isa_features2 = arm_linux_processors[i].features2;
+					} else {
+						isa_features &= arm_linux_processors[i].features;
+						isa_features2 &= arm_linux_processors[i].features2;
 					}
+					processors_with_features += 1;
 				}
 			}
-		#else
-			/* On GNU/Linux getauxval is always available */
-			cpuinfo_arm_linux_hwcap_from_getauxval(&isa_features, &isa_features2);
-		#endif
-		cpuinfo_arm_linux_decode_isa_from_proc_cpuinfo(
-			isa_features, isa_features2,
-			last_midr, last_architecture_version, last_architecture_flags,
-			&chipset, &cpuinfo_isa);
-	#elif CPUINFO_ARCH_ARM64
-		uint32_t isa_features = 0, isa_features2 = 0;
-		/* getauxval is always available on ARM64 Android */
-		cpuinfo_arm_linux_hwcap_from_getauxval(&isa_features, &isa_features2);
-		cpuinfo_arm64_linux_decode_isa_from_proc_cpuinfo(
-			isa_features, isa_features2, last_midr, &chipset, &cpuinfo_isa);
-	#endif
+		}
+	}
+#else
+	/* On GNU/Linux getauxval is always available */
+	cpuinfo_arm_linux_hwcap_from_getauxval(&isa_features, &isa_features2);
+#endif
+	cpuinfo_arm_linux_decode_isa_from_proc_cpuinfo(
+		isa_features,
+		isa_features2,
+		last_midr,
+		last_architecture_version,
+		last_architecture_flags,
+		&chipset,
+		&cpuinfo_isa);
+#elif CPUINFO_ARCH_ARM64
+	uint32_t isa_features = 0, isa_features2 = 0;
+	/* getauxval is always available on ARM64 Android */
+	cpuinfo_arm_linux_hwcap_from_getauxval(&isa_features, &isa_features2);
+	cpuinfo_arm64_linux_decode_isa_from_proc_cpuinfo(
+		isa_features, isa_features2, last_midr, &chipset, &cpuinfo_isa);
+#endif
 
 	/* Detect min/max frequency and package ID */
 	for (uint32_t i = 0; i < arm_linux_processors_count; i++) {
@@ -322,8 +340,9 @@ void cpuinfo_arm_linux_init(void) {
 
 		if (arm_linux_processors[i].flags & CPUINFO_LINUX_FLAG_PACKAGE_ID) {
 			cpuinfo_linux_detect_core_siblings(
-				arm_linux_processors_count, i,
-				(cpuinfo_siblings_callback) cluster_siblings_parser,
+				arm_linux_processors_count,
+				i,
+				(cpuinfo_siblings_callback)cluster_siblings_parser,
 				arm_linux_processors);
 		}
 	}
@@ -331,79 +350,107 @@ void cpuinfo_arm_linux_init(void) {
 	/* Propagate all cluster IDs */
 	uint32_t clustered_processors = 0;
 	for (uint32_t i = 0; i < arm_linux_processors_count; i++) {
-		if (bitmask_all(arm_linux_processors[i].flags, CPUINFO_LINUX_FLAG_VALID | CPUINFO_LINUX_FLAG_PACKAGE_CLUSTER)) {
+		if (bitmask_all(
+			    arm_linux_processors[i].flags,
+			    CPUINFO_LINUX_FLAG_VALID | CPUINFO_LINUX_FLAG_PACKAGE_CLUSTER)) {
 			clustered_processors += 1;
 
 			const uint32_t package_leader_id = arm_linux_processors[i].package_leader_id;
 			if (package_leader_id < i) {
-				arm_linux_processors[i].package_leader_id = arm_linux_processors[package_leader_id].package_leader_id;
+				arm_linux_processors[i].package_leader_id =
+					arm_linux_processors[package_leader_id].package_leader_id;
 			}
 
-			cpuinfo_log_debug("processor %"PRIu32" clustered with processor %"PRIu32" as inferred from system siblings lists",
-				i, arm_linux_processors[i].package_leader_id);
+			cpuinfo_log_debug(
+				"processor %" PRIu32 " clustered with processor %" PRIu32
+				" as inferred from system siblings lists",
+				i,
+				arm_linux_processors[i].package_leader_id);
 		}
 	}
 
 	if (clustered_processors != valid_processors) {
 		/*
-		 * Topology information about some or all logical processors may be unavailable, for the following reasons:
-		 * - Linux kernel is too old, or configured without support for topology information in sysfs.
-		 * - Core is offline, and Linux kernel is configured to not report topology for offline cores.
+		 * Topology information about some or all logical processors may
+		 * be unavailable, for the following reasons:
+		 * - Linux kernel is too old, or configured without support for
+		 * topology information in sysfs.
+		 * - Core is offline, and Linux kernel is configured to not
+		 * report topology for offline cores.
 		 *
-		 * In this case, we assign processors to clusters using two methods:
-		 * - Try heuristic cluster configurations (e.g. 6-core SoC usually has 4+2 big.LITTLE configuration).
-		 * - If heuristic failed, assign processors to core clusters in a sequential scan.
+		 * In this case, we assign processors to clusters using two
+		 * methods:
+		 * - Try heuristic cluster configurations (e.g. 6-core SoC
+		 * usually has 4+2 big.LITTLE configuration).
+		 * - If heuristic failed, assign processors to core clusters in
+		 * a sequential scan.
 		 */
-		if (!cpuinfo_arm_linux_detect_core_clusters_by_heuristic(valid_processors, arm_linux_processors_count, arm_linux_processors)) {
-			cpuinfo_arm_linux_detect_core_clusters_by_sequential_scan(arm_linux_processors_count, arm_linux_processors);
+		if (!cpuinfo_arm_linux_detect_core_clusters_by_heuristic(
+			    valid_processors, arm_linux_processors_count, arm_linux_processors)) {
+			cpuinfo_arm_linux_detect_core_clusters_by_sequential_scan(
+				arm_linux_processors_count, arm_linux_processors);
 		}
 	}
 
 	cpuinfo_arm_linux_count_cluster_processors(arm_linux_processors_count, arm_linux_processors);
 
 	const uint32_t cluster_count = cpuinfo_arm_linux_detect_cluster_midr(
-		&chipset,
-		arm_linux_processors_count, valid_processors, arm_linux_processors);
+		&chipset, arm_linux_processors_count, valid_processors, arm_linux_processors);
 
-	/* Initialize core vendor, uarch, MIDR, and frequency for every logical processor */
+	/* Initialize core vendor, uarch, MIDR, and frequency for every logical
+	 * processor */
 	for (uint32_t i = 0; i < arm_linux_processors_count; i++) {
 		if (bitmask_all(arm_linux_processors[i].flags, CPUINFO_LINUX_FLAG_VALID)) {
 			const uint32_t cluster_leader = arm_linux_processors[i].package_leader_id;
 			if (cluster_leader == i) {
-				/* Cluster leader: decode core vendor and uarch */
+				/* Cluster leader: decode core vendor and uarch
+				 */
 				cpuinfo_arm_decode_vendor_uarch(
-				arm_linux_processors[cluster_leader].midr,
+					arm_linux_processors[cluster_leader].midr,
 #if CPUINFO_ARCH_ARM
-				!!(arm_linux_processors[cluster_leader].features & CPUINFO_ARM_LINUX_FEATURE_VFPV4),
+					!!(arm_linux_processors[cluster_leader].features &
+					   CPUINFO_ARM_LINUX_FEATURE_VFPV4),
 #endif
-				&arm_linux_processors[cluster_leader].vendor,
-				&arm_linux_processors[cluster_leader].uarch);
+					&arm_linux_processors[cluster_leader].vendor,
+					&arm_linux_processors[cluster_leader].uarch);
 			} else {
-				/* Cluster non-leader: copy vendor, uarch, MIDR, and frequency from cluster leader */
+				/* Cluster non-leader: copy vendor, uarch, MIDR,
+				 * and frequency from cluster leader */
 				arm_linux_processors[i].flags |= arm_linux_processors[cluster_leader].flags &
 					(CPUINFO_ARM_LINUX_VALID_MIDR | CPUINFO_LINUX_FLAG_MAX_FREQUENCY);
 				arm_linux_processors[i].midr = arm_linux_processors[cluster_leader].midr;
 				arm_linux_processors[i].vendor = arm_linux_processors[cluster_leader].vendor;
 				arm_linux_processors[i].uarch = arm_linux_processors[cluster_leader].uarch;
-				arm_linux_processors[i].max_frequency = arm_linux_processors[cluster_leader].max_frequency;
+				arm_linux_processors[i].max_frequency =
+					arm_linux_processors[cluster_leader].max_frequency;
 			}
 		}
 	}
 
 	for (uint32_t i = 0; i < arm_linux_processors_count; i++) {
 		if (bitmask_all(arm_linux_processors[i].flags, CPUINFO_LINUX_FLAG_VALID)) {
-			cpuinfo_log_debug("post-analysis processor %"PRIu32": MIDR %08"PRIx32" frequency %"PRIu32,
-				i, arm_linux_processors[i].midr, arm_linux_processors[i].max_frequency);
+			cpuinfo_log_debug(
+				"post-analysis processor %" PRIu32 ": MIDR %08" PRIx32 " frequency %" PRIu32,
+				i,
+				arm_linux_processors[i].midr,
+				arm_linux_processors[i].max_frequency);
 		}
 	}
 
-	qsort(arm_linux_processors, arm_linux_processors_count,
-		sizeof(struct cpuinfo_arm_linux_processor), cmp_arm_linux_processor);
+	qsort(arm_linux_processors,
+	      arm_linux_processors_count,
+	      sizeof(struct cpuinfo_arm_linux_processor),
+	      cmp_arm_linux_processor);
 
 	for (uint32_t i = 0; i < arm_linux_processors_count; i++) {
 		if (bitmask_all(arm_linux_processors[i].flags, CPUINFO_LINUX_FLAG_VALID)) {
-			cpuinfo_log_debug("post-sort processor %"PRIu32": system id %"PRIu32" MIDR %08"PRIx32" frequency %"PRIu32,
-				i, arm_linux_processors[i].system_processor_id, arm_linux_processors[i].midr, arm_linux_processors[i].max_frequency);
+			cpuinfo_log_debug(
+				"post-sort processor %" PRIu32 ": system id %" PRIu32 " MIDR %08" PRIx32
+				" frequency %" PRIu32,
+				i,
+				arm_linux_processors[i].system_processor_id,
+				arm_linux_processors[i].midr,
+				arm_linux_processors[i].max_frequency);
 		}
 	}
 
@@ -422,8 +469,10 @@ void cpuinfo_arm_linux_init(void) {
 	/*
 	 * Assumptions:
 	 * - No SMP (i.e. each core supports only one hardware thread).
-	 * - Level 1 instruction and data caches are private to the core clusters.
-	 * - Level 2 and level 3 cache is shared between cores in the same cluster.
+	 * - Level 1 instruction and data caches are private to the core
+	 * clusters.
+	 * - Level 2 and level 3 cache is shared between cores in the same
+	 * cluster.
 	 */
 	cpuinfo_arm_chipset_to_string(&chipset, package.name);
 	package.processor_count = valid_processors;
@@ -432,66 +481,84 @@ void cpuinfo_arm_linux_init(void) {
 
 	processors = calloc(valid_processors, sizeof(struct cpuinfo_processor));
 	if (processors == NULL) {
-		cpuinfo_log_error("failed to allocate %zu bytes for descriptions of %"PRIu32" logical processors",
-			valid_processors * sizeof(struct cpuinfo_processor), valid_processors);
+		cpuinfo_log_error(
+			"failed to allocate %zu bytes for descriptions of %" PRIu32 " logical processors",
+			valid_processors * sizeof(struct cpuinfo_processor),
+			valid_processors);
 		goto cleanup;
 	}
 
 	cores = calloc(valid_processors, sizeof(struct cpuinfo_core));
 	if (cores == NULL) {
-		cpuinfo_log_error("failed to allocate %zu bytes for descriptions of %"PRIu32" cores",
-			valid_processors * sizeof(struct cpuinfo_core), valid_processors);
+		cpuinfo_log_error(
+			"failed to allocate %zu bytes for descriptions of %" PRIu32 " cores",
+			valid_processors * sizeof(struct cpuinfo_core),
+			valid_processors);
 		goto cleanup;
 	}
 
 	clusters = calloc(cluster_count, sizeof(struct cpuinfo_cluster));
 	if (clusters == NULL) {
-		cpuinfo_log_error("failed to allocate %zu bytes for descriptions of %"PRIu32" core clusters",
-			cluster_count * sizeof(struct cpuinfo_cluster), cluster_count);
+		cpuinfo_log_error(
+			"failed to allocate %zu bytes for descriptions of %" PRIu32 " core clusters",
+			cluster_count * sizeof(struct cpuinfo_cluster),
+			cluster_count);
 		goto cleanup;
 	}
 
 	uarchs = calloc(uarchs_count, sizeof(struct cpuinfo_uarch_info));
 	if (uarchs == NULL) {
-		cpuinfo_log_error("failed to allocate %zu bytes for descriptions of %"PRIu32" microarchitectures",
-			uarchs_count * sizeof(struct cpuinfo_uarch_info), uarchs_count);
+		cpuinfo_log_error(
+			"failed to allocate %zu bytes for descriptions of %" PRIu32 " microarchitectures",
+			uarchs_count * sizeof(struct cpuinfo_uarch_info),
+			uarchs_count);
 		goto cleanup;
 	}
 
 	linux_cpu_to_processor_map = calloc(arm_linux_processors_count, sizeof(struct cpuinfo_processor*));
 	if (linux_cpu_to_processor_map == NULL) {
-		cpuinfo_log_error("failed to allocate %zu bytes for %"PRIu32" logical processor mapping entries",
-			arm_linux_processors_count * sizeof(struct cpuinfo_processor*), arm_linux_processors_count);
+		cpuinfo_log_error(
+			"failed to allocate %zu bytes for %" PRIu32 " logical processor mapping entries",
+			arm_linux_processors_count * sizeof(struct cpuinfo_processor*),
+			arm_linux_processors_count);
 		goto cleanup;
 	}
 
 	linux_cpu_to_core_map = calloc(arm_linux_processors_count, sizeof(struct cpuinfo_core*));
 	if (linux_cpu_to_core_map == NULL) {
-		cpuinfo_log_error("failed to allocate %zu bytes for %"PRIu32" core mapping entries",
-			arm_linux_processors_count * sizeof(struct cpuinfo_core*), arm_linux_processors_count);
+		cpuinfo_log_error(
+			"failed to allocate %zu bytes for %" PRIu32 " core mapping entries",
+			arm_linux_processors_count * sizeof(struct cpuinfo_core*),
+			arm_linux_processors_count);
 		goto cleanup;
 	}
 
 	if (uarchs_count > 1) {
 		linux_cpu_to_uarch_index_map = calloc(arm_linux_processors_count, sizeof(uint32_t));
 		if (linux_cpu_to_uarch_index_map == NULL) {
-			cpuinfo_log_error("failed to allocate %zu bytes for %"PRIu32" uarch index mapping entries",
-				arm_linux_processors_count * sizeof(uint32_t), arm_linux_processors_count);
+			cpuinfo_log_error(
+				"failed to allocate %zu bytes for %" PRIu32 " uarch index mapping entries",
+				arm_linux_processors_count * sizeof(uint32_t),
+				arm_linux_processors_count);
 			goto cleanup;
 		}
 	}
 
 	l1i = calloc(valid_processors, sizeof(struct cpuinfo_cache));
 	if (l1i == NULL) {
-		cpuinfo_log_error("failed to allocate %zu bytes for descriptions of %"PRIu32" L1I caches",
-			valid_processors * sizeof(struct cpuinfo_cache), valid_processors);
+		cpuinfo_log_error(
+			"failed to allocate %zu bytes for descriptions of %" PRIu32 " L1I caches",
+			valid_processors * sizeof(struct cpuinfo_cache),
+			valid_processors);
 		goto cleanup;
 	}
 
 	l1d = calloc(valid_processors, sizeof(struct cpuinfo_cache));
 	if (l1d == NULL) {
-		cpuinfo_log_error("failed to allocate %zu bytes for descriptions of %"PRIu32" L1D caches",
-			valid_processors * sizeof(struct cpuinfo_cache), valid_processors);
+		cpuinfo_log_error(
+			"failed to allocate %zu bytes for descriptions of %" PRIu32 " L1D caches",
+			valid_processors * sizeof(struct cpuinfo_cache),
+			valid_processors);
 		goto cleanup;
 	}
 
@@ -500,7 +567,7 @@ void cpuinfo_arm_linux_init(void) {
 		if (bitmask_all(arm_linux_processors[i].flags, CPUINFO_LINUX_FLAG_VALID)) {
 			if (uarchs_index == 0 || arm_linux_processors[i].uarch != last_uarch) {
 				last_uarch = arm_linux_processors[i].uarch;
-				uarchs[uarchs_index] = (struct cpuinfo_uarch_info) {
+				uarchs[uarchs_index] = (struct cpuinfo_uarch_info){
 					.uarch = arm_linux_processors[i].uarch,
 					.midr = arm_linux_processors[i].midr,
 				};
@@ -518,7 +585,7 @@ void cpuinfo_arm_linux_init(void) {
 	for (uint32_t i = 0; i < valid_processors; i++) {
 		if (arm_linux_processors[i].package_leader_id == arm_linux_processors[i].system_processor_id) {
 			cluster_id += 1;
-			clusters[cluster_id] = (struct cpuinfo_cluster) {
+			clusters[cluster_id] = (struct cpuinfo_cluster){
 				.processor_start = i,
 				.processor_count = arm_linux_processors[i].package_processor_count,
 				.core_start = i,
@@ -535,7 +602,7 @@ void cpuinfo_arm_linux_init(void) {
 		processors[i].core = cores + i;
 		processors[i].cluster = clusters + cluster_id;
 		processors[i].package = &package;
-		processors[i].linux_id = (int) arm_linux_processors[i].system_processor_id;
+		processors[i].linux_id = (int)arm_linux_processors[i].system_processor_id;
 		processors[i].cache.l1i = l1i + i;
 		processors[i].cache.l1d = l1d + i;
 		linux_cpu_to_processor_map[arm_linux_processors[i].system_processor_id] = &processors[i];
@@ -555,7 +622,7 @@ void cpuinfo_arm_linux_init(void) {
 				arm_linux_processors[i].uarch_index;
 		}
 
-		struct cpuinfo_cache temp_l2 = { 0 }, temp_l3 = { 0 };
+		struct cpuinfo_cache temp_l2 = {0}, temp_l3 = {0};
 		cpuinfo_arm_decode_cache(
 			arm_linux_processors[i].uarch,
 			arm_linux_processors[i].package_processor_count,
@@ -563,38 +630,40 @@ void cpuinfo_arm_linux_init(void) {
 			&chipset,
 			cluster_id,
 			arm_linux_processors[i].architecture_version,
-			&l1i[i], &l1d[i], &temp_l2, &temp_l3);
+			&l1i[i],
+			&l1d[i],
+			&temp_l2,
+			&temp_l3);
 		l1i[i].processor_start = l1d[i].processor_start = i;
 		l1i[i].processor_count = l1d[i].processor_count = 1;
-		#if CPUINFO_ARCH_ARM
-			/* L1I reported in /proc/cpuinfo overrides defaults */
-			if (bitmask_all(arm_linux_processors[i].flags, CPUINFO_ARM_LINUX_VALID_ICACHE)) {
-				l1i[i] = (struct cpuinfo_cache) {
-					.size = arm_linux_processors[i].proc_cpuinfo_cache.i_size,
-					.associativity = arm_linux_processors[i].proc_cpuinfo_cache.i_assoc,
-					.sets = arm_linux_processors[i].proc_cpuinfo_cache.i_sets,
-					.partitions = 1,
-					.line_size = arm_linux_processors[i].proc_cpuinfo_cache.i_line_length
-				};
-			}
-			/* L1D reported in /proc/cpuinfo overrides defaults */
-			if (bitmask_all(arm_linux_processors[i].flags, CPUINFO_ARM_LINUX_VALID_DCACHE)) {
-				l1d[i] = (struct cpuinfo_cache) {
-					.size = arm_linux_processors[i].proc_cpuinfo_cache.d_size,
-					.associativity = arm_linux_processors[i].proc_cpuinfo_cache.d_assoc,
-					.sets = arm_linux_processors[i].proc_cpuinfo_cache.d_sets,
-					.partitions = 1,
-					.line_size = arm_linux_processors[i].proc_cpuinfo_cache.d_line_length
-				};
-			}
-		#endif
+#if CPUINFO_ARCH_ARM
+		/* L1I reported in /proc/cpuinfo overrides defaults */
+		if (bitmask_all(arm_linux_processors[i].flags, CPUINFO_ARM_LINUX_VALID_ICACHE)) {
+			l1i[i] = (struct cpuinfo_cache){
+				.size = arm_linux_processors[i].proc_cpuinfo_cache.i_size,
+				.associativity = arm_linux_processors[i].proc_cpuinfo_cache.i_assoc,
+				.sets = arm_linux_processors[i].proc_cpuinfo_cache.i_sets,
+				.partitions = 1,
+				.line_size = arm_linux_processors[i].proc_cpuinfo_cache.i_line_length};
+		}
+		/* L1D reported in /proc/cpuinfo overrides defaults */
+		if (bitmask_all(arm_linux_processors[i].flags, CPUINFO_ARM_LINUX_VALID_DCACHE)) {
+			l1d[i] = (struct cpuinfo_cache){
+				.size = arm_linux_processors[i].proc_cpuinfo_cache.d_size,
+				.associativity = arm_linux_processors[i].proc_cpuinfo_cache.d_assoc,
+				.sets = arm_linux_processors[i].proc_cpuinfo_cache.d_sets,
+				.partitions = 1,
+				.line_size = arm_linux_processors[i].proc_cpuinfo_cache.d_line_length};
+		}
+#endif
 
 		if (temp_l3.size != 0) {
 			/*
 			 * Assumptions:
 			 * - L2 is private to each core
 			 * - L3 is shared by cores in the same cluster
-			 * - If cores in different clusters report the same L3, it is shared between all cores.
+			 * - If cores in different clusters report the same L3,
+			 * it is shared between all cores.
 			 */
 			l2_count += 1;
 			if (arm_linux_processors[i].package_leader_id == arm_linux_processors[i].system_processor_id) {
@@ -602,17 +671,22 @@ void cpuinfo_arm_linux_init(void) {
 					big_l3_size = temp_l3.size;
 					l3_count = 1;
 				} else if (temp_l3.size != big_l3_size) {
-					/* If some cores have different L3 size, L3 is not shared between all cores */
+					/* If some cores have different L3 size,
+					 * L3 is not shared between all cores */
 					shared_l3 = false;
 					l3_count += 1;
 				}
 			}
 		} else {
-			/* If some cores don't have L3 cache, L3 is not shared between all cores */
+			/* If some cores don't have L3 cache, L3 is not shared
+			 * between all cores
+			 */
 			shared_l3 = false;
 			if (temp_l2.size != 0) {
-				/* Assume L2 is shared by cores in the same cluster */
-				if (arm_linux_processors[i].package_leader_id == arm_linux_processors[i].system_processor_id) {
+				/* Assume L2 is shared by cores in the same
+				 * cluster */
+				if (arm_linux_processors[i].package_leader_id ==
+				    arm_linux_processors[i].system_processor_id) {
 					l2_count += 1;
 				}
 			}
@@ -622,16 +696,20 @@ void cpuinfo_arm_linux_init(void) {
 	if (l2_count != 0) {
 		l2 = calloc(l2_count, sizeof(struct cpuinfo_cache));
 		if (l2 == NULL) {
-			cpuinfo_log_error("failed to allocate %zu bytes for descriptions of %"PRIu32" L2 caches",
-				l2_count * sizeof(struct cpuinfo_cache), l2_count);
+			cpuinfo_log_error(
+				"failed to allocate %zu bytes for descriptions of %" PRIu32 " L2 caches",
+				l2_count * sizeof(struct cpuinfo_cache),
+				l2_count);
 			goto cleanup;
 		}
 
 		if (l3_count != 0) {
 			l3 = calloc(l3_count, sizeof(struct cpuinfo_cache));
 			if (l3 == NULL) {
-				cpuinfo_log_error("failed to allocate %zu bytes for descriptions of %"PRIu32" L3 caches",
-					l3_count * sizeof(struct cpuinfo_cache), l3_count);
+				cpuinfo_log_error(
+					"failed to allocate %zu bytes for descriptions of %" PRIu32 " L3 caches",
+					l3_count * sizeof(struct cpuinfo_cache),
+					l3_count);
 				goto cleanup;
 			}
 		}
@@ -644,7 +722,7 @@ void cpuinfo_arm_linux_init(void) {
 			cluster_id++;
 		}
 
-		struct cpuinfo_cache dummy_l1i, dummy_l1d, temp_l2 = { 0 }, temp_l3 = { 0 };
+		struct cpuinfo_cache dummy_l1i, dummy_l1d, temp_l2 = {0}, temp_l3 = {0};
 		cpuinfo_arm_decode_cache(
 			arm_linux_processors[i].uarch,
 			arm_linux_processors[i].package_processor_count,
@@ -652,23 +730,27 @@ void cpuinfo_arm_linux_init(void) {
 			&chipset,
 			cluster_id,
 			arm_linux_processors[i].architecture_version,
-			&dummy_l1i, &dummy_l1d, &temp_l2, &temp_l3);
+			&dummy_l1i,
+			&dummy_l1d,
+			&temp_l2,
+			&temp_l3);
 
 		if (temp_l3.size != 0) {
 			/*
 			 * Assumptions:
 			 * - L2 is private to each core
 			 * - L3 is shared by cores in the same cluster
-			 * - If cores in different clusters report the same L3, it is shared between all cores.
+			 * - If cores in different clusters report the same L3,
+			 * it is shared between all cores.
 			 */
 			l2_index += 1;
-			l2[l2_index] = (struct cpuinfo_cache) {
-				.size            = temp_l2.size,
-				.associativity   = temp_l2.associativity,
-				.sets            = temp_l2.sets,
-				.partitions      = 1,
-				.line_size       = temp_l2.line_size,
-				.flags           = temp_l2.flags,
+			l2[l2_index] = (struct cpuinfo_cache){
+				.size = temp_l2.size,
+				.associativity = temp_l2.associativity,
+				.sets = temp_l2.sets,
+				.partitions = 1,
+				.line_size = temp_l2.line_size,
+				.flags = temp_l2.flags,
 				.processor_start = i,
 				.processor_count = 1,
 			};
@@ -676,16 +758,17 @@ void cpuinfo_arm_linux_init(void) {
 			if (arm_linux_processors[i].package_leader_id == arm_linux_processors[i].system_processor_id) {
 				l3_index += 1;
 				if (l3_index < l3_count) {
-					l3[l3_index] = (struct cpuinfo_cache) {
-						.size            = temp_l3.size,
-						.associativity   = temp_l3.associativity,
-						.sets            = temp_l3.sets,
-						.partitions      = 1,
-						.line_size       = temp_l3.line_size,
-						.flags           = temp_l3.flags,
+					l3[l3_index] = (struct cpuinfo_cache){
+						.size = temp_l3.size,
+						.associativity = temp_l3.associativity,
+						.sets = temp_l3.sets,
+						.partitions = 1,
+						.line_size = temp_l3.line_size,
+						.flags = temp_l3.flags,
 						.processor_start = i,
-						.processor_count =
-							shared_l3 ? valid_processors : arm_linux_processors[i].package_processor_count,
+						.processor_count = shared_l3
+							? valid_processors
+							: arm_linux_processors[i].package_processor_count,
 					};
 				}
 			}
@@ -698,13 +781,13 @@ void cpuinfo_arm_linux_init(void) {
 			/* Assume L2 is shared by cores in the same cluster */
 			if (arm_linux_processors[i].package_leader_id == arm_linux_processors[i].system_processor_id) {
 				l2_index += 1;
-				l2[l2_index] = (struct cpuinfo_cache) {
-					.size            = temp_l2.size,
-					.associativity   = temp_l2.associativity,
-					.sets            = temp_l2.sets,
-					.partitions      = 1,
-					.line_size       = temp_l2.line_size,
-					.flags           = temp_l2.flags,
+				l2[l2_index] = (struct cpuinfo_cache){
+					.size = temp_l2.size,
+					.associativity = temp_l2.associativity,
+					.sets = temp_l2.sets,
+					.partitions = 1,
+					.line_size = temp_l2.line_size,
+					.flags = temp_l2.flags,
 					.processor_start = i,
 					.processor_count = arm_linux_processors[i].package_processor_count,
 				};
@@ -721,8 +804,8 @@ void cpuinfo_arm_linux_init(void) {
 	cpuinfo_uarchs = uarchs;
 	cpuinfo_cache[cpuinfo_cache_level_1i] = l1i;
 	cpuinfo_cache[cpuinfo_cache_level_1d] = l1d;
-	cpuinfo_cache[cpuinfo_cache_level_2]  = l2;
-	cpuinfo_cache[cpuinfo_cache_level_3]  = l3;
+	cpuinfo_cache[cpuinfo_cache_level_2] = l2;
+	cpuinfo_cache[cpuinfo_cache_level_3] = l3;
 
 	cpuinfo_processors_count = valid_processors;
 	cpuinfo_cores_count = valid_processors;
@@ -731,8 +814,8 @@ void cpuinfo_arm_linux_init(void) {
 	cpuinfo_uarchs_count = uarchs_count;
 	cpuinfo_cache_count[cpuinfo_cache_level_1i] = valid_processors;
 	cpuinfo_cache_count[cpuinfo_cache_level_1d] = valid_processors;
-	cpuinfo_cache_count[cpuinfo_cache_level_2]  = l2_count;
-	cpuinfo_cache_count[cpuinfo_cache_level_3]  = l3_count;
+	cpuinfo_cache_count[cpuinfo_cache_level_2] = l2_count;
+	cpuinfo_cache_count[cpuinfo_cache_level_3] = l3_count;
 	cpuinfo_max_cache_size = cpuinfo_arm_compute_max_cache_size(&processors[0]);
 
 	cpuinfo_linux_cpu_max = arm_linux_processors_count;

3rdparty/cpuinfo/src/arm/mach/init.c

@@ -1,31 +1,31 @@
-#include <stdio.h>
+#include <alloca.h>
 #include <stdint.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <alloca.h>
 
 #include <errno.h>
-#include <sys/types.h>
-#include <sys/sysctl.h>
 #include <mach/machine.h>
+#include <sys/sysctl.h>
+#include <sys/types.h>
 
 #include <cpuinfo.h>
-#include <mach/api.h>
 #include <cpuinfo/internal-api.h>
 #include <cpuinfo/log.h>
+#include <mach/api.h>
 
 /* Polyfill recent CPUFAMILY_ARM_* values for older SDKs */
 #ifndef CPUFAMILY_ARM_VORTEX_TEMPEST
-	#define CPUFAMILY_ARM_VORTEX_TEMPEST     0x07D34B9F
+#define CPUFAMILY_ARM_VORTEX_TEMPEST 0x07D34B9F
 #endif
 #ifndef CPUFAMILY_ARM_LIGHTNING_THUNDER
-	#define CPUFAMILY_ARM_LIGHTNING_THUNDER  0x462504D2
+#define CPUFAMILY_ARM_LIGHTNING_THUNDER 0x462504D2
 #endif
 #ifndef CPUFAMILY_ARM_FIRESTORM_ICESTORM
-	#define CPUFAMILY_ARM_FIRESTORM_ICESTORM 0x1B588BB3
+#define CPUFAMILY_ARM_FIRESTORM_ICESTORM 0x1B588BB3
 #endif
 #ifndef CPUFAMILY_ARM_AVALANCHE_BLIZZARD
-	#define CPUFAMILY_ARM_AVALANCHE_BLIZZARD 0xDA33D83D
+#define CPUFAMILY_ARM_AVALANCHE_BLIZZARD 0xDA33D83D
 #endif
 
 struct cpuinfo_arm_isa cpuinfo_isa = {
@@ -39,12 +39,12 @@ struct cpuinfo_arm_isa cpuinfo_isa = {
 static uint32_t get_sys_info(int type_specifier, const char* name) {
 	size_t size = 0;
 	uint32_t result = 0;
-	int mib[2] = { CTL_HW, type_specifier };
+	int mib[2] = {CTL_HW, type_specifier};
 	if (sysctl(mib, 2, NULL, &size, NULL, 0) != 0) {
 		cpuinfo_log_info("sysctl(\"%s\") failed: %s", name, strerror(errno));
 	} else if (size == sizeof(uint32_t)) {
 		sysctl(mib, 2, &result, &size, NULL, 0);
-		cpuinfo_log_debug("%s: %"PRIu32 ", size = %lu", name, result, size);
+		cpuinfo_log_debug("%s: %" PRIu32 ", size = %lu", name, result, size);
 	} else {
 		cpuinfo_log_info("sysctl does not support non-integer lookup for (\"%s\")", name);
 	}
@@ -58,7 +58,7 @@ static uint32_t get_sys_info_by_name(const char* type_specifier) {
 		cpuinfo_log_info("sysctlbyname(\"%s\") failed: %s", type_specifier, strerror(errno));
 	} else if (size == sizeof(uint32_t)) {
 		sysctlbyname(type_specifier, &result, &size, NULL, 0);
-		cpuinfo_log_debug("%s: %"PRIu32 ", size = %lu", type_specifier, result, size);
+		cpuinfo_log_debug("%s: %" PRIu32 ", size = %lu", type_specifier, result, size);
 	} else {
 		cpuinfo_log_info("sysctl does not support non-integer lookup for (\"%s\")", type_specifier);
 	}
@@ -79,13 +79,16 @@ static enum cpuinfo_uarch decode_uarch(uint32_t cpu_family, uint32_t core_index,
 			/* 2x Monsoon + 4x Mistral cores */
 			return core_index < 2 ? cpuinfo_uarch_monsoon : cpuinfo_uarch_mistral;
 		case CPUFAMILY_ARM_VORTEX_TEMPEST:
-			/* Hexa-core: 2x Vortex + 4x Tempest; Octa-core: 4x Cortex + 4x Tempest */
+			/* Hexa-core: 2x Vortex + 4x Tempest; Octa-core: 4x
+			 * Cortex + 4x Tempest */
 			return core_index + 4 < core_count ? cpuinfo_uarch_vortex : cpuinfo_uarch_tempest;
 		case CPUFAMILY_ARM_LIGHTNING_THUNDER:
-			/* Hexa-core: 2x Lightning + 4x Thunder; Octa-core (presumed): 4x Lightning + 4x Thunder */
+			/* Hexa-core: 2x Lightning + 4x Thunder; Octa-core
+			 * (presumed): 4x Lightning + 4x Thunder */
 			return core_index + 4 < core_count ? cpuinfo_uarch_lightning : cpuinfo_uarch_thunder;
 		case CPUFAMILY_ARM_FIRESTORM_ICESTORM:
-			/* Hexa-core: 2x Firestorm + 4x Icestorm; Octa-core: 4x Firestorm + 4x Icestorm */
+			/* Hexa-core: 2x Firestorm + 4x Icestorm; Octa-core: 4x
+			 * Firestorm + 4x Icestorm */
 			return core_index + 4 < core_count ? cpuinfo_uarch_firestorm : cpuinfo_uarch_icestorm;
 		case CPUFAMILY_ARM_AVALANCHE_BLIZZARD:
 			/* Hexa-core: 2x Avalanche + 4x Blizzard */
@@ -105,7 +108,7 @@ static void decode_package_name(char* package_name) {
 		return;
 	}
 
-	char *machine_name = alloca(size);
+	char* machine_name = alloca(size);
 	if (sysctlbyname("hw.machine", machine_name, &size, NULL, 0) != 0) {
 		cpuinfo_log_warning("sysctlbyname(\"hw.machine\") failed: %s", strerror(errno));
 		return;
@@ -114,7 +117,7 @@ static void decode_package_name(char* package_name) {
 
 	char name[10];
 	uint32_t major = 0, minor = 0;
-	if (sscanf(machine_name, "%9[^,0123456789]%"SCNu32",%"SCNu32, name, &major, &minor) != 3) {
+	if (sscanf(machine_name, "%9[^,0123456789]%" SCNu32 ",%" SCNu32, name, &major, &minor) != 3) {
 		cpuinfo_log_warning("parsing \"hw.machine\" failed: %s", strerror(errno));
 		return;
 	}
@@ -149,8 +152,9 @@ static void decode_package_name(char* package_name) {
 			/* iPad 2 and up are supported */
 			case 2:
 				/*
-				 * iPad 2    [A5]: iPad2,1, iPad2,2, iPad2,3, iPad2,4
-				 * iPad mini [A5]: iPad2,5, iPad2,6, iPad2,7
+				 * iPad 2    [A5]: iPad2,1, iPad2,2, iPad2,3,
+				 * iPad2,4 iPad mini [A5]: iPad2,5, iPad2,6,
+				 * iPad2,7
 				 */
 				chip_model = major + 3;
 				break;
@@ -164,9 +168,10 @@ static void decode_package_name(char* package_name) {
 				break;
 			case 4:
 				/*
-				 * iPad Air         [A7]: iPad4,1, iPad4,2, iPad4,3
-				 * iPad mini Retina [A7]: iPad4,4, iPad4,5, iPad4,6
-				 * iPad mini 3      [A7]: iPad4,7, iPad4,8, iPad4,9
+				 * iPad Air         [A7]: iPad4,1, iPad4,2,
+				 * iPad4,3 iPad mini Retina [A7]: iPad4,4,
+				 * iPad4,5, iPad4,6 iPad mini 3      [A7]:
+				 * iPad4,7, iPad4,8, iPad4,9
 				 */
 				chip_model = major + 3;
 				break;
@@ -218,7 +223,7 @@ static void decode_package_name(char* package_name) {
 		cpuinfo_log_info("unknown device: %s", machine_name);
 	}
 	if (chip_model != 0) {
-		snprintf(package_name, CPUINFO_PACKAGE_NAME_MAX, "Apple A%"PRIu32"%c", chip_model, suffix);
+		snprintf(package_name, CPUINFO_PACKAGE_NAME_MAX, "Apple A%" PRIu32 "%c", chip_model, suffix);
 	}
 }
 
@@ -236,20 +241,26 @@ void cpuinfo_arm_mach_init(void) {
 	struct cpuinfo_mach_topology mach_topology = cpuinfo_mach_detect_topology();
 	processors = calloc(mach_topology.threads, sizeof(struct cpuinfo_processor));
 	if (processors == NULL) {
-		cpuinfo_log_error("failed to allocate %zu bytes for descriptions of %"PRIu32" logical processors",
-			mach_topology.threads * sizeof(struct cpuinfo_processor), mach_topology.threads);
+		cpuinfo_log_error(
+			"failed to allocate %zu bytes for descriptions of %" PRIu32 " logical processors",
+			mach_topology.threads * sizeof(struct cpuinfo_processor),
+			mach_topology.threads);
 		goto cleanup;
 	}
 	cores = calloc(mach_topology.cores, sizeof(struct cpuinfo_core));
 	if (cores == NULL) {
-		cpuinfo_log_error("failed to allocate %zu bytes for descriptions of %"PRIu32" cores",
-			mach_topology.cores * sizeof(struct cpuinfo_core), mach_topology.cores);
+		cpuinfo_log_error(
+			"failed to allocate %zu bytes for descriptions of %" PRIu32 " cores",
+			mach_topology.cores * sizeof(struct cpuinfo_core),
+			mach_topology.cores);
 		goto cleanup;
 	}
 	packages = calloc(mach_topology.packages, sizeof(struct cpuinfo_package));
 	if (packages == NULL) {
-		cpuinfo_log_error("failed to allocate %zu bytes for descriptions of %"PRIu32" packages",
-			mach_topology.packages * sizeof(struct cpuinfo_package), mach_topology.packages);
+		cpuinfo_log_error(
+			"failed to allocate %zu bytes for descriptions of %" PRIu32 " packages",
+			mach_topology.packages * sizeof(struct cpuinfo_package),
+			mach_topology.packages);
 		goto cleanup;
 	}
 
@@ -258,7 +269,7 @@ void cpuinfo_arm_mach_init(void) {
 	const uint32_t cores_per_package = mach_topology.cores / mach_topology.packages;
 
 	for (uint32_t i = 0; i < mach_topology.packages; i++) {
-		packages[i] = (struct cpuinfo_package) {
+		packages[i] = (struct cpuinfo_package){
 			.processor_start = i * threads_per_package,
 			.processor_count = threads_per_package,
 			.core_start = i * cores_per_package,
@@ -267,18 +278,19 @@ void cpuinfo_arm_mach_init(void) {
 		decode_package_name(packages[i].name);
 	}
 
-
 	const uint32_t cpu_family = get_sys_info_by_name("hw.cpufamily");
 
 	/*
-	 * iOS 15 and macOS 12 added sysctls for ARM features, use them where possible.
-	 * Otherwise, fallback to hardcoded set of CPUs with known support.
+	 * iOS 15 and macOS 12 added sysctls for ARM features, use them where
+	 * possible. Otherwise, fallback to hardcoded set of CPUs with known
+	 * support.
 	 */
 	const uint32_t has_feat_lse = get_sys_info_by_name("hw.optional.arm.FEAT_LSE");
 	if (has_feat_lse != 0) {
 		cpuinfo_isa.atomics = true;
 	} else {
-		// Mandatory in ARMv8.1-A, list only cores released before iOS 15 / macOS 12
+		// Mandatory in ARMv8.1-A, list only cores released before iOS
+		// 15 / macOS 12
 		switch (cpu_family) {
 			case CPUFAMILY_ARM_MONSOON_MISTRAL:
 			case CPUFAMILY_ARM_VORTEX_TEMPEST:
@@ -327,8 +339,9 @@ void cpuinfo_arm_mach_init(void) {
 		if (has_feat_fhm_legacy != 0) {
 			cpuinfo_isa.fhm = true;
 		} else {
-			// Mandatory in ARMv8.4-A when FP16 arithmetics is implemented,
-			// list only cores released before iOS 15 / macOS 12
+			// Mandatory in ARMv8.4-A when FP16 arithmetics is
+			// implemented, list only cores released before iOS 15 /
+			// macOS 12
 			switch (cpu_family) {
 				case CPUFAMILY_ARM_LIGHTNING_THUNDER:
 				case CPUFAMILY_ARM_FIRESTORM_ICESTORM:
@@ -346,7 +359,8 @@ void cpuinfo_arm_mach_init(void) {
 	if (has_feat_fcma != 0) {
 		cpuinfo_isa.fcma = true;
 	} else {
-		// Mandatory in ARMv8.3-A, list only cores released before iOS 15 / macOS 12
+		// Mandatory in ARMv8.3-A, list only cores released before iOS
+		// 15 / macOS 12
 		switch (cpu_family) {
 			case CPUFAMILY_ARM_LIGHTNING_THUNDER:
 			case CPUFAMILY_ARM_FIRESTORM_ICESTORM:
@@ -358,7 +372,8 @@ void cpuinfo_arm_mach_init(void) {
 	if (has_feat_jscvt != 0) {
 		cpuinfo_isa.jscvt = true;
 	} else {
-		// Mandatory in ARMv8.3-A, list only cores released before iOS 15 / macOS 12
+		// Mandatory in ARMv8.3-A, list only cores released before iOS
+		// 15 / macOS 12
 		switch (cpu_family) {
 			case CPUFAMILY_ARM_LIGHTNING_THUNDER:
 			case CPUFAMILY_ARM_FIRESTORM_ICESTORM:
@@ -370,7 +385,8 @@ void cpuinfo_arm_mach_init(void) {
 	if (has_feat_dotprod != 0) {
 		cpuinfo_isa.dot = true;
 	} else {
-		// Mandatory in ARMv8.4-A, list only cores released before iOS 15 / macOS 12
+		// Mandatory in ARMv8.4-A, list only cores released before iOS
+		// 15 / macOS 12
 		switch (cpu_family) {
 			case CPUFAMILY_ARM_LIGHTNING_THUNDER:
 			case CPUFAMILY_ARM_FIRESTORM_ICESTORM:
@@ -385,7 +401,7 @@ void cpuinfo_arm_mach_init(void) {
 
 	uint32_t num_clusters = 1;
 	for (uint32_t i = 0; i < mach_topology.cores; i++) {
-		cores[i] = (struct cpuinfo_core) {
+		cores[i] = (struct cpuinfo_core){
 			.processor_start = i * threads_per_core,
 			.processor_count = threads_per_core,
 			.core_id = i % cores_per_package,
@@ -410,27 +426,29 @@ void cpuinfo_arm_mach_init(void) {
 	clusters = calloc(num_clusters, sizeof(struct cpuinfo_cluster));
 	if (clusters == NULL) {
 		cpuinfo_log_error(
-			"failed to allocate %zu bytes for descriptions of %"PRIu32" clusters",
-			num_clusters * sizeof(struct cpuinfo_cluster), num_clusters);
+			"failed to allocate %zu bytes for descriptions of %" PRIu32 " clusters",
+			num_clusters * sizeof(struct cpuinfo_cluster),
+			num_clusters);
 		goto cleanup;
 	}
 	uarchs = calloc(num_clusters, sizeof(struct cpuinfo_uarch_info));
 	if (uarchs == NULL) {
 		cpuinfo_log_error(
-			"failed to allocate %zu bytes for descriptions of %"PRIu32" uarchs",
-			num_clusters * sizeof(enum cpuinfo_uarch), num_clusters);
+			"failed to allocate %zu bytes for descriptions of %" PRIu32 " uarchs",
+			num_clusters * sizeof(enum cpuinfo_uarch),
+			num_clusters);
 		goto cleanup;
 	}
 	uint32_t cluster_idx = UINT32_MAX;
 	for (uint32_t i = 0; i < mach_topology.cores; i++) {
 		if (i == 0 || cores[i].uarch != cores[i - 1].uarch) {
 			cluster_idx++;
-			uarchs[cluster_idx] = (struct cpuinfo_uarch_info) {
+			uarchs[cluster_idx] = (struct cpuinfo_uarch_info){
 				.uarch = cores[i].uarch,
 				.processor_count = 1,
 				.core_count = 1,
 			};
-			clusters[cluster_idx] = (struct cpuinfo_cluster) {
+			clusters[cluster_idx] = (struct cpuinfo_cluster){
 				.processor_start = i * threads_per_core,
 				.processor_count = 1,
 				.core_start = i,
@@ -475,7 +493,7 @@ void cpuinfo_arm_mach_init(void) {
 		/* Assume L1 caches are private to each core */
 		threads_per_l1 = 1;
 		l1_count = mach_topology.threads / threads_per_l1;
-		cpuinfo_log_debug("detected %"PRIu32" L1 caches", l1_count);
+		cpuinfo_log_debug("detected %" PRIu32 " L1 caches", l1_count);
 	}
 
 	uint32_t threads_per_l2 = 0, l2_count = 0;
@@ -483,7 +501,7 @@ void cpuinfo_arm_mach_init(void) {
 		/* Assume L2 cache is shared between all cores */
 		threads_per_l2 = mach_topology.cores;
 		l2_count = 1;
-		cpuinfo_log_debug("detected %"PRIu32" L2 caches", l2_count);
+		cpuinfo_log_debug("detected %" PRIu32 " L2 caches", l2_count);
 	}
 
 	uint32_t threads_per_l3 = 0, l3_count = 0;
@@ -491,24 +509,26 @@ void cpuinfo_arm_mach_init(void) {
 		/* Assume L3 cache is shared between all cores */
 		threads_per_l3 = mach_topology.cores;
 		l3_count = 1;
-		cpuinfo_log_debug("detected %"PRIu32" L3 caches", l3_count);
+		cpuinfo_log_debug("detected %" PRIu32 " L3 caches", l3_count);
 	}
 
 	if (l1i_cache_size != 0) {
 		l1i = calloc(l1_count, sizeof(struct cpuinfo_cache));
 		if (l1i == NULL) {
-			cpuinfo_log_error("failed to allocate %zu bytes for descriptions of %"PRIu32" L1I caches",
-				l1_count * sizeof(struct cpuinfo_cache), l1_count);
+			cpuinfo_log_error(
+				"failed to allocate %zu bytes for descriptions of %" PRIu32 " L1I caches",
+				l1_count * sizeof(struct cpuinfo_cache),
+				l1_count);
 			goto cleanup;
 		}
 		for (uint32_t c = 0; c < l1_count; c++) {
-			l1i[c] = (struct cpuinfo_cache) {
-				.size            = l1i_cache_size,
-				.associativity   = l1_cache_associativity,
-				.sets            = l1i_cache_size / (l1_cache_associativity * cacheline_size),
-				.partitions      = cache_partitions,
-				.line_size       = cacheline_size,
-				.flags           = cache_flags,
+			l1i[c] = (struct cpuinfo_cache){
+				.size = l1i_cache_size,
+				.associativity = l1_cache_associativity,
+				.sets = l1i_cache_size / (l1_cache_associativity * cacheline_size),
+				.partitions = cache_partitions,
+				.line_size = cacheline_size,
+				.flags = cache_flags,
 				.processor_start = c * threads_per_l1,
 				.processor_count = threads_per_l1,
 			};
@@ -521,18 +541,20 @@ void cpuinfo_arm_mach_init(void) {
 	if (l1d_cache_size != 0) {
 		l1d = calloc(l1_count, sizeof(struct cpuinfo_cache));
 		if (l1d == NULL) {
-			cpuinfo_log_error("failed to allocate %zu bytes for descriptions of %"PRIu32" L1D caches",
-				l1_count * sizeof(struct cpuinfo_cache), l1_count);
+			cpuinfo_log_error(
+				"failed to allocate %zu bytes for descriptions of %" PRIu32 " L1D caches",
+				l1_count * sizeof(struct cpuinfo_cache),
+				l1_count);
 			goto cleanup;
 		}
 		for (uint32_t c = 0; c < l1_count; c++) {
-			l1d[c] = (struct cpuinfo_cache) {
-				.size            = l1d_cache_size,
-				.associativity   = l1_cache_associativity,
-				.sets            = l1d_cache_size / (l1_cache_associativity * cacheline_size),
-				.partitions      = cache_partitions,
-				.line_size       = cacheline_size,
-				.flags           = cache_flags,
+			l1d[c] = (struct cpuinfo_cache){
+				.size = l1d_cache_size,
+				.associativity = l1_cache_associativity,
+				.sets = l1d_cache_size / (l1_cache_associativity * cacheline_size),
+				.partitions = cache_partitions,
+				.line_size = cacheline_size,
+				.flags = cache_flags,
 				.processor_start = c * threads_per_l1,
 				.processor_count = threads_per_l1,
 			};
@@ -545,18 +567,20 @@ void cpuinfo_arm_mach_init(void) {
 	if (l2_count != 0) {
 		l2 = calloc(l2_count, sizeof(struct cpuinfo_cache));
 		if (l2 == NULL) {
-			cpuinfo_log_error("failed to allocate %zu bytes for descriptions of %"PRIu32" L2 caches",
-				l2_count * sizeof(struct cpuinfo_cache), l2_count);
+			cpuinfo_log_error(
+				"failed to allocate %zu bytes for descriptions of %" PRIu32 " L2 caches",
+				l2_count * sizeof(struct cpuinfo_cache),
+				l2_count);
 			goto cleanup;
 		}
 		for (uint32_t c = 0; c < l2_count; c++) {
-			l2[c] = (struct cpuinfo_cache) {
-				.size            = l2_cache_size,
-				.associativity   = l2_cache_associativity,
-				.sets            = l2_cache_size / (l2_cache_associativity * cacheline_size),
-				.partitions      = cache_partitions,
-				.line_size       = cacheline_size,
-				.flags           = cache_flags,
+			l2[c] = (struct cpuinfo_cache){
+				.size = l2_cache_size,
+				.associativity = l2_cache_associativity,
+				.sets = l2_cache_size / (l2_cache_associativity * cacheline_size),
+				.partitions = cache_partitions,
+				.line_size = cacheline_size,
+				.flags = cache_flags,
 				.processor_start = c * threads_per_l2,
 				.processor_count = threads_per_l2,
 			};
@@ -569,18 +593,20 @@ void cpuinfo_arm_mach_init(void) {
 	if (l3_count != 0) {
 		l3 = calloc(l3_count, sizeof(struct cpuinfo_cache));
 		if (l3 == NULL) {
-			cpuinfo_log_error("failed to allocate %zu bytes for descriptions of %"PRIu32" L3 caches",
-												l3_count * sizeof(struct cpuinfo_cache), l3_count);
+			cpuinfo_log_error(
+				"failed to allocate %zu bytes for descriptions of %" PRIu32 " L3 caches",
+				l3_count * sizeof(struct cpuinfo_cache),
+				l3_count);
 			goto cleanup;
 		}
 		for (uint32_t c = 0; c < l3_count; c++) {
-			l3[c] = (struct cpuinfo_cache) {
-				.size            = l3_cache_size,
-				.associativity   = l3_cache_associativity,
-				.sets            = l3_cache_size / (l3_cache_associativity * cacheline_size),
-				.partitions      = cache_partitions,
-				.line_size       = cacheline_size,
-				.flags           = cache_flags,
+			l3[c] = (struct cpuinfo_cache){
+				.size = l3_cache_size,
+				.associativity = l3_cache_associativity,
+				.sets = l3_cache_size / (l3_cache_associativity * cacheline_size),
+				.partitions = cache_partitions,
+				.line_size = cacheline_size,
+				.flags = cache_flags,
 				.processor_start = c * threads_per_l3,
 				.processor_count = threads_per_l3,
 			};
@@ -598,8 +624,8 @@ void cpuinfo_arm_mach_init(void) {
 	cpuinfo_uarchs = uarchs;
 	cpuinfo_cache[cpuinfo_cache_level_1i] = l1i;
 	cpuinfo_cache[cpuinfo_cache_level_1d] = l1d;
-	cpuinfo_cache[cpuinfo_cache_level_2]  = l2;
-	cpuinfo_cache[cpuinfo_cache_level_3]  = l3;
+	cpuinfo_cache[cpuinfo_cache_level_2] = l2;
+	cpuinfo_cache[cpuinfo_cache_level_3] = l3;
 
 	cpuinfo_processors_count = mach_topology.threads;
 	cpuinfo_cores_count = mach_topology.cores;
@@ -608,8 +634,8 @@ void cpuinfo_arm_mach_init(void) {
 	cpuinfo_uarchs_count = num_clusters;
 	cpuinfo_cache_count[cpuinfo_cache_level_1i] = l1_count;
 	cpuinfo_cache_count[cpuinfo_cache_level_1d] = l1_count;
-	cpuinfo_cache_count[cpuinfo_cache_level_2]  = l2_count;
-	cpuinfo_cache_count[cpuinfo_cache_level_3]  = l3_count;
+	cpuinfo_cache_count[cpuinfo_cache_level_2] = l2_count;
+	cpuinfo_cache_count[cpuinfo_cache_level_3] = l3_count;
 	cpuinfo_max_cache_size = cpuinfo_compute_max_cache_size(&processors[0]);
 
 	__sync_synchronize();