Merge commit '16a2cf3873e00fa08e587d1b05c9132d98c24f50' into back-to-imgui

2025-06-26 22:15:44 +02:00
parent 2ec3abbe14 16a2cf3873
commit e13270e41e
876 changed files with 168071 additions and 411897 deletions
--- a/external/capstone/.github/labeler.yml
+++ b/external/capstone/.github/labeler.yml
@@ -48,6 +48,13 @@ Alpha:
  - tests/MC/Alpha/**
  - tests/details/alpha.yaml

+ARC:
+- arch/ARC/*
+- cstool/cstool_arc.c
+- include/capstone/arc.h
+- suite/MC/ARC/*
+- tests/test_arc.c
+
 BPF:
  - arch/BPF/**
  - cstool/cstool_bpf.c
--- a/external/capstone/.github/workflows/CITest.yml
+++ b/external/capstone/.github/workflows/CITest.yml
@@ -50,7 +50,28 @@ jobs:
              arch: x64,
              build-system: 'cmake',
              diet-build: 'OFF',
-              enable-asan: 'OFF'
+              enable-asan: 'OFF',
+              build_type: 'Debug'
+            }
+          - {
+              name: 'ubuntu-22.04 x64 release - assert warn',
+              os: ubuntu-22.04,
+              arch: x64,
+              build-system: 'cmake',
+              diet-build: 'OFF',
+              enable-asan: 'OFF',
+              build_type: 'Release',
+              build_options: '-DCAPSTONE_ASSERTION_WARNINGS=ON'
+            }
+          - {
+              name: 'ubuntu-22.04 x64 release - no asserts',
+              os: ubuntu-22.04,
+              arch: x64,
+              build-system: 'cmake',
+              diet-build: 'OFF',
+              enable-asan: 'OFF',
+              build_type: 'Release',
+              build_options: '-DCAPSTONE_ASSERTION_WARNINGS=OFF'
            }
          - {
              name: 'ubuntu-24.04 x64 ASAN',
@@ -58,7 +79,8 @@ jobs:
              arch: x64,
              build-system: 'cmake',
              diet-build: 'OFF',
-              enable-asan: 'ON'
+              enable-asan: 'ON',
+              build_type: 'Debug'
            }

    steps:
@@ -85,14 +107,16 @@ jobs:
      if: startsWith(matrix.config.build-system, 'cmake')
      env:
        asan: ${{ matrix.config.enable-asan }}
+        build_option: ${{ matrix.config.build_option }}
+        build_type: ${{ matrix.config.build_type }}
      run: |
        mkdir build && cd build
        # build static library
-        cmake -DCAPSTONE_INSTALL=1 -DCMAKE_INSTALL_PREFIX=/usr -DENABLE_ASAN=${asan} -DCAPSTONE_BUILD_DIET=${diet_build} ..
-        cmake --build . --config Debug
+        cmake -DCAPSTONE_INSTALL=1 -DCMAKE_INSTALL_PREFIX=/usr -DENABLE_ASAN=${asan} -DCAPSTONE_BUILD_DIET=${diet_build} ${build_option} ..
+        cmake --build . --config ${build_type}
        # build shared library
-        cmake -DCAPSTONE_INSTALL=1 -DCAPSTONE_BUILD_SHARED_LIBS=1 -DCMAKE_INSTALL_PREFIX=/usr -DCAPSTONE_BUILD_CSTEST=ON -DENABLE_ASAN=${asan} ..
-        sudo cmake --build . --config Debug --target install
+        cmake -DCAPSTONE_INSTALL=1 -DCAPSTONE_BUILD_SHARED_LIBS=1 -DCMAKE_INSTALL_PREFIX=/usr -DCAPSTONE_BUILD_CSTEST=ON -DENABLE_ASAN=${asan} ${build_option} ..
+        sudo cmake --build . --config ${build_type} --target install

    - name: Lower number of KASL randomized address bits
      run: |
@@ -141,7 +165,8 @@ jobs:
    - name: Valgrind cstest
      if: startsWith(matrix.config.build-system, 'cmake') && startsWith(matrix.config.enable-asan, 'OFF')
      run: |
-        sudo apt-get install valgrind
+        sudo apt-get -y update
+        sudo apt-get -y install valgrind
        valgrind cstest tests

    - name: Comaptibility header generation
--- a/external/capstone/.github/workflows/auto-sync.yml
+++ b/external/capstone/.github/workflows/auto-sync.yml
@@ -55,7 +55,7 @@ jobs:
          cd vendor/llvm_root
          mkdir build
          cd build
-          cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug ../llvm
+          cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=ARC ../llvm
          cmake --build . --target llvm-tblgen --config Debug
          cd ../../../

@@ -74,6 +74,7 @@ jobs:
        run: |
          ./src/autosync/ASUpdater.py -d -a AArch64 -s IncGen
          ./src/autosync/ASUpdater.py -d -a Alpha -s IncGen
+          ./src/autosync/ASUpdater.py -d -a ARC -s IncGen
          ./src/autosync/ASUpdater.py -d -a ARM -s IncGen
          ./src/autosync/ASUpdater.py -d -a PPC -s IncGen
          ./src/autosync/ASUpdater.py -d -a LoongArch -s IncGen
@@ -93,6 +94,7 @@ jobs:
      - name: CppTranslator - Test translation
        run: |
          ./src/autosync/ASUpdater.py --ci -d -a AArch64 -s Translate
+          ./src/autosync/ASUpdater.py --ci -d -a ARC -s Translate
          ./src/autosync/ASUpdater.py --ci -d -a ARM -s Translate
          ./src/autosync/ASUpdater.py --ci -d -a PPC -s Translate
          ./src/autosync/ASUpdater.py --ci -d -a LoongArch -s Translate
--- a/external/capstone/.github/workflows/build-wheels-publish.yml
+++ b/external/capstone/.github/workflows/build-wheels-publish.yml
@@ -34,8 +34,7 @@ env:
  CAPSTONE_DEBUG: ${{ inputs.debugMode != '' && inputs.debugMode || startsWith(github.ref, 'refs/tags') && '0' || '1' }}

 jobs:
-  # job to be executed for every push - testing purpose
-  build_wheels_always:
+  build_and_test_wheels:
    name: Building on ${{ matrix.os }} - ${{ matrix.arch }} - ${{ matrix.cibw_build }}
    runs-on: ${{ matrix.os }}
    strategy:
@@ -44,28 +43,27 @@ jobs:
        include:
          # NOTE: Making this to parallelize and speed up workflow
          # i686 - manylinux
-          # - { os: ubuntu-latest, arch: i686, cibw_build: 'cp38-manylinux* cp313-manylinux*', cibw_skip: '' }
+          # - { os: ubuntu-latest, arch: i686, cibw_build: 'cp*-manylinux*', cibw_skip: '*36* *37*' }
          # i686 - musllinux
-          # - { os: ubuntu-latest, arch: i686, cibw_build: 'cp38-musllinux* cp313-musllinux*', cibw_skip: '' }
+          # - { os: ubuntu-latest, arch: i686, cibw_build: 'cp*-musllinux*', cibw_skip: '*36* *37*' }
          # x86_64 - manylinux
-          - { os: ubuntu-latest, arch: x86_64, cibw_build: 'cp38-manylinux* cp313-manylinux*', cibw_skip: '' }
+          - { os: ubuntu-latest, arch: x86_64, cibw_build: 'cp*-manylinux*', cibw_skip: '*36* *37*' }
          # x86_64 - musllinux
-          - { os: ubuntu-latest, arch: x86_64, cibw_build: 'cp38-musllinux* cp313-musllinux*', cibw_skip: '' }
+          - { os: ubuntu-latest, arch: x86_64, cibw_build: 'cp*-musllinux*', cibw_skip: '*36* *37*' }
          # aarch64 - manylinux
-          - { os: ubuntu-latest, arch: aarch64, cibw_build: 'cp38-manylinux* cp313-manylinux*', cibw_skip: '' }
+          - { os: ubuntu-24.04-arm, arch: aarch64, cibw_build: 'cp*-manylinux*', cibw_skip: '*36* *37*' }
          # aarch64 - musllinux
-          - { os: ubuntu-latest, arch: aarch64, cibw_build: 'cp38-musllinux* cp313-musllinux*', cibw_skip: '' }
+          - { os: ubuntu-24.04-arm, arch: aarch64, cibw_build: 'cp*-musllinux*', cibw_skip: '*36* *37*' }
          # macos - x86_64
-          - { os: macos-13, arch: x86_64, cibw_build: 'cp38* cp313*', cibw_skip: '' }
+          - { os: macos-13, arch: x86_64, cibw_build: 'cp*', cibw_skip: '*36* *37*' }
          # macos - arm64
-          - { os: macos-latest, arch: arm64, cibw_build: 'cp38* cp313*', cibw_skip: '' }
-          - { os: macos-latest, arch: universal2, cibw_build: 'cp38* cp313*', cibw_skip: '' }
-          # windows - x86_64
-          - { os: windows-latest, arch: AMD64, cibw_build: 'cp38* cp313*', cibw_skip: '' }
+          - { os: macos-latest, arch: arm64, cibw_build: 'cp*', cibw_skip: '*36* *37*' }
          # windows - amd64
-          # - { os: windows-latest, arch: x86, cibw_build: 'cp38* cp313*', cibw_skip: '' }
+          - { os: windows-latest, arch: AMD64, cibw_build: 'cp*', cibw_skip: '*36* *37*' }
+          # windows - x86
+          # - { os: windows-latest, arch: x86, cibw_build: 'cp*', cibw_skip: '*36* *37*' }
          # windows - arm64
-          - { os: windows-latest, arch: ARM64, cibw_build: 'cp39* cp313*', cibw_skip: '' }
+          - { os: windows-latest, arch: ARM64, cibw_build: 'cp*', cibw_skip: '*36* *37* *38*' }

    steps:
      - uses: actions/checkout@v4
@@ -104,11 +102,11 @@ jobs:
          arch: amd64_arm64

      - name: '🛠️ Set up QEMU'
-        if: runner.os == 'Linux' && matrix.arch != 'x86_64'
+        if: runner.os == 'Linux' && matrix.arch == 'i686'
        uses: docker/setup-qemu-action@v3

      - name: '🚧 cibuildwheel run'
-        uses: pypa/cibuildwheel@v2.22.0
+        uses: pypa/cibuildwheel@v2.23.3
        env:
          CIBW_BUILD_FRONTEND: build
          CIBW_BUILD: ${{ matrix.cibw_build }}
@@ -131,115 +129,6 @@ jobs:
          name: ${{ env.ARTIFACT_NAME }}
          path: ./wheelhouse/*.whl

-  # To be executed only in case of a tag release
-  build_wheels_all:
-    name: Building on ${{ matrix.os }} - ${{ matrix.arch }} - ${{ matrix.cibw_build }}
-    runs-on: ${{ matrix.os }}
-    if: startsWith(github.ref, 'refs/tags')
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          # NOTE: Making this to parallelize and speed up workflow
-          # i686 - manylinux
-          # - { os: ubuntu-latest, arch: i686, cibw_build: 'cp39-manylinux*', cibw_skip: '' }
-          # - { os: ubuntu-latest, arch: i686, cibw_build: 'cp310-manylinux*', cibw_skip: '' }
-          # - { os: ubuntu-latest, arch: i686, cibw_build: 'cp311-manylinux*', cibw_skip: '' }
-          # - { os: ubuntu-latest, arch: i686, cibw_build: 'cp312-manylinux*', cibw_skip: '' }
-          # i686 - musllinux
-          # - { os: ubuntu-latest, arch: i686, cibw_build: 'cp39-musllinux*', cibw_skip: '' }
-          # - { os: ubuntu-latest, arch: i686, cibw_build: 'cp310-musllinux*', cibw_skip: '' }
-          # - { os: ubuntu-latest, arch: i686, cibw_build: 'cp311-musllinux*', cibw_skip: '' }
-          # - { os: ubuntu-latest, arch: i686, cibw_build: 'cp312-musllinux*', cibw_skip: '' }
-          # x86_64 - manylinux
-          - { os: ubuntu-latest, arch: x86_64, cibw_build: 'cp39-manylinux*', cibw_skip: '' }
-          - { os: ubuntu-latest, arch: x86_64, cibw_build: 'cp310-manylinux*', cibw_skip: '' }
-          - { os: ubuntu-latest, arch: x86_64, cibw_build: 'cp311-manylinux*', cibw_skip: '' }
-          - { os: ubuntu-latest, arch: x86_64, cibw_build: 'cp312-manylinux*', cibw_skip: '' }
-          # x86_64 - musllinux
-          - { os: ubuntu-latest, arch: x86_64, cibw_build: 'cp39-musllinux*', cibw_skip: '' }
-          - { os: ubuntu-latest, arch: x86_64, cibw_build: 'cp310-musllinux*', cibw_skip: '' }
-          - { os: ubuntu-latest, arch: x86_64, cibw_build: 'cp311-musllinux*', cibw_skip: '' }
-          - { os: ubuntu-latest, arch: x86_64, cibw_build: 'cp312-musllinux*', cibw_skip: '' }
-          # aarch64 - manylinux
-          - { os: ubuntu-latest, arch: aarch64, cibw_build: 'cp39-manylinux*', cibw_skip: '' }
-          - { os: ubuntu-latest, arch: aarch64, cibw_build: 'cp310-manylinux*', cibw_skip: '' }
-          - { os: ubuntu-latest, arch: aarch64, cibw_build: 'cp311-manylinux*', cibw_skip: '' }
-          - { os: ubuntu-latest, arch: aarch64, cibw_build: 'cp312-manylinux*', cibw_skip: '' }
-          # aarch64 - musllinux
-          - { os: ubuntu-latest, arch: aarch64, cibw_build: 'cp39-musllinux*', cibw_skip: '' }
-          - { os: ubuntu-latest, arch: aarch64, cibw_build: 'cp310-musllinux*', cibw_skip: '' }
-          - { os: ubuntu-latest, arch: aarch64, cibw_build: 'cp311-musllinux*', cibw_skip: '' }
-          - { os: ubuntu-latest, arch: aarch64, cibw_build: 'cp312-musllinux*', cibw_skip: '' }
-          # macos - x86_64
-          - { os: macos-13, arch: x86_64, cibw_build: 'cp*', cibw_skip: '*36* *37* *38* *313*' }
-          # macos - arm64
-          - { os: macos-latest, arch: arm64, cibw_build: 'cp*', cibw_skip: '*36* *37* *38* *313*' }
-          - { os: macos-latest, arch: universal2, cibw_build: 'cp*', cibw_skip: '*36* *37* *38* *39* *313*' }
-          # windows - amd64
-          - { os: windows-latest, arch: AMD64, cibw_build: 'cp*', cibw_skip: '*36* *37* *38* *313*' }
-          # windows - x86
-          # - { os: windows-latest, arch: x86, cibw_build: 'cp*', cibw_skip: '*36* *37* *38* *313*' }
-          # windows - arm64
-          - { os: windows-latest, arch: ARM64, cibw_build: 'cp*', cibw_skip: '*36* *37* *38* *39* *313*' }
-
-    steps:
-      - uses: actions/checkout@v4
-
-      # https://github.com/actions/upload-artifact/issues/22
-      - name: Prepare a unique name for Artifacts
-        shell: bash
-        run: |
-          # replace not-allowed chars with dash
-          name="cibw-wheels-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.cibw_build }}"
-          name=$(echo -n "$name" | sed -e 's/[ \t:\/\\"<>|*?]/-/g' -e 's/--*/-/g' | sed -e 's/\-$//')
-          echo "ARTIFACT_NAME=$name" >> $GITHUB_ENV
-
-      - name: '🛠️ Win MSVC 32 dev cmd setup'
-        if: runner.os == 'Windows' && matrix.arch == 'x86'
-        uses: ilammy/msvc-dev-cmd@v1
-        with:
-          arch: x86
-
-      - name: '🛠️ Win MSVC 64 dev cmd setup'
-        if: runner.os == 'Windows' && matrix.arch == 'AMD64'
-        uses: ilammy/msvc-dev-cmd@v1
-        with:
-          arch: x64
-
-      - name: '🛠️ Win MSVC ARM64 dev cmd setup'
-        if: runner.os == 'Windows' && matrix.arch == 'ARM64'
-        uses: ilammy/msvc-dev-cmd@v1
-        with:
-          arch: amd64_arm64
-
-      - name: '🛠️ Set up QEMU'
-        if: runner.os == 'Linux' && matrix.arch != 'x86_64'
-        uses: docker/setup-qemu-action@v3
-
-      - name: '🚧 cibuildwheel run'
-        uses: pypa/cibuildwheel@v2.22.0
-        env:
-          CIBW_BUILD_FRONTEND: build
-          CIBW_BUILD: ${{ matrix.cibw_build }}
-          CIBW_SKIP: ${{ matrix.cibw_skip }}
-          CIBW_ARCHS: ${{ matrix.arch }}
-          CIBW_ENVIRONMENT: DEBUG=${{ env.CAPSTONE_DEBUG }}
-          CIBW_ENVIRONMENT_PASS_LINUX: DEBUG
-          # https://cibuildwheel.pypa.io/en/stable/faq/#windows-arm64
-          CIBW_TEST_SKIP: "*-win_arm64"
-          CIBW_TEST_COMMAND: >
-            python -m pip install {package}/cstest_py &&
-            python {project}/suite/run_tests.py
-        with:
-          package-dir: bindings/python
-          output-dir: wheelhouse
-
-      - uses: actions/upload-artifact@v4
-        with:
-          name: ${{ env.ARTIFACT_NAME }}
-          path: ./wheelhouse/*.whl
-
  make_sdist:
    name: Make SDist
    runs-on: ubuntu-latest
@@ -251,9 +140,10 @@ jobs:

      - name: Build SDist
        run: |
-          cd bindings/python
          python3 -m pip install -U pip build
-          python3 -m build --sdist
+          python3 -m build --sdist bindings/python
+          python3 -m pip install bindings/python/dist/*.tar.gz
+          python3 -c 'import capstone; print(f"Capstone version installed from sdist: {capstone.__version__}")'

      - uses: actions/upload-artifact@v4
        with:
@@ -261,7 +151,7 @@ jobs:
          path: bindings/python/dist/*.tar.gz

  publish:
-    needs: [ build_wheels_always, build_wheels_all, make_sdist ]
+    needs: [ build_and_test_wheels, make_sdist ]
    environment: pypi
    permissions:
      id-token: write
--- a/external/capstone/.github/workflows/build_release.yml
+++ b/external/capstone/.github/workflows/build_release.yml
@@ -15,29 +15,6 @@ jobs:
      with:
        submodules: true

-    - name: Make setup.sh and check_capstone.sh are executable
-      run: |
-        chmod +x ./packages/deb/setup.sh
-        chmod +x ./packages/deb/check_capstone.sh
-        
-    - name: Build Debian Package
-      working-directory: ./packages/deb
-      run: ./setup.sh ${{ github.event.release.tag_name }}
-    
-    - name: Run sanity checks on the Debian package
-      working-directory: ./packages/deb
-      run: |
-        ./check_capstone.sh ./libcapstone-dev_${{ github.event.release.tag_name }}_amd64.deb
-      
-    - name: Upload debian package to release
-      uses: softprops/action-gh-release@v2
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        tag_name: ${{ github.event.release.tag_name }}
-        files: |
-          ./packages/deb/*.deb
-  
    - name: Create archive
      id: archive
      run: |
@@ -45,10 +22,9 @@ jobs:
        PKGNAME="capstone-$VERSION"
        SHASUM=$PKGNAME.tar.xz.sha256
        mkdir -p /tmp/$PKGNAME
-        mv * /tmp/$PKGNAME
-        mv /tmp/$PKGNAME .
+        rsync -a --exclude=build --exclude='.*' ./ /tmp/$PKGNAME/
        TARBALL=$PKGNAME.tar.xz
-        tar cJf $TARBALL $PKGNAME
+        tar -C /tmp -cJf $TARBALL $PKGNAME
        sha256sum $TARBALL > $SHASUM
        echo "tarball=$TARBALL" >> $GITHUB_OUTPUT
        echo "shasum=$SHASUM" >> $GITHUB_OUTPUT
@@ -62,3 +38,66 @@ jobs:
        files: |
          ${{ steps.archive.outputs.tarball }}
          ${{ steps.archive.outputs.shasum }}
+
+    - name: Configure CMake and build the project
+      run: |
+        cmake -B build \
+        -DPROJECT_VERSION=${{ github.event.release.tag_name }} \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DCAPSTONE_BUILD_SHARED_LIBS=1 \
+        -DCMAKE_INSTALL_PREFIX=/usr
+        cmake --build build
+
+    - name: Package DEB and RPM package
+      run: |
+        cd build
+        cpack -G DEB
+        cpack -G RPM
+
+    - name: Upload debian package to release
+      uses: softprops/action-gh-release@v2
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        tag_name: ${{ github.event.release.tag_name }}
+        files: |
+          ./build/*.deb
+          ./build/*.rpm
+
+  build_windows:
+    name: build_windows
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: true
+
+    - name: Win MSVC 64 dev cmd setup
+      uses: ilammy/msvc-dev-cmd@v1
+      with:
+        arch: x64
+
+    - name: Configure CMake and build the project
+      run: |
+        cmake -B build `
+        -T "ClangCL,host=x64" `
+        -A x64 `
+        -DPROJECT_VERSION="${{ github.event.release.tag_name }}" `
+        -DCMAKE_BUILD_TYPE=Release `
+        -DCAPSTONE_BUILD_SHARED_LIBS=1
+        cmake --build build --config Release
+        cmake --install build --config Release
+
+    - name: Package NSIS installer
+      run: |
+        cd build
+        cpack -G NSIS
+
+    - name: Upload NSIS installer to release
+      uses: softprops/action-gh-release@v2
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        tag_name: ${{ github.event.release.tag_name }}
+        files: |
+          ./build/*.exe
--- a/external/capstone/.github/workflows/labeler.yml
+++ b/external/capstone/.github/workflows/labeler.yml
@@ -14,7 +14,7 @@ jobs:
      pull-requests: write
    runs-on: ubuntu-22.04
    steps:
-    - uses: actions/labeler@v5
+    - uses: actions/labeler@v4
      with:
        repo-token: "${{ secrets.GITHUB_TOKEN }}"