Add binding for RzAnnotatedCode and RzCodeAnnotation headers

* ci: Upgrade to Ubuntu 24.04 (Noble)
* Remove `pip3 --break-system-packages`
* Use `-include linux/limits.h` for Alpine build

.github/workflows/ci.yml

@@ -4,6 +4,11 @@ on:
   workflow_dispatch:
   workflow_call:
     inputs:
+      external_call:
+        description: 'To distinguish workflow_call from regular push'
+        type: boolean
+        required: false
+        default: true
       rizin_ref:
         required: false
         type: string
@@ -16,21 +21,43 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-22.04, windows-2019, macos-12]
+        os: [ubuntu-24.04, windows-2019, macos-14]
 
     steps:
+    - name: Install SWIG with Homebrew
+      if: matrix.os == 'macos-14' && matrix.enabled
+      run: brew install swig
+
     - name: Checkout rz-bindgen
       uses: actions/checkout@v4
 
+    # runned only from workflow_call
     - name: Checkout rizin
+      if: ${{ inputs.external_call }}
       uses: actions/checkout@v4
       with:
         repository: rizinorg/rizin
         path: rizin
         ref: ${{ inputs.rizin_ref }}
 
+    - name: Checkout rizin (stable)
+      if: ${{ !inputs.external_call && ((github.ref_name == 'stable') || (github.base_ref == 'stable')) }}
+      uses: actions/checkout@v4
+      with:
+        repository: rizinorg/rizin
+        path: rizin
+        ref: stable
+
+    - name: Checkout rizin (dev)
+      if: ${{ !inputs.external_call && ((github.ref_name != 'stable') && (github.base_ref != 'stable')) }}
+      uses: actions/checkout@v4
+      with:
+        repository: rizinorg/rizin
+        path: rizin
+        ref: dev
+
     - name: Build rz-bindgen
-      uses: pypa/cibuildwheel@v2.17.0
+      uses: pypa/cibuildwheel@v2.22.0
 
     - name: Upload sdist
       uses: actions/upload-artifact@v4
@@ -45,7 +72,7 @@ jobs:
         path: wheelhouse/*.whl
 
   ubuntu-default-llvm:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
     - name: Checkout rz-bindgen
@@ -53,16 +80,36 @@ jobs:
       with:
         path: rz-bindgen
 
+    # runned only from workflow_call
     - name: Checkout rizin
+      if: ${{ inputs.external_call }}
       uses: actions/checkout@v4
       with:
         repository: rizinorg/rizin
         path: rizin
+        ref: ${{ inputs.rizin_ref }}
+
+    - name: Checkout rizin (stable)
+      if: ${{ !inputs.external_call && ((github.ref_name == 'stable') || (github.base_ref == 'stable')) }}
+      uses: actions/checkout@v4
+      with:
+        repository: rizinorg/rizin
+        path: rizin
+        ref: stable
+
+    - name: Checkout rizin (dev)
+      if: ${{ !inputs.external_call && ((github.ref_name != 'stable') && (github.base_ref != 'stable')) }}
+      uses: actions/checkout@v4
+      with:
+        repository: rizinorg/rizin
+        path: rizin
+        ref: dev
 
     - name: Install dependencies
       run: |
         sudo apt update
-        sudo apt-get --assume-yes install cmake swig pkg-config clang libclang-dev llvm wget unzip python3-wheel python3-setuptools build-essential python3-pip && sudo pip3 install meson ninja
+        sudo apt-get --assume-yes install cmake swig pkg-config clang libclang-dev llvm wget unzip python3-wheel python3-setuptools build-essential python3-pip
+        sudo pip3 install meson ninja
 
     - name: Install rizin
       run: |

.github/workflows/lint.yml

@@ -2,7 +2,7 @@ name: lint
 on: push
 jobs:
   licenses:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
     - name: Checkout rz-bindgen
       uses: actions/checkout@v3
@@ -10,7 +10,7 @@ jobs:
       uses: fsfe/reuse-action@v1
 
   python:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
     - name: Checkout rz-bindgen
       uses: actions/checkout@v3
@@ -19,7 +19,7 @@ jobs:
         pip install mypy pyflakes pylint black
     - name: Run mypy
       run: |
-        mypy src/main.py
+        mypy --disable-error-code misc src/main.py
       if: ${{ always() }}
     - name: Run pyflakes
       run: |
@@ -35,7 +35,7 @@ jobs:
       if: ${{ always() }}
 
   codeql:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     permissions:
       security-events: write
     steps:

.github/workflows/release.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   extract-rizin-version:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     outputs:
       rizin_version: ${{ steps.extract_version.outputs.result }}
     steps:
@@ -21,7 +21,7 @@ jobs:
       rizin_ref: ${{ needs.extract-rizin-version.outputs.rizin_version }}
 
   publish-pypi:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: [build]
     steps:
     - name: Download artifacts

cibw_before_all.sh

@@ -4,23 +4,30 @@
 set -ex
 
 # Install deps
-pip3 install meson ninja meson-python build
+pygt311=$(python3 -c 'import sys; print(0) if sys.version_info.minor > 11 else print(1)' 2>&1)
+if [[ $pygt311 == '0' ]]; then
+    pip3 install --break-system-packages meson ninja meson-python build
+else
+    pip3 install meson ninja meson-python build
+fi
 
-if command -v apt; then
+if command -v brew; then
+    brew install --require-sha swig
+elif command -v apt; then
     set +e
     grep VERSION_CODENAME=stretch /etc/os-release >/dev/null 2>/dev/null
     if [[ $? == 0 ]] ; then
-	# Required because manylinux_2_24 uses Debian Stretch and the repos are not available anymore
+        # Required because manylinux_2_24 uses Debian Stretch and the repos are not available anymore
         echo "deb http://archive.debian.org/debian stretch main" > /etc/apt/sources.list
         echo "deb http://archive.debian.org/debian-security stretch/updates main" >> /etc/apt/sources.list
         echo "Acquire::Check-Valid-Until no;" > /etc/apt/apt.conf.d/99no-check-valid-until
     fi
     set -e
-    apt update && apt install --assume-yes libclang-7-dev clang-7 llvm-7
+    apt update && apt install --assume-yes libclang-7-dev clang-7 llvm-7 sudo
 elif command -v apk; then
-    apk update && apk add clang-dev
+    apk update && apk add clang-dev sudo
 elif command -v yum; then
-    yum -y install llvm-toolset-7.0 llvm-toolset-7.0-llvm-devel
+    yum -y install llvm-toolset-7.0 llvm-toolset-7.0-llvm-devel sudo
     # (CentOS 7) Uncomment following lines to see required paths in build log:
     #   yum -y install centos-release-scl
     #   source scl_source enable llvm-toolset-7.0 || true
@@ -30,11 +37,15 @@ pushd rizin
 
 if [[ "$OSTYPE" =~ msys* ]]; then
     meson setup --buildtype=release --prefix='c:/rizin' --vsenv build
+    meson install -C build
 else
+    if [[ "$OSTYPE" =~ linux* ]]; then
+        export CFLAGS="-include linux/limits.h"
+    fi
     meson setup --buildtype=release --libdir=lib build
+    sudo meson install -C build
 fi
 
-meson install -C build
 popd
 
 if command -v apt; then

plugin/plugin.c

@@ -2,6 +2,13 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 
 #include <Python.h>
+/**
+ * Some defines in rz_userconf.h are conflicting with the ones in python.h
+ **/
+#undef HAVE_EXPLICIT_BZERO
+#undef HAVE_SIGACTION
+#undef HAVE_REALPATH
+
 #include <rz_core.h>
 #include <rz_util/rz_file.h>
 #include <swig_runtime.h>

pyproject.toml

@@ -19,13 +19,16 @@ environment = { PATH="/opt/rh/llvm-toolset-7.0/root/usr/bin:/opt/rh/llvm-toolset
 archs = ["x86_64"]
 
 [tool.cibuildwheel.windows]
-environment = { CMAKE_PREFIX_PATH="C:\\rizin" }
+environment = { CMAKE_PREFIX_PATH="C:/rizin" }
 archs = ["AMD64"]
 
+[tool.cibuildwheel.macos]
+environment = { PATH="/opt/homebrew/bin:$PATH", MACOSX_DEPLOYMENT_TARGET="14.0" }
+
 [project]
 name = "rz-bindings"
 dynamic = [
   'version',
 ]
-requires-python = ">=3.8"
+requires-python = ">=3.9"
 readme = "README.md"

src/bindings.py

@@ -258,7 +258,6 @@ def bind_cons(cons_h: Header) -> None:
         typedef="RzCons",
         ignore_fields={"term_raw", "term_buf"},  # struct termios
         rename_fields={
-            "lastline": "_lastline",
             "echo": "_echo",
             "highlight": "_highlight",
             "newline": "_newline",
@@ -328,6 +327,29 @@ def bind_core(core_h: Header) -> None:
 
     Class(core_h, typedef="RzCoreFile")
 
+@threaded_header("rz_util/rz_annotated_code.h")
+def bind_annotated_code(annotated_code_h: Header) -> None:
+    """
+    RzAnnotatedCode
+    """
+    rz_code_annotation = Class(
+        annotated_code_h,
+        typedef="RzCodeAnnotation",
+        struct="rz_code_annotation_t",
+    )
+    rz_code_annotation.add_prefixed_methods("rz_annotation_")
+    rz_code_annotation.add_prefixed_funcs("rz_annotation_")
+
+    rz_annotated_code = Class(
+        annotated_code_h,
+        typedef="RzAnnotatedCode",
+        struct="rz_annotated_code_t",
+    )
+    rz_annotated_code.add_constructor("rz_annotated_code_new")
+    rz_annotated_code.add_destructor("rz_annotated_code_free")
+
+    rz_annotated_code.add_prefixed_methods("rz_annotated_code_")
+    rz_annotated_code.add_prefixed_funcs("rz_annotated_code_")
 
 @threaded_header("rz_flag.h")
 def bind_flag(flag_h: Header) -> None:

src/clang/cindex.py

@@ -2224,7 +2224,7 @@ class Type(Structure):
 
                 return result
 
-        assert self.kind == TypeKind.FUNCTIONPROTO
+        assert self.kind in (TypeKind.FUNCTIONPROTO, TypeKind.FUNCTIONNOPROTO)
         return ArgumentsIterator(self)
 
     @property
@@ -2320,7 +2320,7 @@ class Type(Structure):
 
     def is_function_variadic(self):
         """Determine whether this function Type is a variadic function type."""
-        assert self.kind == TypeKind.FUNCTIONPROTO
+        assert self.kind in (TypeKind.FUNCTIONPROTO, TypeKind.FUNCTIONNOPROTO)
 
         return conf.lib.clang_isFunctionTypeVariadic(self)
 

src/clang/cindex.pyi

@@ -38,6 +38,7 @@ class TypeKind(Enum):
     POINTER: TypeKind
     CONSTANTARRAY: TypeKind
     FUNCTIONPROTO: TypeKind
+    FUNCTIONNOPROTO: TypeKind
     INCOMPLETEARRAY: TypeKind
 
     RECORD: TypeKind

src/cparser_types.py

@@ -123,7 +123,7 @@ def wrap_type(type_: Type) -> CType:
             cursor=type_.get_declaration(),
         )
 
-    if type_.kind == TypeKind.FUNCTIONPROTO:
+    if type_.kind in (TypeKind.FUNCTIONPROTO, TypeKind.FUNCTIONNOPROTO):
         return CFunctionType(
             orig_type,
             result=wrap_type(type_.get_result()),

src/generator_swig.py

@@ -265,6 +265,11 @@ def write_func(writer: Writer, func: Func, name: str, kind: FuncKind) -> None:
         if arg_name == "self":
             arg_name = "_self"
 
+        # if function arg is the same as the function name
+        # we rename the argument
+        if arg_name == name:
+            arg_name += "_arg"
+
         arg_decl = stringify_decl(
             arg_name,
             arg.ctype,