Capstone@next TriCore

.github/workflows/ci.yml

@@ -63,7 +63,7 @@ jobs:
             linux-clang-tests-asan,
             linux-gcc-tests-codecov,
             capstone-v3,
-            capstone-next,
+            capstone-v4,
           ]
         include:
           - name: linux-meson-clang-tests
@@ -149,11 +149,11 @@ jobs:
             timeout: 45
             cflags: "-Wno-cpp"
             allow_failure: false
-          - name: capstone-next
+          - name: capstone-v4
             os: ubuntu-22.04
             build_system: meson
             compiler: gcc
-            meson_options: -Dbuildtype=release -Duse_capstone_version=next --werror
+            meson_options: -Dbuildtype=release -Duse_capstone_version=v4 --werror
             run_tests: false
             enabled: ${{ (github.event_name != 'pull_request' || contains(github.head_ref, 'capstone')) && needs.changes.outputs.edited == 'true' }}
             timeout: 45

doc/PACKAGERS.md

@@ -60,7 +60,7 @@ directories used by Rizin, have a look at options `rizin_sdb`, `rizin_zigns`,
 etc. in [meson_options.txt][].
 
 Rizin uses the Capstone disassembly engine and supports versions 3, 4, and 5.
-By default we use a custom version of Capstone based on v4 and statically link
+By default we use a custom version of Capstone based on v5 and statically link
 it into the Rizin executables.  Some distributions might prefer that a system
 version of Capstone be dynamically linked at runtime. To do this, use the
 `-Duse_sys_capstone=enabled` command line option when running `meson`.

librz/analysis/arch/arm/arm_il64.c

@@ -1708,7 +1708,7 @@ static RzILOpEffect *movn(cs_insn *insn) {
 static RzILOpEffect *msr(cs_insn *insn) {
 	cs_arm64_op *op = &insn->detail->arm64.operands[0];
 #if CS_API_MAJOR > 4
-	if (op->type != ARM64_OP_SYS || op->sys != ARM64_SYSREG_NZCV) {
+	if (op->type != ARM64_OP_SYS || (ut64)op->sys != (ut64)ARM64_SYSREG_NZCV) {
 		return NULL;
 	}
 #else
@@ -1803,7 +1803,7 @@ static RzILOpEffect *mrs(cs_insn *insn) {
 	}
 	cs_arm64_op *op = &insn->detail->arm64.operands[1];
 #if CS_API_MAJOR > 4
-	if (op->type != ARM64_OP_SYS || op->sys != ARM64_SYSREG_NZCV) {
+	if (op->type != ARM64_OP_SYS || (ut64)op->sys != (ut64)ARM64_SYSREG_NZCV) {
 		return NULL;
 	}
 #else

librz/analysis/meson.build

@@ -45,6 +45,7 @@ analysis_plugins_list = [
 ]
 if capstone_dep.version().split('.')[0].to_int() > 4
   analysis_plugins_list += 'riscv_cs'
+  analysis_plugins_list += 'tricore_cs'
 endif
 
 if get_option('use_gpl')
@@ -56,7 +57,6 @@ if get_option('use_gpl')
     'riscv',
     'sh',
     'sparc_gnu',
-    'tricore',
     'vax',
     'xtensa',
     'z80',
@@ -234,6 +234,7 @@ rz_analysis_sources = [
 
 if capstone_dep.version().split('.')[0].to_int() > 4
   rz_analysis_sources += 'p/analysis_riscv_cs.c'
+  rz_analysis_sources += 'p/analysis_tricore_cs.c'
 endif
 
 if get_option('use_gpl')
@@ -245,7 +246,6 @@ if get_option('use_gpl')
     'p/analysis_riscv.c',
     'p/analysis_sh.c',
     'p/analysis_sparc_gnu.c',
-    'p/analysis_tricore.c',
     'p/analysis_vax.c',
     'p/analysis_xtensa.c',
     'p/analysis_z80.c',