rs, sys: bump capstone to 6.0.0-Alpha6

Author: jiegec

CHANGELOG.md

@@ -15,7 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - New operands types are added to `ArmOperandType`
 
 ### Changed
-- Bump bundled capstone to 6.0.0-Alpha5
+- Bump bundled capstone to 6.0.0-Alpha6
 - Rename ARM64 to AARCH64, SYSZ to SYSTEMZ to follow upstream changes
 - AArch64 support is rewritten to follow upstream changes
 - Endian must be specified for Sparc/SystemZ, since little endian support is added

capstone-rs/src/arch/alpha.rs

@@ -48,7 +48,7 @@ pub enum AlphaOperandType {
     Reg(RegId),
 
     /// Immediate
-    Imm(i32),
+    Imm(i64),
 
     /// Invalid
     Invalid,

capstone-rs/src/arch/m68k.rs

@@ -381,12 +381,12 @@ impl M68kOpMem {
 
     define_m68k_getter!(
         /// Indirect displacement
-        => in_disp: u32
+        => in_disp: i32
     );
 
     define_m68k_getter!(
         /// other displacement
-        => out_disp: u32
+        => out_disp: i32
     );
 
     define_m68k_getter!(
@@ -479,6 +479,9 @@ mod test {
         width: 0,
         offset: 0,
         index_size: 0,
+        disp_size: 0,
+        in_disp_size: 0,
+        out_disp_size: 0
     };
 
     #[test]

capstone-rs/src/test.rs

@@ -596,8 +596,8 @@ fn test_instruction_details() {
             "je",
             b"\x74\x05",
             &[JUMP],
-            &[X86_REG_EFLAGS],
-            &[X86_REG_EIP],
+            &[X86_REG_EFLAGS, X86_REG_RIP],
+            &[X86_REG_RIP],
         ),
         (
             "call",
@@ -610,11 +610,23 @@ fn test_instruction_details() {
             "ret",
             b"\xc3",
             &[RET],
-            &[X86_REG_RSP],
+            &[X86_REG_RSP, X86_REG_SS],
             &[X86_REG_RIP, X86_REG_RSP],
         ),
-        ("syscall", b"\x0f\x05", &[INT], &[], &[]),
-        ("iretd", b"\xcf", &[IRET], &[], &[]),
+        (
+            "syscall",
+            b"\x0f\x05",
+            &[INT],
+            &[],
+            &[X86_REG_EFLAGS, X86_REG_RCX, X86_REG_RIP, X86_REG_R11],
+        ),
+        (
+            "iretd",
+            b"\xcf",
+            &[IRET],
+            &[X86_REG_EFLAGS, X86_REG_ESP, X86_REG_SS],
+            &[X86_REG_EFLAGS, X86_REG_EIP, X86_REG_ESP],
+        ),
         (
             "sub",
             b"\x48\x83\xec\x08",
@@ -785,8 +797,8 @@ fn test_syntax() {
             "je",
             b"\x74\x05",
             &[JUMP],
-            &[X86_REG_EFLAGS],
-            &[X86_REG_EIP],
+            &[X86_REG_EFLAGS, X86_REG_RIP],
+            &[X86_REG_RIP],
         ),
         (
             "call",
@@ -801,11 +813,25 @@ fn test_syntax() {
             "retq",
             b"\xc3",
             &[RET],
-            &[X86_REG_RSP],
+            &[X86_REG_RSP, X86_REG_SS],
             &[X86_REG_RSP, X86_REG_RIP],
         ),
-        ("syscall", "syscall", b"\x0f\x05", &[INT], &[], &[]),
-        ("iretd", "iretl", b"\xcf", &[IRET], &[], &[]),
+        (
+            "syscall",
+            "syscall",
+            b"\x0f\x05",
+            &[INT],
+            &[],
+            &[X86_REG_EFLAGS, X86_REG_RCX, X86_REG_RIP, X86_REG_R11],
+        ),
+        (
+            "iretd",
+            "iretl",
+            b"\xcf",
+            &[IRET],
+            &[X86_REG_EFLAGS, X86_REG_ESP, X86_REG_SS],
+            &[X86_REG_EFLAGS, X86_REG_EIP, X86_REG_ESP],
+        ),
         (
             "sub",
             "subq",
@@ -2685,6 +2711,9 @@ fn test_arch_m68k_detail() {
         width: 0,
         offset: 0,
         index_size: 0,
+        disp_size: 0,
+        in_disp_size: 0,
+        out_disp_size: 0,
     };
 
     test_arch_mode_endian_insns_detail(

capstone-sys/CHANGELOG.md

@@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [UNRELEASED] - YYYY-MM-DD
 ### Changed
 - Rename ARM64 to AARCH64, SYSZ to SYSTEMZ to follow upstream changes
-- Bump bundled capstone to 6.0.0-Alpha5
+- Bump bundled capstone to 6.0.0-Alpha6
 
 ## [0.18.0] - 2026-01-04
 ### Added

capstone-sys/capstone/.clang-format

@@ -15,9 +15,7 @@ AlignConsecutiveAssignments: false
 AlignConsecutiveDeclarations: false
 AlignEscapedNewlines: DontAlign
 AlignOperands: true
-AlignTrailingComments:
-  Kind: Always
-  OverEmptyLines: 2
+AlignTrailingComments: false
 AllowAllParametersOfDeclarationOnNextLine: false
 AllowShortBlocksOnASingleLine: false
 AllowShortCaseLabelsOnASingleLine: false

capstone-sys/capstone/.github/workflows/CITest.yml

@@ -54,17 +54,17 @@ jobs:
               build_type: 'Debug'
             }
           - {
-              name: 'ubuntu-22.04 x64 release - assert warn',
+              name: 'ubuntu-22.04 x64 debug - assert warn',
               os: ubuntu-22.04,
               arch: x64,
               build-system: 'cmake',
               diet-build: 'OFF',
               enable-asan: 'OFF',
-              build_type: 'Release',
+              build_type: 'Debug',
               build_options: '-DCAPSTONE_ASSERTION_WARNINGS=ON'
             }
           - {
-              name: 'ubuntu-22.04 x64 release - no asserts',
+              name: 'ubuntu-22.04 x64 release - no assert warnings',
               os: ubuntu-22.04,
               arch: x64,
               build-system: 'cmake',
@@ -73,6 +73,16 @@ jobs:
               build_type: 'Release',
               build_options: '-DCAPSTONE_ASSERTION_WARNINGS=OFF'
             }
+          - {
+              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-24.04 x64 ASAN',
               os: ubuntu-24.04,
@@ -112,10 +122,10 @@ jobs:
       run: |
         mkdir build && cd build
         # build static library
-        cmake -DCAPSTONE_INSTALL=1 -DCMAKE_INSTALL_PREFIX=/usr -DENABLE_ASAN=${asan} -DCAPSTONE_BUILD_DIET=${diet_build} ${build_option} ..
+        cmake -DCMAKE_BUILD_TYPE=${build_type} -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} ${build_option} ..
+        cmake -DCMAKE_BUILD_TYPE=${build_type} -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
@@ -137,6 +147,16 @@ jobs:
       run: |
         sh suite/run_invalid_cstool.sh
 
+    - name: cstest negatives
+      if: startsWith(matrix.config.build-system, 'cmake')
+      run: |
+        ctest --test-dir build --output-on-failure -R NegativeTests1
+        ctest --test-dir build --output-on-failure -R NegativeTests2
+        ctest --test-dir build --output-on-failure -R NegativeTests3
+        ctest --test-dir build --output-on-failure -R NegativeTests4
+        ctest --test-dir build --output-on-failure -R NegativeTests5
+        ctest --test-dir build --output-on-failure -R NegativeTests6
+
     - name: cstest MC
       if: startsWith(matrix.config.build-system, 'cmake')
       run: |
@@ -167,15 +187,23 @@ jobs:
       run: |
         sudo apt-get -y update
         sudo apt-get -y install valgrind
-        valgrind cstest tests
-
-    - name: Comaptibility header generation
-      if: startsWith(matrix.config.build-system, 'cmake')
+        valgrind --leak-check=full cstest tests/details
+        valgrind --leak-check=full cstest tests/features
+        valgrind --leak-check=full cstest tests/issues
+        valgrind --leak-check=full cstest tests/MC
+
+    - name: Compatibility header generation
+      # clang-format-17 is only available in Ubuntu 24.04
+      # Hence the check only happens for it.
+      if: startsWith(matrix.config.build-system, 'cmake') && startsWith(matrix.config.os, 'ubuntu-24.04')
       run: |
+        sudo apt-get -y update
+        sudo apt-get -y install clang-format-17
+        clang-format-17 --version
         cp ./include/capstone/arm64.h arm64_compat_current.h
         cp ./include/capstone/systemz_compatibility.h systemz_compat_current.h
-        ./suite/auto-sync/src/autosync/HeaderPatcher.py -c --v6 ./include/capstone/aarch64.h --v5 ./include/capstone/arm64.h
-        ./suite/auto-sync/src/autosync/HeaderPatcher.py -c --v6 ./include/capstone/systemz.h --v5 ./include/capstone/systemz_compatibility.h
+        ./suite/auto-sync/src/autosync/HeaderPatcher.py -C ./.clang-format -c --v6 ./include/capstone/aarch64.h --v5 ./include/capstone/arm64.h
+        ./suite/auto-sync/src/autosync/HeaderPatcher.py -C ./.clang-format -c --v6 ./include/capstone/systemz.h --v5 ./include/capstone/systemz_compatibility.h
         diff ./include/capstone/arm64.h arm64_compat_current.h &&
         diff ./include/capstone/systemz_compatibility.h systemz_compat_current.h
 
@@ -192,6 +220,14 @@ jobs:
             platform: windows
             python-arch: x64
             python-version: '3.9'
+            diet_build: false
+          - name: 'windows x64 MSVC 64bit DIET'
+            os: windows-latest
+            arch: x64
+            platform: windows
+            python-arch: x64
+            python-version: '3.9'
+            diet_build: true
 
     steps:
     - uses: actions/checkout@v4
@@ -210,6 +246,6 @@ jobs:
       shell: bash
       run: |
         cmake --version
-        cmake --preset=${{ matrix.config.platform }}-x64
-        cmake --build --preset build-${{ matrix.config.platform }}-release
-        cmake --build --preset install-${{ matrix.config.platform }}-release
+        cmake --preset=${{ matrix.config.platform }}-x64${{ matrix.config.diet_build == true && '-diet' || '' }}
+        cmake --build --preset build-${{ matrix.config.platform }}${{ matrix.config.diet_build == true && '-diet' || '' }}-release
+        cmake --build --preset install-${{ matrix.config.platform }}${{ matrix.config.diet_build == true && '-diet' || '' }}-release