changelog

v3.2.1
update pinned smda version
2025-12-10 23:00:37 -08:00 · 2022-07-06 20:47:46 +00:00 · 2022-07-06 20:45:13 +00:00 · 2022-07-06 20:44:13 +00:00
362 changed files with 10332 additions and 84020 deletions
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,21 +0,0 @@
-# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.233.0/containers/python-3/.devcontainer/base.Dockerfile
-
-# [Choice] Python version (use -bullseye variants on local arm64/Apple Silicon): 3, 3.10, 3-bullseye, 3.10-bullseye, 3-buster, 3.10-buster, etc.
-ARG VARIANT="3.10-bullseye"
-FROM mcr.microsoft.com/vscode/devcontainers/python:0-${VARIANT}
-
-# [Choice] Node.js version: none, lts/*, 16, 14, 12, 10
-ARG NODE_VERSION="none"
-RUN if [ "${NODE_VERSION}" != "none" ]; then su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi
-
-# [Optional] If your pip requirements rarely change, uncomment this section to add them to the image.
-# COPY requirements.txt /tmp/pip-tmp/
-# RUN pip3 --disable-pip-version-check --no-cache-dir install -r /tmp/pip-tmp/requirements.txt \
-#    && rm -rf /tmp/pip-tmp
-
-# [Optional] Uncomment this section to install additional OS packages.
-# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
-#     && apt-get -y install --no-install-recommends <your-package-list-here>
-
-# [Optional] Uncomment this line to install global node packages.
-# RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g <your-package-here>" 2>&1
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,51 +0,0 @@
-// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
-// https://github.com/microsoft/vscode-dev-containers/tree/v0.233.0/containers/python-3
-{
-	"name": "Python 3",
-	"build": {
-		"dockerfile": "Dockerfile",
-		"context": "..",
-		"args": { 
-			// Update 'VARIANT' to pick a Python version: 3, 3.10, etc.
-			// Append -bullseye or -buster to pin to an OS version.
-			// Use -bullseye variants on local on arm64/Apple Silicon.
-			"VARIANT": "3.10",
-			// Options
-			"NODE_VERSION": "none"
-		}
-	},
-
-	// Set *default* container specific settings.json values on container create.
-	"settings": { 
-		"python.defaultInterpreterPath": "/usr/local/bin/python",
-		"python.linting.enabled": true,
-		"python.linting.pylintEnabled": true,
-		"python.formatting.autopep8Path": "/usr/local/py-utils/bin/autopep8",
-		"python.formatting.blackPath": "/usr/local/py-utils/bin/black",
-		"python.formatting.yapfPath": "/usr/local/py-utils/bin/yapf",
-		"python.linting.banditPath": "/usr/local/py-utils/bin/bandit",
-		"python.linting.flake8Path": "/usr/local/py-utils/bin/flake8",
-		"python.linting.mypyPath": "/usr/local/py-utils/bin/mypy",
-		"python.linting.pycodestylePath": "/usr/local/py-utils/bin/pycodestyle",
-		"python.linting.pydocstylePath": "/usr/local/py-utils/bin/pydocstyle",
-		"python.linting.pylintPath": "/usr/local/py-utils/bin/pylint"
-	},
-
-	// Add the IDs of extensions you want installed when the container is created.
-	"extensions": [
-		"ms-python.python",
-		"ms-python.vscode-pylance"
-	],
-
-	// Use 'forwardPorts' to make a list of ports inside the container available locally.
-	// "forwardPorts": [],
-
-	// Use 'postCreateCommand' to run commands after the container is created.
-	"postCreateCommand": "git submodule update --init && pip3 install --user -e .[dev] && pre-commit install",
-
-	// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
-	"remoteUser": "vscode",
-	"features": {
-		"git": "latest"
-	}
-}
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -31,7 +31,7 @@ This project and everyone participating in it is governed by the [Capa Code of C

 ### Capa and its repositories

-We host the capa project as three GitHub repositories:
+We host the capa project as three Github repositories:
  - [capa](https://github.com/mandiant/capa)
  - [capa-rules](https://github.com/mandiant/capa-rules)
  - [capa-testfiles](https://github.com/mandiant/capa-testfiles)
@@ -57,7 +57,7 @@ When we make a significant decision in how we maintain the project and what we c
 we will document it in the [capa issues tracker](https://github.com/mandiant/capa/issues).
 This is the best place review our discussions about what/how/why we do things in the project.
 If you have a question, check to see if it is documented there.
-If it is *not* documented there, or you can't find an answer, please open an issue.
+If it is *not* documented there, or you can't find an answer, please open a issue.
 We'll link to existing issues when appropriate to keep discussions in one place.

 ## How Can I Contribute?
@@ -159,25 +159,12 @@ The process described here has several goals:

 Please follow these steps to have your contribution considered by the maintainers:

-0. Sign the [Contributor License Agreement](#contributor-license-agreement)
 1. Follow the [styleguides](#styleguides)
 2. Update the CHANGELOG and add tests and documentation. In case they are not needed, indicate it in [the PR template](pull_request_template.md).
 3. After you submit your pull request, verify that all [status checks](https://help.github.com/articles/about-status-checks/) are passing <details><summary>What if the status checks are failing? </summary>If a status check is failing, and you believe that the failure is unrelated to your change, please leave a comment on the pull request explaining why you believe the failure is unrelated. A maintainer will re-run the status check for you. If we conclude that the failure was a false positive, then we will open an issue to track that problem with our status check suite.</details>

 While the prerequisites above must be satisfied prior to having your pull request reviewed, the reviewer(s) may ask you to complete additional design work, tests, or other changes before your pull request can be ultimately accepted.

-### Contributor License Agreement
-
-Contributions to this project must be accompanied by a Contributor License
-Agreement. You (or your employer) retain the copyright to your contribution,
-this simply gives us permission to use and redistribute your contributions as
-part of the project. Head over to <https://cla.developers.google.com/> to see
-your current agreements on file or to sign a new one.
-
-You generally only need to submit a CLA once, so if you've already submitted one
-(even if it was for a different project), you probably don't need to do it
-again.
-
 ## Styleguides

 ### Git Commit Messages
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -4,6 +4,3 @@ updates:
    directory: "/"
    schedule:
      interval: "weekly"
-    ignore:
-      - dependency-name: "*"
-        update-types: ["version-update:semver-patch"]
--- a/.github/flake8.ini
+++ b/.github/flake8.ini
@@ -1,43 +0,0 @@
-[flake8]
-max-line-length = 120
-
-extend-ignore =
-    # E203: whitespace before ':'  (black does this)
-    E203,
-    # F401: `foo` imported but unused  (prefer ruff)
-    F401,
-    # F811 Redefinition of unused `foo`  (prefer ruff)
-    F811,
-    # E501 line too long  (prefer black)
-    E501,
-    # E701 multiple statements on one line (colon)  (prefer black, see https://github.com/psf/black/issues/4173)
-    E701,
-    # B010 Do not call setattr with a constant attribute value
-    B010,
-    # G200 Logging statement uses exception in arguments
-    G200,
-    # SIM102 Use a single if-statement instead of nested if-statements
-    # doesn't provide a space for commenting or logical separation of conditions
-    SIM102,
-    # SIM114 Use logical or and a single body
-    # makes logic trees too complex
-    SIM114,
-    # SIM117 Use 'with Foo, Bar:' instead of multiple with statements
-    # makes lines too long
-    SIM117
-
-per-file-ignores =
-    # T201 print found.
-    #
-    # scripts are meant to print output
-    scripts/*: T201
-    # capa.exe is meant to print output
-    capa/main.py: T201
-    # IDA tests emit results to output window so need to print
-    tests/test_ida_features.py: T201
-    # utility used to find the Binary Ninja API via invoking python.exe
-    capa/features/extractors/binja/find_binja_api.py: T201
-
-copyright-check = True
-copyright-min-file-size = 1 
-copyright-regexp = Copyright \(C\) \d{4} Mandiant, Inc. All Rights Reserved.
--- a/.github/mypy/mypy.ini
+++ b/.github/mypy/mypy.ini
@@ -1,5 +1,11 @@
 [mypy]

+[mypy-halo.*]
+ignore_missing_imports = True
+
+[mypy-tqdm.*]
+ignore_missing_imports = True
+
 [mypy-ruamel.*]
 ignore_missing_imports = True

@@ -15,6 +21,9 @@ ignore_missing_imports = True
 [mypy-flirt.*]
 ignore_missing_imports = True

+[mypy-smda.*]
+ignore_missing_imports = True
+
 [mypy-lief.*]
 ignore_missing_imports = True

@@ -36,15 +45,9 @@ ignore_missing_imports = True
 [mypy-idautils.*]
 ignore_missing_imports = True

-[mypy-ida_auto.*]
-ignore_missing_imports = True
-
 [mypy-ida_bytes.*]
 ignore_missing_imports = True

-[mypy-ida_nalt.*]
-ignore_missing_imports = True
-
 [mypy-ida_kernwin.*]
 ignore_missing_imports = True

@@ -57,9 +60,6 @@ ignore_missing_imports = True
 [mypy-ida_loader.*]
 ignore_missing_imports = True

-[mypy-ida_segment.*]
-ignore_missing_imports = True
-
 [mypy-PyQt5.*]
 ignore_missing_imports = True

@@ -74,12 +74,3 @@ ignore_missing_imports = True

 [mypy-elftools.*]
 ignore_missing_imports = True
-
-[mypy-dncil.*]
-ignore_missing_imports = True
-
-[mypy-netnode.*]
-ignore_missing_imports = True
-
-[mypy-ghidra.*]
-ignore_missing_imports = True
--- a/.github/pyinstaller/hooks/hook-smda.py
+++ b/.github/pyinstaller/hooks/hook-smda.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2020 Mandiant, Inc. All Rights Reserved.
+import PyInstaller.utils.hooks
+
+# ref: https://groups.google.com/g/pyinstaller/c/amWi0-66uZI/m/miPoKfWjBAAJ
+binaries = PyInstaller.utils.hooks.collect_dynamic_libs("capstone")
--- a/.github/pyinstaller/hooks/hook-vivisect.py
+++ b/.github/pyinstaller/hooks/hook-vivisect.py
@@ -24,7 +24,7 @@ excludedimports = [
    "pyqtwebengine",
    # the above are imported by these viv modules.
    # so really, we'd want to exclude these submodules of viv.
-    # but i don't think this works.
+    # but i dont think this works.
    "vqt",
    "vdb.qt",
    "envi.qt",
@@ -38,36 +38,39 @@ hiddenimports = [
    "vivisect",
    "vivisect.analysis",
    "vivisect.analysis.amd64",
+    "vivisect.analysis.amd64",
    "vivisect.analysis.amd64.emulation",
    "vivisect.analysis.amd64.golang",
    "vivisect.analysis.crypto",
+    "vivisect.analysis.crypto",
    "vivisect.analysis.crypto.constants",
    "vivisect.analysis.elf",
    "vivisect.analysis.elf.elfplt",
    "vivisect.analysis.elf.elfplt_late",
    "vivisect.analysis.elf.libc_start_main",
    "vivisect.analysis.generic",
+    "vivisect.analysis.generic",
    "vivisect.analysis.generic.codeblocks",
    "vivisect.analysis.generic.emucode",
    "vivisect.analysis.generic.entrypoints",
    "vivisect.analysis.generic.funcentries",
    "vivisect.analysis.generic.impapi",
-    "vivisect.analysis.generic.linker",
    "vivisect.analysis.generic.mkpointers",
-    "vivisect.analysis.generic.noret",
    "vivisect.analysis.generic.pointers",
    "vivisect.analysis.generic.pointertables",
    "vivisect.analysis.generic.relocations",
    "vivisect.analysis.generic.strconst",
    "vivisect.analysis.generic.switchcase",
-    "vivisect.analysis.generic.symswitchcase",
    "vivisect.analysis.generic.thunks",
+    "vivisect.analysis.generic.noret",
+    "vivisect.analysis.i386",
    "vivisect.analysis.i386",
    "vivisect.analysis.i386.calling",
    "vivisect.analysis.i386.golang",
    "vivisect.analysis.i386.importcalls",
    "vivisect.analysis.i386.instrhook",
-    "vivisect.analysis.i386.thunk_reg",
+    "vivisect.analysis.i386.thunk_bx",
+    "vivisect.analysis.ms",
    "vivisect.analysis.ms",
    "vivisect.analysis.ms.hotpatch",
    "vivisect.analysis.ms.localhints",
@@ -78,40 +81,8 @@ hiddenimports = [
    "vivisect.impapi.posix.amd64",
    "vivisect.impapi.posix.i386",
    "vivisect.impapi.windows",
-    "vivisect.impapi.windows.advapi_32",
-    "vivisect.impapi.windows.advapi_64",
    "vivisect.impapi.windows.amd64",
-    "vivisect.impapi.windows.gdi_32",
-    "vivisect.impapi.windows.gdi_64",
    "vivisect.impapi.windows.i386",
-    "vivisect.impapi.windows.kernel_32",
-    "vivisect.impapi.windows.kernel_64",
-    "vivisect.impapi.windows.msvcr100_32",
-    "vivisect.impapi.windows.msvcr100_64",
-    "vivisect.impapi.windows.msvcr110_32",
-    "vivisect.impapi.windows.msvcr110_64",
-    "vivisect.impapi.windows.msvcr120_32",
-    "vivisect.impapi.windows.msvcr120_64",
-    "vivisect.impapi.windows.msvcr71_32",
-    "vivisect.impapi.windows.msvcr80_32",
-    "vivisect.impapi.windows.msvcr80_64",
-    "vivisect.impapi.windows.msvcr90_32",
-    "vivisect.impapi.windows.msvcr90_64",
-    "vivisect.impapi.windows.msvcrt_32",
-    "vivisect.impapi.windows.msvcrt_64",
-    "vivisect.impapi.windows.ntdll_32",
-    "vivisect.impapi.windows.ntdll_64",
-    "vivisect.impapi.windows.ole_32",
-    "vivisect.impapi.windows.ole_64",
-    "vivisect.impapi.windows.rpcrt4_32",
-    "vivisect.impapi.windows.rpcrt4_64",
-    "vivisect.impapi.windows.shell_32",
-    "vivisect.impapi.windows.shell_64",
-    "vivisect.impapi.windows.user_32",
-    "vivisect.impapi.windows.user_64",
-    "vivisect.impapi.windows.ws2plus_32",
-    "vivisect.impapi.windows.ws2plus_64",
-    "vivisect.impapi.winkern",
    "vivisect.impapi.winkern.i386",
    "vivisect.impapi.winkern.amd64",
    "vivisect.parsers.blob",
--- a/.github/pyinstaller/pyinstaller.spec
+++ b/.github/pyinstaller/pyinstaller.spec
@@ -1,45 +1,66 @@
 # -*- mode: python -*-
 # Copyright (C) 2020 Mandiant, Inc. All Rights Reserved.
-import sys
+import os.path
+import subprocess

-import capa.rules.cache
+import wcwidth

-from pathlib import Path

-# SPECPATH is a global variable which points to .spec file path
-capa_dir = Path(SPECPATH).parent.parent
-rules_dir = capa_dir / 'rules'
-cache_dir = capa_dir / 'cache'
-
-if not capa.rules.cache.generate_rule_cache(rules_dir, cache_dir):
-    sys.exit(-1)
+# when invoking pyinstaller from the project root,
+# this gets run from the project root.
+with open('./capa/version.py', 'wb') as f:
+    # git output will look like:
+    #
+    #     tags/v1.0.0-0-g3af38dc
+    #         ------- tag
+    #                 - commits since
+    #                   g------- git hash fragment
+    version = (subprocess.check_output(["git", "describe", "--always", "--tags", "--long"])
+               .decode("utf-8")
+               .strip()
+               .replace("tags/", ""))
+    f.write(("__version__ = '%s'" % version).encode("utf-8"))

 a = Analysis(
    # when invoking pyinstaller from the project root,
    # this gets invoked from the directory of the spec file,
    # i.e. ./.github/pyinstaller
-    ["../../capa/main.py"],
-    pathex=["capa"],
+    ['../../capa/main.py'],
+    pathex=['capa'],
    binaries=None,
    datas=[
        # when invoking pyinstaller from the project root,
        # this gets invoked from the directory of the spec file,
        # i.e. ./.github/pyinstaller
-        ("../../rules", "rules"),
-        ("../../sigs", "sigs"),
-        ("../../cache", "cache"),
+        ('../../rules', 'rules'),
+        ('../../sigs', 'sigs'),
+
+        # capa.render.default uses tabulate that depends on wcwidth.
+        # it seems wcwidth uses a json file `version.json`
+        # and this doesn't get picked up by pyinstaller automatically.
+        # so we manually embed the wcwidth resources here.
+        #
+        # ref: https://stackoverflow.com/a/62278462/87207
+        (os.path.dirname(wcwidth.__file__), 'wcwidth')
    ],
    # when invoking pyinstaller from the project root,
    # this gets run from the project root.
-    hookspath=[".github/pyinstaller/hooks"],
+    hookspath=['.github/pyinstaller/hooks'],
    runtime_hooks=None,
    excludes=[
        # ignore packages that would otherwise be bundled with the .exe.
        # review: build/pyinstaller/xref-pyinstaller.html
+
        # we don't do any GUI stuff, so ignore these modules
        "tkinter",
        "_tkinter",
        "Tkinter",
+        # tqdm provides renderers for ipython,
+        # however, this drags in a lot of dependencies.
+        # since we don't spawn a notebook, we can safely remove these.
+        "IPython",
+        "ipywidgets",
+
        # these are pulled in by networkx
        # but we don't need to compute the strongly connected components.
        "numpy",
@@ -47,6 +68,7 @@ a = Analysis(
        "matplotlib",
        "pandas",
        "pytest",
+
        # deps from viv that we don't use.
        # this duplicates the entries in `hook-vivisect`,
        # but works better this way.
@@ -56,39 +78,35 @@ a = Analysis(
        "PyQt5",
        "qt5",
        "pyqtwebengine",
-        "pyasn1",
-        # don't pull in Binary Ninja/IDA bindings that should
-        # only be installed locally.
-        "binaryninja",
-        "ida",
-    ],
-)
+        "pyasn1"
+    ])

-a.binaries = a.binaries - TOC([("tcl85.dll", None, None), ("tk85.dll", None, None), ("_tkinter", None, None)])
+a.binaries = a.binaries - TOC([
+ ('tcl85.dll', None, None),
+ ('tk85.dll', None, None),
+ ('_tkinter', None, None)])

 pyz = PYZ(a.pure, a.zipped_data)

-exe = EXE(
-    pyz,
-    a.scripts,
-    a.binaries,
-    a.zipfiles,
-    a.datas,
-    exclude_binaries=False,
-    name="capa",
-    icon="logo.ico",
-    debug=False,
-    strip=False,
-    upx=True,
-    console=True,
-)
+exe = EXE(pyz,
+          a.scripts,
+          a.binaries,
+          a.zipfiles,
+          a.datas,
+          exclude_binaries=False,
+          name='capa',
+          icon='logo.ico',
+          debug=False,
+          strip=None,
+          upx=True,
+          console=True )

 # enable the following to debug the contents of the .exe
 #
-# coll = COLLECT(exe,
+#coll = COLLECT(exe,
 #               a.binaries,
 #               a.zipfiles,
 #               a.datas,
 #               strip=None,
 #               upx=True,
-#               name='capa-dat')
+#               name='capa-dat')
--- a/.github/ruff.toml
+++ b/.github/ruff.toml
@@ -1,43 +0,0 @@
-# Enable the pycodestyle (`E`) and Pyflakes (`F`) rules by default.
-# Unlike Flake8, Ruff doesn't enable pycodestyle warnings (`W`) or
-# McCabe complexity (`C901`) by default.
-lint.select = ["E", "F"]
-
-# Allow autofix for all enabled rules (when `--fix`) is provided.
-lint.fixable = ["ALL"]
-lint.unfixable = []
-
-# E402 module level import not at top of file
-# E722 do not use bare 'except'
-# E501 line too long
-lint.ignore = ["E402", "E722", "E501"]
-
-line-length = 120
-
-exclude = [
-    # Exclude a variety of commonly ignored directories.
-    ".bzr",
-    ".direnv",
-    ".eggs",
-    ".git",
-    ".git-rewrite",
-    ".hg",
-    ".mypy_cache",
-    ".nox",
-    ".pants.d",
-    ".pytype",
-    ".ruff_cache",
-    ".svn",
-    ".tox",
-    ".venv",
-    "__pypackages__",
-    "_build",
-    "buck-out",
-    "build",
-    "dist",
-    "node_modules",
-    "venv",
-    # protobuf generated files
-    "*_pb2.py", 
-    "*_pb2.pyi"
-]
--- a/.github/tox.ini
+++ b/.github/tox.ini
@@ -0,0 +1,10 @@
+[pycodestyle]
+; E402: module level import not at top of file
+; W503: line break before binary operator
+; E231 missing whitespace after ',' (emitted by black)
+; E203 whitespace before ':' (emitted by black)
+ignore = E402,W503,E203,E231
+max-line-length = 160
+statistics = True
+count = True
+exclude = .*
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,103 +1,83 @@
 name: build

 on:
-  pull_request:
-    branches: [ master ]
-    paths-ignore:
-      - 'web/**'
-      - 'doc/**'
-      - '**.md'
+  push:
+    branches: [master]
  release:
    types: [edited, published]

-permissions:
-  contents: write
-
 jobs:
  build:
-    name: PyInstaller for ${{ matrix.os }} / Py ${{ matrix.python_version }}
+    name: PyInstaller for ${{ matrix.os }}
    runs-on: ${{ matrix.os }}
    strategy:
-      # set to false for debugging
-      fail-fast: true
      matrix:
        include:
-          - os: ubuntu-20.04
+          - os: ubuntu-18.04
            # use old linux so that the shared library versioning is more portable
            artifact_name: capa
            asset_name: linux
-            python_version: '3.10'
-          - os: ubuntu-20.04
-            artifact_name: capa
-            asset_name: linux-py312
-            python_version: '3.12'
          - os: windows-2019
            artifact_name: capa.exe
            asset_name: windows
-            python_version: '3.10'
-          - os: macos-13
-            # use older macOS for assumed better portability
+          - os: macos-10.15
            artifact_name: capa
            asset_name: macos
-            python_version: '3.10'
    steps:
      - name: Checkout capa
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@v2
        with:
          submodules: true
-      - name: Set up Python ${{ matrix.python_version }}
-        uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
+      # using Python 3.8 to support running across multiple operating systems including Windows 7
+      - name: Set up Python 3.8
+        uses: actions/setup-python@v2
        with:
-          python-version: ${{ matrix.python_version }}
-      - if: matrix.os == 'ubuntu-20.04'
+          python-version: 3.8
+      - if: matrix.os == 'ubuntu-18.04'
        run: sudo apt-get install -y libyaml-dev
-      - name: Upgrade pip, setuptools
-        run: python -m pip install --upgrade pip setuptools
-      - name: Install capa with build requirements
-        run: |
-          pip install -r requirements.txt
-          pip install -e .[build]
+      - name: Install PyInstaller
+        run: pip install 'pyinstaller==4.2'
+      - name: Install capa
+        run: pip install -e .
      - name: Build standalone executable
-        run: pyinstaller --log-level DEBUG .github/pyinstaller/pyinstaller.spec
+        run: pyinstaller .github/pyinstaller/pyinstaller.spec
      - name: Does it run (PE)?
-        run: dist/capa -d "tests/data/Practical Malware Analysis Lab 01-01.dll_"
+        run: dist/capa "tests/data/Practical Malware Analysis Lab 01-01.dll_"
      - name: Does it run (Shellcode)?
-        run: dist/capa -d "tests/data/499c2a85f6e8142c3f48d4251c9c7cd6.raw32"
+        run: dist/capa "tests/data/499c2a85f6e8142c3f48d4251c9c7cd6.raw32"
      - name: Does it run (ELF)?
-        run: dist/capa -d "tests/data/7351f8a40c5450557b24622417fc478d.elf_"
-      - name: Does it run (CAPE)?
-        run: |
-          7z e "tests/data/dynamic/cape/v2.2/d46900384c78863420fb3e297d0a2f743cd2b6b3f7f82bf64059a168e07aceb7.json.gz"
-          dist/capa -d "d46900384c78863420fb3e297d0a2f743cd2b6b3f7f82bf64059a168e07aceb7.json"
-      - uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
+        run: dist/capa "tests/data/7351f8a40c5450557b24622417fc478d.elf_"
+      - uses: actions/upload-artifact@v2
        with:
          name: ${{ matrix.asset_name }}
          path: dist/${{ matrix.artifact_name }}

  test_run:
-    name: Test run on ${{ matrix.os }} / ${{ matrix.asset_name }}
+    # test that binaries run on push to master
+    if: github.event_name == 'push'
+    name: Test run on ${{ matrix.os }}
    runs-on: ${{ matrix.os }}
    needs: [build]
    strategy:
      matrix:
        include:
          # OSs not already tested above
-          - os: ubuntu-22.04
+          - os: ubuntu-18.04
            artifact_name: capa
            asset_name: linux
-          - os: ubuntu-22.04
+          - os: ubuntu-20.04
            artifact_name: capa
-            asset_name: linux-py312
-          - os: windows-2022
+            asset_name: linux
+          - os: windows-2016
            artifact_name: capa.exe
            asset_name: windows
    steps:
      - name: Download ${{ matrix.asset_name }}
-        uses: actions/download-artifact@eaceaf801fd36c7dee90939fad912460b18a1ffe # v4.1.2
+        uses: actions/download-artifact@v2
        with:
          name: ${{ matrix.asset_name }}
      - name: Set executable flag
-        if: matrix.os != 'windows-2022'
+        if: matrix.os != 'windows-2016'
        run: chmod +x ${{ matrix.artifact_name }}
      - name: Run capa
        run: ./${{ matrix.artifact_name }} -h
@@ -106,22 +86,20 @@ jobs:
    # upload zipped binaries to Release page
    if: github.event_name == 'release'
    name: zip and upload ${{ matrix.asset_name }}
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
    needs: [build]
    strategy:
      matrix:
        include:
          - asset_name: linux
            artifact_name: capa
-          - asset_name: linux-py312
-            artifact_name: capa
          - asset_name: windows
            artifact_name: capa.exe
          - asset_name: macos
            artifact_name: capa
    steps:
      - name: Download ${{ matrix.asset_name }}
-        uses: actions/download-artifact@eaceaf801fd36c7dee90939fad912460b18a1ffe # v4.1.2
+        uses: actions/download-artifact@v2
        with:
          name: ${{ matrix.asset_name }}
      - name: Set executable flag
@@ -131,7 +109,7 @@ jobs:
      - name: Zip ${{ matrix.artifact_name }} into ${{ env.zip_name }}
        run: zip ${{ env.zip_name }} ${{ matrix.artifact_name }}
      - name: Upload ${{ env.zip_name }} to GH Release
-        uses: svenstaro/upload-release-action@2728235f7dc9ff598bd86ce3c274b74f802d2208 # v2
+        uses: svenstaro/upload-release-action@v2
        with:
          repo_token: ${{ secrets.GITHUB_TOKEN}}
          file: ${{ env.zip_name }}
--- a/.github/workflows/changelog.yml
+++ b/.github/workflows/changelog.yml
@@ -7,23 +7,17 @@ on:
  pull_request_target:
    types: [opened, edited, synchronize]

-permissions:
-  pull-requests: write
-
 jobs:
  check_changelog:
    # no need to check for dependency updates via dependabot
-    # github.event.pull_request.user.login refers to PR author
-    if: |
-      github.event.pull_request.user.login != 'dependabot[bot]' &&
-      github.event.pull_request.user.login != 'dependabot-preview[bot]'
-    runs-on: ubuntu-latest
+    if: github.actor != 'dependabot[bot]' && github.actor != 'dependabot-preview[bot]'
+    runs-on: ubuntu-20.04
    env:
      NO_CHANGELOG: '[x] No CHANGELOG update needed'
    steps:
    - name: Get changed files
      id: files
-      uses: Ana06/get-changed-files@25f79e676e7ea1868813e21465014798211fad8c # v2.3.0
+      uses: Ana06/get-changed-files@v1.2
    - name: check changelog updated
      id: changelog_updated
      env:
@@ -33,14 +27,14 @@ jobs:
        echo $FILES | grep -qF 'CHANGELOG.md' || echo $PR_BODY | grep -qiF "$NO_CHANGELOG"
    - name: Reject pull request if no CHANGELOG update
      if: ${{ always() && steps.changelog_updated.outcome == 'failure' }}
-      uses: Ana06/automatic-pull-request-review@76aaf9b15b116a54e1da7a28a46f91fe089600bf # v0.2.0
+      uses: Ana06/automatic-pull-request-review@v0.1.0
      with:
        repo-token: ${{ secrets.GITHUB_TOKEN }}
        event: REQUEST_CHANGES
        body: "Please add bug fixes, new features, breaking changes and anything else you think is worthwhile mentioning to the `master (unreleased)` section of CHANGELOG.md. If no CHANGELOG update is needed add the following to the PR description: `${{ env.NO_CHANGELOG }}`"
        allow_duplicate: false
    - name: Dismiss previous review if CHANGELOG update
-      uses: Ana06/automatic-pull-request-review@76aaf9b15b116a54e1da7a28a46f91fe089600bf # v0.2.0
+      uses: Ana06/automatic-pull-request-review@v0.1.0
      with:
        repo-token: ${{ secrets.GITHUB_TOKEN }}
        event: DISMISS
--- a/.github/workflows/pip-audit.yml
+++ b/.github/workflows/pip-audit.yml
@@ -1,21 +0,0 @@
-name: PIP audit
-
-on:
-  schedule:
-  - cron: '0 8 * * 1'
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-    strategy:
-      matrix:
-        python-version: ["3.11"]
-
-    steps:
-      - name: Check out repository code
-        uses: actions/checkout@v4
-
-      - uses: pypa/gh-action-pip-audit@v1.0.8
-        with:
-          inputs: .
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -1,42 +1,30 @@
-# use PyPI trusted publishing, as described here: 
-# https://blog.trailofbits.com/2023/05/23/trusted-publishing-a-new-benchmark-for-packaging-security/
+# This workflows will upload a Python Package using Twine when a release is created
+# For more information see: https://help.github.com/en/actions/language-and-framework-guides/using-python-with-github-actions#publishing-to-package-registries
+
 name: publish to pypi

 on:
  release:
    types: [published]

-permissions:
-  contents: write
-
 jobs:
-  pypi-publish:
-    runs-on: ubuntu-latest
-    environment:
-      name: release
-    permissions:
-      id-token: write
+  deploy:
+    runs-on: ubuntu-20.04
    steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      - uses: actions/checkout@v2
      - name: Set up Python
-        uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
+        uses: actions/setup-python@v2
        with:
-          python-version: '3.10'
+          python-version: '3.6'
      - name: Install dependencies
        run: |
          python -m pip install --upgrade pip
-          pip install -r requirements.txt
-          pip install -e .[build]
-      - name: build package
+          pip install setuptools wheel twine
+      - name: Build and publish
+        env:
+          TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
+          TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
        run: |
-          python -m build
-      - name: upload package artifacts
-        uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
-        with:
-          path: dist/*
-      - name: publish package
-        uses: pypa/gh-action-pypi-publish@f5622bde02b04381239da3573277701ceca8f6a0  # release/v1
-        with:
-          skip-existing: true
-          verbose: true
-          print-hash: true
+          python setup.py sdist bdist_wheel
+          twine upload --skip-existing dist/*
+
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -1,72 +0,0 @@
-# This workflow uses actions that are not certified by GitHub. They are provided
-# by a third-party and are governed by separate terms of service, privacy
-# policy, and support documentation.
-
-name: Scorecard supply-chain security
-on:
-  # For Branch-Protection check. Only the default branch is supported. See
-  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#branch-protection
-  branch_protection_rule:
-  # To guarantee Maintained check is occasionally updated. See
-  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#maintained
-  schedule:
-    - cron: '43 4 * * 3'
-  push:
-    branches: [ "master" ]
-
-# Declare default permissions as read only.
-permissions: read-all
-
-jobs:
-  analysis:
-    name: Scorecard analysis
-    runs-on: ubuntu-latest
-    permissions:
-      # Needed to upload the results to code-scanning dashboard.
-      security-events: write
-      # Needed to publish results and get a badge (see publish_results below).
-      id-token: write
-      # Uncomment the permissions below if installing in a private repository.
-      # contents: read
-      # actions: read
-
-    steps:
-      - name: "Checkout code"
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11  # v4.1.1
-        with:
-          persist-credentials: false
-
-      - name: "Run analysis"
-        uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1
-        with:
-          results_file: results.sarif
-          results_format: sarif
-          # (Optional) "write" PAT token. Uncomment the `repo_token` line below if:
-          # - you want to enable the Branch-Protection check on a *public* repository, or
-          # - you are installing Scorecard on a *private* repository
-          # To create the PAT, follow the steps in https://github.com/ossf/scorecard-action#authentication-with-pat.
-          # repo_token: ${{ secrets.SCORECARD_TOKEN }}
-
-          # Public repositories:
-          #   - Publish results to OpenSSF REST API for easy access by consumers
-          #   - Allows the repository to include the Scorecard badge.
-          #   - See https://github.com/ossf/scorecard-action#publishing-results.
-          # For private repositories:
-          #   - `publish_results` will always be set to `false`, regardless
-          #     of the value entered here.
-          publish_results: true
-
-      # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
-      # format to the repository Actions tab.
-      - name: "Upload artifact"
-        uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
-        with:
-          name: SARIF file
-          path: results.sarif
-          retention-days: 5
-
-      # Upload the results to GitHub's code scanning dashboard.
-      - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@8a470fddafa5cbb6266ee11b37ef4d8aae19c571  # v3.24.6
-        with:
-          sarif_file: results.sarif
--- a/.github/workflows/tag.yml
+++ b/.github/workflows/tag.yml
@@ -4,15 +4,13 @@ on:
  release:
    types: [published]

-permissions: read-all
-
 jobs:
  tag:
    name: Tag capa rules
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
    steps:
    - name: Checkout capa-rules
-      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      uses: actions/checkout@v2
      with:
        repository: mandiant/capa-rules
        token: ${{ secrets.CAPA_TOKEN }}
@@ -23,9 +21,8 @@ jobs:
        git config user.name 'Capa Bot'
        name=${{ github.event.release.tag_name }}
        git tag $name -m "https://github.com/mandiant/capa/releases/$name"
-        # TODO update branch name-major=${name%%.*}
    - name: Push tag to capa-rules
-      uses: ad-m/github-push-action@d91a481090679876dfc4178fef17f286781251df # v0.8.0
+      uses: ad-m/github-push-action@master
      with:
        repository: mandiant/capa-rules
        github_token: ${{ secrets.CAPA_TOKEN }}
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -1,24 +1,10 @@
 name: CI

-# tests.yml workflow will run for all changes except:
-# any file or directory under web/ or doc/
-# any Markdown (.md) file anywhere in the repository
-
 on:
  push:
    branches: [ master ]
-    paths-ignore:
-      - 'web/**'
-      - 'doc/**'
-      - '**.md'
  pull_request:
    branches: [ master ]
-    paths-ignore:
-      - 'web/**'
-      - 'doc/**'
-      - '**.md'
-
-permissions: read-all

 # save workspaces to speed up testing
 env:
@@ -26,10 +12,10 @@ env:

 jobs:
  changelog_format:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
    steps:
    - name: Checkout capa
-      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      uses: actions/checkout@v2
    # The sync GH action in capa-rules relies on a single '- *$' in the CHANGELOG file
    - name: Ensure CHANGELOG has '- *$'
      run: |
@@ -37,47 +23,36 @@ jobs:
        if [ $number != 1 ]; then exit 1; fi

  code_style:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
    steps:
    - name: Checkout capa
-      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-    # use latest available python to take advantage of best performance
-    - name: Set up Python 3.12
-      uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
+      uses: actions/checkout@v2
+    - name: Set up Python 3.8
+      uses: actions/setup-python@v2
      with:
-        python-version: "3.12"
+        python-version: "3.8"
    - name: Install dependencies
-      run: |
-        pip install -r requirements.txt
-        pip install -e .[dev,scripts]
-    - name: Lint with ruff
-      run: pre-commit run ruff
+      run: pip install -e .[dev]
    - name: Lint with isort
-      run: pre-commit run isort --show-diff-on-failure
+      run: isort --profile black --length-sort --line-width 120 -c .
    - name: Lint with black
-      run: pre-commit run black --show-diff-on-failure
-    - name: Lint with flake8
-      run: pre-commit run flake8 --hook-stage manual
+      run: black -l 120 --check .
    - name: Check types with mypy
-      run: pre-commit run mypy --hook-stage manual
-    - name: Check imports against dependencies
-      run: pre-commit run deptry --hook-stage manual
+      run: mypy --config-file .github/mypy/mypy.ini capa/ scripts/ tests/

  rule_linter:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
    steps:
    - name: Checkout capa with submodules
-      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      uses: actions/checkout@v2
      with:
-        submodules: recursive
-    - name: Set up Python 3.12
-      uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
+        submodules: true
+    - name: Set up Python 3.8
+      uses: actions/setup-python@v2
      with:
-        python-version: "3.12"
+        python-version: "3.8"
    - name: Install capa
-      run: |
-        pip install -r requirements.txt
-        pip install -e .[dev,scripts]
+      run: pip install -e .
    - name: Run rule linter
      run: python scripts/lint.py rules/

@@ -88,134 +63,30 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        os: [ubuntu-20.04, windows-2019, macos-13]
+        os: [ubuntu-20.04, windows-2019, macos-10.15]
        # across all operating systems
-        python-version: ["3.10", "3.11"]
+        python-version: ["3.6", "3.10"]
        include:
          # on Ubuntu run these as well
          - os: ubuntu-20.04
-            python-version: "3.10"
+            python-version: "3.7"
          - os: ubuntu-20.04
-            python-version: "3.11"
+            python-version: "3.8"
          - os: ubuntu-20.04
-            python-version: "3.12"
+            python-version: "3.9"
    steps:
    - name: Checkout capa with submodules
-      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      uses: actions/checkout@v2
      with:
-        submodules: recursive
+        submodules: true
    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
+      uses: actions/setup-python@v2
      with:
        python-version: ${{ matrix.python-version }}
    - name: Install pyyaml
      if: matrix.os == 'ubuntu-20.04'
      run: sudo apt-get install -y libyaml-dev
    - name: Install capa
-      run: |
-        pip install -r requirements.txt
-        pip install -e .[dev,scripts]
-    - name: Run tests (fast)
-      # this set of tests runs about 80% of the cases in 20% of the time,
-      # and should catch most errors quickly.
-      run:  pre-commit run pytest-fast --all-files --hook-stage manual
+      run: pip install -e .[dev]
    - name: Run tests
      run: pytest -v tests/
-
-  binja-tests:
-    name: Binary Ninja tests for ${{ matrix.python-version }}
-    env:
-      BN_SERIAL: ${{ secrets.BN_SERIAL }}
-    runs-on: ubuntu-22.04
-    needs: [tests]
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version: ["3.10", "3.11"]
-    steps:
-    - name: Checkout capa with submodules
-      # do only run if BN_SERIAL is available, have to do this in every step, see https://github.com/orgs/community/discussions/26726#discussioncomment-3253118
-      if: ${{ env.BN_SERIAL != 0 }}
-      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-      with:
-        submodules: recursive
-    - name: Set up Python ${{ matrix.python-version }}
-      if: ${{ env.BN_SERIAL != 0 }}
-      uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Install pyyaml
-      if: ${{ env.BN_SERIAL != 0 }}
-      run: sudo apt-get install -y libyaml-dev
-    - name: Install capa
-      if: ${{ env.BN_SERIAL != 0 }}
-      run: |
-        pip install -r requirements.txt
-        pip install -e .[dev,scripts]
-    - name: install Binary Ninja
-      if: ${{ env.BN_SERIAL != 0 }}
-      run: |
-        mkdir ./.github/binja
-        curl "https://raw.githubusercontent.com/Vector35/binaryninja-api/6812c97/scripts/download_headless.py" -o ./.github/binja/download_headless.py
-        python ./.github/binja/download_headless.py --serial ${{ env.BN_SERIAL }} --output .github/binja/BinaryNinja-headless.zip
-        unzip .github/binja/BinaryNinja-headless.zip -d .github/binja/
-        python .github/binja/binaryninja/scripts/install_api.py --install-on-root --silent
-    - name: Run tests
-      if: ${{ env.BN_SERIAL != 0 }}
-      env:
-        BN_LICENSE: ${{ secrets.BN_LICENSE }}
-      run: pytest -v tests/test_binja_features.py  # explicitly refer to the binja tests for performance. other tests run above.
-
-  ghidra-tests:
-    name: Ghidra tests for ${{ matrix.python-version }}
-    runs-on: ubuntu-20.04
-    needs: [tests]
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version: ["3.10", "3.11"]
-        java-version: ["17"]
-        ghidra-version: ["11.0.1"]
-        public-version: ["PUBLIC_20240130"] # for ghidra releases
-        ghidrathon-version: ["4.0.0"] 
-    steps:
-    - name: Checkout capa with submodules
-      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-      with:
-        submodules: true
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Set up Java ${{ matrix.java-version }}
-      uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
-      with:
-        distribution: 'temurin'
-        java-version: ${{ matrix.java-version }}
-    - name: Install Ghidra ${{ matrix.ghidra-version }} 
-      run: |
-        mkdir ./.github/ghidra
-        wget "https://github.com/NationalSecurityAgency/ghidra/releases/download/Ghidra_${{ matrix.ghidra-version }}_build/ghidra_${{ matrix.ghidra-version }}_${{ matrix.public-version }}.zip" -O ./.github/ghidra/ghidra_${{ matrix.ghidra-version }}_PUBLIC.zip
-        unzip .github/ghidra/ghidra_${{ matrix.ghidra-version }}_PUBLIC.zip -d .github/ghidra/
-    - name: Install Ghidrathon
-      run : |
-        mkdir ./.github/ghidrathon
-        wget "https://github.com/mandiant/Ghidrathon/releases/download/v${{ matrix.ghidrathon-version }}/Ghidrathon-v${{ matrix.ghidrathon-version}}.zip" -O ./.github/ghidrathon/ghidrathon-v${{ matrix.ghidrathon-version }}.zip
-        unzip .github/ghidrathon/ghidrathon-v${{ matrix.ghidrathon-version }}.zip -d .github/ghidrathon/
-        python -m pip install -r .github/ghidrathon/requirements.txt
-        python .github/ghidrathon/ghidrathon_configure.py $(pwd)/.github/ghidra/ghidra_${{ matrix.ghidra-version }}_PUBLIC
-        unzip .github/ghidrathon/Ghidrathon-v${{ matrix.ghidrathon-version }}.zip -d .github/ghidra/ghidra_${{ matrix.ghidra-version }}_PUBLIC/Ghidra/Extensions
-    - name: Install pyyaml
-      run: sudo apt-get install -y libyaml-dev
-    - name: Install capa
-      run: |
-        pip install -r requirements.txt
-        pip install -e .[dev,scripts]
-    - name: Run tests
-      run: | 
-        mkdir ./.github/ghidra/project
-        .github/ghidra/ghidra_${{ matrix.ghidra-version }}_PUBLIC/support/analyzeHeadless .github/ghidra/project ghidra_test -Import ./tests/data/mimikatz.exe_ -ScriptPath ./tests/ -PostScript test_ghidra_features.py > ../output.log
-        cat ../output.log
-        exit_code=$(cat ../output.log | grep exit | awk '{print $NF}')
-        exit $exit_code
- 
--- a/.github/workflows/web-deploy.yml
+++ b/.github/workflows/web-deploy.yml
@@ -1,134 +0,0 @@
-name: deploy web to GitHub Pages
-
-on:
-  push:
-    branches: [ master ]
-    paths:
-      - 'web/**'
-
-  # Allows to run this workflow manually from the Actions tab
-  workflow_dispatch:
-
-# Sets the GITHUB_TOKEN permissions to allow deployment to GitHub Pages
-permissions:
-  contents: read
-  pages: write
-  id-token: write
-
-# Allow one concurrent deployment
-concurrency:
-  group: 'pages'
-  cancel-in-progress: true
-
-jobs:
-  build-landing-page:
-    name: Build landing page
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - uses: actions/upload-artifact@v4
-        with:
-          name: landing-page
-          path: './web/public'
-
-  build-explorer:
-    name: Build capa Explorer Web
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          submodules: 'recursive'
-          fetch-depth: 1
-          show-progress: true
-      - name: Set up Node
-        uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
-        with:
-          node-version: 20
-          cache: 'npm'
-          cache-dependency-path: './web/explorer/package-lock.json'
-      - name: Install dependencies
-        run: npm ci
-        working-directory: ./web/explorer
-      - name: Generate release bundle
-        run: npm run build:bundle
-        working-directory: ./web/explorer
-      - name: Zip release bundle
-        run: zip -r public/capa-explorer-web.zip capa-explorer-web
-        working-directory: ./web/explorer
-      - name: Build
-        run: npm run build
-        working-directory: ./web/explorer
-      - uses: actions/upload-artifact@v4
-        with:
-          name: explorer
-          path: './web/explorer/dist'
-
-  build-rules:
-    name: Build rules site
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out the repository
-        uses: actions/checkout@v4
-        with:
-          submodules: 'recursive'
-          # full depth so that capa-rules has a full history
-          # and we can construct a timeline of rule updates.
-          fetch-depth: 0
-      - name: Set up Python
-        uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
-        with:
-          python-version: '3.12'
-      - uses: extractions/setup-just@v2
-      - name: Install pagefind
-        uses: supplypike/setup-bin@v4
-        with:
-          uri: "https://github.com/CloudCannon/pagefind/releases/download/v1.1.0/pagefind-v1.1.0-x86_64-unknown-linux-musl.tar.gz"
-          name: "pagefind"
-          version: "1.1.0"
-      - name: Install dependencies
-        working-directory: ./web/rules
-        run: pip install -r requirements.txt
-      - name: Build the website
-        working-directory: ./web/rules
-        run: just build
-      - name: Index the website
-        working-directory: ./web/rules
-        run: pagefind --site "public"
-      # upload the build website to artifacts
-      # so that we can download and inspect, if desired.
-      - uses: actions/upload-artifact@v4
-        with:
-          name: rules
-          path: './web/rules/public'
-
-  deploy:
-    name: Deploy site to GitHub Pages
-    environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}
-    runs-on: ubuntu-latest
-    needs: [build-landing-page, build-explorer, build-rules]
-    steps:
-      - uses: actions/download-artifact@v4
-        with:
-          name: landing-page
-          path: './public/'
-      - uses: actions/download-artifact@v4
-        with:
-          name: explorer
-          path: './public/explorer'
-      - uses: actions/download-artifact@v4
-        with:
-          name: rules
-          path: './public/rules'
-      - name: Setup Pages
-        uses: actions/configure-pages@v4
-      - name: Upload artifact
-        uses: actions/upload-pages-artifact@v3
-        with:
-          path: './public'
-      - name: Deploy to GitHub Pages
-        id: deployment
-        uses: actions/deploy-pages@v4
--- a/.github/workflows/web-release.yml
+++ b/.github/workflows/web-release.yml
@@ -1,103 +0,0 @@
-name: create web release
-on:
-  workflow_dispatch:
-    inputs:
-      version:
-        description: 'Version number for the release (x.x.x)'
-        required: true
-        type: string
-
-jobs:
-  run-tests:
-    uses: ./.github/workflows/web-tests.yml
-
-  build-and-release:
-    needs: run-tests
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-
-    - name: Set release name
-      run: echo "RELEASE_NAME=capa-explorer-web-v${{ github.event.inputs.version }}-${GITHUB_SHA::7}" >> $GITHUB_ENV
-
-    - name: Check if release already exists
-      run: |
-        if ls web/explorer/releases/capa-explorer-web-v${{ github.event.inputs.version }}-* 1> /dev/null 2>&1; then
-          echo "::error:: A release with version ${{ github.event.inputs.version }} already exists"
-          exit 1
-        fi
-
-    - name: Set up Node.js
-      uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
-      with:
-        node-version: 20
-        cache: 'npm'
-        cache-dependency-path: 'web/explorer/package-lock.json'
-
-    - name: Install dependencies
-      run: npm ci
-      working-directory: web/explorer
-
-    - name: Build offline bundle
-      run: npm run build:bundle
-      working-directory: web/explorer
-
-    - name: Compress bundle
-      run: zip -r ${{ env.RELEASE_NAME }}.zip capa-explorer-web
-      working-directory: web/explorer
-
-    - name: Create releases directory
-      run: mkdir -vp web/explorer/releases
-
-    - name: Move release to releases folder
-      run: mv web/explorer/${{ env.RELEASE_NAME }}.zip web/explorer/releases
-
-    - name: Compute release SHA256 hash
-      run: |
-        echo "RELEASE_SHA256=$(sha256sum web/explorer/releases/${{ env.RELEASE_NAME }}.zip | awk '{print $1}')" >> $GITHUB_ENV
-
-    - name: Update CHANGELOG.md
-      run: |
-        echo "## ${{ env.RELEASE_NAME }}" >> web/explorer/releases/CHANGELOG.md
-        echo "- Release Date: $(date -u '+%Y-%m-%d %H:%M:%S UTC')" >> web/explorer/releases/CHANGELOG.md
-        echo "- SHA256: ${{ env.RELEASE_SHA256 }}" >> web/explorer/releases/CHANGELOG.md
-        echo "" >> web/explorer/releases/CHANGELOG.md
-        cat web/explorer/releases/CHANGELOG.md
-
-    - name: Remove older releases
-      # keep only the latest 3 releases
-      run: ls -t capa-explorer-web-v*.zip | tail -n +4 | xargs -r rm --
-      working-directory: web/explorer/releases
-
-    - name: Stage release files
-      run: |
-        git config --local user.email "capa-dev@mandiant.com"
-        git config --local user.name "Capa Bot"
-        git add -f web/explorer/releases/${{ env.RELEASE_NAME }}.zip web/explorer/releases/CHANGELOG.md
-        git add -u web/explorer/releases/
-
-    - name: Create Pull Request
-      uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # v7.0.5
-      with:
-        token: ${{ secrets.GITHUB_TOKEN }}
-        title: "explorer web: add release v${{ github.event.inputs.version }}"
-        body: |
-          This PR adds a new capa Explorer Web release v${{ github.event.inputs.version }}.
-
-          Release details:
-          - Name: ${{ env.RELEASE_NAME }}
-          - SHA256: ${{ env.RELEASE_SHA256 }}
-
-          This release is generated by the [web release](https://github.com/mandiant/capa/actions/workflows/web-release.yml) workflow.
-
-          - [x] No CHANGELOG update needed
-          - [x] No new tests needed
-          - [x] No documentation update needed
-        commit-message: ":robot: explorer web: add release ${{ env.RELEASE_NAME }}"
-        branch: release/web-v${{ github.event.inputs.version }}
-        add-paths: web/explorer/releases/${{ env.RELEASE_NAME }}.zip
-        base: master
-        labels: webui
-        delete-branch: true
-        committer: Capa Bot <capa-dev@mandiant.com>
-        author: Capa Bot <capa-dev@mandiant.com>
--- a/.github/workflows/web-tests.yml
+++ b/.github/workflows/web-tests.yml
@@ -1,43 +0,0 @@
-name: capa Explorer Web tests 
-
-on:
-  pull_request:
-    branches: [ master ]
-    paths:
-      - 'web/explorer/**'
-  workflow_call:  # this allows the workflow to be called by other workflows
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-      with:
-        submodules: 'recursive'
-        fetch-depth: 1
-        show-progress: true
-
-    - name: Set up Node
-      uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
-      with:
-        node-version: 20
-        cache: 'npm'
-        cache-dependency-path: 'web/explorer/package-lock.json'
-
-    - name: Install dependencies
-      run: npm ci
-      working-directory: web/explorer
-
-    - name: Lint
-      run: npm run lint
-      working-directory: web/explorer
-
-    - name: Format
-      run: npm run format:check
-      working-directory: web/explorer
-
-    - name: Run unit tests
-      run: npm run test
-      working-directory: web/explorer
--- a/.gitignore
+++ b/.gitignore
@@ -108,23 +108,13 @@ venv.bak/
 *.viv
 *.idb
 *.i64
-.vscode
-
 !rules/lib

+# hooks/ci.sh output
+isort-output.log
+black-output.log
+rule-linter-output.log
+.vscode
 scripts/perf/*.txt
 scripts/perf/*.svg
 scripts/perf/*.zip
-
-.direnv
-.envrc
-.DS_Store
-*/.DS_Store
-Pipfile
-Pipfile.lock
-/cache/
-.github/binja/binaryninja
-.github/binja/download_headless.py
-.github/binja/BinaryNinja-headless.zip
-justfile
-data/
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "rules"]
 	path = rules
-	url = ../../mandiant/capa-rules.git
+	url = ../capa-rules.git
 [submodule "tests/data"]
 	path = tests/data
-	url = ../../mandiant/capa-testfiles.git
+	url = ../capa-testfiles.git
--- a/.justfile
+++ b/.justfile
@@ -1,25 +0,0 @@
-@isort:
-    pre-commit run isort --show-diff-on-failure --all-files
-
-@black:
-    pre-commit run black --show-diff-on-failure --all-files
-
-@ruff:
-    pre-commit run ruff --all-files
-
-@flake8:
-    pre-commit run flake8 --hook-stage manual --all-files
-
-@mypy:
-    pre-commit run mypy --hook-stage manual --all-files
-
-@deptry:
-    pre-commit run deptry --hook-stage manual --all-files
-
-@lint:
-    -just isort
-    -just black
-    -just ruff
-    -just flake8
-    -just mypy
-    -just deptry
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,146 +0,0 @@
-# install the pre-commit hooks:
-#
-#    ❯ pre-commit install --hook-type pre-commit
-#    pre-commit installed at .git/hooks/pre-commit
-#
-#    ❯ pre-commit install --hook-type pre-push
-#    pre-commit installed at .git/hooks/pre-push
-#
-# run all linters liks:
-#
-#    ❯ pre-commit run --all-files
-#    isort....................................................................Passed
-#    black....................................................................Passed
-#    ruff.....................................................................Passed
-#    flake8...................................................................Passed
-#    mypy.....................................................................Passed
-#
-# run a single linter like:
-#
-#    ❯ pre-commit run --all-files isort
-#    isort....................................................................Passed
-
-repos:
-   repo: local
-    hooks:
-    -   id: isort
-        name: isort
-        stages: [pre-commit, pre-push, manual]
-        language: system
-        entry: isort
-        args: 
-        -   "--length-sort"
-        -   "--profile"
-        -   "black"
-        -   "--line-length=120"
-        -   "--skip-glob"
-        -   "*_pb2.py"
-        -   "capa/"
-        -   "scripts/"
-        -   "tests/"
-        -   "web/rules/scripts/"
-        always_run: true
-        pass_filenames: false
-
-   repo: local
-    hooks:
-    -   id: black
-        name: black
-        stages: [pre-commit, pre-push, manual]
-        language: system
-        entry: black
-        args: 
-        -   "--line-length=120"
-        -   "--extend-exclude"
-        -   ".*_pb2.py"
-        -   "capa/"
-        -   "scripts/"
-        -   "tests/"
-        -   "web/rules/scripts/"
-        always_run: true
-        pass_filenames: false
-
-   repo: local
-    hooks:
-    -   id: ruff
-        name: ruff
-        stages: [pre-commit, pre-push, manual]
-        language: system
-        entry: ruff
-        args: 
-        -   "check"
-        -   "--config"
-        -   ".github/ruff.toml"
-        -   "capa/"
-        -   "scripts/"
-        -   "tests/"
-        -   "web/rules/scripts/"
-        always_run: true
-        pass_filenames: false
-
-   repo: local
-    hooks:
-    -   id: flake8
-        name: flake8
-        stages: [pre-push, manual]
-        language: system
-        entry: flake8
-        args: 
-        -   "--config"
-        -   ".github/flake8.ini"
-        -   "--extend-exclude"
-        -   "capa/render/proto/capa_pb2.py,capa/features/extractors/binexport2/binexport2_pb2.py"
-        -   "capa/"
-        -   "scripts/"
-        -   "tests/"
-        -   "web/rules/scripts/"
-        always_run: true
-        pass_filenames: false
-
-   repo: local
-    hooks:
-    -   id: mypy
-        name: mypy
-        stages: [pre-push, manual]
-        language: system
-        entry: mypy
-        args: 
-        -   "--check-untyped-defs"
-        -   "--ignore-missing-imports"
-        -   "--config-file=.github/mypy/mypy.ini"
-        -   "--enable-incomplete-feature=NewGenericSyntax"
-        -   "capa/"
-        -   "scripts/"
-        -   "tests/"
-        -   "web/rules/scripts/"
-        always_run: true
-        pass_filenames: false
-
-   repo: local
-    hooks:
-    -   id: deptry
-        name: deptry
-        stages: [pre-push, manual]
-        language: system
-        entry: deptry .
-        always_run: true
-        pass_filenames: false
-
-   repo: local
-    hooks:
-    -   id: pytest-fast
-        name: pytest (fast)
-        stages: [manual]
-        language: system
-        entry: pytest
-        args: 
-        -   "tests/"
-        -   "--ignore=tests/test_binja_features.py"
-        -   "--ignore=tests/test_ghidra_features.py"
-        -   "--ignore=tests/test_ida_features.py"
-        -   "--ignore=tests/test_viv_features.py"
-        -   "--ignore=tests/test_main.py"
-        -   "--ignore=tests/test_scripts.py"
-        always_run: true
-        pass_filenames: false
-
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
--- a/CITATION.cff
+++ b/CITATION.cff
@@ -1,8 +0,0 @@
-cff-version: 1.2.0
-message: "If you use this software, please cite it as below."
-authors:
-  - name: "The FLARE Team"
-title: "capa, a tool to identify capabilities in programs and sandbox traces."
-date-released: 2020-07-16
-url: "https://github.com/mandiant/capa"
-
--- a/README.md
+++ b/README.md
@@ -1,84 +1,67 @@
-<br />
-<div align="center">
-<a href="https://mandiant.github.io/capa/" target="_blank">
-  <img src="https://github.com/mandiant/capa/blob/master/.github/logo.png">
-</a>
-<p align="center">
-  <a href="https://mandiant.github.io/capa/" target="_blank">Website</a>
-  |
-  <a href="https://github.com/mandiant/capa/releases/latest" target="_blank">Download</a>
-  |
-  <a href="https://mandiant.github.io/capa/explorer/" target="_blank">Web Interface</a>
-</p>
-<div align="center">
+![capa](https://github.com/mandiant/capa/blob/master/.github/logo.png)

 [![PyPI - Python Version](https://img.shields.io/pypi/pyversions/flare-capa)](https://pypi.org/project/flare-capa)
 [![Last release](https://img.shields.io/github/v/release/mandiant/capa)](https://github.com/mandiant/capa/releases)
-[![Number of rules](https://gist.githubusercontent.com/capa-bot/6d7960e911f48b3b74916df8988cf0f3/raw/rules_badge.svg)](https://github.com/mandiant/capa-rules)
+[![Number of rules](https://img.shields.io/badge/rules-661-blue.svg)](https://github.com/mandiant/capa-rules)
 [![CI status](https://github.com/mandiant/capa/workflows/CI/badge.svg)](https://github.com/mandiant/capa/actions?query=workflow%3ACI+event%3Apush+branch%3Amaster)
 [![Downloads](https://img.shields.io/github/downloads/mandiant/capa/total)](https://github.com/mandiant/capa/releases)
 [![License](https://img.shields.io/badge/license-Apache--2.0-green.svg)](LICENSE.txt)

-</div>
-</div>
-
---
-
 capa detects capabilities in executable files.
-You run it against a PE, ELF, .NET module, shellcode file, or a sandbox report and it tells you what it thinks the program can do.
+You run it against a PE, ELF, or shellcode file and it tells you what it thinks the program can do.
 For example, it might suggest that the file is a backdoor, is capable of installing services, or relies on HTTP to communicate.

-To interactively inspect capa results in your browser use the [capa Explorer Web](https://mandiant.github.io/capa/explorer/).
+Check out:
+- the overview in our first [capa blog post](https://www.fireeye.com/blog/threat-research/2020/07/capa-automatically-identify-malware-capabilities.html)
+- the major version 2.0 updates described in our [second blog post](https://www.fireeye.com/blog/threat-research/2021/07/capa-2-better-stronger-faster.html)
+- the major version 3.0 (ELF support) described in the [third blog post](https://www.fireeye.com/blog/threat-research/2021/09/elfant-in-the-room-capa-v3.html)

-If you want to inspect or write capa rules, head on over to the [capa-rules repository](https://github.com/mandiant/capa-rules). Otherwise, keep reading.
-
-Below you find a list of [our capa blog posts with more details.](#blog-posts)
-
-# example capa output
 ```
 $ capa.exe suspicious.exe

-+--------------------+------------------------------------------------------------------------+
-| ATT&CK Tactic      | ATT&CK Technique                                                       |
-|--------------------+------------------------------------------------------------------------|
-| DEFENSE EVASION    | Obfuscated Files or Information [T1027]                                |
-| DISCOVERY          | Query Registry [T1012]                                                 |
-|                    | System Information Discovery [T1082]                                   |
-| EXECUTION          | Command and Scripting Interpreter::Windows Command Shell [T1059.003]   |
-|                    | Shared Modules [T1129]                                                 |
-| EXFILTRATION       | Exfiltration Over C2 Channel [T1041]                                   |
-| PERSISTENCE        | Create or Modify System Process::Windows Service [T1543.003]           |
-+--------------------+------------------------------------------------------------------------+
+------------------------+--------------------------------------------------------------------------------+
+| ATT&CK Tactic          | ATT&CK Technique                                                               |
+|------------------------+--------------------------------------------------------------------------------|
+| DEFENSE EVASION        | Obfuscated Files or Information [T1027]                                        |
+| DISCOVERY              | Query Registry [T1012]                                                         |
+|                        | System Information Discovery [T1082]                                           |
+| EXECUTION              | Command and Scripting Interpreter::Windows Command Shell [T1059.003]           |
+|                        | Shared Modules [T1129]                                                         |
+| EXFILTRATION           | Exfiltration Over C2 Channel [T1041]                                           |
+| PERSISTENCE            | Create or Modify System Process::Windows Service [T1543.003]                   |
+------------------------+--------------------------------------------------------------------------------+

-+-------------------------------------------+-------------------------------------------------+
-| CAPABILITY                                | NAMESPACE                                       |
-|-------------------------------------------+-------------------------------------------------|
-| read and send data from client to server  | c2/file-transfer                               |
-| execute shell command and capture output  | c2/shell                                       |
-| receive data (2 matches)                  | communication                                   |
-| send data (6 matches)                     | communication                                   |
-| connect to HTTP server (3 matches)        | communication/http/client                       |
-| send HTTP request (3 matches)             | communication/http/client                       |
-| create pipe                               | communication/named-pipe/create                 |
-| get socket status (2 matches)             | communication/socket                            |
-| receive data on socket (2 matches)        | communication/socket/receive                    |
-| send data on socket (3 matches)           | communication/socket/send                       |
-| connect TCP socket                        | communication/socket/tcp                        |
-| encode data using Base64                  | data-manipulation/encoding/base64               |
-| encode data using XOR (6 matches)         | data-manipulation/encoding/xor                  |
-| run as a service                          | executable/pe                                   |
-| get common file path (3 matches)          | host-interaction/file-system                    |
-| read file                                 | host-interaction/file-system/read               |
-| write file (2 matches)                    | host-interaction/file-system/write              |
-| print debug messages (2 matches)          | host-interaction/log/debug/write-event          |
-| resolve DNS                               | host-interaction/network/dns/resolve            |
-| get hostname                              | host-interaction/os/hostname                    |
-| create process                            | host-interaction/process/create                 |
-| create registry key                       | host-interaction/registry/create                |
-| create service                            | host-interaction/service/create                 |
-| create thread                             | host-interaction/thread/create                  |
-| persist via Windows service               | persistence/service                             |
-+-------------------------------------------+-------------------------------------------------+
+-------------------------------------------------------+-------------------------------------------------+
+| CAPABILITY                                            | NAMESPACE                                       |
+|-------------------------------------------------------+-------------------------------------------------|
+| check for OutputDebugString error                     | anti-analysis/anti-debugging/debugger-detection |
+| read and send data from client to server              | c2/file-transfer                                |
+| execute shell command and capture output              | c2/shell                                        |
+| receive data (2 matches)                              | communication                                   |
+| send data (6 matches)                                 | communication                                   |
+| connect to HTTP server (3 matches)                    | communication/http/client                       |
+| send HTTP request (3 matches)                         | communication/http/client                       |
+| create pipe                                           | communication/named-pipe/create                 |
+| get socket status (2 matches)                         | communication/socket                            |
+| receive data on socket (2 matches)                    | communication/socket/receive                    |
+| send data on socket (3 matches)                       | communication/socket/send                       |
+| connect TCP socket                                    | communication/socket/tcp                        |
+| encode data using Base64                              | data-manipulation/encoding/base64               |
+| encode data using XOR (6 matches)                     | data-manipulation/encoding/xor                  |
+| run as a service                                      | executable/pe                                   |
+| get common file path (3 matches)                      | host-interaction/file-system                    |
+| read file                                             | host-interaction/file-system/read               |
+| write file (2 matches)                                | host-interaction/file-system/write              |
+| print debug messages (2 matches)                      | host-interaction/log/debug/write-event          |
+| resolve DNS                                           | host-interaction/network/dns/resolve            |
+| get hostname                                          | host-interaction/os/hostname                    |
+| create a process with modified I/O handles and window | host-interaction/process/create                 |
+| create process                                        | host-interaction/process/create                 |
+| create registry key                                   | host-interaction/registry/create                |
+| create service                                        | host-interaction/service/create                 |
+| create thread                                         | host-interaction/thread/create                  |
+| persist via Windows service                           | persistence/service                             |
+-------------------------------------------------------+-------------------------------------------------+
 ```

 # download and usage
@@ -87,23 +70,16 @@ Download stable releases of the standalone capa binaries [here](https://github.c

 To use capa as a library or integrate with another tool, see [doc/installation.md](https://github.com/mandiant/capa/blob/master/doc/installation.md) for further setup instructions.

-# capa Explorer Web
-The [capa Explorer Web](https://mandiant.github.io/capa/explorer/) enables you to interactively explore capa results in your web browser. Besides the online version you can download a standalone HTML file for local offline usage.
-
-![capa Explorer Web screenshot](https://github.com/mandiant/capa/blob/master/doc/img/capa_web_explorer.png)
-
-More details on the web UI is available in the [capa Explorer Web README](https://github.com/mandiant/capa/blob/master/web/explorer/README.md).
+For more information about how to use capa, see [doc/usage.md](https://github.com/mandiant/capa/blob/master/doc/usage.md).

 # example

-In the above sample output, we run capa against an unknown binary (`suspicious.exe`),
-and the tool reports that the program can send HTTP requests, decode data via XOR and Base64,
+In the above sample output, we ran capa against an unknown binary (`suspicious.exe`),
+and the tool reported that the program can send HTTP requests, decode data via XOR and Base64,
 install services, and spawn new processes.
 Taken together, this makes us think that `suspicious.exe` could be a persistent backdoor.
 Therefore, our next analysis step might be to run `suspicious.exe` in a sandbox and try to recover the command and control server.

-## detailed results
-
 By passing the `-vv` flag (for very verbose), capa reports exactly where it found evidence of these capabilities.
 This is useful for at least two reasons:

@@ -119,131 +95,26 @@ author      matthew.williams@mandiant.com
 scope       function
 att&ck      Execution::Command and Scripting Interpreter::Windows Command Shell [T1059.003]
 references  https://docs.microsoft.com/en-us/windows/win32/api/processthreadsapi/ns-processthreadsapi-startupinfoa
-function @ 0x4011C0
+examples    Practical Malware Analysis Lab 14-02.exe_:0x4011C0
+function @ 0x10003A13
  and:
-    match: create a process with modified I/O handles and window @ 0x4011C0
+    match: create a process with modified I/O handles and window @ 0x10003A13
      and:
-        number: 257 = STARTF_USESTDHANDLES | STARTF_USESHOWWINDOW @ 0x4012B8
        or:
-          number: 68 = StartupInfo.cb (size) @ 0x401282
-        or: = API functions that accept a pointer to a STARTUPINFO structure
-          api: kernel32.CreateProcess @ 0x401343
-    match: create pipe @ 0x4011C0
+          api: kernel32.CreateProcess @ 0x10003D6D
+        number: 0x101 @ 0x10003B03
+        or:
+          number: 0x44 @ 0x10003ADC
+        optional:
+          api: kernel32.GetStartupInfo @ 0x10003AE4
+    match: create pipe @ 0x10003A13
      or:
-        api: kernel32.CreatePipe @ 0x40126F, 0x401280
-    optional:
-      match: create thread @ 0x40136A, 0x4013BA
-        or:
-          and:
-            os: windows
-            or:
-              api: kernel32.CreateThread @ 0x4013D7
-        or:
-          and:
-            os: windows
-            or:
-              api: kernel32.CreateThread @ 0x401395
+        api: kernel32.CreatePipe @ 0x10003ACB
    or:
-      string: "cmd.exe" @ 0x4012FD
+      string: cmd.exe /c  @ 0x10003AED
 ...
 ```

-capa also supports dynamic capabilities detection for multiple sandboxes including:
-* [CAPE](https://github.com/kevoreilly/CAPEv2) (supported report formats: `.json`, `.json_`, `.json.gz`)
-* [DRAKVUF](https://github.com/CERT-Polska/drakvuf-sandbox/) (supported report formats: `.log`, `.log.gz`)
-* [VMRay](https://www.vmray.com/) (supported report formats: analysis archive `.zip`)
-
-
-To use this feature, submit your file to a supported sandbox and then download and run capa against the generated report file. This feature enables capa to match capabilities against dynamic and static features that the sandbox captured during execution.
-
-Here's an example of running capa against a packed file, and then running capa against the CAPE report generated for the same packed file:
-
-```yaml
-$ capa 05be49819139a3fdcdbddbdefd298398779521f3d68daa25275cc77508e42310.exe
-WARNING:capa.capabilities.common:--------------------------------------------------------------------------------
-WARNING:capa.capabilities.common: This sample appears to be packed.
-WARNING:capa.capabilities.common: 
-WARNING:capa.capabilities.common: Packed samples have often been obfuscated to hide their logic.
-WARNING:capa.capabilities.common: capa cannot handle obfuscation well using static analysis. This means the results may be misleading or incomplete.
-WARNING:capa.capabilities.common: If possible, you should try to unpack this input file before analyzing it with capa.
-WARNING:capa.capabilities.common: Alternatively, run the sample in a supported sandbox and invoke capa against the report to obtain dynamic analysis results.
-WARNING:capa.capabilities.common: 
-WARNING:capa.capabilities.common: Identified via rule: (internal) packer file limitation
-WARNING:capa.capabilities.common: 
-WARNING:capa.capabilities.common: Use -v or -vv if you really want to see the capabilities identified by capa.
-WARNING:capa.capabilities.common:--------------------------------------------------------------------------------
-
-$ capa 05be49819139a3fdcdbddbdefd298398779521f3d68daa25275cc77508e42310.json
-
-┍━━━━━━━━━━━━━━━━━━━━━━━━┯━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┑
-│ ATT&CK Tactic          │ ATT&CK Technique                                                                   │
-┝━━━━━━━━━━━━━━━━━━━━━━━━┿━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┥
-│ CREDENTIAL ACCESS      │ Credentials from Password Stores T1555                                             │
-├────────────────────────┼────────────────────────────────────────────────────────────────────────────────────┤
-│ DEFENSE EVASION        │ File and Directory Permissions Modification T1222                                  │
-│                        │ Modify Registry T1112                                                              │
-│                        │ Obfuscated Files or Information T1027                                              │
-│                        │ Virtualization/Sandbox Evasion::User Activity Based Checks T1497.002               │
-├────────────────────────┼────────────────────────────────────────────────────────────────────────────────────┤
-│ DISCOVERY              │ Account Discovery T1087                                                            │
-│                        │ Application Window Discovery T1010                                                 │
-│                        │ File and Directory Discovery T1083                                                 │
-│                        │ Query Registry T1012                                                               │
-│                        │ System Information Discovery T1082                                                 │
-│                        │ System Location Discovery::System Language Discovery T1614.001                     │
-│                        │ System Owner/User Discovery T1033                                                  │
-├────────────────────────┼────────────────────────────────────────────────────────────────────────────────────┤
-│ EXECUTION              │ System Services::Service Execution T1569.002                                       │
-├────────────────────────┼────────────────────────────────────────────────────────────────────────────────────┤
-│ PERSISTENCE            │ Boot or Logon Autostart Execution::Registry Run Keys / Startup Folder T1547.001    │
-│                        │ Boot or Logon Autostart Execution::Winlogon Helper DLL T1547.004                   │
-│                        │ Create or Modify System Process::Windows Service T1543.003                         │
-┕━━━━━━━━━━━━━━━━━━━━━━━━┷━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┙
-
-┍━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┯━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┑
-│ Capability                                           │ Namespace                                            │
-┝━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┿━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┥
-│ check for unmoving mouse cursor (3 matches)          │ anti-analysis/anti-vm/vm-detection                   │
-│ gather bitkinex information                          │ collection/file-managers                             │
-│ gather classicftp information                        │ collection/file-managers                             │
-│ gather filezilla information                         │ collection/file-managers                             │
-│ gather total-commander information                   │ collection/file-managers                             │
-│ gather ultrafxp information                          │ collection/file-managers                             │
-│ resolve DNS (23 matches)                             │ communication/dns                                    │
-│ initialize Winsock library (7 matches)               │ communication/socket                                 │
-│ act as TCP client (3 matches)                        │ communication/tcp/client                             │
-│ create new key via CryptAcquireContext               │ data-manipulation/encryption                         │
-│ encrypt or decrypt via WinCrypt                      │ data-manipulation/encryption                         │
-│ hash data via WinCrypt                               │ data-manipulation/hashing                            │
-│ initialize hashing via WinCrypt                      │ data-manipulation/hashing                            │
-│ hash data with MD5                                   │ data-manipulation/hashing/md5                        │
-│ generate random numbers via WinAPI                   │ data-manipulation/prng                               │
-│ extract resource via kernel32 functions (2 matches)  │ executable/resource                                  │
-│ interact with driver via control codes (2 matches)   │ host-interaction/driver                              │
-│ get Program Files directory (18 matches)             │ host-interaction/file-system                         │
-│ get common file path (575 matches)                   │ host-interaction/file-system                         │
-│ create directory (2 matches)                         │ host-interaction/file-system/create                  │
-│ delete file                                          │ host-interaction/file-system/delete                  │
-│ get file attributes (122 matches)                    │ host-interaction/file-system/meta                    │
-│ set file attributes (8 matches)                      │ host-interaction/file-system/meta                    │
-│ move file                                            │ host-interaction/file-system/move                    │
-│ find taskbar (3 matches)                             │ host-interaction/gui/taskbar/find                    │
-│ get keyboard layout (12 matches)                     │ host-interaction/hardware/keyboard                   │
-│ get disk size                                        │ host-interaction/hardware/storage                    │
-│ get hostname (4 matches)                             │ host-interaction/os/hostname                         │
-│ allocate or change RWX memory (3 matches)            │ host-interaction/process/inject                      │
-│ query or enumerate registry key (3 matches)          │ host-interaction/registry                            │
-│ query or enumerate registry value (8 matches)        │ host-interaction/registry                            │
-│ delete registry key                                  │ host-interaction/registry/delete                     │
-│ start service                                        │ host-interaction/service/start                       │
-│ get session user name                                │ host-interaction/session                             │
-│ persist via Run registry key                         │ persistence/registry/run                             │
-│ persist via Winlogon Helper DLL registry key         │ persistence/registry/winlogon-helper                 │
-│ persist via Windows service (2 matches)              │ persistence/service                                  │
-┕━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┷━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┙
-```
-
-# capa rules
 capa uses a collection of rules to identify capabilities within a program.
 These rules are easy to write, even for those new to reverse engineering.
 By authoring rules, you can extend the capabilities that capa recognizes.
@@ -254,54 +125,31 @@ Here's an example rule used by capa:
 ```yaml
 rule:
  meta:
-    name: create TCP socket
-    namespace: communication/socket/tcp
-    authors:
-      - william.ballenthin@mandiant.com
-      - joakim@intezer.com
-      - anushka.virgaonkar@mandiant.com
-    scopes:
-      static: basic block
-      dynamic: call
-    mbc:
-      - Communication::Socket Communication::Create TCP Socket [C0001.011]
+    name: hash data with CRC32
+    namespace: data-manipulation/checksum/crc32
+    author: moritz.raabe@mandiant.com
+    scope: function
    examples:
-      - Practical Malware Analysis Lab 01-01.dll_:0x10001010
+      - 2D3EDC218A90F03089CC01715A9F047F:0x403CBD
+      - 7D28CB106CB54876B2A5C111724A07CD:0x402350  # RtlComputeCrc32
  features:
    - or:
      - and:
-        - number: 6 = IPPROTO_TCP
-        - number: 1 = SOCK_STREAM
-        - number: 2 = AF_INET
-        - or:
-          - api: ws2_32.socket
-          - api: ws2_32.WSASocket
-          - api: socket
-      - property/read: System.Net.Sockets.TcpClient::Client
+        - mnemonic: shr
+        - number: 0xEDB88320
+        - number: 8
+        - characteristic: nzxor
+      - api: RtlComputeCrc32
 ```

-The [github.com/mandiant/capa-rules](https://github.com/mandiant/capa-rules) repository contains hundreds of standard rules that are distributed with capa.
+The [github.com/mandiant/capa-rules](https://github.com/mandiant/capa-rules) repository contains hundreds of standard library rules that are distributed with capa.
 Please learn to write rules and contribute new entries as you find interesting techniques in malware.

-# IDA Pro plugin: capa explorer
 If you use IDA Pro, then you can use the [capa explorer](https://github.com/mandiant/capa/tree/master/capa/ida/plugin) plugin.
 capa explorer helps you identify interesting areas of a program and build new capa rules using features extracted directly from your IDA Pro database.
-It also uses your local changes to the .idb to extract better features, such as when you rename a global variable that contains a dynamically resolved API address.

 ![capa + IDA Pro integration](https://github.com/mandiant/capa/blob/master/doc/img/explorer_expanded.png)

-# Ghidra integration
-If you use Ghidra, then you can use the [capa + Ghidra integration](/capa/ghidra/) to run capa's analysis directly on your Ghidra database and render the results in Ghidra's user interface.
-
-<img src="https://github.com/mandiant/capa/assets/66766340/eeae33f4-99d4-42dc-a5e8-4c1b8c661492" width=300>
-
-# blog posts
- [Dynamic capa: Exploring Executable Run-Time Behavior with the CAPE Sandbox](https://www.mandiant.com/resources/blog/dynamic-capa-executable-behavior-cape-sandbox)
- [capa v4: casting a wider .NET](https://www.mandiant.com/resources/blog/capa-v4-casting-wider-net) (.NET support)
- [ELFant in the Room – capa v3](https://www.mandiant.com/resources/elfant-in-the-room-capa-v3) (ELF support)
- [capa 2.0: Better, Stronger, Faster](https://www.mandiant.com/resources/capa-2-better-stronger-faster)
- [capa: Automatically Identify Malware Capabilities](https://www.mandiant.com/resources/capa-automatically-identify-malware-capabilities)
-
 # further information
 ## capa
 - [Installation](https://github.com/mandiant/capa/blob/master/doc/installation.md)
--- a/capa/analysis/flirt.py
+++ b/capa/analysis/flirt.py
@@ -1,38 +0,0 @@
-# Copyright (C) 2024 Mandiant, Inc. All Rights Reserved.
-# Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at: [package root]/LICENSE.txt
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-#  is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and limitations under the License.
-
-from pydantic import BaseModel
-
-import capa.features.extractors.ida.idalib as idalib
-
-if not idalib.has_idalib():
-    raise RuntimeError("cannot find IDA idalib module.")
-
-if not idalib.load_idalib():
-    raise RuntimeError("failed to load IDA idalib module.")
-
-import idaapi
-import idautils
-
-
-class FunctionId(BaseModel):
-    va: int
-    is_library: bool
-    name: str
-
-
-def get_flirt_matches(lib_only=True):
-    for fva in idautils.Functions():
-        f = idaapi.get_func(fva)
-        is_lib = bool(f.flags & idaapi.FUNC_LIB)
-        fname = idaapi.get_func_name(fva)
-
-        if lib_only and not is_lib:
-            continue
-
-        yield FunctionId(va=fva, is_library=is_lib, name=fname)
--- a/capa/analysis/libraries.py
+++ b/capa/analysis/libraries.py
@@ -1,242 +0,0 @@
-# Copyright (C) 2024 Mandiant, Inc. All Rights Reserved.
-# Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at: [package root]/LICENSE.txt
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-#  is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and limitations under the License.
-import io
-import sys
-import logging
-import argparse
-import tempfile
-import contextlib
-from enum import Enum
-from typing import List, Optional
-from pathlib import Path
-
-import rich
-from pydantic import BaseModel
-from rich.text import Text
-from rich.console import Console
-
-import capa.main
-import capa.helpers
-import capa.analysis.flirt
-import capa.analysis.strings
-import capa.features.extractors.ida.idalib as idalib
-
-if not idalib.has_idalib():
-    raise RuntimeError("cannot find IDA idalib module.")
-
-if not idalib.load_idalib():
-    raise RuntimeError("failed to load IDA idalib module.")
-
-import idaapi
-import idapro
-import ida_auto
-import idautils
-
-logger = logging.getLogger(__name__)
-
-
-class Classification(str, Enum):
-    USER = "user"
-    LIBRARY = "library"
-    UNKNOWN = "unknown"
-
-
-class Method(str, Enum):
-    FLIRT = "flirt"
-    STRINGS = "strings"
-    THUNK = "thunk"
-    ENTRYPOINT = "entrypoint"
-
-
-class FunctionClassification(BaseModel):
-    va: int
-    classification: Classification
-    # name per the disassembler/analysis tool
-    # may be combined with the recovered/suspected name TODO below
-    name: str
-
-    # if is library, this must be provided
-    method: Optional[Method]
-
-    # TODO if is library, recovered/suspected name?
-
-    # if is library, these can optionally be provided.
-    library_name: Optional[str] = None
-    library_version: Optional[str] = None
-
-
-class FunctionIdResults(BaseModel):
-    function_classifications: List[FunctionClassification]
-
-
-@contextlib.contextmanager
-def ida_session(input_path: Path, use_temp_dir=True):
-    if use_temp_dir:
-        t = Path(tempfile.mkdtemp(prefix="ida-")) / input_path.name
-    else:
-        t = input_path
-
-    logger.debug("using %s", str(t))
-    # stderr=True is used here to redirect the spinner banner to stderr,
-    # so that users can redirect capa's output.
-    console = Console(stderr=True, quiet=False)
-
-    try:
-        if use_temp_dir:
-            t.write_bytes(input_path.read_bytes())
-
-        # idalib writes to stdout (ugh), so we have to capture that
-        # so as not to screw up structured output.
-        with capa.helpers.stdout_redirector(io.BytesIO()):
-            idapro.enable_console_messages(False)
-            with capa.main.timing("analyze program"):
-                with console.status("analyzing program...", spinner="dots"):
-                    if idapro.open_database(str(t.absolute()), run_auto_analysis=True):
-                        raise RuntimeError("failed to analyze input file")
-
-            logger.debug("idalib: waiting for analysis...")
-            ida_auto.auto_wait()
-            logger.debug("idalib: opened database.")
-
-        yield
-    finally:
-        idapro.close_database()
-        if use_temp_dir:
-            t.unlink()
-
-
-def is_thunk_function(fva):
-    f = idaapi.get_func(fva)
-    return bool(f.flags & idaapi.FUNC_THUNK)
-
-
-def main(argv=None):
-    if argv is None:
-        argv = sys.argv[1:]
-
-    parser = argparse.ArgumentParser(description="Identify library functions using various strategies.")
-    capa.main.install_common_args(parser, wanted={"input_file"})
-    parser.add_argument("--store-idb", action="store_true", default=False, help="store IDA database file")
-    parser.add_argument("--min-string-length", type=int, default=8, help="minimum string length")
-    parser.add_argument("-j", "--json", action="store_true", help="emit JSON instead of text")
-    args = parser.parse_args(args=argv)
-
-    try:
-        capa.main.handle_common_args(args)
-    except capa.main.ShouldExitError as e:
-        return e.status_code
-
-    dbs = capa.analysis.strings.get_default_databases()
-    capa.analysis.strings.prune_databases(dbs, n=args.min_string_length)
-
-    function_classifications: List[FunctionClassification] = []
-    with ida_session(args.input_file, use_temp_dir=not args.store_idb):
-        with capa.main.timing("FLIRT-based library identification"):
-            # TODO: add more signature (files)
-            # TOOD: apply more signatures
-            for flirt_match in capa.analysis.flirt.get_flirt_matches():
-                function_classifications.append(
-                    FunctionClassification(
-                        va=flirt_match.va,
-                        name=flirt_match.name,
-                        classification=Classification.LIBRARY,
-                        method=Method.FLIRT,
-                        # note: we cannot currently include which signature matched per function via the IDA API
-                    )
-                )
-
-        # thunks
-        for fva in idautils.Functions():
-            if is_thunk_function(fva):
-                function_classifications.append(
-                    FunctionClassification(
-                        va=fva,
-                        name=idaapi.get_func_name(fva),
-                        classification=Classification.LIBRARY,
-                        method=Method.THUNK,
-                    )
-                )
-
-        with capa.main.timing("string-based library identification"):
-            for string_match in capa.analysis.strings.get_string_matches(dbs):
-                function_classifications.append(
-                    FunctionClassification(
-                        va=string_match.va,
-                        name=idaapi.get_func_name(string_match.va),
-                        classification=Classification.LIBRARY,
-                        method=Method.STRINGS,
-                        library_name=string_match.metadata.library_name,
-                        library_version=string_match.metadata.library_version,
-                    )
-                )
-
-        for va in idautils.Functions():
-            name = idaapi.get_func_name(va)
-            if name not in {
-                "WinMain",
-            }:
-                continue
-
-            function_classifications.append(
-                FunctionClassification(
-                    va=va,
-                    name=name,
-                    classification=Classification.USER,
-                    method=Method.ENTRYPOINT,
-                )
-            )
-
-        doc = FunctionIdResults(function_classifications=[])
-        classifications_by_va = capa.analysis.strings.create_index(function_classifications, "va")
-        for va in idautils.Functions():
-            if classifications := classifications_by_va.get(va):
-                doc.function_classifications.extend(classifications)
-            else:
-                doc.function_classifications.append(
-                    FunctionClassification(
-                        va=va,
-                        name=idaapi.get_func_name(va),
-                        classification=Classification.UNKNOWN,
-                        method=None,
-                    )
-                )
-
-        if args.json:
-            print(doc.model_dump_json())  # noqa: T201 print found
-
-        else:
-            table = rich.table.Table()
-            table.add_column("FVA")
-            table.add_column("CLASSIFICATION")
-            table.add_column("METHOD")
-            table.add_column("FNAME")
-            table.add_column("EXTRA INFO")
-
-            classifications_by_va = capa.analysis.strings.create_index(doc.function_classifications, "va", sorted_=True)
-            for va, classifications in classifications_by_va.items():
-                name = ", ".join({c.name for c in classifications})
-                if "sub_" in name:
-                    name = Text(name, style="grey53")
-
-                classification = {c.classification for c in classifications}
-                method = {c.method for c in classifications if c.method}
-                extra = {f"{c.library_name}@{c.library_version}" for c in classifications if c.library_name}
-
-                table.add_row(
-                    hex(va),
-                    ", ".join(classification) if classification != {"unknown"} else Text("unknown", style="grey53"),
-                    ", ".join(method),
-                    name,
-                    ", ".join(extra),
-                )
-
-            rich.print(table)
-
-
-if __name__ == "__main__":
-    sys.exit(main())
--- a/capa/analysis/requirements.txt
+++ b/capa/analysis/requirements.txt
@@ -1,2 +0,0 @@
-# temporary extra file to track dependencies of the analysis directory
-nltk==3.9.1
--- a/capa/analysis/strings/init.py
+++ b/capa/analysis/strings/init.py
@@ -1,269 +0,0 @@
-# Copyright (C) 2024 Mandiant, Inc. All Rights Reserved.
-# Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at: [package root]/LICENSE.txt
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-#  is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and limitations under the License.
-
-"""
-further requirements:
-  - nltk
-"""
-import gzip
-import logging
-import collections
-from typing import Any, Dict, Mapping
-from pathlib import Path
-from dataclasses import dataclass
-
-import msgspec
-
-import capa.features.extractors.strings
-
-logger = logging.getLogger(__name__)
-
-
-class LibraryString(msgspec.Struct):
-    string: str
-    library_name: str
-    library_version: str
-    file_path: str | None = None
-    function_name: str | None = None
-    line_number: int | None = None
-
-
-@dataclass
-class LibraryStringDatabase:
-    metadata_by_string: Dict[str, LibraryString]
-
-    def __len__(self) -> int:
-        return len(self.metadata_by_string)
-
-    @classmethod
-    def from_file(cls, path: Path) -> "LibraryStringDatabase":
-        metadata_by_string: Dict[str, LibraryString] = {}
-        decoder = msgspec.json.Decoder(type=LibraryString)
-        for line in gzip.decompress(path.read_bytes()).split(b"\n"):
-            if not line:
-                continue
-            s = decoder.decode(line)
-            metadata_by_string[s.string] = s
-
-        return cls(metadata_by_string=metadata_by_string)
-
-
-DEFAULT_FILENAMES = (
-    "brotli.jsonl.gz",
-    "bzip2.jsonl.gz",
-    "cryptopp.jsonl.gz",
-    "curl.jsonl.gz",
-    "detours.jsonl.gz",
-    "jemalloc.jsonl.gz",
-    "jsoncpp.jsonl.gz",
-    "kcp.jsonl.gz",
-    "liblzma.jsonl.gz",
-    "libsodium.jsonl.gz",
-    "libpcap.jsonl.gz",
-    "mbedtls.jsonl.gz",
-    "openssl.jsonl.gz",
-    "sqlite3.jsonl.gz",
-    "tomcrypt.jsonl.gz",
-    "wolfssl.jsonl.gz",
-    "zlib.jsonl.gz",
-)
-
-DEFAULT_PATHS = tuple(Path(__file__).parent / "data" / "oss" / filename for filename in DEFAULT_FILENAMES) + (
-    Path(__file__).parent / "data" / "crt" / "msvc_v143.jsonl.gz",
-)
-
-
-def get_default_databases() -> list[LibraryStringDatabase]:
-    return [LibraryStringDatabase.from_file(path) for path in DEFAULT_PATHS]
-
-
-@dataclass
-class WindowsApiStringDatabase:
-    dll_names: set[str]
-    api_names: set[str]
-
-    def __len__(self) -> int:
-        return len(self.dll_names) + len(self.api_names)
-
-    @classmethod
-    def from_dir(cls, path: Path) -> "WindowsApiStringDatabase":
-        dll_names: set[str] = set()
-        api_names: set[str] = set()
-
-        for line in gzip.decompress((path / "dlls.txt.gz").read_bytes()).decode("utf-8").splitlines():
-            if not line:
-                continue
-            dll_names.add(line)
-
-        for line in gzip.decompress((path / "apis.txt.gz").read_bytes()).decode("utf-8").splitlines():
-            if not line:
-                continue
-            api_names.add(line)
-
-        return cls(dll_names=dll_names, api_names=api_names)
-
-    @classmethod
-    def from_defaults(cls) -> "WindowsApiStringDatabase":
-        return cls.from_dir(Path(__file__).parent / "data" / "winapi")
-
-
-def extract_strings(buf, n=4):
-    yield from capa.features.extractors.strings.extract_ascii_strings(buf, n=n)
-    yield from capa.features.extractors.strings.extract_unicode_strings(buf, n=n)
-
-
-def prune_databases(dbs: list[LibraryStringDatabase], n=8):
-    """remove less trustyworthy database entries.
-
-    such as:
-      - those found in multiple databases
-      - those that are English words
-      - those that are too short
-      - Windows API and DLL names
-    """
-
-    # TODO: consider applying these filters directly to the persisted databases, not at load time.
-
-    winapi = WindowsApiStringDatabase.from_defaults()
-
-    try:
-        from nltk.corpus import words as nltk_words
-
-        nltk_words.words()
-    except (ImportError, LookupError):
-        # one-time download of dataset.
-        # this probably doesn't work well for embedded use.
-        import nltk
-
-        nltk.download("words")
-        from nltk.corpus import words as nltk_words
-    words = set(nltk_words.words())
-
-    counter: collections.Counter[str] = collections.Counter()
-    to_remove = set()
-    for db in dbs:
-        for string in db.metadata_by_string.keys():
-            counter[string] += 1
-
-            if string in words:
-                to_remove.add(string)
-                continue
-
-            if len(string) < n:
-                to_remove.add(string)
-                continue
-
-            if string in winapi.api_names:
-                to_remove.add(string)
-                continue
-
-            if string in winapi.dll_names:
-                to_remove.add(string)
-                continue
-
-    for string, count in counter.most_common():
-        if count <= 1:
-            break
-
-        # remove strings that are seen in more than one database
-        to_remove.add(string)
-
-    for db in dbs:
-        for string in to_remove:
-            if string in db.metadata_by_string:
-                del db.metadata_by_string[string]
-
-
-def get_function_strings():
-    import idaapi
-    import idautils
-
-    import capa.features.extractors.ida.helpers as ida_helpers
-
-    strings_by_function = collections.defaultdict(set)
-    for ea in idautils.Functions():
-        f = idaapi.get_func(ea)
-
-        # ignore library functions and thunk functions as identified by IDA
-        if f.flags & idaapi.FUNC_THUNK:
-            continue
-        if f.flags & idaapi.FUNC_LIB:
-            continue
-
-        for bb in ida_helpers.get_function_blocks(f):
-            for insn in ida_helpers.get_instructions_in_range(bb.start_ea, bb.end_ea):
-                ref = capa.features.extractors.ida.helpers.find_data_reference_from_insn(insn)
-                if ref == insn.ea:
-                    continue
-
-                string = capa.features.extractors.ida.helpers.find_string_at(ref)
-                if not string:
-                    continue
-
-                strings_by_function[ea].add(string)
-
-    return strings_by_function
-
-
-@dataclass
-class LibraryStringClassification:
-    va: int
-    string: str
-    library_name: str
-    metadata: LibraryString
-
-
-def create_index(s: list, k: str, sorted_: bool = False) -> Mapping[Any, list]:
-    """create an index of the elements in `s` using the key `k`, optionally sorted by `k`"""
-    if sorted_:
-        s = sorted(s, key=lambda x: getattr(x, k))
-
-    s_by_k = collections.defaultdict(list)
-    for v in s:
-        p = getattr(v, k)
-        s_by_k[p].append(v)
-    return s_by_k
-
-
-def get_string_matches(dbs: list[LibraryStringDatabase]) -> list[LibraryStringClassification]:
-    matches: list[LibraryStringClassification] = []
-
-    for function, strings in sorted(get_function_strings().items()):
-        for string in strings:
-            for db in dbs:
-                if metadata := db.metadata_by_string.get(string):
-                    matches.append(
-                        LibraryStringClassification(
-                            va=function,
-                            string=string,
-                            library_name=metadata.library_name,
-                            metadata=metadata,
-                        )
-                    )
-
-    # if there are less than N strings per library, ignore that library
-    matches_by_library = create_index(matches, "library_name")
-    for library_name, library_matches in matches_by_library.items():
-        if len(library_matches) > 5:
-            continue
-
-        logger.info("pruning library %s: only %d matched string", library_name, len(library_matches))
-        matches = [m for m in matches if m.library_name != library_name]
-
-    # if there are conflicts within a single function, don't label it
-    matches_by_function = create_index(matches, "va")
-    for va, function_matches in matches_by_function.items():
-        library_names = {m.library_name for m in function_matches}
-        if len(library_names) == 1:
-            continue
-
-        logger.info("conflicting matches: 0x%x: %s", va, sorted(library_names))
-        # this is potentially slow (O(n**2)) but hopefully fast enough in practice.
-        matches = [m for m in matches if m.va != va]
-
-    return matches
--- a/capa/analysis/strings/main.py
+++ b/capa/analysis/strings/main.py
@@ -1,130 +0,0 @@
-# Copyright (C) 2024 Mandiant, Inc. All Rights Reserved.
-# Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at: [package root]/LICENSE.txt
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-#  is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and limitations under the License.
-import sys
-import logging
-import collections
-from pathlib import Path
-
-import rich
-from rich.text import Text
-
-import capa.analysis.strings
-import capa.features.extractors.strings
-import capa.features.extractors.ida.helpers as ida_helpers
-
-logger = logging.getLogger(__name__)
-
-
-def open_ida(input_path: Path):
-    import tempfile
-
-    import idapro
-
-    t = Path(tempfile.mkdtemp(prefix="ida-")) / input_path.name
-    t.write_bytes(input_path.read_bytes())
-    # resource leak: we should delete this upon exit
-
-    idapro.enable_console_messages(False)
-    idapro.open_database(str(t.absolute()), run_auto_analysis=True)
-
-    import ida_auto
-
-    ida_auto.auto_wait()
-
-
-def main():
-    logging.basicConfig(level=logging.DEBUG)
-
-    # use n=8 to ignore common words
-    N = 8
-
-    input_path = Path(sys.argv[1])
-
-    dbs = capa.analysis.strings.get_default_databases()
-    capa.analysis.strings.prune_databases(dbs, n=N)
-
-    strings_by_library = collections.defaultdict(set)
-    for string in capa.analysis.strings.extract_strings(input_path.read_bytes(), n=N):
-        for db in dbs:
-            if metadata := db.metadata_by_string.get(string.s):
-                strings_by_library[metadata.library_name].add(string.s)
-
-    console = rich.get_console()
-    console.print("found libraries:", style="bold")
-    for library, strings in sorted(strings_by_library.items(), key=lambda p: len(p[1]), reverse=True):
-        console.print(f"  - [b]{library}[/] ({len(strings)} strings)")
-
-        for string in sorted(strings)[:10]:
-            console.print(f"    - {string}", markup=False, style="grey37")
-
-        if len(strings) > 10:
-            console.print("    ...", style="grey37")
-
-    if not strings_by_library:
-        console.print("  (none)", style="grey37")
-        # since we're not going to find any strings
-        # return early and don't do IDA analysis
-        return
-
-    open_ida(input_path)
-
-    import idaapi
-    import idautils
-    import ida_funcs
-
-    strings_by_function = collections.defaultdict(set)
-    for ea in idautils.Functions():
-        f = idaapi.get_func(ea)
-
-        # ignore library functions and thunk functions as identified by IDA
-        if f.flags & idaapi.FUNC_THUNK:
-            continue
-        if f.flags & idaapi.FUNC_LIB:
-            continue
-
-        for bb in ida_helpers.get_function_blocks(f):
-            for insn in ida_helpers.get_instructions_in_range(bb.start_ea, bb.end_ea):
-                ref = capa.features.extractors.ida.helpers.find_data_reference_from_insn(insn)
-                if ref == insn.ea:
-                    continue
-
-                string = capa.features.extractors.ida.helpers.find_string_at(ref)
-                if not string:
-                    continue
-
-                for db in dbs:
-                    if metadata := db.metadata_by_string.get(string):
-                        strings_by_function[ea].add(string)
-
-    # ensure there are at least XXX functions renamed, or ignore those entries
-
-    console.print("functions:", style="bold")
-    for function, strings in sorted(strings_by_function.items()):
-        if strings:
-            name = ida_funcs.get_func_name(function)
-
-            console.print(f"  [b]{name}[/]@{function:08x}:")
-
-            for string in strings:
-                for db in dbs:
-                    if metadata := db.metadata_by_string.get(string):
-                        location = Text(
-                            f"{metadata.library_name}@{metadata.library_version}::{metadata.function_name}",
-                            style="grey37",
-                        )
-                        console.print("    - ", location, ": ", string.rstrip())
-
-    console.print()
-
-    console.print(
-        f"found {len(strings_by_function)} library functions across {len(list(idautils.Functions()))} functions"
-    )
-
-
-if __name__ == "__main__":
-    main()
--- a/capa/analysis/strings/data/crt/msvc_v143.jsonl.gz
+++ b/capa/analysis/strings/data/crt/msvc_v143.jsonl.gz
--- a/capa/analysis/strings/data/oss/.gitignore
+++ b/capa/analysis/strings/data/oss/.gitignore
@@ -1,3 +0,0 @@
-*.csv
-*.jsonl
-*.jsonl.gz
--- a/capa/analysis/strings/data/oss/brotli.jsonl.gz
+++ b/capa/analysis/strings/data/oss/brotli.jsonl.gz
--- a/capa/analysis/strings/data/oss/bzip2.jsonl.gz
+++ b/capa/analysis/strings/data/oss/bzip2.jsonl.gz
--- a/capa/analysis/strings/data/oss/cryptopp.jsonl.gz
+++ b/capa/analysis/strings/data/oss/cryptopp.jsonl.gz
--- a/capa/analysis/strings/data/oss/curl.jsonl.gz
+++ b/capa/analysis/strings/data/oss/curl.jsonl.gz
--- a/capa/analysis/strings/data/oss/detours.jsonl.gz
+++ b/capa/analysis/strings/data/oss/detours.jsonl.gz
--- a/capa/analysis/strings/data/oss/jemalloc.jsonl.gz
+++ b/capa/analysis/strings/data/oss/jemalloc.jsonl.gz
--- a/capa/analysis/strings/data/oss/jsoncpp.jsonl.gz
+++ b/capa/analysis/strings/data/oss/jsoncpp.jsonl.gz
--- a/capa/analysis/strings/data/oss/kcp.jsonl.gz
+++ b/capa/analysis/strings/data/oss/kcp.jsonl.gz
--- a/capa/analysis/strings/data/oss/liblzma.jsonl.gz
+++ b/capa/analysis/strings/data/oss/liblzma.jsonl.gz
--- a/capa/analysis/strings/data/oss/libpcap.jsonl.gz
+++ b/capa/analysis/strings/data/oss/libpcap.jsonl.gz
--- a/capa/analysis/strings/data/oss/libsodium.jsonl.gz
+++ b/capa/analysis/strings/data/oss/libsodium.jsonl.gz
--- a/capa/analysis/strings/data/oss/mbedtls.jsonl.gz
+++ b/capa/analysis/strings/data/oss/mbedtls.jsonl.gz
--- a/capa/analysis/strings/data/oss/openssl.jsonl.gz
+++ b/capa/analysis/strings/data/oss/openssl.jsonl.gz
--- a/capa/analysis/strings/data/oss/readme.md
+++ b/capa/analysis/strings/data/oss/readme.md
@@ -1,99 +0,0 @@
-# Strings from Open Source libraries
-
-This directory contains databases of strings extracted from open soure software. 
-capa uses these databases to ignore functions that are likely library code.
-
-There is one file for each database. Each database is a gzip-compressed, JSONL (one JSON document per line) file.
-The JSON document looks like this:
-
-    string: "1.0.8, 13-Jul-2019"
-    library_name: "bzip2"
-    library_version: "1.0.8#3"
-    file_path: "CMakeFiles/bz2.dir/bzlib.c.obj"
-    function_name: "BZ2_bzlibVersion"
-    line_number: null
-
-The following databases were extracted via the vkpkg & jh technique:
-
-  - brotli 1.0.9#5
-  - bzip2 1.0.8#3
-  - cryptopp 8.7.0
-  - curl 7.86.0#1
-  - detours 4.0.1#7
-  - jemalloc 5.3.0#1
-  - jsoncpp 1.9.5
-  - kcp 1.7
-  - liblzma 5.2.5#6
-  - libsodium 1.0.18#8
-  - libpcap 1.10.1#3
-  - mbedtls 2.28.1
-  - openssl 3.0.7#1
-  - sqlite3 3.40.0#1
-  - tomcrypt 1.18.2#2
-  - wolfssl 5.5.0
-  - zlib 1.2.13
-
-This code was originally developed in FLOSS and imported into capa.
-
-## The vkpkg & jh technique
-
-Major steps:
-
-  1. build static libraries via vcpkg
-  2. extract features via jh
-  3. convert to JSONL format with `jh_to_qs.py`
-  4. compress with gzip
-
-### Build static libraries via vcpkg
-
-[vcpkg](https://vcpkg.io/en/) is a free C/C++ package manager for acquiring and managing libraries.
-We use it to easily build common open source libraries, like zlib.
-Use the triplet `x64-windows-static` to build static archives (.lib files that are AR archives containing COFF object files):
-
-```console
-PS > C:\vcpkg\vcpkg.exe install --triplet x64-windows-static zlib
-```
-
-### Extract features via jh
-
-[jh](https://github.com/williballenthin/lancelot/blob/master/bin/src/bin/jh.rs)
-is a lancelot-based utility that parses AR archives containing COFF object files,
-reconstructs their control flow, finds functions, and extracts features. 
-jh extracts numbers, API calls, and strings; we are only interested in the string features.
-
-For each feature, jh emits a CSV line with the fields 
-  - target triplet
-  - compiler 
-  - library
-  - version
-  - build profile
-  - path
-  - function
-  - feature type
-  - feature value
-
-For example:
-
-```csv
-x64-windows-static,msvc143,bzip2,1.0.8#3,release,CMakeFiles/bz2.dir/bzlib.c.obj,BZ2_bzBuffToBuffCompress,number,0x00000100
-```
-
-For example, to invoke jh:
-
-```console
-$ ~/lancelot/target/release/jh x64-windows-static msvc143 zlib 1.2.13 release /mnt/c/vcpkg/installed/x64-windows-static/lib/zlib.lib > ~/flare-floss/floss/qs/db/data/oss/zlib.csv
-```
-
-### Convert to OSS database format
-
-We use the script `jh_to_qs.py` to convert these CSV lines into JSONL file prepared for FLOSS:
-
-```console
-$ python3 jh_to_qs.py zlib.csv > zlib.jsonl
-```
-
-These files are then gzip'd:
-
-```console
-$  gzip -c zlib.jsonl > zlib.jsonl.gz
-```
--- a/capa/analysis/strings/data/oss/sqlite3.jsonl.gz
+++ b/capa/analysis/strings/data/oss/sqlite3.jsonl.gz
--- a/capa/analysis/strings/data/oss/tomcrypt.jsonl.gz
+++ b/capa/analysis/strings/data/oss/tomcrypt.jsonl.gz
--- a/capa/analysis/strings/data/oss/wolfssl.jsonl.gz
+++ b/capa/analysis/strings/data/oss/wolfssl.jsonl.gz
--- a/capa/analysis/strings/data/oss/zlib.jsonl.gz
+++ b/capa/analysis/strings/data/oss/zlib.jsonl.gz
--- a/capa/analysis/strings/data/winapi/apis.txt.gz
+++ b/capa/analysis/strings/data/winapi/apis.txt.gz
--- a/capa/analysis/strings/data/winapi/dlls.txt.gz
+++ b/capa/analysis/strings/data/winapi/dlls.txt.gz
--- a/capa/capabilities/init.py
+++ b/capa/capabilities/init.py
--- a/capa/capabilities/common.py
+++ b/capa/capabilities/common.py
@@ -1,79 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (C) 2023 Mandiant, Inc. All Rights Reserved.
-# Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at: [package root]/LICENSE.txt
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-#  is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and limitations under the License.
-import logging
-import itertools
-import collections
-from typing import Any
-
-from capa.rules import Scope, RuleSet
-from capa.engine import FeatureSet, MatchResults
-from capa.features.address import NO_ADDRESS
-from capa.features.extractors.base_extractor import FeatureExtractor, StaticFeatureExtractor, DynamicFeatureExtractor
-
-logger = logging.getLogger(__name__)
-
-
-def find_file_capabilities(ruleset: RuleSet, extractor: FeatureExtractor, function_features: FeatureSet):
-    file_features: FeatureSet = collections.defaultdict(set)
-
-    for feature, va in itertools.chain(extractor.extract_file_features(), extractor.extract_global_features()):
-        # not all file features may have virtual addresses.
-        # if not, then at least ensure the feature shows up in the index.
-        # the set of addresses will still be empty.
-        if va:
-            file_features[feature].add(va)
-        else:
-            if feature not in file_features:
-                file_features[feature] = set()
-
-    logger.debug("analyzed file and extracted %d features", len(file_features))
-
-    file_features.update(function_features)
-
-    _, matches = ruleset.match(Scope.FILE, file_features, NO_ADDRESS)
-    return matches, len(file_features)
-
-
-def has_file_limitation(rules: RuleSet, capabilities: MatchResults, is_standalone=True) -> bool:
-    file_limitation_rules = list(filter(lambda r: r.is_file_limitation_rule(), rules.rules.values()))
-
-    for file_limitation_rule in file_limitation_rules:
-        if file_limitation_rule.name not in capabilities:
-            continue
-
-        logger.warning("-" * 80)
-        for line in file_limitation_rule.meta.get("description", "").split("\n"):
-            logger.warning(" %s", line)
-        logger.warning(" Identified via rule: %s", file_limitation_rule.name)
-        if is_standalone:
-            logger.warning(" ")
-            logger.warning(" Use -v or -vv if you really want to see the capabilities identified by capa.")
-        logger.warning("-" * 80)
-
-        # bail on first file limitation
-        return True
-
-    return False
-
-
-def find_capabilities(
-    ruleset: RuleSet, extractor: FeatureExtractor, disable_progress=None, **kwargs
-) -> tuple[MatchResults, Any]:
-    from capa.capabilities.static import find_static_capabilities
-    from capa.capabilities.dynamic import find_dynamic_capabilities
-
-    if isinstance(extractor, StaticFeatureExtractor):
-        # for the time being, extractors are either static or dynamic.
-        # Remove this assertion once that has changed
-        assert not isinstance(extractor, DynamicFeatureExtractor)
-        return find_static_capabilities(ruleset, extractor, disable_progress=disable_progress, **kwargs)
-    if isinstance(extractor, DynamicFeatureExtractor):
-        return find_dynamic_capabilities(ruleset, extractor, disable_progress=disable_progress, **kwargs)
-
-    raise ValueError(f"unexpected extractor type: {extractor.__class__.__name__}")
--- a/capa/capabilities/dynamic.py
+++ b/capa/capabilities/dynamic.py
@@ -1,192 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (C) 2023 Mandiant, Inc. All Rights Reserved.
-# Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at: [package root]/LICENSE.txt
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-#  is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and limitations under the License.
-import logging
-import itertools
-import collections
-from typing import Any
-
-import capa.perf
-import capa.features.freeze as frz
-import capa.render.result_document as rdoc
-from capa.rules import Scope, RuleSet
-from capa.engine import FeatureSet, MatchResults
-from capa.capabilities.common import find_file_capabilities
-from capa.features.extractors.base_extractor import CallHandle, ThreadHandle, ProcessHandle, DynamicFeatureExtractor
-
-logger = logging.getLogger(__name__)
-
-
-def find_call_capabilities(
-    ruleset: RuleSet, extractor: DynamicFeatureExtractor, ph: ProcessHandle, th: ThreadHandle, ch: CallHandle
-) -> tuple[FeatureSet, MatchResults]:
-    """
-    find matches for the given rules for the given call.
-
-    returns: tuple containing (features for call, match results for call)
-    """
-    # all features found for the call.
-    features: FeatureSet = collections.defaultdict(set)
-
-    for feature, addr in itertools.chain(
-        extractor.extract_call_features(ph, th, ch), extractor.extract_global_features()
-    ):
-        features[feature].add(addr)
-
-    # matches found at this thread.
-    _, matches = ruleset.match(Scope.CALL, features, ch.address)
-
-    for rule_name, res in matches.items():
-        rule = ruleset[rule_name]
-        for addr, _ in res:
-            capa.engine.index_rule_matches(features, rule, [addr])
-
-    return features, matches
-
-
-def find_thread_capabilities(
-    ruleset: RuleSet, extractor: DynamicFeatureExtractor, ph: ProcessHandle, th: ThreadHandle
-) -> tuple[FeatureSet, MatchResults, MatchResults]:
-    """
-    find matches for the given rules within the given thread.
-
-    returns: tuple containing (features for thread, match results for thread, match results for calls)
-    """
-    # all features found within this thread,
-    # includes features found within calls.
-    features: FeatureSet = collections.defaultdict(set)
-
-    # matches found at the call scope.
-    # might be found at different calls, that's ok.
-    call_matches: MatchResults = collections.defaultdict(list)
-
-    for ch in extractor.get_calls(ph, th):
-        ifeatures, imatches = find_call_capabilities(ruleset, extractor, ph, th, ch)
-        for feature, vas in ifeatures.items():
-            features[feature].update(vas)
-
-        for rule_name, res in imatches.items():
-            call_matches[rule_name].extend(res)
-
-    for feature, va in itertools.chain(extractor.extract_thread_features(ph, th), extractor.extract_global_features()):
-        features[feature].add(va)
-
-    # matches found within this thread.
-    _, matches = ruleset.match(Scope.THREAD, features, th.address)
-
-    for rule_name, res in matches.items():
-        rule = ruleset[rule_name]
-        for va, _ in res:
-            capa.engine.index_rule_matches(features, rule, [va])
-
-    return features, matches, call_matches
-
-
-def find_process_capabilities(
-    ruleset: RuleSet, extractor: DynamicFeatureExtractor, ph: ProcessHandle
-) -> tuple[MatchResults, MatchResults, MatchResults, int]:
-    """
-    find matches for the given rules within the given process.
-
-    returns: tuple containing (match results for process, match results for threads, match results for calls, number of features)
-    """
-    # all features found within this process,
-    # includes features found within threads (and calls).
-    process_features: FeatureSet = collections.defaultdict(set)
-
-    # matches found at the basic threads.
-    # might be found at different threads, that's ok.
-    thread_matches: MatchResults = collections.defaultdict(list)
-
-    # matches found at the call scope.
-    # might be found at different calls, that's ok.
-    call_matches: MatchResults = collections.defaultdict(list)
-
-    for th in extractor.get_threads(ph):
-        features, tmatches, cmatches = find_thread_capabilities(ruleset, extractor, ph, th)
-        for feature, vas in features.items():
-            process_features[feature].update(vas)
-
-        for rule_name, res in tmatches.items():
-            thread_matches[rule_name].extend(res)
-
-        for rule_name, res in cmatches.items():
-            call_matches[rule_name].extend(res)
-
-    for feature, va in itertools.chain(extractor.extract_process_features(ph), extractor.extract_global_features()):
-        process_features[feature].add(va)
-
-    _, process_matches = ruleset.match(Scope.PROCESS, process_features, ph.address)
-    return process_matches, thread_matches, call_matches, len(process_features)
-
-
-def find_dynamic_capabilities(
-    ruleset: RuleSet, extractor: DynamicFeatureExtractor, disable_progress=None
-) -> tuple[MatchResults, Any]:
-    all_process_matches: MatchResults = collections.defaultdict(list)
-    all_thread_matches: MatchResults = collections.defaultdict(list)
-    all_call_matches: MatchResults = collections.defaultdict(list)
-
-    feature_counts = rdoc.DynamicFeatureCounts(file=0, processes=())
-
-    assert isinstance(extractor, DynamicFeatureExtractor)
-    processes: list[ProcessHandle] = list(extractor.get_processes())
-    n_processes: int = len(processes)
-
-    with capa.helpers.CapaProgressBar(
-        console=capa.helpers.log_console, transient=True, disable=disable_progress
-    ) as pbar:
-        task = pbar.add_task("matching", total=n_processes, unit="processes")
-        for p in processes:
-            process_matches, thread_matches, call_matches, feature_count = find_process_capabilities(
-                ruleset, extractor, p
-            )
-            feature_counts.processes += (
-                rdoc.ProcessFeatureCount(address=frz.Address.from_capa(p.address), count=feature_count),
-            )
-            logger.debug("analyzed %s and extracted %d features", p.address, feature_count)
-
-            for rule_name, res in process_matches.items():
-                all_process_matches[rule_name].extend(res)
-            for rule_name, res in thread_matches.items():
-                all_thread_matches[rule_name].extend(res)
-            for rule_name, res in call_matches.items():
-                all_call_matches[rule_name].extend(res)
-
-            pbar.advance(task)
-
-    # collection of features that captures the rule matches within process and thread scopes.
-    # mapping from feature (matched rule) to set of addresses at which it matched.
-    process_and_lower_features: FeatureSet = collections.defaultdict(set)
-    for rule_name, results in itertools.chain(
-        all_process_matches.items(), all_thread_matches.items(), all_call_matches.items()
-    ):
-        locations = {p[0] for p in results}
-        rule = ruleset[rule_name]
-        capa.engine.index_rule_matches(process_and_lower_features, rule, locations)
-
-    all_file_matches, feature_count = find_file_capabilities(ruleset, extractor, process_and_lower_features)
-    feature_counts.file = feature_count
-
-    matches = dict(
-        itertools.chain(
-            # each rule exists in exactly one scope,
-            # so there won't be any overlap among these following MatchResults,
-            # and we can merge the dictionaries naively.
-            all_thread_matches.items(),
-            all_process_matches.items(),
-            all_call_matches.items(),
-            all_file_matches.items(),
-        )
-    )
-
-    meta = {
-        "feature_counts": feature_counts,
-    }
-
-    return matches, meta
--- a/capa/capabilities/static.py
+++ b/capa/capabilities/static.py
@@ -1,226 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (C) 2023 Mandiant, Inc. All Rights Reserved.
-# Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at: [package root]/LICENSE.txt
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-#  is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and limitations under the License.
-import time
-import logging
-import itertools
-import collections
-from typing import Any
-
-import capa.perf
-import capa.helpers
-import capa.features.freeze as frz
-import capa.render.result_document as rdoc
-from capa.rules import Scope, RuleSet
-from capa.engine import FeatureSet, MatchResults
-from capa.capabilities.common import find_file_capabilities
-from capa.features.extractors.base_extractor import BBHandle, InsnHandle, FunctionHandle, StaticFeatureExtractor
-
-logger = logging.getLogger(__name__)
-
-
-def find_instruction_capabilities(
-    ruleset: RuleSet, extractor: StaticFeatureExtractor, f: FunctionHandle, bb: BBHandle, insn: InsnHandle
-) -> tuple[FeatureSet, MatchResults]:
-    """
-    find matches for the given rules for the given instruction.
-
-    returns: tuple containing (features for instruction, match results for instruction)
-    """
-    # all features found for the instruction.
-    features: FeatureSet = collections.defaultdict(set)
-
-    for feature, addr in itertools.chain(
-        extractor.extract_insn_features(f, bb, insn), extractor.extract_global_features()
-    ):
-        features[feature].add(addr)
-
-    # matches found at this instruction.
-    _, matches = ruleset.match(Scope.INSTRUCTION, features, insn.address)
-
-    for rule_name, res in matches.items():
-        rule = ruleset[rule_name]
-        for addr, _ in res:
-            capa.engine.index_rule_matches(features, rule, [addr])
-
-    return features, matches
-
-
-def find_basic_block_capabilities(
-    ruleset: RuleSet, extractor: StaticFeatureExtractor, f: FunctionHandle, bb: BBHandle
-) -> tuple[FeatureSet, MatchResults, MatchResults]:
-    """
-    find matches for the given rules within the given basic block.
-
-    returns: tuple containing (features for basic block, match results for basic block, match results for instructions)
-    """
-    # all features found within this basic block,
-    # includes features found within instructions.
-    features: FeatureSet = collections.defaultdict(set)
-
-    # matches found at the instruction scope.
-    # might be found at different instructions, that's ok.
-    insn_matches: MatchResults = collections.defaultdict(list)
-
-    for insn in extractor.get_instructions(f, bb):
-        ifeatures, imatches = find_instruction_capabilities(ruleset, extractor, f, bb, insn)
-        for feature, vas in ifeatures.items():
-            features[feature].update(vas)
-
-        for rule_name, res in imatches.items():
-            insn_matches[rule_name].extend(res)
-
-    for feature, va in itertools.chain(
-        extractor.extract_basic_block_features(f, bb), extractor.extract_global_features()
-    ):
-        features[feature].add(va)
-
-    # matches found within this basic block.
-    _, matches = ruleset.match(Scope.BASIC_BLOCK, features, bb.address)
-
-    for rule_name, res in matches.items():
-        rule = ruleset[rule_name]
-        for va, _ in res:
-            capa.engine.index_rule_matches(features, rule, [va])
-
-    return features, matches, insn_matches
-
-
-def find_code_capabilities(
-    ruleset: RuleSet, extractor: StaticFeatureExtractor, fh: FunctionHandle
-) -> tuple[MatchResults, MatchResults, MatchResults, int]:
-    """
-    find matches for the given rules within the given function.
-
-    returns: tuple containing (match results for function, match results for basic blocks, match results for instructions, number of features)
-    """
-    # all features found within this function,
-    # includes features found within basic blocks (and instructions).
-    function_features: FeatureSet = collections.defaultdict(set)
-
-    # matches found at the basic block scope.
-    # might be found at different basic blocks, that's ok.
-    bb_matches: MatchResults = collections.defaultdict(list)
-
-    # matches found at the instruction scope.
-    # might be found at different instructions, that's ok.
-    insn_matches: MatchResults = collections.defaultdict(list)
-
-    for bb in extractor.get_basic_blocks(fh):
-        features, bmatches, imatches = find_basic_block_capabilities(ruleset, extractor, fh, bb)
-        for feature, vas in features.items():
-            function_features[feature].update(vas)
-
-        for rule_name, res in bmatches.items():
-            bb_matches[rule_name].extend(res)
-
-        for rule_name, res in imatches.items():
-            insn_matches[rule_name].extend(res)
-
-    for feature, va in itertools.chain(extractor.extract_function_features(fh), extractor.extract_global_features()):
-        function_features[feature].add(va)
-
-    _, function_matches = ruleset.match(Scope.FUNCTION, function_features, fh.address)
-    return function_matches, bb_matches, insn_matches, len(function_features)
-
-
-def find_static_capabilities(
-    ruleset: RuleSet, extractor: StaticFeatureExtractor, disable_progress=None
-) -> tuple[MatchResults, Any]:
-    all_function_matches: MatchResults = collections.defaultdict(list)
-    all_bb_matches: MatchResults = collections.defaultdict(list)
-    all_insn_matches: MatchResults = collections.defaultdict(list)
-
-    feature_counts = rdoc.StaticFeatureCounts(file=0, functions=())
-    library_functions: tuple[rdoc.LibraryFunction, ...] = ()
-
-    assert isinstance(extractor, StaticFeatureExtractor)
-    functions: list[FunctionHandle] = list(extractor.get_functions())
-    n_funcs: int = len(functions)
-    n_libs: int = 0
-    percentage: float = 0
-
-    with capa.helpers.CapaProgressBar(
-        console=capa.helpers.log_console, transient=True, disable=disable_progress
-    ) as pbar:
-        task = pbar.add_task(
-            "matching", total=n_funcs, unit="functions", postfix=f"skipped {n_libs} library functions, {percentage}%"
-        )
-        for f in functions:
-            t0 = time.time()
-            if extractor.is_library_function(f.address):
-                function_name = extractor.get_function_name(f.address)
-                logger.debug("skipping library function 0x%x (%s)", f.address, function_name)
-                library_functions += (
-                    rdoc.LibraryFunction(address=frz.Address.from_capa(f.address), name=function_name),
-                )
-                n_libs = len(library_functions)
-                percentage = round(100 * (n_libs / n_funcs))
-                pbar.update(task, postfix=f"skipped {n_libs} library functions, {percentage}%")
-                pbar.advance(task)
-                continue
-
-            function_matches, bb_matches, insn_matches, feature_count = find_code_capabilities(ruleset, extractor, f)
-            feature_counts.functions += (
-                rdoc.FunctionFeatureCount(address=frz.Address.from_capa(f.address), count=feature_count),
-            )
-            t1 = time.time()
-
-            match_count = 0
-            for name, matches_ in itertools.chain(function_matches.items(), bb_matches.items(), insn_matches.items()):
-                if not ruleset.rules[name].is_subscope_rule():
-                    match_count += len(matches_)
-
-            logger.debug(
-                "analyzed function 0x%x and extracted %d features, %d matches in %0.02fs",
-                f.address,
-                feature_count,
-                match_count,
-                t1 - t0,
-            )
-
-            for rule_name, res in function_matches.items():
-                all_function_matches[rule_name].extend(res)
-            for rule_name, res in bb_matches.items():
-                all_bb_matches[rule_name].extend(res)
-            for rule_name, res in insn_matches.items():
-                all_insn_matches[rule_name].extend(res)
-
-            pbar.advance(task)
-
-    # collection of features that captures the rule matches within function, BB, and instruction scopes.
-    # mapping from feature (matched rule) to set of addresses at which it matched.
-    function_and_lower_features: FeatureSet = collections.defaultdict(set)
-    for rule_name, results in itertools.chain(
-        all_function_matches.items(), all_bb_matches.items(), all_insn_matches.items()
-    ):
-        locations = {p[0] for p in results}
-        rule = ruleset[rule_name]
-        capa.engine.index_rule_matches(function_and_lower_features, rule, locations)
-
-    all_file_matches, feature_count = find_file_capabilities(ruleset, extractor, function_and_lower_features)
-    feature_counts.file = feature_count
-
-    matches: MatchResults = dict(
-        itertools.chain(
-            # each rule exists in exactly one scope,
-            # so there won't be any overlap among these following MatchResults,
-            # and we can merge the dictionaries naively.
-            all_insn_matches.items(),
-            all_bb_matches.items(),
-            all_function_matches.items(),
-            all_file_matches.items(),
-        )
-    )
-
-    meta = {
-        "feature_counts": feature_counts,
-        "library_functions": library_functions,
-    }
-
-    return matches, meta
--- a/capa/engine.py
+++ b/capa/engine.py
@@ -8,12 +8,11 @@

 import copy
 import collections
-from typing import TYPE_CHECKING, Union, Mapping, Iterable, Iterator
+from typing import TYPE_CHECKING, Set, Dict, List, Tuple, Mapping, Iterable

 import capa.perf
 import capa.features.common
 from capa.features.common import Result, Feature
-from capa.features.address import Address

 if TYPE_CHECKING:
    # circular import, otherwise
@@ -27,7 +26,7 @@ if TYPE_CHECKING:
 # to collect the locations of a feature, do: `features[Number(0x10)]`
 #
 # aliased here so that the type can be documented and xref'd.
-FeatureSet = dict[Feature, set[Address]]
+FeatureSet = Dict[Feature, Set[int]]


 class Statement:
@@ -38,17 +37,15 @@ class Statement:
    """

    def __init__(self, description=None):
-        super().__init__()
+        super(Statement, self).__init__()
        self.name = self.__class__.__name__
        self.description = description

    def __str__(self):
-        name = self.name.lower()
-        children = ",".join(map(str, self.get_children()))
        if self.description:
-            return f"{name}({children} = {self.description})"
+            return "%s(%s = %s)" % (self.name.lower(), ",".join(map(str, self.get_children())), self.description)
        else:
-            return f"{name}({children})"
+            return "%s(%s)" % (self.name.lower(), ",".join(map(str, self.get_children())))

    def __repr__(self):
        return str(self)
@@ -62,28 +59,21 @@ class Statement:
        """
        raise NotImplementedError()

-    def get_children(self) -> Iterator[Union["Statement", Feature]]:
+    def get_children(self):
        if hasattr(self, "child"):
-            # this really confuses mypy because the property may not exist
-            # since its defined in the subclasses.
-            child = self.child  # type: ignore
-            assert isinstance(child, (Statement, Feature))
-            yield child
+            yield self.child

        if hasattr(self, "children"):
-            for child in self.children:
-                assert isinstance(child, (Statement, Feature))
+            for child in getattr(self, "children"):
                yield child

    def replace_child(self, existing, new):
        if hasattr(self, "child"):
-            # this really confuses mypy because the property may not exist
-            # since its defined in the subclasses.
-            if self.child is existing:  # type: ignore
+            if self.child is existing:
                self.child = new

        if hasattr(self, "children"):
-            children = self.children
+            children = getattr(self, "children")
            for i, child in enumerate(children):
                if child is existing:
                    children[i] = new
@@ -94,22 +84,22 @@ class And(Statement):
    match if all of the children evaluate to True.

    the order of evaluation is dictated by the property
-    `And.children` (type: list[Statement|Feature]).
+    `And.children` (type: List[Statement|Feature]).
    a query optimizer may safely manipulate the order of these children.
    """

    def __init__(self, children, description=None):
-        super().__init__(description=description)
+        super(And, self).__init__(description=description)
        self.children = children

-    def evaluate(self, features: FeatureSet, short_circuit=True):
+    def evaluate(self, ctx, short_circuit=True):
        capa.perf.counters["evaluate.feature"] += 1
        capa.perf.counters["evaluate.feature.and"] += 1

        if short_circuit:
            results = []
            for child in self.children:
-                result = child.evaluate(features, short_circuit=short_circuit)
+                result = child.evaluate(ctx, short_circuit=short_circuit)
                results.append(result)
                if not result:
                    # short circuit
@@ -117,7 +107,7 @@ class And(Statement):

            return Result(True, self, results)
        else:
-            results = [child.evaluate(features, short_circuit=short_circuit) for child in self.children]
+            results = [child.evaluate(ctx, short_circuit=short_circuit) for child in self.children]
            success = all(results)
            return Result(success, self, results)

@@ -127,22 +117,22 @@ class Or(Statement):
    match if any of the children evaluate to True.

    the order of evaluation is dictated by the property
-    `Or.children` (type: list[Statement|Feature]).
+    `Or.children` (type: List[Statement|Feature]).
    a query optimizer may safely manipulate the order of these children.
    """

    def __init__(self, children, description=None):
-        super().__init__(description=description)
+        super(Or, self).__init__(description=description)
        self.children = children

-    def evaluate(self, features: FeatureSet, short_circuit=True):
+    def evaluate(self, ctx, short_circuit=True):
        capa.perf.counters["evaluate.feature"] += 1
        capa.perf.counters["evaluate.feature.or"] += 1

        if short_circuit:
            results = []
            for child in self.children:
-                result = child.evaluate(features, short_circuit=short_circuit)
+                result = child.evaluate(ctx, short_circuit=short_circuit)
                results.append(result)
                if result:
                    # short circuit as soon as we hit one match
@@ -150,7 +140,7 @@ class Or(Statement):

            return Result(False, self, results)
        else:
-            results = [child.evaluate(features, short_circuit=short_circuit) for child in self.children]
+            results = [child.evaluate(ctx, short_circuit=short_circuit) for child in self.children]
            success = any(results)
            return Result(success, self, results)

@@ -159,14 +149,14 @@ class Not(Statement):
    """match only if the child evaluates to False."""

    def __init__(self, child, description=None):
-        super().__init__(description=description)
+        super(Not, self).__init__(description=description)
        self.child = child

-    def evaluate(self, features: FeatureSet, short_circuit=True):
+    def evaluate(self, ctx, short_circuit=True):
        capa.perf.counters["evaluate.feature"] += 1
        capa.perf.counters["evaluate.feature.not"] += 1

-        results = [self.child.evaluate(features, short_circuit=short_circuit)]
+        results = [self.child.evaluate(ctx, short_circuit=short_circuit)]
        success = not results[0]
        return Result(success, self, results)

@@ -176,16 +166,16 @@ class Some(Statement):
    match if at least N of the children evaluate to True.

    the order of evaluation is dictated by the property
-    `Some.children` (type: list[Statement|Feature]).
+    `Some.children` (type: List[Statement|Feature]).
    a query optimizer may safely manipulate the order of these children.
    """

    def __init__(self, count, children, description=None):
-        super().__init__(description=description)
+        super(Some, self).__init__(description=description)
        self.count = count
        self.children = children

-    def evaluate(self, features: FeatureSet, short_circuit=True):
+    def evaluate(self, ctx, short_circuit=True):
        capa.perf.counters["evaluate.feature"] += 1
        capa.perf.counters["evaluate.feature.some"] += 1

@@ -193,7 +183,7 @@ class Some(Statement):
            results = []
            satisfied_children_count = 0
            for child in self.children:
-                result = child.evaluate(features, short_circuit=short_circuit)
+                result = child.evaluate(ctx, short_circuit=short_circuit)
                results.append(result)
                if result:
                    satisfied_children_count += 1
@@ -204,7 +194,7 @@ class Some(Statement):

            return Result(False, self, results)
        else:
-            results = [child.evaluate(features, short_circuit=short_circuit) for child in self.children]
+            results = [child.evaluate(ctx, short_circuit=short_circuit) for child in self.children]
            # note that here we cast the child result as a bool
            # because we've overridden `__bool__` above.
            #
@@ -214,29 +204,29 @@ class Some(Statement):


 class Range(Statement):
-    """match if the child is contained in the feature set with a count in the given range."""
+    """match if the child is contained in the ctx set with a count in the given range."""

    def __init__(self, child, min=None, max=None, description=None):
-        super().__init__(description=description)
+        super(Range, self).__init__(description=description)
        self.child = child
        self.min = min if min is not None else 0
        self.max = max if max is not None else (1 << 64 - 1)

-    def evaluate(self, features: FeatureSet, short_circuit=True):
+    def evaluate(self, ctx, **kwargs):
        capa.perf.counters["evaluate.feature"] += 1
        capa.perf.counters["evaluate.feature.range"] += 1

-        count = len(features.get(self.child, []))
+        count = len(ctx.get(self.child, []))
        if self.min == 0 and count == 0:
            return Result(True, self, [])

-        return Result(self.min <= count <= self.max, self, [], locations=features.get(self.child))
+        return Result(self.min <= count <= self.max, self, [], locations=ctx.get(self.child))

    def __str__(self):
        if self.max == (1 << 64 - 1):
-            return f"range({str(self.child)}, min={self.min}, max=infinity)"
+            return "range(%s, min=%d, max=infinity)" % (str(self.child), self.min)
        else:
-            return f"range({str(self.child)}, min={self.min}, max={self.max})"
+            return "range(%s, min=%d, max=%d)" % (str(self.child), self.min, self.max)


 class Subscope(Statement):
@@ -245,12 +235,12 @@ class Subscope(Statement):
    the engine should preprocess rules to extract subscope statements into their own rules.
    """

-    def __init__(self, scope, child, description=None):
-        super().__init__(description=description)
+    def __init__(self, scope, child):
+        super(Subscope, self).__init__()
        self.scope = scope
        self.child = child

-    def evaluate(self, features: FeatureSet, short_circuit=True):
+    def evaluate(self, ctx, **kwargs):
        raise ValueError("cannot evaluate a subscope directly!")


@@ -267,18 +257,10 @@ class Subscope(Statement):
 #         inspect(match_details)
 #
 # aliased here so that the type can be documented and xref'd.
-MatchResults = Mapping[str, list[tuple[Address, Result]]]
+MatchResults = Mapping[str, List[Tuple[int, Result]]]


-def get_rule_namespaces(rule: "capa.rules.Rule") -> Iterator[str]:
-    namespace = rule.meta.get("namespace")
-    if namespace:
-        while namespace:
-            yield namespace
-            namespace, _, _ = namespace.rpartition("/")
-
-
-def index_rule_matches(features: FeatureSet, rule: "capa.rules.Rule", locations: Iterable[Address]):
+def index_rule_matches(features: FeatureSet, rule: "capa.rules.Rule", locations: Iterable[int]):
    """
    record into the given featureset that the given rule matched at the given locations.

@@ -288,11 +270,14 @@ def index_rule_matches(features: FeatureSet, rule: "capa.rules.Rule", locations:
    updates `features` in-place. doesn't modify the remaining arguments.
    """
    features[capa.features.common.MatchedRule(rule.name)].update(locations)
-    for namespace in get_rule_namespaces(rule):
-        features[capa.features.common.MatchedRule(namespace)].update(locations)
+    namespace = rule.meta.get("namespace")
+    if namespace:
+        while namespace:
+            features[capa.features.common.MatchedRule(namespace)].update(locations)
+            namespace, _, _ = namespace.rpartition("/")


-def match(rules: list["capa.rules.Rule"], features: FeatureSet, addr: Address) -> tuple[FeatureSet, MatchResults]:
+def match(rules: List["capa.rules.Rule"], features: FeatureSet, va: int) -> Tuple[FeatureSet, MatchResults]:
    """
    match the given rules against the given features,
    returning an updated set of features and the matches.
@@ -309,7 +294,7 @@ def match(rules: list["capa.rules.Rule"], features: FeatureSet, addr: Address) -
    other strategies can be imagined that match differently; implement these elsewhere.
    specifically, this routine does "top down" matching of the given rules against the feature set.
    """
-    results: MatchResults = collections.defaultdict(list)
+    results = collections.defaultdict(list)  # type: MatchResults

    # copy features so that we can modify it
    # without affecting the caller (keep this function pure)
@@ -330,10 +315,10 @@ def match(rules: list["capa.rules.Rule"], features: FeatureSet, addr: Address) -
            # sanity check
            assert bool(res) is True

-            results[rule.name].append((addr, res))
+            results[rule.name].append((va, res))
            # we need to update the current `features`
            # because subsequent iterations of this loop may use newly added features,
            # such as rule or namespace matches.
-            index_rule_matches(features, rule, [addr])
+            index_rule_matches(features, rule, [va])

    return (features, results)
--- a/capa/exceptions.py
+++ b/capa/exceptions.py
@@ -1,37 +0,0 @@
-# Copyright (C) 2022 Mandiant, Inc. All Rights Reserved.
-# Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at: [package root]/LICENSE.txt
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-#  is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and limitations under the License.
-class UnsupportedRuntimeError(RuntimeError):
-    pass
-
-
-class UnsupportedFormatError(ValueError):
-    pass
-
-
-class UnsupportedArchError(ValueError):
-    pass
-
-
-class UnsupportedOSError(ValueError):
-    pass
-
-
-class EmptyReportError(ValueError):
-    pass
-
-
-class InvalidArgument(ValueError):
-    pass
-
-
-class NonExistantFunctionError(ValueError):
-    pass
-
-
-class NonExistantProcessError(ValueError):
-    pass
--- a/capa/features/address.py
+++ b/capa/features/address.py
@@ -1,193 +0,0 @@
-# Copyright (C) 2022 Mandiant, Inc. All Rights Reserved.
-# Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at: [package root]/LICENSE.txt
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-#  is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and limitations under the License.
-import abc
-
-
-class Address(abc.ABC):
-    @abc.abstractmethod
-    def __eq__(self, other): ...
-
-    @abc.abstractmethod
-    def __lt__(self, other):
-        # implement < so that addresses can be sorted from low to high
-        ...
-
-    @abc.abstractmethod
-    def __hash__(self):
-        # implement hash so that addresses can be used in sets and dicts
-        ...
-
-    @abc.abstractmethod
-    def __repr__(self):
-        # implement repr to help during debugging
-        ...
-
-
-class AbsoluteVirtualAddress(int, Address):
-    """an absolute memory address"""
-
-    def __new__(cls, v):
-        assert v >= 0
-        return int.__new__(cls, v)
-
-    def __repr__(self):
-        return f"absolute(0x{self:x})"
-
-    def __hash__(self):
-        return int.__hash__(self)
-
-
-class ProcessAddress(Address):
-    """an address of a process in a dynamic execution trace"""
-
-    def __init__(self, pid: int, ppid: int = 0):
-        assert ppid >= 0
-        assert pid > 0
-        self.ppid = ppid
-        self.pid = pid
-
-    def __repr__(self):
-        return "process(%s%s)" % (
-            f"ppid: {self.ppid}, " if self.ppid > 0 else "",
-            f"pid: {self.pid}",
-        )
-
-    def __hash__(self):
-        return hash((self.ppid, self.pid))
-
-    def __eq__(self, other):
-        assert isinstance(other, ProcessAddress)
-        return (self.ppid, self.pid) == (other.ppid, other.pid)
-
-    def __lt__(self, other):
-        assert isinstance(other, ProcessAddress)
-        return (self.ppid, self.pid) < (other.ppid, other.pid)
-
-
-class ThreadAddress(Address):
-    """addresses a thread in a dynamic execution trace"""
-
-    def __init__(self, process: ProcessAddress, tid: int):
-        assert tid >= 0
-        self.process = process
-        self.tid = tid
-
-    def __repr__(self):
-        return f"{self.process}, thread(tid: {self.tid})"
-
-    def __hash__(self):
-        return hash((self.process, self.tid))
-
-    def __eq__(self, other):
-        assert isinstance(other, ThreadAddress)
-        return (self.process, self.tid) == (other.process, other.tid)
-
-    def __lt__(self, other):
-        assert isinstance(other, ThreadAddress)
-        return (self.process, self.tid) < (other.process, other.tid)
-
-
-class DynamicCallAddress(Address):
-    """addresses a call in a dynamic execution trace"""
-
-    def __init__(self, thread: ThreadAddress, id: int):
-        assert id >= 0
-        self.thread = thread
-        self.id = id
-
-    def __repr__(self):
-        return f"{self.thread}, call(id: {self.id})"
-
-    def __hash__(self):
-        return hash((self.thread, self.id))
-
-    def __eq__(self, other):
-        assert isinstance(other, DynamicCallAddress)
-        return (self.thread, self.id) == (other.thread, other.id)
-
-    def __lt__(self, other):
-        assert isinstance(other, DynamicCallAddress)
-        return (self.thread, self.id) < (other.thread, other.id)
-
-
-class RelativeVirtualAddress(int, Address):
-    """a memory address relative to a base address"""
-
-    def __repr__(self):
-        return f"relative(0x{self:x})"
-
-    def __hash__(self):
-        return int.__hash__(self)
-
-
-class FileOffsetAddress(int, Address):
-    """an address relative to the start of a file"""
-
-    def __new__(cls, v):
-        assert v >= 0
-        return int.__new__(cls, v)
-
-    def __repr__(self):
-        return f"file(0x{self:x})"
-
-    def __hash__(self):
-        return int.__hash__(self)
-
-
-class DNTokenAddress(int, Address):
-    """a .NET token"""
-
-    def __new__(cls, token: int):
-        return int.__new__(cls, token)
-
-    def __repr__(self):
-        return f"token(0x{self:x})"
-
-    def __hash__(self):
-        return int.__hash__(self)
-
-
-class DNTokenOffsetAddress(Address):
-    """an offset into an object specified by a .NET token"""
-
-    def __init__(self, token: int, offset: int):
-        assert offset >= 0
-        self.token = token
-        self.offset = offset
-
-    def __eq__(self, other):
-        return (self.token, self.offset) == (other.token, other.offset)
-
-    def __lt__(self, other):
-        return (self.token, self.offset) < (other.token, other.offset)
-
-    def __hash__(self):
-        return hash((self.token, self.offset))
-
-    def __repr__(self):
-        return f"token(0x{self.token:x})+(0x{self.offset:x})"
-
-    def __index__(self):
-        return self.token + self.offset
-
-
-class _NoAddress(Address):
-    def __eq__(self, other):
-        return True
-
-    def __lt__(self, other):
-        return False
-
-    def __hash__(self):
-        return hash(0)
-
-    def __repr__(self):
-        return "no address"
-
-
-NO_ADDRESS = _NoAddress()
--- a/capa/features/basicblock.py
+++ b/capa/features/basicblock.py
@@ -10,11 +10,18 @@ from capa.features.common import Feature


 class BasicBlock(Feature):
-    def __init__(self, description=None):
-        super().__init__(0, description=description)
+    def __init__(self):
+        super(BasicBlock, self).__init__(None)

    def __str__(self):
        return "basic block"

    def get_value_str(self):
        return ""
+
+    def freeze_serialize(self):
+        return (self.__class__.__name__, [])
+
+    @classmethod
+    def freeze_deserialize(cls, args):
+        return cls()
--- a/capa/features/com/init.py
+++ b/capa/features/com/init.py
@@ -1,35 +0,0 @@
-# Copyright (C) 2024 Mandiant, Inc. All Rights Reserved.
-# Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at: [package root]/LICENSE.txt
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-#  is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and limitations under the License.
-from enum import Enum
-
-from capa.helpers import assert_never
-
-
-class ComType(Enum):
-    CLASS = "class"
-    INTERFACE = "interface"
-
-
-COM_PREFIXES = {
-    ComType.CLASS: "CLSID_",
-    ComType.INTERFACE: "IID_",
-}
-
-
-def load_com_database(com_type: ComType) -> dict[str, list[str]]:
-    # lazy load these python files since they are so large.
-    # that is, don't load them unless a COM feature is being handled.
-    import capa.features.com.classes
-    import capa.features.com.interfaces
-
-    if com_type == ComType.CLASS:
-        return capa.features.com.classes.COM_CLASSES
-    elif com_type == ComType.INTERFACE:
-        return capa.features.com.interfaces.COM_INTERFACES
-    else:
-        assert_never(com_type)
--- a/capa/features/com/classes.py
+++ b/capa/features/com/classes.py
--- a/capa/features/com/interfaces.py
+++ b/capa/features/com/interfaces.py
--- a/capa/features/common.py
+++ b/capa/features/common.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 Mandiant, Inc. All Rights Reserved.
+# Copyright (C) 2020 Mandiant, Inc. All Rights Reserved.
 # Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at: [package root]/LICENSE.txt
@@ -7,11 +7,10 @@
 # See the License for the specific language governing permissions and limitations under the License.

 import re
-import abc
 import codecs
 import logging
 import collections
-from typing import TYPE_CHECKING, Union, Optional
+from typing import TYPE_CHECKING, Set, Dict, List, Union

 if TYPE_CHECKING:
    # circular import, otherwise
@@ -20,7 +19,6 @@ if TYPE_CHECKING:
 import capa.perf
 import capa.features
 import capa.features.extractors.elf
-from capa.features.address import Address

 logger = logging.getLogger(__name__)
 MAX_BYTES_FEATURE_SIZE = 0x100
@@ -29,14 +27,6 @@ MAX_BYTES_FEATURE_SIZE = 0x100
 THUNK_CHAIN_DEPTH_DELTA = 5


-class FeatureAccess:
-    READ = "read"
-    WRITE = "write"
-
-
-VALID_FEATURE_ACCESS = (FeatureAccess.READ, FeatureAccess.WRITE)
-
-
 def bytes_to_str(b: bytes) -> str:
    return str(codecs.encode(b, "hex").decode("utf-8"))

@@ -78,14 +68,21 @@ class Result:
        self,
        success: bool,
        statement: Union["capa.engine.Statement", "Feature"],
-        children: list["Result"],
-        locations: Optional[set[Address]] = None,
+        children: List["Result"],
+        locations=None,
    ):
-        super().__init__()
+        """
+        args:
+          success (bool)
+          statement (capa.engine.Statement or capa.features.Feature)
+          children (list[Result])
+          locations (iterable[VA])
+        """
+        super(Result, self).__init__()
        self.success = success
        self.statement = statement
        self.children = children
-        self.locations = locations if locations is not None else set()
+        self.locations = locations if locations is not None else ()

    def __eq__(self, other):
        if isinstance(other, bool):
@@ -99,123 +96,111 @@ class Result:
        return self.success


-class Feature(abc.ABC):  # noqa: B024
-    # this is an abstract class, since we don't want anyone to instantiate it directly,
-    # but it doesn't have any abstract methods.
-
-    def __init__(
-        self,
-        value: Union[str, int, float, bytes],
-        description: Optional[str] = None,
-    ):
+class Feature:
+    def __init__(self, value: Union[str, int, bytes], bitness=None, description=None):
        """
        Args:
          value (any): the value of the feature, such as the number or string.
+          bitness (str): one of the VALID_BITNESS values, or None.
+            When None, then the feature applies to any bitness.
+            Modifies the feature name from `feature` to `feature/bitness`, like `offset/x32`.
          description (str): a human-readable description that explains the feature value.
        """
-        super().__init__()
+        super(Feature, self).__init__()
+
+        if bitness is not None:
+            if bitness not in VALID_BITNESS:
+                raise ValueError("bitness '%s' must be one of %s" % (bitness, VALID_BITNESS))
+            self.name = self.__class__.__name__.lower() + "/" + bitness
+        else:
+            self.name = self.__class__.__name__.lower()

-        self.name = self.__class__.__name__.lower()
        self.value = value
+        self.bitness = bitness
        self.description = description

    def __hash__(self):
-        return hash((self.name, self.value))
+        return hash((self.name, self.value, self.bitness))

    def __eq__(self, other):
-        return self.name == other.name and self.value == other.value
-
-    def __lt__(self, other):
-        # implementing sorting by serializing to JSON is a huge hack.
-        # it's slow, inelegant, and probably doesn't work intuitively;
-        # however, we only use it for deterministic output, so it's good enough for now.
-
-        # circular import
-        # we should fix if this wasn't already a huge hack.
-        import capa.features.freeze.features
-
-        return (
-            capa.features.freeze.features.feature_from_capa(self).model_dump_json()
-            < capa.features.freeze.features.feature_from_capa(other).model_dump_json()
-        )
-
-    def get_name_str(self) -> str:
-        """
-        render the name of this feature, for use by `__str__` and friends.
-        subclasses should override to customize the rendering.
-        """
-        return self.name
+        return self.name == other.name and self.value == other.value and self.bitness == other.bitness

    def get_value_str(self) -> str:
        """
        render the value of this feature, for use by `__str__` and friends.
        subclasses should override to customize the rendering.
+
+        Returns: any
        """
        return str(self.value)

    def __str__(self):
        if self.value is not None:
            if self.description:
-                return f"{self.get_name_str()}({self.get_value_str()} = {self.description})"
+                return "%s(%s = %s)" % (self.name, self.get_value_str(), self.description)
            else:
-                return f"{self.get_name_str()}({self.get_value_str()})"
+                return "%s(%s)" % (self.name, self.get_value_str())
        else:
-            return f"{self.get_name_str()}"
+            return "%s" % self.name

    def __repr__(self):
        return str(self)

-    def evaluate(self, features: "capa.engine.FeatureSet", short_circuit=True) -> Result:
+    def evaluate(self, ctx: Dict["Feature", Set[int]], **kwargs) -> Result:
        capa.perf.counters["evaluate.feature"] += 1
        capa.perf.counters["evaluate.feature." + self.name] += 1
-        return Result(self in features, self, [], locations=features.get(self, set()))
+        return Result(self in ctx, self, [], locations=ctx.get(self, []))
+
+    def freeze_serialize(self):
+        if self.bitness is not None:
+            return (self.__class__.__name__, [self.value, {"bitness": self.bitness}])
+        else:
+            return (self.__class__.__name__, [self.value])
+
+    @classmethod
+    def freeze_deserialize(cls, args):
+        # as you can see below in code,
+        # if the last argument is a dictionary,
+        # consider it to be kwargs passed to the feature constructor.
+        if len(args) == 1:
+            return cls(*args)
+        elif isinstance(args[-1], dict):
+            kwargs = args[-1]
+            args = args[:-1]
+            return cls(*args, **kwargs)


 class MatchedRule(Feature):
    def __init__(self, value: str, description=None):
-        super().__init__(value, description=description)
+        super(MatchedRule, self).__init__(value, description=description)
        self.name = "match"


 class Characteristic(Feature):
    def __init__(self, value: str, description=None):
-        super().__init__(value, description=description)
+
+        super(Characteristic, self).__init__(value, description=description)


 class String(Feature):
    def __init__(self, value: str, description=None):
-        super().__init__(value, description=description)
-
-    def get_value_str(self) -> str:
-        assert isinstance(self.value, str)
-        return escape_string(self.value)
-
-
-class Class(Feature):
-    def __init__(self, value: str, description=None):
-        super().__init__(value, description=description)
-
-
-class Namespace(Feature):
-    def __init__(self, value: str, description=None):
-        super().__init__(value, description=description)
+        super(String, self).__init__(value, description=description)


 class Substring(String):
    def __init__(self, value: str, description=None):
-        super().__init__(value, description=description)
+        super(Substring, self).__init__(value, description=description)
        self.value = value

-    def evaluate(self, features: "capa.engine.FeatureSet", short_circuit=True):
+    def evaluate(self, ctx, short_circuit=True):
        capa.perf.counters["evaluate.feature"] += 1
        capa.perf.counters["evaluate.feature.substring"] += 1

        # mapping from string value to list of locations.
        # will unique the locations later on.
-        matches: collections.defaultdict[str, set[Address]] = collections.defaultdict(set)
+        matches = collections.defaultdict(list)

-        assert isinstance(self.value, str)
-        for feature, locations in features.items():
+        for feature, locations in ctx.items():
            if not isinstance(feature, (String,)):
                continue

@@ -224,32 +209,32 @@ class Substring(String):
                raise ValueError("unexpected feature value type")

            if self.value in feature.value:
-                matches[feature.value].update(locations)
+                matches[feature.value].extend(locations)
                if short_circuit:
-                    # we found one matching string, that's sufficient to match.
+                    # we found one matching string, thats sufficient to match.
                    # don't collect other matching strings in this mode.
                    break

        if matches:
+            # finalize: defaultdict -> dict
+            # which makes json serialization easier
+            matches = dict(matches)
+
            # collect all locations
            locations = set()
-            for locs in matches.values():
-                locations.update(locs)
+            for s in matches.keys():
+                matches[s] = list(set(matches[s]))
+                locations.update(matches[s])

            # unlike other features, we cannot return put a reference to `self` directly in a `Result`.
            # this is because `self` may match on many strings, so we can't stuff the matched value into it.
            # instead, return a new instance that has a reference to both the substring and the matched values.
-            return Result(True, _MatchedSubstring(self, dict(matches)), [], locations=locations)
+            return Result(True, _MatchedSubstring(self, matches), [], locations=locations)
        else:
-            return Result(False, _MatchedSubstring(self, {}), [])
-
-    def get_value_str(self) -> str:
-        assert isinstance(self.value, str)
-        return escape_string(self.value)
+            return Result(False, _MatchedSubstring(self, None), [])

    def __str__(self):
-        assert isinstance(self.value, str)
-        return f"substring({escape_string(self.value)})"
+        return "substring(%s)" % self.value


 class _MatchedSubstring(Substring):
@@ -260,13 +245,13 @@ class _MatchedSubstring(Substring):
    note: this type should only ever be constructed by `Substring.evaluate()`. it is not part of the public API.
    """

-    def __init__(self, substring: Substring, matches: dict[str, set[Address]]):
+    def __init__(self, substring: Substring, matches):
        """
        args:
-          substring: the substring feature that matches.
-          match: mapping from matching string to its locations.
+          substring (Substring): the substring feature that matches.
+          match (Dict[string, List[int]]|None): mapping from matching string to its locations.
        """
-        super().__init__(str(substring.value), description=substring.description)
+        super(_MatchedSubstring, self).__init__(str(substring.value), description=substring.description)
        # we want this to collide with the name of `Substring` above,
        # so that it works nicely with the renderers.
        self.name = "substring"
@@ -274,14 +259,15 @@ class _MatchedSubstring(Substring):
        self.matches = matches

    def __str__(self):
-        matches = ", ".join(f'"{s}"' for s in (self.matches or {}).keys())
-        assert isinstance(self.value, str)
-        return f'substring("{self.value}", matches = {matches})'
+        return 'substring("%s", matches = %s)' % (
+            self.value,
+            ", ".join(map(lambda s: '"' + s + '"', (self.matches or {}).keys())),
+        )


 class Regex(String):
    def __init__(self, value: str, description=None):
-        super().__init__(value, description=description)
+        super(Regex, self).__init__(value, description=description)
        self.value = value

        pat = self.value[len("/") : -len("/")]
@@ -291,22 +277,22 @@ class Regex(String):
            flags |= re.IGNORECASE
        try:
            self.re = re.compile(pat, flags)
-        except re.error as exc:
+        except re.error:
            if value.endswith("/i"):
                value = value[: -len("i")]
            raise ValueError(
-                f"invalid regular expression: {value} it should use Python syntax, try it at https://pythex.org"
-            ) from exc
+                "invalid regular expression: %s it should use Python syntax, try it at https://pythex.org" % value
+            )

-    def evaluate(self, features: "capa.engine.FeatureSet", short_circuit=True):
+    def evaluate(self, ctx, short_circuit=True):
        capa.perf.counters["evaluate.feature"] += 1
        capa.perf.counters["evaluate.feature.regex"] += 1

        # mapping from string value to list of locations.
        # will unique the locations later on.
-        matches: collections.defaultdict[str, set[Address]] = collections.defaultdict(set)
+        matches = collections.defaultdict(list)

-        for feature, locations in features.items():
+        for feature, locations in ctx.items():
            if not isinstance(feature, (String,)):
                continue

@@ -319,29 +305,33 @@ class Regex(String):
            # using this mode cleans is more convenient for rule authors,
            # so that they don't have to prefix/suffix their terms like: /.*foo.*/.
            if self.re.search(feature.value):
-                matches[feature.value].update(locations)
+                matches[feature.value].extend(locations)
                if short_circuit:
-                    # we found one matching string, that's sufficient to match.
+                    # we found one matching string, thats sufficient to match.
                    # don't collect other matching strings in this mode.
                    break

        if matches:
+            # finalize: defaultdict -> dict
+            # which makes json serialization easier
+            matches = dict(matches)
+
            # collect all locations
            locations = set()
-            for locs in matches.values():
-                locations.update(locs)
+            for s in matches.keys():
+                matches[s] = list(set(matches[s]))
+                locations.update(matches[s])

            # unlike other features, we cannot return put a reference to `self` directly in a `Result`.
            # this is because `self` may match on many strings, so we can't stuff the matched value into it.
            # instead, return a new instance that has a reference to both the regex and the matched values.
            # see #262.
-            return Result(True, _MatchedRegex(self, dict(matches)), [], locations=locations)
+            return Result(True, _MatchedRegex(self, matches), [], locations=locations)
        else:
-            return Result(False, _MatchedRegex(self, {}), [])
+            return Result(False, _MatchedRegex(self, None), [])

    def __str__(self):
-        assert isinstance(self.value, str)
-        return f"regex(string =~ {self.value})"
+        return "regex(string =~ %s)" % self.value


 class _MatchedRegex(Regex):
@@ -352,13 +342,13 @@ class _MatchedRegex(Regex):
    note: this type should only ever be constructed by `Regex.evaluate()`. it is not part of the public API.
    """

-    def __init__(self, regex: Regex, matches: dict[str, set[Address]]):
+    def __init__(self, regex: Regex, matches):
        """
        args:
-          regex: the regex feature that matches.
-          matches: mapping from matching string to its locations.
+          regex (Regex): the regex feature that matches.
+          match (Dict[string, List[int]]|None): mapping from matching string to its locations.
        """
-        super().__init__(str(regex.value), description=regex.description)
+        super(_MatchedRegex, self).__init__(str(regex.value), description=regex.description)
        # we want this to collide with the name of `Regex` above,
        # so that it works nicely with the renderers.
        self.name = "regex"
@@ -366,9 +356,10 @@ class _MatchedRegex(Regex):
        self.matches = matches

    def __str__(self):
-        matches = ", ".join(f'"{s}"' for s in (self.matches or {}).keys())
-        assert isinstance(self.value, str)
-        return f"regex(string =~ {self.value}, matches = {matches})"
+        return "regex(string =~ %s, matches = %s)" % (
+            self.value,
+            ", ".join(map(lambda s: '"' + s + '"', (self.matches or {}).keys())),
+        )


 class StringFactory:
@@ -380,123 +371,79 @@ class StringFactory:

 class Bytes(Feature):
    def __init__(self, value: bytes, description=None):
-        super().__init__(value, description=description)
+        super(Bytes, self).__init__(value, description=description)
        self.value = value

-    def evaluate(self, features: "capa.engine.FeatureSet", short_circuit=True):
-        assert isinstance(self.value, bytes)
-
+    def evaluate(self, ctx, **kwargs):
        capa.perf.counters["evaluate.feature"] += 1
        capa.perf.counters["evaluate.feature.bytes"] += 1
-        capa.perf.counters["evaluate.feature.bytes." + str(len(self.value))] += 1

-        for feature, locations in features.items():
+        for feature, locations in ctx.items():
            if not isinstance(feature, (Bytes,)):
                continue

-            assert isinstance(feature.value, bytes)
            if feature.value.startswith(self.value):
                return Result(True, self, [], locations=locations)

        return Result(False, self, [])

    def get_value_str(self):
-        assert isinstance(self.value, bytes)
        return hex_string(bytes_to_str(self.value))

+    def freeze_serialize(self):
+        return (self.__class__.__name__, [bytes_to_str(self.value).upper()])
+
+    @classmethod
+    def freeze_deserialize(cls, args):
+        return cls(*[codecs.decode(x, "hex") for x in args])
+
+
+# identifiers for supported bitness names that tweak a feature
+# for example, offset/x32
+BITNESS_X32 = "x32"
+BITNESS_X64 = "x64"
+VALID_BITNESS = (BITNESS_X32, BITNESS_X64)
+

 # other candidates here: https://docs.microsoft.com/en-us/windows/win32/debug/pe-format#machine-types
 ARCH_I386 = "i386"
 ARCH_AMD64 = "amd64"
-ARCH_AARCH64 = "aarch64"
-# dotnet
-ARCH_ANY = "any"
-VALID_ARCH = (ARCH_I386, ARCH_AMD64, ARCH_AARCH64, ARCH_ANY)
+VALID_ARCH = (ARCH_I386, ARCH_AMD64)


 class Arch(Feature):
    def __init__(self, value: str, description=None):
-        super().__init__(value, description=description)
+        super(Arch, self).__init__(value, description=description)
        self.name = "arch"


 OS_WINDOWS = "windows"
 OS_LINUX = "linux"
 OS_MACOS = "macos"
-OS_ANDROID = "android"
-# dotnet
-OS_ANY = "any"
 VALID_OS = {os.value for os in capa.features.extractors.elf.OS}
-VALID_OS.update({OS_WINDOWS, OS_LINUX, OS_MACOS, OS_ANY, OS_ANDROID})
-# internal only, not to be used in rules
-OS_AUTO = "auto"
+VALID_OS.update({OS_WINDOWS, OS_LINUX, OS_MACOS})


 class OS(Feature):
    def __init__(self, value: str, description=None):
-        super().__init__(value, description=description)
+        super(OS, self).__init__(value, description=description)
        self.name = "os"

-    def evaluate(self, features: "capa.engine.FeatureSet", short_circuit=True):
-        capa.perf.counters["evaluate.feature"] += 1
-        capa.perf.counters["evaluate.feature." + self.name] += 1
-
-        for feature, locations in features.items():
-            if not isinstance(feature, (OS,)):
-                continue
-
-            assert isinstance(feature.value, str)
-            if OS_ANY in (self.value, feature.value) or self.value == feature.value:
-                return Result(True, self, [], locations=locations)
-
-        return Result(False, self, [])
-

 FORMAT_PE = "pe"
 FORMAT_ELF = "elf"
-FORMAT_DOTNET = "dotnet"
-VALID_FORMAT = (FORMAT_PE, FORMAT_ELF, FORMAT_DOTNET)
-# internal only, not to be used in rules
-FORMAT_AUTO = "auto"
-FORMAT_SC32 = "sc32"
-FORMAT_SC64 = "sc64"
-FORMAT_CAPE = "cape"
-FORMAT_DRAKVUF = "drakvuf"
-FORMAT_VMRAY = "vmray"
-FORMAT_BINEXPORT2 = "binexport2"
-FORMAT_FREEZE = "freeze"
-FORMAT_RESULT = "result"
-FORMAT_BINJA_DB = "binja_database"
-STATIC_FORMATS = {
-    FORMAT_SC32,
-    FORMAT_SC64,
-    FORMAT_PE,
-    FORMAT_ELF,
-    FORMAT_DOTNET,
-    FORMAT_FREEZE,
-    FORMAT_RESULT,
-    FORMAT_BINEXPORT2,
-    FORMAT_BINJA_DB,
-}
-DYNAMIC_FORMATS = {
-    FORMAT_CAPE,
-    FORMAT_DRAKVUF,
-    FORMAT_VMRAY,
-    FORMAT_FREEZE,
-    FORMAT_RESULT,
-}
-FORMAT_UNKNOWN = "unknown"
+VALID_FORMAT = (FORMAT_PE, FORMAT_ELF)


 class Format(Feature):
    def __init__(self, value: str, description=None):
-        super().__init__(value, description=description)
+        super(Format, self).__init__(value, description=description)
        self.name = "format"


 def is_global_feature(feature):
    """
    is this a feature that is extracted at every scope?
-    today, these are OS, arch, and format features.
+    today, these are OS and arch features.
    """
-    return isinstance(feature, (OS, Arch, Format))
+    return isinstance(feature, (OS, Arch))
--- a/capa/features/extractors/base_extractor.py
+++ b/capa/features/extractors/base_extractor.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 Mandiant, Inc. All Rights Reserved.
+# Copyright (C) 2020 Mandiant, Inc. All Rights Reserved.
 # Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at: [package root]/LICENSE.txt
@@ -7,95 +7,35 @@
 # See the License for the specific language governing permissions and limitations under the License.

 import abc
-import hashlib
-import dataclasses
-from copy import copy
-from types import MethodType
-from typing import Any, Union, Iterator, TypeAlias
-from dataclasses import dataclass
+from typing import Tuple, Iterator, SupportsInt

-import capa.features.address
 from capa.features.common import Feature
-from capa.features.address import Address, ThreadAddress, ProcessAddress, DynamicCallAddress, AbsoluteVirtualAddress

 # feature extractors may reference functions, BBs, insns by opaque handle values.
-# you can use the `.address` property to get and render the address of the feature.
+# the only requirement of these handles are that they support `__int__`,
+# so that they can be rendered as addresses.
 #
 # these handles are only consumed by routines on
 # the feature extractor from which they were created.
+#
+# int(FunctionHandle) -> function start address
+# int(BBHandle) -> BasicBlock start address
+# int(InsnHandle) -> instruction address
+FunctionHandle = SupportsInt
+BBHandle = SupportsInt
+InsnHandle = SupportsInt


-@dataclass
-class SampleHashes:
-    md5: str
-    sha1: str
-    sha256: str
-
-    @classmethod
-    def from_bytes(cls, buf: bytes) -> "SampleHashes":
-        md5 = hashlib.md5()
-        sha1 = hashlib.sha1()
-        sha256 = hashlib.sha256()
-        md5.update(buf)
-        sha1.update(buf)
-        sha256.update(buf)
-
-        return cls(md5=md5.hexdigest(), sha1=sha1.hexdigest(), sha256=sha256.hexdigest())
-
-
-@dataclass
-class FunctionHandle:
-    """reference to a function recognized by a feature extractor.
-
-    Attributes:
-        address: the address of the function.
-        inner: extractor-specific data.
-        ctx: a context object for the extractor.
+class FeatureExtractor:
    """
-
-    address: Address
-    inner: Any
-    ctx: dict[str, Any] = dataclasses.field(default_factory=dict)
-
-
-@dataclass
-class BBHandle:
-    """reference to a basic block recognized by a feature extractor.
-
-    Attributes:
-        address: the address of the basic block start address.
-        inner: extractor-specific data.
-    """
-
-    address: Address
-    inner: Any
-
-
-@dataclass
-class InsnHandle:
-    """reference to an instruction recognized by a feature extractor.
-
-    Attributes:
-        address: the address of the instruction address.
-        inner: extractor-specific data.
-    """
-
-    address: Address
-    inner: Any
-
-
-class StaticFeatureExtractor:
-    """
-    StaticFeatureExtractor defines the interface for fetching features from a
-    sample without running it; extractors that rely on the execution trace of
-    a sample must implement the other sibling class, DynamicFeatureExtracor.
+    FeatureExtractor defines the interface for fetching features from a sample.

    There may be multiple backends that support fetching features for capa.
    For example, we use vivisect by default, but also want to support saving
     and restoring features from a JSON file.
    When we restore the features, we'd like to use exactly the same matching logic
     to find matching rules.
-    Therefore, we can define a StaticFeatureExtractor that provides features from the
+    Therefore, we can define a FeatureExtractor that provides features from the
     serialized JSON file and do matching without a binary analysis pass.
    Also, this provides a way to hook in an IDA backend.

@@ -104,34 +44,23 @@ class StaticFeatureExtractor:

    __metaclass__ = abc.ABCMeta

-    def __init__(self, hashes: SampleHashes):
+    def __init__(self):
        #
        # note: a subclass should define ctor parameters for its own use.
        #  for example, the Vivisect feature extract might require the vw and/or path.
        # this base class doesn't know what to do with that info, though.
        #
-        super().__init__()
-        self._sample_hashes = hashes
+        super(FeatureExtractor, self).__init__()

    @abc.abstractmethod
-    def get_base_address(self) -> Union[AbsoluteVirtualAddress, capa.features.address._NoAddress]:
+    def get_base_address(self) -> int:
        """
        fetch the preferred load address at which the sample was analyzed.
-
-        when the base address is `NO_ADDRESS`, then the loader has no concept of a preferred load address.
-        such as: shellcode, .NET modules, etc.
-        in these scenarios, RelativeVirtualAddresses aren't used.
        """
        raise NotImplementedError()

-    def get_sample_hashes(self) -> SampleHashes:
-        """
-        fetch the hashes for the sample contained within the extractor.
-        """
-        return self._sample_hashes
-
    @abc.abstractmethod
-    def extract_global_features(self) -> Iterator[tuple[Feature, Address]]:
+    def extract_global_features(self) -> Iterator[Tuple[Feature, int]]:
        """
        extract features found at every scope ("global").

@@ -142,12 +71,12 @@ class StaticFeatureExtractor:
                print('0x%x: %s', va, feature)

        yields:
-          tuple[Feature, Address]: feature and its location
+          Tuple[Feature, int]: feature and its location
        """
        raise NotImplementedError()

    @abc.abstractmethod
-    def extract_file_features(self) -> Iterator[tuple[Feature, Address]]:
+    def extract_file_features(self) -> Iterator[Tuple[Feature, int]]:
        """
        extract file-scope features.

@@ -158,7 +87,7 @@ class StaticFeatureExtractor:
                print('0x%x: %s', va, feature)

        yields:
-          tuple[Feature, Address]: feature and its location
+          Tuple[Feature, int]: feature and its location
        """
        raise NotImplementedError()

@@ -170,33 +99,32 @@ class StaticFeatureExtractor:
        """
        raise NotImplementedError()

-    def is_library_function(self, addr: Address) -> bool:
+    def is_library_function(self, va: int) -> bool:
        """
        is the given address a library function?
        the backend may implement its own function matching algorithm, or none at all.
-        we accept an address here, rather than function object,
-         to handle addresses identified in instructions.
+        we accept a VA here, rather than function object, to handle addresses identified in instructions.

        this information is used to:
          - filter out matches in library functions (by default), and
          - recognize when to fetch symbol names for called (non-API) functions

        args:
-          addr (Address): the address of a function.
+          va (int): the virtual address of a function.

        returns:
          bool: True if the given address is the start of a library function.
        """
        return False

-    def get_function_name(self, addr: Address) -> str:
+    def get_function_name(self, va: int) -> str:
        """
        fetch any recognized name for the given address.
        this is only guaranteed to return a value when the given function is a recognized library function.
        we accept a VA here, rather than function object, to handle addresses identified in instructions.

        args:
-          addr (Address): the address of a function.
+          va (int): the virtual address of a function.

        returns:
          str: the function name
@@ -204,10 +132,10 @@ class StaticFeatureExtractor:
        raises:
          KeyError: when the given function does not have a name.
        """
-        raise KeyError(addr)
+        raise KeyError(va)

    @abc.abstractmethod
-    def extract_function_features(self, f: FunctionHandle) -> Iterator[tuple[Feature, Address]]:
+    def extract_function_features(self, f: FunctionHandle) -> Iterator[Tuple[Feature, int]]:
        """
        extract function-scope features.
        the arguments are opaque values previously provided by `.get_functions()`, etc.
@@ -216,14 +144,14 @@ class StaticFeatureExtractor:

            extractor = VivisectFeatureExtractor(vw, path)
            for function in extractor.get_functions():
-                for feature, address in extractor.extract_function_features(function):
-                    print('0x%x: %s', address, feature)
+                for feature, va in extractor.extract_function_features(function):
+                    print('0x%x: %s', va, feature)

        args:
          f [FunctionHandle]: an opaque value previously fetched from `.get_functions()`.

        yields:
-          tuple[Feature, Address]: feature and its location
+          Tuple[Feature, int]: feature and its location
        """
        raise NotImplementedError()

@@ -236,7 +164,7 @@ class StaticFeatureExtractor:
        raise NotImplementedError()

    @abc.abstractmethod
-    def extract_basic_block_features(self, f: FunctionHandle, bb: BBHandle) -> Iterator[tuple[Feature, Address]]:
+    def extract_basic_block_features(self, f: FunctionHandle, bb: BBHandle) -> Iterator[Tuple[Feature, int]]:
        """
        extract basic block-scope features.
        the arguments are opaque values previously provided by `.get_functions()`, etc.
@@ -246,15 +174,15 @@ class StaticFeatureExtractor:
            extractor = VivisectFeatureExtractor(vw, path)
            for function in extractor.get_functions():
                for bb in extractor.get_basic_blocks(function):
-                    for feature, address in extractor.extract_basic_block_features(function, bb):
-                        print('0x%x: %s', address, feature)
+                    for feature, va in extractor.extract_basic_block_features(function, bb):
+                        print('0x%x: %s', va, feature)

        args:
          f [FunctionHandle]: an opaque value previously fetched from `.get_functions()`.
          bb [BBHandle]: an opaque value previously fetched from `.get_basic_blocks()`.

        yields:
-          tuple[Feature, Address]: feature and its location
+          Tuple[Feature, int]: feature and its location
        """
        raise NotImplementedError()

@@ -267,9 +195,7 @@ class StaticFeatureExtractor:
        raise NotImplementedError()

    @abc.abstractmethod
-    def extract_insn_features(
-        self, f: FunctionHandle, bb: BBHandle, insn: InsnHandle
-    ) -> Iterator[tuple[Feature, Address]]:
+    def extract_insn_features(self, f: FunctionHandle, bb: BBHandle, insn: InsnHandle) -> Iterator[Tuple[Feature, int]]:
        """
        extract instruction-scope features.
        the arguments are opaque values previously provided by `.get_functions()`, etc.
@@ -280,8 +206,8 @@ class StaticFeatureExtractor:
            for function in extractor.get_functions():
                for bb in extractor.get_basic_blocks(function):
                    for insn in extractor.get_instructions(function, bb):
-                        for feature, address in extractor.extract_insn_features(function, bb, insn):
-                            print('0x%x: %s', address, feature)
+                        for feature, va in extractor.extract_insn_features(function, bb, insn):
+                            print('0x%x: %s', va, feature)

        args:
          f [FunctionHandle]: an opaque value previously fetched from `.get_functions()`.
@@ -289,212 +215,123 @@ class StaticFeatureExtractor:
          insn [InsnHandle]: an opaque value previously fetched from `.get_instructions()`.

        yields:
-          tuple[Feature, Address]: feature and its location
+          Tuple[Feature, int]: feature and its location
        """
        raise NotImplementedError()


-def FunctionFilter(extractor: StaticFeatureExtractor, functions: set) -> StaticFeatureExtractor:
-    original_get_functions = extractor.get_functions
-
-    def filtered_get_functions(self):
-        yield from (f for f in original_get_functions() if f.address in functions)
-
-    # we make a copy of the original extractor object and then update its get_functions() method with the decorated filter one.
-    # this is in order to preserve the original extractor object's get_functions() method, in case it is used elsewhere in the code.
-    # an example where this is important is in our testfiles where we may use the same extractor object with different tests,
-    # with some of these tests needing to install a functions filter on the extractor object.
-    new_extractor = copy(extractor)
-    new_extractor.get_functions = MethodType(filtered_get_functions, extractor)  # type: ignore
-
-    return new_extractor
-
-
-@dataclass
-class ProcessHandle:
+class NullFeatureExtractor(FeatureExtractor):
    """
-    reference to a process extracted by the sandbox.
+    An extractor that extracts some user-provided features.
+    The structure of the single parameter is demonstrated in the example below.

-    Attributes:
-        address: process's address (pid)
-        inner: sandbox-specific data
+    This is useful for testing, as we can provide expected values and see if matching works.
+    Also, this is how we represent features deserialized from a freeze file.
+
+    example::
+
+        extractor = NullFeatureExtractor({
+            'base address: 0x401000,
+            'global features': [
+                (0x0, capa.features.Arch('i386')),
+                (0x0, capa.features.OS('linux')),
+            ],
+            'file features': [
+                (0x402345, capa.features.Characteristic('embedded pe')),
+            ],
+            'functions': {
+                0x401000: {
+                    'features': [
+                        (0x401000, capa.features.Characteristic('nzxor')),
+                    ],
+                    'basic blocks': {
+                        0x401000: {
+                            'features': [
+                                (0x401000, capa.features.Characteristic('tight-loop')),
+                            ],
+                            'instructions': {
+                                0x401000: {
+                                    'features': [
+                                        (0x401000, capa.features.Characteristic('nzxor')),
+                                    ],
+                                },
+                                0x401002: ...
+                            }
+                        },
+                        0x401005: ...
+                    }
+                },
+                0x40200: ...
+            }
+        )
    """

-    address: ProcessAddress
-    inner: Any
+    def __init__(self, features):
+        super(NullFeatureExtractor, self).__init__()
+        self.features = features

+    def get_base_address(self):
+        return self.features["base address"]

-@dataclass
-class ThreadHandle:
-    """
-    reference to a thread extracted by the sandbox.
+    def extract_global_features(self):
+        for p in self.features.get("global features", []):
+            va, feature = p
+            yield feature, va

-    Attributes:
-        address: thread's address (tid)
-        inner: sandbox-specific data
-    """
+    def extract_file_features(self):
+        for p in self.features.get("file features", []):
+            va, feature = p
+            yield feature, va

-    address: ThreadAddress
-    inner: Any
+    def get_functions(self):
+        for va in sorted(self.features["functions"].keys()):
+            yield va

+    def extract_function_features(self, f):
+        for p in self.features.get("functions", {}).get(f, {}).get("features", []):  # noqa: E127 line over-indented
+            va, feature = p
+            yield feature, va

-@dataclass
-class CallHandle:
-    """
-    reference to an api call extracted by the sandbox.
+    def get_basic_blocks(self, f):
+        for va in sorted(
+            self.features.get("functions", {})  # noqa: E127 line over-indented
+            .get(f, {})
+            .get("basic blocks", {})
+            .keys()
+        ):
+            yield va

-    Attributes:
-        address: call's address, such as event index or id
-        inner: sandbox-specific data
-    """
+    def extract_basic_block_features(self, f, bb):
+        for p in (
+            self.features.get("functions", {})  # noqa: E127 line over-indented
+            .get(f, {})
+            .get("basic blocks", {})
+            .get(bb, {})
+            .get("features", [])
+        ):
+            va, feature = p
+            yield feature, va

-    address: DynamicCallAddress
-    inner: Any
+    def get_instructions(self, f, bb):
+        for va in sorted(
+            self.features.get("functions", {})  # noqa: E127 line over-indented
+            .get(f, {})
+            .get("basic blocks", {})
+            .get(bb, {})
+            .get("instructions", {})
+            .keys()
+        ):
+            yield va

-
-class DynamicFeatureExtractor:
-    """
-    DynamicFeatureExtractor defines the interface for fetching features from a
-    sandbox' analysis of a sample; extractors that rely on statically analyzing
-    a sample must implement the sibling extractor, StaticFeatureExtractor.
-
-    Features are grouped mainly into threads that alongside their meta-features are also grouped into
-    processes (that also have their own features). Other scopes (such as function and file) may also apply
-    for a specific sandbox.
-
-    This class is not instantiated directly; it is the base class for other implementations.
-    """
-
-    __metaclass__ = abc.ABCMeta
-
-    def __init__(self, hashes: SampleHashes):
-        #
-        # note: a subclass should define ctor parameters for its own use.
-        #  for example, the Vivisect feature extract might require the vw and/or path.
-        # this base class doesn't know what to do with that info, though.
-        #
-        super().__init__()
-        self._sample_hashes = hashes
-
-    def get_sample_hashes(self) -> SampleHashes:
-        """
-        fetch the hashes for the sample contained within the extractor.
-        """
-        return self._sample_hashes
-
-    @abc.abstractmethod
-    def extract_global_features(self) -> Iterator[tuple[Feature, Address]]:
-        """
-        extract features found at every scope ("global").
-
-        example::
-
-            extractor = CapeFeatureExtractor.from_report(json.loads(buf))
-            for feature, addr in extractor.get_global_features():
-                print(addr, feature)
-
-        yields:
-          tuple[Feature, Address]: feature and its location
-        """
-        raise NotImplementedError()
-
-    @abc.abstractmethod
-    def extract_file_features(self) -> Iterator[tuple[Feature, Address]]:
-        """
-        extract file-scope features.
-
-        example::
-
-            extractor = CapeFeatureExtractor.from_report(json.loads(buf))
-            for feature, addr in extractor.get_file_features():
-                print(addr, feature)
-
-        yields:
-          tuple[Feature, Address]: feature and its location
-        """
-        raise NotImplementedError()
-
-    @abc.abstractmethod
-    def get_processes(self) -> Iterator[ProcessHandle]:
-        """
-        Enumerate processes in the trace.
-        """
-        raise NotImplementedError()
-
-    @abc.abstractmethod
-    def extract_process_features(self, ph: ProcessHandle) -> Iterator[tuple[Feature, Address]]:
-        """
-        Yields all the features of a process. These include:
-        - file features of the process' image
-        """
-        raise NotImplementedError()
-
-    @abc.abstractmethod
-    def get_process_name(self, ph: ProcessHandle) -> str:
-        """
-        Returns the human-readable name for the given process,
-        such as the filename.
-        """
-        raise NotImplementedError()
-
-    @abc.abstractmethod
-    def get_threads(self, ph: ProcessHandle) -> Iterator[ThreadHandle]:
-        """
-        Enumerate threads in the given process.
-        """
-        raise NotImplementedError()
-
-    @abc.abstractmethod
-    def extract_thread_features(self, ph: ProcessHandle, th: ThreadHandle) -> Iterator[tuple[Feature, Address]]:
-        """
-        Yields all the features of a thread. These include:
-        - sequenced api traces
-        """
-        raise NotImplementedError()
-
-    @abc.abstractmethod
-    def get_calls(self, ph: ProcessHandle, th: ThreadHandle) -> Iterator[CallHandle]:
-        """
-        Enumerate calls in the given thread
-        """
-        raise NotImplementedError()
-
-    @abc.abstractmethod
-    def extract_call_features(
-        self, ph: ProcessHandle, th: ThreadHandle, ch: CallHandle
-    ) -> Iterator[tuple[Feature, Address]]:
-        """
-        Yields all features of a call. These include:
-        - api name
-        - bytes/strings/numbers extracted from arguments
-        """
-        raise NotImplementedError()
-
-    @abc.abstractmethod
-    def get_call_name(self, ph: ProcessHandle, th: ThreadHandle, ch: CallHandle) -> str:
-        """
-        Returns the human-readable name for the given call,
-        such as as rendered API log entry, like:
-
-            Foo(1, "two", b"\x00\x11") -> -1
-        """
-        raise NotImplementedError()
-
-
-def ProcessFilter(extractor: DynamicFeatureExtractor, processes: set) -> DynamicFeatureExtractor:
-    original_get_processes = extractor.get_processes
-
-    def filtered_get_processes(self):
-        yield from (f for f in original_get_processes() if f.address.pid in processes)
-
-    # we make a copy of the original extractor object and then update its get_processes() method with the decorated filter one.
-    # this is in order to preserve the original extractor object's get_processes() method, in case it is used elsewhere in the code.
-    # an example where this is important is in our testfiles where we may use the same extractor object with different tests,
-    # with some of these tests needing to install a processes filter on the extractor object.
-    new_extractor = copy(extractor)
-    new_extractor.get_processes = MethodType(filtered_get_processes, extractor)  # type: ignore
-
-    return new_extractor
-
-
-FeatureExtractor: TypeAlias = Union[StaticFeatureExtractor, DynamicFeatureExtractor]
+    def extract_insn_features(self, f, bb, insn):
+        for p in (
+            self.features.get("functions", {})  # noqa: E127 line over-indented
+            .get(f, {})
+            .get("basic blocks", {})
+            .get(bb, {})
+            .get("instructions", {})
+            .get(insn, {})
+            .get("features", [])
+        ):
+            va, feature = p
+            yield feature, va
--- a/capa/features/extractors/binexport2/init.py
+++ b/capa/features/extractors/binexport2/init.py
@@ -1,418 +0,0 @@
-# Copyright (C) 2023 Mandiant, Inc. All Rights Reserved.
-# Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at: [package root]/LICENSE.txt
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-#  is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and limitations under the License.
-"""
-Proto files generated via protobuf v24.4:
-
-    protoc --python_out=. --mypy_out=. binexport2.proto
-
-from BinExport2 at 6916731d5f6693c4a4f0a052501fd3bd92cfd08b
-https://github.com/google/binexport/blob/6916731/binexport2.proto
-"""
-import io
-import hashlib
-import logging
-import contextlib
-from typing import Iterator
-from pathlib import Path
-from collections import defaultdict
-from dataclasses import dataclass
-
-from pefile import PE
-from elftools.elf.elffile import ELFFile
-
-import capa.features.common
-import capa.features.extractors.common
-import capa.features.extractors.binexport2.helpers
-from capa.features.extractors.binexport2.binexport2_pb2 import BinExport2
-
-logger = logging.getLogger(__name__)
-
-
-def get_binexport2(sample: Path) -> BinExport2:
-    be2: BinExport2 = BinExport2()
-    be2.ParseFromString(sample.read_bytes())
-    return be2
-
-
-def compute_common_prefix_length(m: str, n: str) -> int:
-    # ensure #m < #n
-    if len(n) < len(m):
-        m, n = n, m
-
-    for i, c in enumerate(m):
-        if n[i] != c:
-            return i
-
-    return len(m)
-
-
-def get_sample_from_binexport2(input_file: Path, be2: BinExport2, search_paths: list[Path]) -> Path:
-    """attempt to find the sample file, given a BinExport2 file.
-
-    searches in the same directory as the BinExport2 file, and then in search_paths.
-    """
-
-    def filename_similarity_key(p: Path) -> tuple[int, str]:
-        # note closure over input_file.
-        # sort first by length of common prefix, then by name (for stability)
-        return (compute_common_prefix_length(p.name, input_file.name), p.name)
-
-    wanted_sha256: str = be2.meta_information.executable_id.lower()
-
-    input_directory: Path = input_file.parent
-    siblings: list[Path] = [p for p in input_directory.iterdir() if p.is_file()]
-    siblings.sort(key=filename_similarity_key, reverse=True)
-    for sibling in siblings:
-        # e.g. with open IDA files in the same directory on Windows
-        with contextlib.suppress(PermissionError):
-            if hashlib.sha256(sibling.read_bytes()).hexdigest().lower() == wanted_sha256:
-                return sibling
-
-    for search_path in search_paths:
-        candidates: list[Path] = [p for p in search_path.iterdir() if p.is_file()]
-        candidates.sort(key=filename_similarity_key, reverse=True)
-        for candidate in candidates:
-            with contextlib.suppress(PermissionError):
-                if hashlib.sha256(candidate.read_bytes()).hexdigest().lower() == wanted_sha256:
-                    return candidate
-
-    raise ValueError("cannot find sample, you may specify the path using the CAPA_SAMPLES_DIR environment variable")
-
-
-class BinExport2Index:
-    def __init__(self, be2: BinExport2):
-        self.be2: BinExport2 = be2
-
-        self.callers_by_vertex_index: dict[int, list[int]] = defaultdict(list)
-        self.callees_by_vertex_index: dict[int, list[int]] = defaultdict(list)
-
-        # note: flow graph != call graph (vertex)
-        self.flow_graph_index_by_address: dict[int, int] = {}
-        self.flow_graph_address_by_index: dict[int, int] = {}
-
-        # edges that come from the given basic block
-        self.source_edges_by_basic_block_index: dict[int, list[BinExport2.FlowGraph.Edge]] = defaultdict(list)
-        # edges that end up at the given basic block
-        self.target_edges_by_basic_block_index: dict[int, list[BinExport2.FlowGraph.Edge]] = defaultdict(list)
-
-        self.vertex_index_by_address: dict[int, int] = {}
-
-        self.data_reference_index_by_source_instruction_index: dict[int, list[int]] = defaultdict(list)
-        self.data_reference_index_by_target_address: dict[int, list[int]] = defaultdict(list)
-        self.string_reference_index_by_source_instruction_index: dict[int, list[int]] = defaultdict(list)
-
-        self.insn_address_by_index: dict[int, int] = {}
-        self.insn_index_by_address: dict[int, int] = {}
-        self.insn_by_address: dict[int, BinExport2.Instruction] = {}
-
-        # must index instructions first
-        self._index_insn_addresses()
-        self._index_vertex_edges()
-        self._index_flow_graph_nodes()
-        self._index_flow_graph_edges()
-        self._index_call_graph_vertices()
-        self._index_data_references()
-        self._index_string_references()
-
-    def get_insn_address(self, insn_index: int) -> int:
-        assert insn_index in self.insn_address_by_index, f"insn must be indexed, missing {insn_index}"
-        return self.insn_address_by_index[insn_index]
-
-    def get_basic_block_address(self, basic_block_index: int) -> int:
-        basic_block: BinExport2.BasicBlock = self.be2.basic_block[basic_block_index]
-        first_instruction_index: int = next(self.instruction_indices(basic_block))
-        return self.get_insn_address(first_instruction_index)
-
-    def _index_vertex_edges(self):
-        for edge in self.be2.call_graph.edge:
-            if not edge.source_vertex_index:
-                continue
-            if not edge.target_vertex_index:
-                continue
-
-            self.callers_by_vertex_index[edge.target_vertex_index].append(edge.source_vertex_index)
-            self.callees_by_vertex_index[edge.source_vertex_index].append(edge.target_vertex_index)
-
-    def _index_flow_graph_nodes(self):
-        for flow_graph_index, flow_graph in enumerate(self.be2.flow_graph):
-            function_address: int = self.get_basic_block_address(flow_graph.entry_basic_block_index)
-            self.flow_graph_index_by_address[function_address] = flow_graph_index
-            self.flow_graph_address_by_index[flow_graph_index] = function_address
-
-    def _index_flow_graph_edges(self):
-        for flow_graph in self.be2.flow_graph:
-            for edge in flow_graph.edge:
-                if not edge.HasField("source_basic_block_index") or not edge.HasField("target_basic_block_index"):
-                    continue
-
-                self.source_edges_by_basic_block_index[edge.source_basic_block_index].append(edge)
-                self.target_edges_by_basic_block_index[edge.target_basic_block_index].append(edge)
-
-    def _index_call_graph_vertices(self):
-        for vertex_index, vertex in enumerate(self.be2.call_graph.vertex):
-            if not vertex.HasField("address"):
-                continue
-
-            vertex_address: int = vertex.address
-            self.vertex_index_by_address[vertex_address] = vertex_index
-
-    def _index_data_references(self):
-        for data_reference_index, data_reference in enumerate(self.be2.data_reference):
-            self.data_reference_index_by_source_instruction_index[data_reference.instruction_index].append(
-                data_reference_index
-            )
-            self.data_reference_index_by_target_address[data_reference.address].append(data_reference_index)
-
-    def _index_string_references(self):
-        for string_reference_index, string_reference in enumerate(self.be2.string_reference):
-            self.string_reference_index_by_source_instruction_index[string_reference.instruction_index].append(
-                string_reference_index
-            )
-
-    def _index_insn_addresses(self):
-        # see https://github.com/google/binexport/blob/39f6445c232bb5caf5c4a2a996de91dfa20c48e8/binexport.cc#L45
-        if len(self.be2.instruction) == 0:
-            return
-
-        assert self.be2.instruction[0].HasField("address"), "first insn must have explicit address"
-
-        addr: int = 0
-        next_addr: int = 0
-        for idx, insn in enumerate(self.be2.instruction):
-            if insn.HasField("address"):
-                addr = insn.address
-                next_addr = addr + len(insn.raw_bytes)
-            else:
-                addr = next_addr
-                next_addr += len(insn.raw_bytes)
-            self.insn_address_by_index[idx] = addr
-            self.insn_index_by_address[addr] = idx
-            self.insn_by_address[addr] = insn
-
-    @staticmethod
-    def instruction_indices(basic_block: BinExport2.BasicBlock) -> Iterator[int]:
-        """
-        For a given basic block, enumerate the instruction indices.
-        """
-        for index_range in basic_block.instruction_index:
-            if not index_range.HasField("end_index"):
-                yield index_range.begin_index
-                continue
-            else:
-                yield from range(index_range.begin_index, index_range.end_index)
-
-    def basic_block_instructions(
-        self, basic_block: BinExport2.BasicBlock
-    ) -> Iterator[tuple[int, BinExport2.Instruction, int]]:
-        """
-        For a given basic block, enumerate the instruction indices,
-        the instruction instances, and their addresses.
-        """
-        for instruction_index in self.instruction_indices(basic_block):
-            instruction: BinExport2.Instruction = self.be2.instruction[instruction_index]
-            instruction_address: int = self.get_insn_address(instruction_index)
-
-            yield instruction_index, instruction, instruction_address
-
-    def get_function_name_by_vertex(self, vertex_index: int) -> str:
-        vertex: BinExport2.CallGraph.Vertex = self.be2.call_graph.vertex[vertex_index]
-        name: str = f"sub_{vertex.address:x}"
-        if vertex.HasField("mangled_name"):
-            name = vertex.mangled_name
-
-        if vertex.HasField("demangled_name"):
-            name = vertex.demangled_name
-
-        if vertex.HasField("library_index"):
-            library: BinExport2.Library = self.be2.library[vertex.library_index]
-            if library.HasField("name"):
-                name = f"{library.name}!{name}"
-
-        return name
-
-    def get_function_name_by_address(self, address: int) -> str:
-        if address not in self.vertex_index_by_address:
-            return ""
-
-        vertex_index: int = self.vertex_index_by_address[address]
-        return self.get_function_name_by_vertex(vertex_index)
-
-    def get_instruction_by_address(self, address: int) -> BinExport2.Instruction:
-        assert address in self.insn_by_address, f"address must be indexed, missing {address:x}"
-        return self.insn_by_address[address]
-
-
-class BinExport2Analysis:
-    def __init__(self, be2: BinExport2, idx: BinExport2Index, buf: bytes):
-        self.be2: BinExport2 = be2
-        self.idx: BinExport2Index = idx
-        self.buf: bytes = buf
-        self.base_address: int = 0
-        self.thunks: dict[int, int] = {}
-
-        self._find_base_address()
-        self._compute_thunks()
-
-    def _find_base_address(self):
-        sections_with_perms: Iterator[BinExport2.Section] = filter(
-            lambda s: s.flag_r or s.flag_w or s.flag_x, self.be2.section
-        )
-        # assume the lowest address is the base address.
-        # this works as long as BinExport doesn't record other
-        # libraries mapped into memory.
-        self.base_address = min(s.address for s in sections_with_perms)
-
-        logger.debug("found base address: %x", self.base_address)
-
-    def _compute_thunks(self):
-        for addr, idx in self.idx.vertex_index_by_address.items():
-            vertex: BinExport2.CallGraph.Vertex = self.be2.call_graph.vertex[idx]
-            if not capa.features.extractors.binexport2.helpers.is_vertex_type(
-                vertex, BinExport2.CallGraph.Vertex.Type.THUNK
-            ):
-                continue
-
-            curr_idx: int = idx
-            for _ in range(capa.features.common.THUNK_CHAIN_DEPTH_DELTA):
-                thunk_callees: list[int] = self.idx.callees_by_vertex_index[curr_idx]
-                # If this doesn't hold, then it doesn't seem like this is a thunk,
-                # because either, len is:
-                #    0 and the thunk doesn't point to anything or is indirect, like `call eax`, or
-                #   >1 and the thunk may end up at many functions.
-                # In any case, this doesn't appear to be the sort of thunk we're looking for.
-                if len(thunk_callees) != 1:
-                    break
-
-                thunked_idx: int = thunk_callees[0]
-                thunked_vertex: BinExport2.CallGraph.Vertex = self.be2.call_graph.vertex[thunked_idx]
-
-                if not capa.features.extractors.binexport2.helpers.is_vertex_type(
-                    thunked_vertex, BinExport2.CallGraph.Vertex.Type.THUNK
-                ):
-                    assert thunked_vertex.HasField("address")
-
-                    self.thunks[addr] = thunked_vertex.address
-                    break
-
-                curr_idx = thunked_idx
-
-
-@dataclass
-class MemoryRegion:
-    # location of the bytes, potentially relative to a base address
-    address: int
-    buf: bytes
-
-    @property
-    def end(self) -> int:
-        return self.address + len(self.buf)
-
-    def contains(self, address: int) -> bool:
-        # note: address must be relative to any base address
-        return self.address <= address < self.end
-
-
-class ReadMemoryError(ValueError): ...
-
-
-class AddressNotMappedError(ReadMemoryError): ...
-
-
-@dataclass
-class AddressSpace:
-    base_address: int
-    memory_regions: tuple[MemoryRegion, ...]
-
-    def read_memory(self, address: int, length: int) -> bytes:
-        rva: int = address - self.base_address
-        for region in self.memory_regions:
-            if region.contains(rva):
-                offset: int = rva - region.address
-                return region.buf[offset : offset + length]
-
-        raise AddressNotMappedError(address)
-
-    @classmethod
-    def from_pe(cls, pe: PE, base_address: int):
-        regions: list[MemoryRegion] = []
-        for section in pe.sections:
-            address: int = section.VirtualAddress
-            size: int = section.Misc_VirtualSize
-            buf: bytes = section.get_data()
-
-            if len(buf) != size:
-                # pad the section with NULLs
-                # assume page alignment is already handled.
-                # might need more hardening here.
-                buf += b"\x00" * (size - len(buf))
-
-            regions.append(MemoryRegion(address, buf))
-
-        return cls(base_address, tuple(regions))
-
-    @classmethod
-    def from_elf(cls, elf: ELFFile, base_address: int):
-        regions: list[MemoryRegion] = []
-
-        # ELF segments are for runtime data,
-        # ELF sections are for link-time data.
-        for segment in elf.iter_segments():
-            # assume p_align is consistent with addresses here.
-            # otherwise, should harden this loader.
-            segment_rva: int = segment.header.p_vaddr
-            segment_size: int = segment.header.p_memsz
-            segment_data: bytes = segment.data()
-
-            if len(segment_data) < segment_size:
-                # pad the section with NULLs
-                # assume page alignment is already handled.
-                # might need more hardening here.
-                segment_data += b"\x00" * (segment_size - len(segment_data))
-
-            regions.append(MemoryRegion(segment_rva, segment_data))
-
-        return cls(base_address, tuple(regions))
-
-    @classmethod
-    def from_buf(cls, buf: bytes, base_address: int):
-        if buf.startswith(capa.features.extractors.common.MATCH_PE):
-            pe: PE = PE(data=buf)
-            return cls.from_pe(pe, base_address)
-        elif buf.startswith(capa.features.extractors.common.MATCH_ELF):
-            elf: ELFFile = ELFFile(io.BytesIO(buf))
-            return cls.from_elf(elf, base_address)
-        else:
-            raise NotImplementedError("file format address space")
-
-
-@dataclass
-class AnalysisContext:
-    sample_bytes: bytes
-    be2: BinExport2
-    idx: BinExport2Index
-    analysis: BinExport2Analysis
-    address_space: AddressSpace
-
-
-@dataclass
-class FunctionContext:
-    ctx: AnalysisContext
-    flow_graph_index: int
-    format: set[str]
-    os: set[str]
-    arch: set[str]
-
-
-@dataclass
-class BasicBlockContext:
-    basic_block_index: int
-
-
-@dataclass
-class InstructionContext:
-    instruction_index: int
--- a/capa/features/extractors/binexport2/arch/init.py
+++ b/capa/features/extractors/binexport2/arch/init.py
--- a/capa/features/extractors/binexport2/arch/arm/init.py
+++ b/capa/features/extractors/binexport2/arch/arm/init.py
--- a/capa/features/extractors/binexport2/arch/arm/helpers.py
+++ b/capa/features/extractors/binexport2/arch/arm/helpers.py
@@ -1,15 +0,0 @@
-# Copyright (C) 2024 Mandiant, Inc. All Rights Reserved.
-# Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at: [package root]/LICENSE.txt
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-#  is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and limitations under the License.
-
-from capa.features.extractors.binexport2.binexport2_pb2 import BinExport2
-
-
-def is_stack_register_expression(be2: BinExport2, expression: BinExport2.Expression) -> bool:
-    return bool(
-        expression and expression.type == BinExport2.Expression.REGISTER and expression.symbol.lower().endswith("sp")
-    )
--- a/capa/features/extractors/binexport2/arch/arm/insn.py
+++ b/capa/features/extractors/binexport2/arch/arm/insn.py
@@ -1,155 +0,0 @@
-# Copyright (C) 2024 Mandiant, Inc. All Rights Reserved.
-# Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at: [package root]/LICENSE.txt
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-#  is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and limitations under the License.
-import logging
-from typing import Iterator, Optional
-
-import capa.features.extractors.binexport2.helpers
-from capa.features.insn import MAX_STRUCTURE_SIZE, Number, Offset, OperandNumber, OperandOffset
-from capa.features.common import Feature, Characteristic
-from capa.features.address import Address
-from capa.features.extractors.binexport2 import FunctionContext, InstructionContext
-from capa.features.extractors.base_extractor import BBHandle, InsnHandle, FunctionHandle
-from capa.features.extractors.binexport2.helpers import (
-    BinExport2InstructionPatternMatcher,
-    mask_immediate,
-    is_address_mapped,
-    get_instruction_mnemonic,
-    get_operand_register_expression,
-    get_operand_immediate_expression,
-)
-from capa.features.extractors.binexport2.binexport2_pb2 import BinExport2
-from capa.features.extractors.binexport2.arch.arm.helpers import is_stack_register_expression
-
-logger = logging.getLogger(__name__)
-
-
-def extract_insn_number_features(
-    fh: FunctionHandle, _bbh: BBHandle, ih: InsnHandle
-) -> Iterator[tuple[Feature, Address]]:
-    fhi: FunctionContext = fh.inner
-    ii: InstructionContext = ih.inner
-
-    be2: BinExport2 = fhi.ctx.be2
-
-    instruction_index: int = ii.instruction_index
-    instruction: BinExport2.Instruction = be2.instruction[instruction_index]
-
-    if len(instruction.operand_index) == 0:
-        # skip things like:
-        #   .text:0040116e leave
-        return
-
-    mnemonic: str = get_instruction_mnemonic(be2, instruction)
-
-    if mnemonic in ("add", "sub"):
-        assert len(instruction.operand_index) == 3
-
-        operand1_expression: Optional[BinExport2.Expression] = get_operand_register_expression(
-            be2, be2.operand[instruction.operand_index[1]]
-        )
-        if operand1_expression and is_stack_register_expression(be2, operand1_expression):
-            # skip things like:
-            # add x0,sp,#0x8
-            return
-
-    for i, operand_index in enumerate(instruction.operand_index):
-        operand: BinExport2.Operand = be2.operand[operand_index]
-
-        immediate_expression: Optional[BinExport2.Expression] = get_operand_immediate_expression(be2, operand)
-        if not immediate_expression:
-            continue
-
-        value: int = mask_immediate(fhi.arch, immediate_expression.immediate)
-        if is_address_mapped(be2, value):
-            continue
-
-        yield Number(value), ih.address
-        yield OperandNumber(i, value), ih.address
-
-        if mnemonic == "add" and i == 2:
-            if 0 < value < MAX_STRUCTURE_SIZE:
-                yield Offset(value), ih.address
-                yield OperandOffset(i, value), ih.address
-
-
-OFFSET_PATTERNS = BinExport2InstructionPatternMatcher.from_str(
-    """
-    ldr|ldrb|ldrh|ldrsb|ldrsh|ldrex|ldrd|str|strb|strh|strex|strd reg, [reg(not-stack),  #int]                                 ; capture #int
-    ldr|ldrb|ldrh|ldrsb|ldrsh|ldrex|ldrd|str|strb|strh|strex|strd reg, [reg(not-stack),  #int]!                                ; capture #int
-    ldr|ldrb|ldrh|ldrsb|ldrsh|ldrex|ldrd|str|strb|strh|strex|strd reg, [reg(not-stack)],        #int                           ; capture #int
-    ldp|ldpd|stp|stpd                                             reg, reg,                     [reg(not-stack), #int]         ; capture #int
-    ldp|ldpd|stp|stpd                                             reg, reg,                     [reg(not-stack), #int]!        ; capture #int
-    ldp|ldpd|stp|stpd                                             reg, reg,                     [reg(not-stack)],       #int   ; capture #int
-    """
-)
-
-
-def extract_insn_offset_features(
-    fh: FunctionHandle, bbh: BBHandle, ih: InsnHandle
-) -> Iterator[tuple[Feature, Address]]:
-    fhi: FunctionContext = fh.inner
-    ii: InstructionContext = ih.inner
-
-    be2: BinExport2 = fhi.ctx.be2
-
-    match = OFFSET_PATTERNS.match_with_be2(be2, ii.instruction_index)
-    if not match:
-        return
-
-    value = match.expression.immediate
-
-    value = mask_immediate(fhi.arch, value)
-    if not is_address_mapped(be2, value):
-        value = capa.features.extractors.binexport2.helpers.twos_complement(fhi.arch, value)
-        yield Offset(value), ih.address
-        yield OperandOffset(match.operand_index, value), ih.address
-
-
-NZXOR_PATTERNS = BinExport2InstructionPatternMatcher.from_str(
-    """
-    eor reg, reg, reg
-    eor reg, reg, #int
-    """
-)
-
-
-def extract_insn_nzxor_characteristic_features(
-    fh: FunctionHandle, bbh: BBHandle, ih: InsnHandle
-) -> Iterator[tuple[Feature, Address]]:
-    fhi: FunctionContext = fh.inner
-    ii: InstructionContext = ih.inner
-    be2: BinExport2 = fhi.ctx.be2
-
-    if NZXOR_PATTERNS.match_with_be2(be2, ii.instruction_index) is None:
-        return
-
-    instruction: BinExport2.Instruction = be2.instruction[ii.instruction_index]
-    # guaranteed to be simple int/reg operands
-    # so we don't have to realize the tree/list.
-    operands: list[BinExport2.Operand] = [be2.operand[operand_index] for operand_index in instruction.operand_index]
-
-    if operands[1] != operands[2]:
-        yield Characteristic("nzxor"), ih.address
-
-
-INDIRECT_CALL_PATTERNS = BinExport2InstructionPatternMatcher.from_str(
-    """
-    blx|bx|blr reg
-    """
-)
-
-
-def extract_function_indirect_call_characteristic_features(
-    fh: FunctionHandle, bbh: BBHandle, ih: InsnHandle
-) -> Iterator[tuple[Feature, Address]]:
-    fhi: FunctionContext = fh.inner
-    ii: InstructionContext = ih.inner
-    be2: BinExport2 = fhi.ctx.be2
-
-    if INDIRECT_CALL_PATTERNS.match_with_be2(be2, ii.instruction_index) is not None:
-        yield Characteristic("indirect call"), ih.address
--- a/capa/features/extractors/binexport2/arch/intel/init.py
+++ b/capa/features/extractors/binexport2/arch/intel/init.py
--- a/capa/features/extractors/binexport2/arch/intel/helpers.py
+++ b/capa/features/extractors/binexport2/arch/intel/helpers.py
@@ -1,135 +0,0 @@
-# Copyright (C) 2024 Mandiant, Inc. All Rights Reserved.
-# Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at: [package root]/LICENSE.txt
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-#  is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and limitations under the License.
-from typing import Optional
-from dataclasses import dataclass
-
-from capa.features.extractors.binexport2.helpers import get_operand_expressions
-from capa.features.extractors.binexport2.binexport2_pb2 import BinExport2
-
-# security cookie checks may perform non-zeroing XORs, these are expected within a certain
-# byte range within the first and returning basic blocks, this helps to reduce FP features
-SECURITY_COOKIE_BYTES_DELTA: int = 0x40
-
-
-@dataclass
-class OperandPhraseInfo:
-    scale: Optional[BinExport2.Expression] = None
-    index: Optional[BinExport2.Expression] = None
-    base: Optional[BinExport2.Expression] = None
-    displacement: Optional[BinExport2.Expression] = None
-
-
-def get_operand_phrase_info(be2: BinExport2, operand: BinExport2.Operand) -> Optional[OperandPhraseInfo]:
-    # assume the following (see https://blog.yossarian.net/2020/06/13/How-x86_64-addresses-memory):
-    #
-    # Scale: A 2-bit constant factor
-    # Index: Any general purpose register
-    # Base: Any general purpose register
-    # Displacement: An integral offset
-
-    expressions: list[BinExport2.Expression] = get_operand_expressions(be2, operand)
-
-    # skip expression up to and including BinExport2.Expression.DEREFERENCE, assume caller
-    # has checked for BinExport2.Expression.DEREFERENCE
-    for i, expression in enumerate(expressions):
-        if expression.type == BinExport2.Expression.DEREFERENCE:
-            expressions = expressions[i + 1 :]
-            break
-
-    expression0: BinExport2.Expression
-    expression1: BinExport2.Expression
-    expression2: BinExport2.Expression
-    expression3: BinExport2.Expression
-    expression4: BinExport2.Expression
-
-    if len(expressions) == 1:
-        expression0 = expressions[0]
-
-        assert (
-            expression0.type == BinExport2.Expression.IMMEDIATE_INT
-            or expression0.type == BinExport2.Expression.REGISTER
-        )
-
-        if expression0.type == BinExport2.Expression.IMMEDIATE_INT:
-            # Displacement
-            return OperandPhraseInfo(displacement=expression0)
-        elif expression0.type == BinExport2.Expression.REGISTER:
-            # Base
-            return OperandPhraseInfo(base=expression0)
-
-    elif len(expressions) == 3:
-        expression0 = expressions[0]
-        expression1 = expressions[1]
-        expression2 = expressions[2]
-
-        assert expression0.type == BinExport2.Expression.REGISTER
-        assert expression1.type == BinExport2.Expression.OPERATOR
-        assert (
-            expression2.type == BinExport2.Expression.IMMEDIATE_INT
-            or expression2.type == BinExport2.Expression.REGISTER
-        )
-
-        if expression2.type == BinExport2.Expression.REGISTER:
-            # Base + Index
-            return OperandPhraseInfo(base=expression0, index=expression2)
-        elif expression2.type == BinExport2.Expression.IMMEDIATE_INT:
-            # Base + Displacement
-            return OperandPhraseInfo(base=expression0, displacement=expression2)
-
-    elif len(expressions) == 5:
-        expression0 = expressions[0]
-        expression1 = expressions[1]
-        expression2 = expressions[2]
-        expression3 = expressions[3]
-        expression4 = expressions[4]
-
-        assert expression0.type == BinExport2.Expression.REGISTER
-        assert expression1.type == BinExport2.Expression.OPERATOR
-        assert (
-            expression2.type == BinExport2.Expression.REGISTER
-            or expression2.type == BinExport2.Expression.IMMEDIATE_INT
-        )
-        assert expression3.type == BinExport2.Expression.OPERATOR
-        assert expression4.type == BinExport2.Expression.IMMEDIATE_INT
-
-        if expression1.symbol == "+" and expression3.symbol == "+":
-            # Base + Index + Displacement
-            return OperandPhraseInfo(base=expression0, index=expression2, displacement=expression4)
-        elif expression1.symbol == "+" and expression3.symbol == "*":
-            # Base + (Index * Scale)
-            return OperandPhraseInfo(base=expression0, index=expression2, scale=expression3)
-        elif expression1.symbol == "*" and expression3.symbol == "+":
-            # (Index * Scale) + Displacement
-            return OperandPhraseInfo(index=expression0, scale=expression2, displacement=expression3)
-        else:
-            raise NotImplementedError(expression1.symbol, expression3.symbol)
-
-    elif len(expressions) == 7:
-        expression0 = expressions[0]
-        expression1 = expressions[1]
-        expression2 = expressions[2]
-        expression3 = expressions[3]
-        expression4 = expressions[4]
-        expression5 = expressions[5]
-        expression6 = expressions[6]
-
-        assert expression0.type == BinExport2.Expression.REGISTER
-        assert expression1.type == BinExport2.Expression.OPERATOR
-        assert expression2.type == BinExport2.Expression.REGISTER
-        assert expression3.type == BinExport2.Expression.OPERATOR
-        assert expression4.type == BinExport2.Expression.IMMEDIATE_INT
-        assert expression5.type == BinExport2.Expression.OPERATOR
-        assert expression6.type == BinExport2.Expression.IMMEDIATE_INT
-
-        # Base + (Index * Scale) + Displacement
-        return OperandPhraseInfo(base=expression0, index=expression2, scale=expression4, displacement=expression6)
-
-    else:
-        raise NotImplementedError(len(expressions))
-
-    return None
--- a/capa/features/extractors/binexport2/arch/intel/insn.py
+++ b/capa/features/extractors/binexport2/arch/intel/insn.py
@@ -1,248 +0,0 @@
-# Copyright (C) 2024 Mandiant, Inc. All Rights Reserved.
-# Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at: [package root]/LICENSE.txt
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-#  is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and limitations under the License.
-import logging
-from typing import Iterator
-
-import capa.features.extractors.strings
-import capa.features.extractors.binexport2.helpers
-from capa.features.insn import MAX_STRUCTURE_SIZE, Number, Offset, OperandNumber, OperandOffset
-from capa.features.common import Feature, Characteristic
-from capa.features.address import Address
-from capa.features.extractors.binexport2 import BinExport2Index, FunctionContext, BasicBlockContext, InstructionContext
-from capa.features.extractors.base_extractor import BBHandle, InsnHandle, FunctionHandle
-from capa.features.extractors.binexport2.helpers import (
-    BinExport2InstructionPatternMatcher,
-    mask_immediate,
-    is_address_mapped,
-    get_instruction_mnemonic,
-)
-from capa.features.extractors.binexport2.binexport2_pb2 import BinExport2
-from capa.features.extractors.binexport2.arch.intel.helpers import SECURITY_COOKIE_BYTES_DELTA
-
-logger = logging.getLogger(__name__)
-
-
-IGNORE_NUMBER_PATTERNS = BinExport2InstructionPatternMatcher.from_str(
-    """
-    ret  #int
-    retn #int
-    add  reg(stack), #int
-    sub  reg(stack), #int
-    """
-)
-
-NUMBER_PATTERNS = BinExport2InstructionPatternMatcher.from_str(
-    """
-    push #int0            ; capture #int0
-
-    # its a little tedious to enumerate all the address forms
-    # but at least we are explicit
-    cmp|and|or|test|mov|add|adc|sub|shl|shr|sal|sar  reg,                      #int0  ; capture #int0
-    cmp|and|or|test|mov|add|adc|sub|shl|shr|sal|sar [reg],                     #int0  ; capture #int0
-    cmp|and|or|test|mov|add|adc|sub|shl|shr|sal|sar [#int],                    #int0  ; capture #int0
-    cmp|and|or|test|mov|add|adc|sub|shl|shr|sal|sar [reg + #int],              #int0  ; capture #int0
-    cmp|and|or|test|mov|add|adc|sub|shl|shr|sal|sar [reg + reg + #int],        #int0  ; capture #int0
-    cmp|and|or|test|mov|add|adc|sub|shl|shr|sal|sar [reg + reg * #int],        #int0  ; capture #int0
-    cmp|and|or|test|mov|add|adc|sub|shl|shr|sal|sar [reg + reg * #int + #int], #int0  ; capture #int0
-
-    imul reg, reg, #int  ; capture #int
-    # note that int is first
-    cmp|test #int0, reg   ; capture #int0
-
-    # imagine reg is zero'd out, then this is like `mov reg, #int`
-    # which is not uncommon.
-    lea reg, [reg + #int]  ; capture #int
-    """
-)
-
-
-def extract_insn_number_features(
-    fh: FunctionHandle, _bbh: BBHandle, ih: InsnHandle
-) -> Iterator[tuple[Feature, Address]]:
-    fhi: FunctionContext = fh.inner
-    ii: InstructionContext = ih.inner
-
-    be2: BinExport2 = fhi.ctx.be2
-
-    if IGNORE_NUMBER_PATTERNS.match_with_be2(be2, ii.instruction_index):
-        return
-
-    match = NUMBER_PATTERNS.match_with_be2(be2, ii.instruction_index)
-    if not match:
-        return
-
-    value: int = mask_immediate(fhi.arch, match.expression.immediate)
-    if is_address_mapped(be2, value):
-        return
-
-    yield Number(value), ih.address
-    yield OperandNumber(match.operand_index, value), ih.address
-
-    instruction_index: int = ii.instruction_index
-    instruction: BinExport2.Instruction = be2.instruction[instruction_index]
-
-    mnemonic: str = get_instruction_mnemonic(be2, instruction)
-    if mnemonic.startswith("add"):
-        if 0 < value < MAX_STRUCTURE_SIZE:
-            yield Offset(value), ih.address
-            yield OperandOffset(match.operand_index, value), ih.address
-
-
-OFFSET_PATTERNS = BinExport2InstructionPatternMatcher.from_str(
-    """
-    mov|movzx|movsb|cmp [reg            +  reg * #int + #int0], #int  ; capture #int0
-    mov|movzx|movsb|cmp [reg            * #int + #int0],        #int  ; capture #int0
-    mov|movzx|movsb|cmp [reg            +  reg + #int0],        #int  ; capture #int0
-    mov|movzx|movsb|cmp [reg(not-stack) + #int0],               #int  ; capture #int0
-    mov|movzx|movsb|cmp [reg            +  reg * #int + #int0], reg   ; capture #int0
-    mov|movzx|movsb|cmp [reg            * #int + #int0],        reg   ; capture #int0
-    mov|movzx|movsb|cmp [reg            +  reg + #int0],        reg   ; capture #int0
-    mov|movzx|movsb|cmp [reg(not-stack) + #int0],               reg   ; capture #int0
-    mov|movzx|movsb|cmp|lea reg, [reg            +  reg * #int + #int0]  ; capture #int0
-    mov|movzx|movsb|cmp|lea reg, [reg            * #int + #int0]         ; capture #int0
-    mov|movzx|movsb|cmp|lea reg, [reg            +  reg + #int0]         ; capture #int0
-    mov|movzx|movsb|cmp|lea reg, [reg(not-stack) + #int0]                ; capture #int0
-    """
-)
-
-# these are patterns that access offset 0 from some pointer
-# (pointer is not the stack pointer).
-OFFSET_ZERO_PATTERNS = BinExport2InstructionPatternMatcher.from_str(
-    """
-    mov|movzx|movsb [reg(not-stack)], reg
-    mov|movzx|movsb [reg(not-stack)], #int
-    lea             reg,              [reg(not-stack)]
-    """
-)
-
-
-def extract_insn_offset_features(
-    fh: FunctionHandle, bbh: BBHandle, ih: InsnHandle
-) -> Iterator[tuple[Feature, Address]]:
-    fhi: FunctionContext = fh.inner
-    ii: InstructionContext = ih.inner
-
-    be2: BinExport2 = fhi.ctx.be2
-
-    match = OFFSET_PATTERNS.match_with_be2(be2, ii.instruction_index)
-    if not match:
-        match = OFFSET_ZERO_PATTERNS.match_with_be2(be2, ii.instruction_index)
-        if not match:
-            return
-
-        yield Offset(0), ih.address
-        yield OperandOffset(match.operand_index, 0), ih.address
-
-    value = mask_immediate(fhi.arch, match.expression.immediate)
-    if is_address_mapped(be2, value):
-        return
-
-    value = capa.features.extractors.binexport2.helpers.twos_complement(fhi.arch, value, 32)
-    yield Offset(value), ih.address
-    yield OperandOffset(match.operand_index, value), ih.address
-
-
-def is_security_cookie(
-    fhi: FunctionContext,
-    bbi: BasicBlockContext,
-    instruction_address: int,
-    instruction: BinExport2.Instruction,
-) -> bool:
-    """
-    check if an instruction is related to security cookie checks.
-    """
-    be2: BinExport2 = fhi.ctx.be2
-    idx: BinExport2Index = fhi.ctx.idx
-
-    # security cookie check should use SP or BP
-    op1: BinExport2.Operand = be2.operand[instruction.operand_index[1]]
-    op1_exprs: list[BinExport2.Expression] = [be2.expression[expr_i] for expr_i in op1.expression_index]
-    if all(expr.symbol.lower() not in ("bp", "esp", "ebp", "rbp", "rsp") for expr in op1_exprs):
-        return False
-
-    # check_nzxor_security_cookie_delta
-    # if insn falls at the start of first entry block of the parent function.
-    flow_graph: BinExport2.FlowGraph = be2.flow_graph[fhi.flow_graph_index]
-    basic_block_index: int = bbi.basic_block_index
-    bb: BinExport2.BasicBlock = be2.basic_block[basic_block_index]
-    if flow_graph.entry_basic_block_index == basic_block_index:
-        first_addr: int = min((idx.insn_address_by_index[ir.begin_index] for ir in bb.instruction_index))
-        if instruction_address < first_addr + SECURITY_COOKIE_BYTES_DELTA:
-            return True
-    # or insn falls at the end before return in a terminal basic block.
-    if basic_block_index not in (e.source_basic_block_index for e in flow_graph.edge):
-        last_addr: int = max((idx.insn_address_by_index[ir.end_index - 1] for ir in bb.instruction_index))
-        if instruction_address > last_addr - SECURITY_COOKIE_BYTES_DELTA:
-            return True
-    return False
-
-
-NZXOR_PATTERNS = BinExport2InstructionPatternMatcher.from_str(
-    """
-    xor|xorpd|xorps|pxor reg, reg
-    xor|xorpd|xorps|pxor reg, #int
-    """
-)
-
-
-def extract_insn_nzxor_characteristic_features(
-    fh: FunctionHandle, bbh: BBHandle, ih: InsnHandle
-) -> Iterator[tuple[Feature, Address]]:
-    """
-    parse non-zeroing XOR instruction from the given instruction.
-    ignore expected non-zeroing XORs, e.g. security cookies.
-    """
-    fhi: FunctionContext = fh.inner
-    ii: InstructionContext = ih.inner
-
-    be2: BinExport2 = fhi.ctx.be2
-    idx: BinExport2Index = fhi.ctx.idx
-
-    if NZXOR_PATTERNS.match_with_be2(be2, ii.instruction_index) is None:
-        return
-
-    instruction: BinExport2.Instruction = be2.instruction[ii.instruction_index]
-    # guaranteed to be simple int/reg operands
-    # so we don't have to realize the tree/list.
-    operands: list[BinExport2.Operand] = [be2.operand[operand_index] for operand_index in instruction.operand_index]
-
-    if operands[0] == operands[1]:
-        return
-
-    instruction_address: int = idx.insn_address_by_index[ii.instruction_index]
-    if is_security_cookie(fhi, bbh.inner, instruction_address, instruction):
-        return
-
-    yield Characteristic("nzxor"), ih.address
-
-
-INDIRECT_CALL_PATTERNS = BinExport2InstructionPatternMatcher.from_str(
-    """
-    call|jmp reg0
-    call|jmp [reg + reg * #int + #int]
-    call|jmp [reg + reg * #int]
-    call|jmp [reg * #int + #int]
-    call|jmp [reg + reg + #int]
-    call|jmp [reg + #int]
-    call|jmp [reg]
-    """
-)
-
-
-def extract_function_indirect_call_characteristic_features(
-    fh: FunctionHandle, bbh: BBHandle, ih: InsnHandle
-) -> Iterator[tuple[Feature, Address]]:
-    fhi: FunctionContext = fh.inner
-    ii: InstructionContext = ih.inner
-    be2: BinExport2 = fhi.ctx.be2
-
-    match = INDIRECT_CALL_PATTERNS.match_with_be2(be2, ii.instruction_index)
-    if match is None:
-        return
-
-    yield Characteristic("indirect call"), ih.address
--- a/capa/features/extractors/binexport2/basicblock.py
+++ b/capa/features/extractors/binexport2/basicblock.py
@@ -1,40 +0,0 @@
-# Copyright (C) 2023 Mandiant, Inc. All Rights Reserved.
-# Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at: [package root]/LICENSE.txt
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-#  is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and limitations under the License.
-
-from typing import Iterator
-
-from capa.features.common import Feature, Characteristic
-from capa.features.address import Address, AbsoluteVirtualAddress
-from capa.features.basicblock import BasicBlock
-from capa.features.extractors.binexport2 import FunctionContext, BasicBlockContext
-from capa.features.extractors.base_extractor import BBHandle, FunctionHandle
-from capa.features.extractors.binexport2.binexport2_pb2 import BinExport2
-
-
-def extract_bb_tight_loop(fh: FunctionHandle, bbh: BBHandle) -> Iterator[tuple[Feature, Address]]:
-    fhi: FunctionContext = fh.inner
-    bbi: BasicBlockContext = bbh.inner
-
-    idx = fhi.ctx.idx
-
-    basic_block_index: int = bbi.basic_block_index
-    target_edges: list[BinExport2.FlowGraph.Edge] = idx.target_edges_by_basic_block_index[basic_block_index]
-    if basic_block_index in (e.source_basic_block_index for e in target_edges):
-        basic_block_address: int = idx.get_basic_block_address(basic_block_index)
-        yield Characteristic("tight loop"), AbsoluteVirtualAddress(basic_block_address)
-
-
-def extract_features(fh: FunctionHandle, bbh: BBHandle) -> Iterator[tuple[Feature, Address]]:
-    """extract basic block features"""
-    for bb_handler in BASIC_BLOCK_HANDLERS:
-        for feature, addr in bb_handler(fh, bbh):
-            yield feature, addr
-    yield BasicBlock(), bbh.address
-
-
-BASIC_BLOCK_HANDLERS = (extract_bb_tight_loop,)
--- a/capa/features/extractors/binexport2/binexport2_pb2.py
+++ b/capa/features/extractors/binexport2/binexport2_pb2.py
--- a/capa/features/extractors/binexport2/binexport2_pb2.pyi
+++ b/capa/features/extractors/binexport2/binexport2_pb2.pyi
@@ -1,784 +0,0 @@
-"""
-@generated by mypy-protobuf.  Do not edit manually!
-isort:skip_file
-The representation is generic to accommodate various source architectures.
-In particular 32 and 64 bit versions of x86, ARM, PowerPC and MIPS have been
-tested.
-
-Multiple levels of deduping have been applied to make the format more compact
-and avoid redundant data duplication. Some of this due to hard-earned
-experience trying to cope with intentionally obfuscated malicious binaries.
-Note in particular that the same instruction may occur in multiple basic
-blocks and the same basic block in multiple functions (instruction and basic
-block sharing). Implemented naively, malware can use this to cause
-combinatorial explosion in memory usage, DOSing the analyst. This format
-should store every unique expression, mnemonic, operand, instruction and
-basic block only once instead of duplicating the information for every
-instance of it.
-
-This format does _not_ try to be 100% backwards compatible with the old
-version. In particular, we do not store IDA's comment types, making lossless
-porting of IDA comments impossible. We do however, store comments and
-expression substitutions, so porting the actual data is possible, just not
-the exact IDA type.
-
-While it would be more natural to use addresses when defining call graph and
-flow graph edges and other such references, it is more efficient to employ
-one more level of indirection and use indices into the basic block or
-function arrays instead. This is because addresses will usually use most of
-the available 64 bit space while indices will be much smaller and compress
-much better (less randomly distributed).
-
-We omit all fields that are set to their default value anyways. Note that
-this has two side effects:
-  - changing the defaults in this proto file will, in effect, change what's
-    read from disk
-  - the generated code has_* methods are somewhat less useful
-WARNING: We omit the defaults manually in the code writing the data. Do not
-         change the defaults here without changing the code!
-
-TODO(cblichmann): Link flow graphs to call graph nodes. The connection is
-                  there via the address, but tricky to extract.
-"""
-import builtins
-import collections.abc
-import google.protobuf.descriptor
-import google.protobuf.internal.containers
-import google.protobuf.internal.enum_type_wrapper
-import google.protobuf.message
-import sys
-import typing
-
-if sys.version_info >= (3, 10):
-    import typing as typing_extensions
-else:
-    import typing_extensions
-
-DESCRIPTOR: google.protobuf.descriptor.FileDescriptor
-
-@typing_extensions.final
-class BinExport2(google.protobuf.message.Message):
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    @typing_extensions.final
-    class Meta(google.protobuf.message.Message):
-        DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-        EXECUTABLE_NAME_FIELD_NUMBER: builtins.int
-        EXECUTABLE_ID_FIELD_NUMBER: builtins.int
-        ARCHITECTURE_NAME_FIELD_NUMBER: builtins.int
-        TIMESTAMP_FIELD_NUMBER: builtins.int
-        executable_name: builtins.str
-        """Input binary filename including file extension but excluding file path.
-        example: "insider_gcc.exe"
-        """
-        executable_id: builtins.str
-        """Application defined executable id. Often the SHA256 hash of the input
-        binary.
-        """
-        architecture_name: builtins.str
-        """Input architecture name, e.g. x86-32."""
-        timestamp: builtins.int
-        """When did this file get created? Unix time. This may be used for some
-        primitive versioning in case the file format ever changes.
-        """
-        def __init__(
-            self,
-            *,
-            executable_name: builtins.str | None = ...,
-            executable_id: builtins.str | None = ...,
-            architecture_name: builtins.str | None = ...,
-            timestamp: builtins.int | None = ...,
-        ) -> None: ...
-        def HasField(self, field_name: typing_extensions.Literal["architecture_name", b"architecture_name", "executable_id", b"executable_id", "executable_name", b"executable_name", "timestamp", b"timestamp"]) -> builtins.bool: ...
-        def ClearField(self, field_name: typing_extensions.Literal["architecture_name", b"architecture_name", "executable_id", b"executable_id", "executable_name", b"executable_name", "timestamp", b"timestamp"]) -> None: ...
-
-    @typing_extensions.final
-    class CallGraph(google.protobuf.message.Message):
-        DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-        @typing_extensions.final
-        class Vertex(google.protobuf.message.Message):
-            DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-            class _Type:
-                ValueType = typing.NewType("ValueType", builtins.int)
-                V: typing_extensions.TypeAlias = ValueType
-
-            class _TypeEnumTypeWrapper(google.protobuf.internal.enum_type_wrapper._EnumTypeWrapper[BinExport2.CallGraph.Vertex._Type.ValueType], builtins.type):
-                DESCRIPTOR: google.protobuf.descriptor.EnumDescriptor
-                NORMAL: BinExport2.CallGraph.Vertex._Type.ValueType  # 0
-                """Regular function with full disassembly."""
-                LIBRARY: BinExport2.CallGraph.Vertex._Type.ValueType  # 1
-                """This function is a well known library function."""
-                IMPORTED: BinExport2.CallGraph.Vertex._Type.ValueType  # 2
-                """Imported from a dynamic link library (e.g. dll)."""
-                THUNK: BinExport2.CallGraph.Vertex._Type.ValueType  # 3
-                """A thunk function, forwarding its work via an unconditional jump."""
-                INVALID: BinExport2.CallGraph.Vertex._Type.ValueType  # 4
-                """An invalid function (a function that contained invalid code or was
-                considered invalid by some heuristics).
-                """
-
-            class Type(_Type, metaclass=_TypeEnumTypeWrapper): ...
-            NORMAL: BinExport2.CallGraph.Vertex.Type.ValueType  # 0
-            """Regular function with full disassembly."""
-            LIBRARY: BinExport2.CallGraph.Vertex.Type.ValueType  # 1
-            """This function is a well known library function."""
-            IMPORTED: BinExport2.CallGraph.Vertex.Type.ValueType  # 2
-            """Imported from a dynamic link library (e.g. dll)."""
-            THUNK: BinExport2.CallGraph.Vertex.Type.ValueType  # 3
-            """A thunk function, forwarding its work via an unconditional jump."""
-            INVALID: BinExport2.CallGraph.Vertex.Type.ValueType  # 4
-            """An invalid function (a function that contained invalid code or was
-            considered invalid by some heuristics).
-            """
-
-            ADDRESS_FIELD_NUMBER: builtins.int
-            TYPE_FIELD_NUMBER: builtins.int
-            MANGLED_NAME_FIELD_NUMBER: builtins.int
-            DEMANGLED_NAME_FIELD_NUMBER: builtins.int
-            LIBRARY_INDEX_FIELD_NUMBER: builtins.int
-            MODULE_INDEX_FIELD_NUMBER: builtins.int
-            address: builtins.int
-            """The function's entry point address. Messages need to be sorted, see
-            comment below on `vertex`.
-            """
-            type: global___BinExport2.CallGraph.Vertex.Type.ValueType
-            mangled_name: builtins.str
-            """If the function has a user defined, real name it will be given here.
-            main() is a proper name, sub_BAADF00D is not (auto generated dummy
-            name).
-            """
-            demangled_name: builtins.str
-            """Demangled name if the function is a mangled C++ function and we could
-            demangle it.
-            """
-            library_index: builtins.int
-            """If this is a library function, what is its index in library arrays."""
-            module_index: builtins.int
-            """If module name, such as class name for DEX files, is present - index in
-            module table.
-            """
-            def __init__(
-                self,
-                *,
-                address: builtins.int | None = ...,
-                type: global___BinExport2.CallGraph.Vertex.Type.ValueType | None = ...,
-                mangled_name: builtins.str | None = ...,
-                demangled_name: builtins.str | None = ...,
-                library_index: builtins.int | None = ...,
-                module_index: builtins.int | None = ...,
-            ) -> None: ...
-            def HasField(self, field_name: typing_extensions.Literal["address", b"address", "demangled_name", b"demangled_name", "library_index", b"library_index", "mangled_name", b"mangled_name", "module_index", b"module_index", "type", b"type"]) -> builtins.bool: ...
-            def ClearField(self, field_name: typing_extensions.Literal["address", b"address", "demangled_name", b"demangled_name", "library_index", b"library_index", "mangled_name", b"mangled_name", "module_index", b"module_index", "type", b"type"]) -> None: ...
-
-        @typing_extensions.final
-        class Edge(google.protobuf.message.Message):
-            DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-            SOURCE_VERTEX_INDEX_FIELD_NUMBER: builtins.int
-            TARGET_VERTEX_INDEX_FIELD_NUMBER: builtins.int
-            source_vertex_index: builtins.int
-            """source and target index into the vertex repeated field."""
-            target_vertex_index: builtins.int
-            def __init__(
-                self,
-                *,
-                source_vertex_index: builtins.int | None = ...,
-                target_vertex_index: builtins.int | None = ...,
-            ) -> None: ...
-            def HasField(self, field_name: typing_extensions.Literal["source_vertex_index", b"source_vertex_index", "target_vertex_index", b"target_vertex_index"]) -> builtins.bool: ...
-            def ClearField(self, field_name: typing_extensions.Literal["source_vertex_index", b"source_vertex_index", "target_vertex_index", b"target_vertex_index"]) -> None: ...
-
-        VERTEX_FIELD_NUMBER: builtins.int
-        EDGE_FIELD_NUMBER: builtins.int
-        @property
-        def vertex(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[global___BinExport2.CallGraph.Vertex]:
-            """vertices == functions in the call graph.
-            Important: Most downstream tooling (notably BinDiff), need these to be
-                       sorted by `Vertex::address` (ascending). For C++, the
-                       `BinExport2Writer` class enforces this invariant.
-            """
-        @property
-        def edge(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[global___BinExport2.CallGraph.Edge]:
-            """edges == calls in the call graph."""
-        def __init__(
-            self,
-            *,
-            vertex: collections.abc.Iterable[global___BinExport2.CallGraph.Vertex] | None = ...,
-            edge: collections.abc.Iterable[global___BinExport2.CallGraph.Edge] | None = ...,
-        ) -> None: ...
-        def ClearField(self, field_name: typing_extensions.Literal["edge", b"edge", "vertex", b"vertex"]) -> None: ...
-
-    @typing_extensions.final
-    class Expression(google.protobuf.message.Message):
-        """An operand consists of 1 or more expressions, linked together as a tree."""
-
-        DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-        class _Type:
-            ValueType = typing.NewType("ValueType", builtins.int)
-            V: typing_extensions.TypeAlias = ValueType
-
-        class _TypeEnumTypeWrapper(google.protobuf.internal.enum_type_wrapper._EnumTypeWrapper[BinExport2.Expression._Type.ValueType], builtins.type):
-            DESCRIPTOR: google.protobuf.descriptor.EnumDescriptor
-            SYMBOL: BinExport2.Expression._Type.ValueType  # 1
-            IMMEDIATE_INT: BinExport2.Expression._Type.ValueType  # 2
-            IMMEDIATE_FLOAT: BinExport2.Expression._Type.ValueType  # 3
-            OPERATOR: BinExport2.Expression._Type.ValueType  # 4
-            REGISTER: BinExport2.Expression._Type.ValueType  # 5
-            SIZE_PREFIX: BinExport2.Expression._Type.ValueType  # 6
-            DEREFERENCE: BinExport2.Expression._Type.ValueType  # 7
-
-        class Type(_Type, metaclass=_TypeEnumTypeWrapper): ...
-        SYMBOL: BinExport2.Expression.Type.ValueType  # 1
-        IMMEDIATE_INT: BinExport2.Expression.Type.ValueType  # 2
-        IMMEDIATE_FLOAT: BinExport2.Expression.Type.ValueType  # 3
-        OPERATOR: BinExport2.Expression.Type.ValueType  # 4
-        REGISTER: BinExport2.Expression.Type.ValueType  # 5
-        SIZE_PREFIX: BinExport2.Expression.Type.ValueType  # 6
-        DEREFERENCE: BinExport2.Expression.Type.ValueType  # 7
-
-        TYPE_FIELD_NUMBER: builtins.int
-        SYMBOL_FIELD_NUMBER: builtins.int
-        IMMEDIATE_FIELD_NUMBER: builtins.int
-        PARENT_INDEX_FIELD_NUMBER: builtins.int
-        IS_RELOCATION_FIELD_NUMBER: builtins.int
-        type: global___BinExport2.Expression.Type.ValueType
-        """IMMEDIATE_INT is by far the most common type and thus we can save some
-        space by omitting it as the default.
-        """
-        symbol: builtins.str
-        """Symbol for this expression. Interpretation depends on type. Examples
-        include: "eax", "[", "+"
-        """
-        immediate: builtins.int
-        """If the expression can be interpreted as an integer value (IMMEDIATE_INT)
-        the value is given here.
-        """
-        parent_index: builtins.int
-        """The parent expression. Example expression tree for the second operand of:
-        mov eax, b4 [ebx + 12]
-        "b4" --- "[" --- "+" --- "ebx"
-                              \\  "12"
-        """
-        is_relocation: builtins.bool
-        """true if the expression has entry in relocation table"""
-        def __init__(
-            self,
-            *,
-            type: global___BinExport2.Expression.Type.ValueType | None = ...,
-            symbol: builtins.str | None = ...,
-            immediate: builtins.int | None = ...,
-            parent_index: builtins.int | None = ...,
-            is_relocation: builtins.bool | None = ...,
-        ) -> None: ...
-        def HasField(self, field_name: typing_extensions.Literal["immediate", b"immediate", "is_relocation", b"is_relocation", "parent_index", b"parent_index", "symbol", b"symbol", "type", b"type"]) -> builtins.bool: ...
-        def ClearField(self, field_name: typing_extensions.Literal["immediate", b"immediate", "is_relocation", b"is_relocation", "parent_index", b"parent_index", "symbol", b"symbol", "type", b"type"]) -> None: ...
-
-    @typing_extensions.final
-    class Operand(google.protobuf.message.Message):
-        """An instruction may have 0 or more operands."""
-
-        DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-        EXPRESSION_INDEX_FIELD_NUMBER: builtins.int
-        @property
-        def expression_index(self) -> google.protobuf.internal.containers.RepeatedScalarFieldContainer[builtins.int]:
-            """Contains all expressions constituting this operand. All expressions
-            should be linked into a single tree, i.e. there should only be one
-            expression in this list with parent_index == NULL and all others should
-            descend from that. Rendering order for expressions on the same tree level
-            (siblings) is implicitly given by the order they are referenced in this
-            repeated field.
-            Implicit: expression sequence
-            """
-        def __init__(
-            self,
-            *,
-            expression_index: collections.abc.Iterable[builtins.int] | None = ...,
-        ) -> None: ...
-        def ClearField(self, field_name: typing_extensions.Literal["expression_index", b"expression_index"]) -> None: ...
-
-    @typing_extensions.final
-    class Mnemonic(google.protobuf.message.Message):
-        """An instruction has exactly 1 mnemonic."""
-
-        DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-        NAME_FIELD_NUMBER: builtins.int
-        name: builtins.str
-        """Literal representation of the mnemonic, e.g.: "mov"."""
-        def __init__(
-            self,
-            *,
-            name: builtins.str | None = ...,
-        ) -> None: ...
-        def HasField(self, field_name: typing_extensions.Literal["name", b"name"]) -> builtins.bool: ...
-        def ClearField(self, field_name: typing_extensions.Literal["name", b"name"]) -> None: ...
-
-    @typing_extensions.final
-    class Instruction(google.protobuf.message.Message):
-        DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-        ADDRESS_FIELD_NUMBER: builtins.int
-        CALL_TARGET_FIELD_NUMBER: builtins.int
-        MNEMONIC_INDEX_FIELD_NUMBER: builtins.int
-        OPERAND_INDEX_FIELD_NUMBER: builtins.int
-        RAW_BYTES_FIELD_NUMBER: builtins.int
-        COMMENT_INDEX_FIELD_NUMBER: builtins.int
-        address: builtins.int
-        """This will only be filled for instructions that do not just flow from the
-        immediately preceding instruction. Regular instructions will have to
-        calculate their own address by adding raw_bytes.size() to the previous
-        instruction's address.
-        """
-        @property
-        def call_target(self) -> google.protobuf.internal.containers.RepeatedScalarFieldContainer[builtins.int]:
-            """If this is a call instruction and call targets could be determined
-            they'll be given here. Note that we may or may not have a flow graph for
-            the target and thus cannot use an index into the flow graph table here.
-            We could potentially use call graph nodes, but linking instructions to
-            the call graph directly does not seem a good choice.
-            """
-        mnemonic_index: builtins.int
-        """Index into the mnemonic array of strings. Used for de-duping the data.
-        The default value is used for the most common mnemonic in the executable.
-        """
-        @property
-        def operand_index(self) -> google.protobuf.internal.containers.RepeatedScalarFieldContainer[builtins.int]:
-            """Indices into the operand tree. On X86 this can be 0, 1 or 2 elements
-            long, 3 elements with VEX/EVEX.
-            Implicit: operand sequence
-            """
-        raw_bytes: builtins.bytes
-        """The unmodified input bytes corresponding to this instruction."""
-        @property
-        def comment_index(self) -> google.protobuf.internal.containers.RepeatedScalarFieldContainer[builtins.int]:
-            """Implicit: comment sequence"""
-        def __init__(
-            self,
-            *,
-            address: builtins.int | None = ...,
-            call_target: collections.abc.Iterable[builtins.int] | None = ...,
-            mnemonic_index: builtins.int | None = ...,
-            operand_index: collections.abc.Iterable[builtins.int] | None = ...,
-            raw_bytes: builtins.bytes | None = ...,
-            comment_index: collections.abc.Iterable[builtins.int] | None = ...,
-        ) -> None: ...
-        def HasField(self, field_name: typing_extensions.Literal["address", b"address", "mnemonic_index", b"mnemonic_index", "raw_bytes", b"raw_bytes"]) -> builtins.bool: ...
-        def ClearField(self, field_name: typing_extensions.Literal["address", b"address", "call_target", b"call_target", "comment_index", b"comment_index", "mnemonic_index", b"mnemonic_index", "operand_index", b"operand_index", "raw_bytes", b"raw_bytes"]) -> None: ...
-
-    @typing_extensions.final
-    class BasicBlock(google.protobuf.message.Message):
-        DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-        @typing_extensions.final
-        class IndexRange(google.protobuf.message.Message):
-            """This is a space optimization. The instructions for an individual basic
-            block will usually be in a continuous index range. Thus it is more
-            efficient to store the range instead of individual indices. However, this
-            does not hold true for all basic blocks, so we need to be able to store
-            multiple index ranges per block.
-            """
-
-            DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-            BEGIN_INDEX_FIELD_NUMBER: builtins.int
-            END_INDEX_FIELD_NUMBER: builtins.int
-            begin_index: builtins.int
-            """These work like begin and end iterators, i.e. the sequence is
-            [begin_index, end_index). If the sequence only contains a single
-            element end_index will be omitted.
-            """
-            end_index: builtins.int
-            def __init__(
-                self,
-                *,
-                begin_index: builtins.int | None = ...,
-                end_index: builtins.int | None = ...,
-            ) -> None: ...
-            def HasField(self, field_name: typing_extensions.Literal["begin_index", b"begin_index", "end_index", b"end_index"]) -> builtins.bool: ...
-            def ClearField(self, field_name: typing_extensions.Literal["begin_index", b"begin_index", "end_index", b"end_index"]) -> None: ...
-
-        INSTRUCTION_INDEX_FIELD_NUMBER: builtins.int
-        @property
-        def instruction_index(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[global___BinExport2.BasicBlock.IndexRange]:
-            """Implicit: instruction sequence"""
-        def __init__(
-            self,
-            *,
-            instruction_index: collections.abc.Iterable[global___BinExport2.BasicBlock.IndexRange] | None = ...,
-        ) -> None: ...
-        def ClearField(self, field_name: typing_extensions.Literal["instruction_index", b"instruction_index"]) -> None: ...
-
-    @typing_extensions.final
-    class FlowGraph(google.protobuf.message.Message):
-        DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-        @typing_extensions.final
-        class Edge(google.protobuf.message.Message):
-            DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-            class _Type:
-                ValueType = typing.NewType("ValueType", builtins.int)
-                V: typing_extensions.TypeAlias = ValueType
-
-            class _TypeEnumTypeWrapper(google.protobuf.internal.enum_type_wrapper._EnumTypeWrapper[BinExport2.FlowGraph.Edge._Type.ValueType], builtins.type):
-                DESCRIPTOR: google.protobuf.descriptor.EnumDescriptor
-                CONDITION_TRUE: BinExport2.FlowGraph.Edge._Type.ValueType  # 1
-                CONDITION_FALSE: BinExport2.FlowGraph.Edge._Type.ValueType  # 2
-                UNCONDITIONAL: BinExport2.FlowGraph.Edge._Type.ValueType  # 3
-                SWITCH: BinExport2.FlowGraph.Edge._Type.ValueType  # 4
-
-            class Type(_Type, metaclass=_TypeEnumTypeWrapper): ...
-            CONDITION_TRUE: BinExport2.FlowGraph.Edge.Type.ValueType  # 1
-            CONDITION_FALSE: BinExport2.FlowGraph.Edge.Type.ValueType  # 2
-            UNCONDITIONAL: BinExport2.FlowGraph.Edge.Type.ValueType  # 3
-            SWITCH: BinExport2.FlowGraph.Edge.Type.ValueType  # 4
-
-            SOURCE_BASIC_BLOCK_INDEX_FIELD_NUMBER: builtins.int
-            TARGET_BASIC_BLOCK_INDEX_FIELD_NUMBER: builtins.int
-            TYPE_FIELD_NUMBER: builtins.int
-            IS_BACK_EDGE_FIELD_NUMBER: builtins.int
-            source_basic_block_index: builtins.int
-            """Source instruction will always be the last instruction of the source
-            basic block, target instruction the first instruction of the target
-            basic block.
-            """
-            target_basic_block_index: builtins.int
-            type: global___BinExport2.FlowGraph.Edge.Type.ValueType
-            is_back_edge: builtins.bool
-            """Indicates whether this is a loop edge as determined by Lengauer-Tarjan."""
-            def __init__(
-                self,
-                *,
-                source_basic_block_index: builtins.int | None = ...,
-                target_basic_block_index: builtins.int | None = ...,
-                type: global___BinExport2.FlowGraph.Edge.Type.ValueType | None = ...,
-                is_back_edge: builtins.bool | None = ...,
-            ) -> None: ...
-            def HasField(self, field_name: typing_extensions.Literal["is_back_edge", b"is_back_edge", "source_basic_block_index", b"source_basic_block_index", "target_basic_block_index", b"target_basic_block_index", "type", b"type"]) -> builtins.bool: ...
-            def ClearField(self, field_name: typing_extensions.Literal["is_back_edge", b"is_back_edge", "source_basic_block_index", b"source_basic_block_index", "target_basic_block_index", b"target_basic_block_index", "type", b"type"]) -> None: ...
-
-        BASIC_BLOCK_INDEX_FIELD_NUMBER: builtins.int
-        ENTRY_BASIC_BLOCK_INDEX_FIELD_NUMBER: builtins.int
-        EDGE_FIELD_NUMBER: builtins.int
-        @property
-        def basic_block_index(self) -> google.protobuf.internal.containers.RepeatedScalarFieldContainer[builtins.int]:
-            """Basic blocks are sorted by address."""
-        entry_basic_block_index: builtins.int
-        """The flow graph's entry point address is the first instruction of the
-        entry_basic_block.
-        """
-        @property
-        def edge(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[global___BinExport2.FlowGraph.Edge]: ...
-        def __init__(
-            self,
-            *,
-            basic_block_index: collections.abc.Iterable[builtins.int] | None = ...,
-            entry_basic_block_index: builtins.int | None = ...,
-            edge: collections.abc.Iterable[global___BinExport2.FlowGraph.Edge] | None = ...,
-        ) -> None: ...
-        def HasField(self, field_name: typing_extensions.Literal["entry_basic_block_index", b"entry_basic_block_index"]) -> builtins.bool: ...
-        def ClearField(self, field_name: typing_extensions.Literal["basic_block_index", b"basic_block_index", "edge", b"edge", "entry_basic_block_index", b"entry_basic_block_index"]) -> None: ...
-
-    @typing_extensions.final
-    class Reference(google.protobuf.message.Message):
-        """Generic reference class used for address comments (deprecated), string
-        references and expression substitutions. It allows referencing from an
-        instruction, operand, expression subtree tuple to a de-duped string in the
-        string table.
-        """
-
-        DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-        INSTRUCTION_INDEX_FIELD_NUMBER: builtins.int
-        INSTRUCTION_OPERAND_INDEX_FIELD_NUMBER: builtins.int
-        OPERAND_EXPRESSION_INDEX_FIELD_NUMBER: builtins.int
-        STRING_TABLE_INDEX_FIELD_NUMBER: builtins.int
-        instruction_index: builtins.int
-        """Index into the global instruction table."""
-        instruction_operand_index: builtins.int
-        """Index into the operand array local to an instruction."""
-        operand_expression_index: builtins.int
-        """Index into the expression array local to an operand."""
-        string_table_index: builtins.int
-        """Index into the global string table."""
-        def __init__(
-            self,
-            *,
-            instruction_index: builtins.int | None = ...,
-            instruction_operand_index: builtins.int | None = ...,
-            operand_expression_index: builtins.int | None = ...,
-            string_table_index: builtins.int | None = ...,
-        ) -> None: ...
-        def HasField(self, field_name: typing_extensions.Literal["instruction_index", b"instruction_index", "instruction_operand_index", b"instruction_operand_index", "operand_expression_index", b"operand_expression_index", "string_table_index", b"string_table_index"]) -> builtins.bool: ...
-        def ClearField(self, field_name: typing_extensions.Literal["instruction_index", b"instruction_index", "instruction_operand_index", b"instruction_operand_index", "operand_expression_index", b"operand_expression_index", "string_table_index", b"string_table_index"]) -> None: ...
-
-    @typing_extensions.final
-    class DataReference(google.protobuf.message.Message):
-        DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-        INSTRUCTION_INDEX_FIELD_NUMBER: builtins.int
-        ADDRESS_FIELD_NUMBER: builtins.int
-        instruction_index: builtins.int
-        """Index into the global instruction table."""
-        address: builtins.int
-        """Address being referred."""
-        def __init__(
-            self,
-            *,
-            instruction_index: builtins.int | None = ...,
-            address: builtins.int | None = ...,
-        ) -> None: ...
-        def HasField(self, field_name: typing_extensions.Literal["address", b"address", "instruction_index", b"instruction_index"]) -> builtins.bool: ...
-        def ClearField(self, field_name: typing_extensions.Literal["address", b"address", "instruction_index", b"instruction_index"]) -> None: ...
-
-    @typing_extensions.final
-    class Comment(google.protobuf.message.Message):
-        DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-        class _Type:
-            ValueType = typing.NewType("ValueType", builtins.int)
-            V: typing_extensions.TypeAlias = ValueType
-
-        class _TypeEnumTypeWrapper(google.protobuf.internal.enum_type_wrapper._EnumTypeWrapper[BinExport2.Comment._Type.ValueType], builtins.type):
-            DESCRIPTOR: google.protobuf.descriptor.EnumDescriptor
-            DEFAULT: BinExport2.Comment._Type.ValueType  # 0
-            """A regular instruction comment. Typically displayed next to the
-            instruction disassembly.
-            """
-            ANTERIOR: BinExport2.Comment._Type.ValueType  # 1
-            """A comment line that is typically displayed before (above) the
-            instruction it refers to.
-            """
-            POSTERIOR: BinExport2.Comment._Type.ValueType  # 2
-            """Like ANTERIOR, but a typically displayed after (below)."""
-            FUNCTION: BinExport2.Comment._Type.ValueType  # 3
-            """Similar to an ANTERIOR comment, but applies to the beginning of an
-            identified function. Programs displaying the proto may choose to render
-            these differently (e.g. above an inferred function signature).
-            """
-            ENUM: BinExport2.Comment._Type.ValueType  # 4
-            """Named constants, bitfields and similar."""
-            LOCATION: BinExport2.Comment._Type.ValueType  # 5
-            """Named locations, usually the target of a jump."""
-            GLOBAL_REFERENCE: BinExport2.Comment._Type.ValueType  # 6
-            """Data cross references."""
-            LOCAL_REFERENCE: BinExport2.Comment._Type.ValueType  # 7
-            """Local/stack variables."""
-
-        class Type(_Type, metaclass=_TypeEnumTypeWrapper): ...
-        DEFAULT: BinExport2.Comment.Type.ValueType  # 0
-        """A regular instruction comment. Typically displayed next to the
-        instruction disassembly.
-        """
-        ANTERIOR: BinExport2.Comment.Type.ValueType  # 1
-        """A comment line that is typically displayed before (above) the
-        instruction it refers to.
-        """
-        POSTERIOR: BinExport2.Comment.Type.ValueType  # 2
-        """Like ANTERIOR, but a typically displayed after (below)."""
-        FUNCTION: BinExport2.Comment.Type.ValueType  # 3
-        """Similar to an ANTERIOR comment, but applies to the beginning of an
-        identified function. Programs displaying the proto may choose to render
-        these differently (e.g. above an inferred function signature).
-        """
-        ENUM: BinExport2.Comment.Type.ValueType  # 4
-        """Named constants, bitfields and similar."""
-        LOCATION: BinExport2.Comment.Type.ValueType  # 5
-        """Named locations, usually the target of a jump."""
-        GLOBAL_REFERENCE: BinExport2.Comment.Type.ValueType  # 6
-        """Data cross references."""
-        LOCAL_REFERENCE: BinExport2.Comment.Type.ValueType  # 7
-        """Local/stack variables."""
-
-        INSTRUCTION_INDEX_FIELD_NUMBER: builtins.int
-        INSTRUCTION_OPERAND_INDEX_FIELD_NUMBER: builtins.int
-        OPERAND_EXPRESSION_INDEX_FIELD_NUMBER: builtins.int
-        STRING_TABLE_INDEX_FIELD_NUMBER: builtins.int
-        REPEATABLE_FIELD_NUMBER: builtins.int
-        TYPE_FIELD_NUMBER: builtins.int
-        instruction_index: builtins.int
-        """Index into the global instruction table. This is here to enable
-        comment processing without having to iterate over all instructions.
-        There is an N:M mapping of instructions to comments.
-        """
-        instruction_operand_index: builtins.int
-        """Index into the operand array local to an instruction."""
-        operand_expression_index: builtins.int
-        """Index into the expression array local to an operand, like in Reference.
-        This is not currently used, but allows to implement expression
-        substitutions.
-        """
-        string_table_index: builtins.int
-        """Index into the global string table."""
-        repeatable: builtins.bool
-        """Comment is propagated to all locations that reference the original
-        location.
-        """
-        type: global___BinExport2.Comment.Type.ValueType
-        def __init__(
-            self,
-            *,
-            instruction_index: builtins.int | None = ...,
-            instruction_operand_index: builtins.int | None = ...,
-            operand_expression_index: builtins.int | None = ...,
-            string_table_index: builtins.int | None = ...,
-            repeatable: builtins.bool | None = ...,
-            type: global___BinExport2.Comment.Type.ValueType | None = ...,
-        ) -> None: ...
-        def HasField(self, field_name: typing_extensions.Literal["instruction_index", b"instruction_index", "instruction_operand_index", b"instruction_operand_index", "operand_expression_index", b"operand_expression_index", "repeatable", b"repeatable", "string_table_index", b"string_table_index", "type", b"type"]) -> builtins.bool: ...
-        def ClearField(self, field_name: typing_extensions.Literal["instruction_index", b"instruction_index", "instruction_operand_index", b"instruction_operand_index", "operand_expression_index", b"operand_expression_index", "repeatable", b"repeatable", "string_table_index", b"string_table_index", "type", b"type"]) -> None: ...
-
-    @typing_extensions.final
-    class Section(google.protobuf.message.Message):
-        DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-        ADDRESS_FIELD_NUMBER: builtins.int
-        SIZE_FIELD_NUMBER: builtins.int
-        FLAG_R_FIELD_NUMBER: builtins.int
-        FLAG_W_FIELD_NUMBER: builtins.int
-        FLAG_X_FIELD_NUMBER: builtins.int
-        address: builtins.int
-        """Section start address."""
-        size: builtins.int
-        """Section size."""
-        flag_r: builtins.bool
-        """Read flag of the section, True when section is readable."""
-        flag_w: builtins.bool
-        """Write flag of the section, True when section is writable."""
-        flag_x: builtins.bool
-        """Execute flag of the section, True when section is executable."""
-        def __init__(
-            self,
-            *,
-            address: builtins.int | None = ...,
-            size: builtins.int | None = ...,
-            flag_r: builtins.bool | None = ...,
-            flag_w: builtins.bool | None = ...,
-            flag_x: builtins.bool | None = ...,
-        ) -> None: ...
-        def HasField(self, field_name: typing_extensions.Literal["address", b"address", "flag_r", b"flag_r", "flag_w", b"flag_w", "flag_x", b"flag_x", "size", b"size"]) -> builtins.bool: ...
-        def ClearField(self, field_name: typing_extensions.Literal["address", b"address", "flag_r", b"flag_r", "flag_w", b"flag_w", "flag_x", b"flag_x", "size", b"size"]) -> None: ...
-
-    @typing_extensions.final
-    class Library(google.protobuf.message.Message):
-        DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-        IS_STATIC_FIELD_NUMBER: builtins.int
-        LOAD_ADDRESS_FIELD_NUMBER: builtins.int
-        NAME_FIELD_NUMBER: builtins.int
-        is_static: builtins.bool
-        """If this library is statically linked."""
-        load_address: builtins.int
-        """Address where this library was loaded, 0 if unknown."""
-        name: builtins.str
-        """Name of the library (format is platform-dependent)."""
-        def __init__(
-            self,
-            *,
-            is_static: builtins.bool | None = ...,
-            load_address: builtins.int | None = ...,
-            name: builtins.str | None = ...,
-        ) -> None: ...
-        def HasField(self, field_name: typing_extensions.Literal["is_static", b"is_static", "load_address", b"load_address", "name", b"name"]) -> builtins.bool: ...
-        def ClearField(self, field_name: typing_extensions.Literal["is_static", b"is_static", "load_address", b"load_address", "name", b"name"]) -> None: ...
-
-    @typing_extensions.final
-    class Module(google.protobuf.message.Message):
-        DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-        NAME_FIELD_NUMBER: builtins.int
-        name: builtins.str
-        """Name, such as Java class name. Platform-dependent."""
-        def __init__(
-            self,
-            *,
-            name: builtins.str | None = ...,
-        ) -> None: ...
-        def HasField(self, field_name: typing_extensions.Literal["name", b"name"]) -> builtins.bool: ...
-        def ClearField(self, field_name: typing_extensions.Literal["name", b"name"]) -> None: ...
-
-    META_INFORMATION_FIELD_NUMBER: builtins.int
-    EXPRESSION_FIELD_NUMBER: builtins.int
-    OPERAND_FIELD_NUMBER: builtins.int
-    MNEMONIC_FIELD_NUMBER: builtins.int
-    INSTRUCTION_FIELD_NUMBER: builtins.int
-    BASIC_BLOCK_FIELD_NUMBER: builtins.int
-    FLOW_GRAPH_FIELD_NUMBER: builtins.int
-    CALL_GRAPH_FIELD_NUMBER: builtins.int
-    STRING_TABLE_FIELD_NUMBER: builtins.int
-    ADDRESS_COMMENT_FIELD_NUMBER: builtins.int
-    COMMENT_FIELD_NUMBER: builtins.int
-    STRING_REFERENCE_FIELD_NUMBER: builtins.int
-    EXPRESSION_SUBSTITUTION_FIELD_NUMBER: builtins.int
-    SECTION_FIELD_NUMBER: builtins.int
-    LIBRARY_FIELD_NUMBER: builtins.int
-    DATA_REFERENCE_FIELD_NUMBER: builtins.int
-    MODULE_FIELD_NUMBER: builtins.int
-    @property
-    def meta_information(self) -> global___BinExport2.Meta: ...
-    @property
-    def expression(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[global___BinExport2.Expression]: ...
-    @property
-    def operand(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[global___BinExport2.Operand]: ...
-    @property
-    def mnemonic(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[global___BinExport2.Mnemonic]: ...
-    @property
-    def instruction(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[global___BinExport2.Instruction]: ...
-    @property
-    def basic_block(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[global___BinExport2.BasicBlock]: ...
-    @property
-    def flow_graph(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[global___BinExport2.FlowGraph]: ...
-    @property
-    def call_graph(self) -> global___BinExport2.CallGraph: ...
-    @property
-    def string_table(self) -> google.protobuf.internal.containers.RepeatedScalarFieldContainer[builtins.str]: ...
-    @property
-    def address_comment(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[global___BinExport2.Reference]:
-        """No longer written. This is here so that BinDiff can work with older
-        BinExport files.
-        """
-    @property
-    def comment(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[global___BinExport2.Comment]:
-        """Rich comment index used for BinDiff's comment porting."""
-    @property
-    def string_reference(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[global___BinExport2.Reference]: ...
-    @property
-    def expression_substitution(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[global___BinExport2.Reference]: ...
-    @property
-    def section(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[global___BinExport2.Section]: ...
-    @property
-    def library(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[global___BinExport2.Library]: ...
-    @property
-    def data_reference(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[global___BinExport2.DataReference]: ...
-    @property
-    def module(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[global___BinExport2.Module]: ...
-    def __init__(
-        self,
-        *,
-        meta_information: global___BinExport2.Meta | None = ...,
-        expression: collections.abc.Iterable[global___BinExport2.Expression] | None = ...,
-        operand: collections.abc.Iterable[global___BinExport2.Operand] | None = ...,
-        mnemonic: collections.abc.Iterable[global___BinExport2.Mnemonic] | None = ...,
-        instruction: collections.abc.Iterable[global___BinExport2.Instruction] | None = ...,
-        basic_block: collections.abc.Iterable[global___BinExport2.BasicBlock] | None = ...,
-        flow_graph: collections.abc.Iterable[global___BinExport2.FlowGraph] | None = ...,
-        call_graph: global___BinExport2.CallGraph | None = ...,
-        string_table: collections.abc.Iterable[builtins.str] | None = ...,
-        address_comment: collections.abc.Iterable[global___BinExport2.Reference] | None = ...,
-        comment: collections.abc.Iterable[global___BinExport2.Comment] | None = ...,
-        string_reference: collections.abc.Iterable[global___BinExport2.Reference] | None = ...,
-        expression_substitution: collections.abc.Iterable[global___BinExport2.Reference] | None = ...,
-        section: collections.abc.Iterable[global___BinExport2.Section] | None = ...,
-        library: collections.abc.Iterable[global___BinExport2.Library] | None = ...,
-        data_reference: collections.abc.Iterable[global___BinExport2.DataReference] | None = ...,
-        module: collections.abc.Iterable[global___BinExport2.Module] | None = ...,
-    ) -> None: ...
-    def HasField(self, field_name: typing_extensions.Literal["call_graph", b"call_graph", "meta_information", b"meta_information"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing_extensions.Literal["address_comment", b"address_comment", "basic_block", b"basic_block", "call_graph", b"call_graph", "comment", b"comment", "data_reference", b"data_reference", "expression", b"expression", "expression_substitution", b"expression_substitution", "flow_graph", b"flow_graph", "instruction", b"instruction", "library", b"library", "meta_information", b"meta_information", "mnemonic", b"mnemonic", "module", b"module", "operand", b"operand", "section", b"section", "string_reference", b"string_reference", "string_table", b"string_table"]) -> None: ...
-
-global___BinExport2 = BinExport2
--- a/capa/features/extractors/binexport2/extractor.py
+++ b/capa/features/extractors/binexport2/extractor.py
@@ -1,130 +0,0 @@
-# Copyright (C) 2023 Mandiant, Inc. All Rights Reserved.
-# Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at: [package root]/LICENSE.txt
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-#  is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and limitations under the License.
-import logging
-from typing import Iterator
-
-import capa.features.extractors.elf
-import capa.features.extractors.common
-import capa.features.extractors.binexport2.file
-import capa.features.extractors.binexport2.insn
-import capa.features.extractors.binexport2.helpers
-import capa.features.extractors.binexport2.function
-import capa.features.extractors.binexport2.basicblock
-from capa.features.common import OS, Arch, Format, Feature
-from capa.features.address import Address, AbsoluteVirtualAddress
-from capa.features.extractors.binexport2 import (
-    AddressSpace,
-    AnalysisContext,
-    BinExport2Index,
-    FunctionContext,
-    BasicBlockContext,
-    BinExport2Analysis,
-    InstructionContext,
-)
-from capa.features.extractors.base_extractor import (
-    BBHandle,
-    InsnHandle,
-    SampleHashes,
-    FunctionHandle,
-    StaticFeatureExtractor,
-)
-from capa.features.extractors.binexport2.binexport2_pb2 import BinExport2
-
-logger = logging.getLogger(__name__)
-
-
-class BinExport2FeatureExtractor(StaticFeatureExtractor):
-    def __init__(self, be2: BinExport2, buf: bytes):
-        super().__init__(hashes=SampleHashes.from_bytes(buf))
-        self.be2: BinExport2 = be2
-        self.buf: bytes = buf
-        self.idx: BinExport2Index = BinExport2Index(self.be2)
-        self.analysis: BinExport2Analysis = BinExport2Analysis(self.be2, self.idx, self.buf)
-        address_space: AddressSpace = AddressSpace.from_buf(buf, self.analysis.base_address)
-        self.ctx: AnalysisContext = AnalysisContext(self.buf, self.be2, self.idx, self.analysis, address_space)
-
-        self.global_features: list[tuple[Feature, Address]] = []
-        self.global_features.extend(list(capa.features.extractors.common.extract_format(self.buf)))
-        self.global_features.extend(list(capa.features.extractors.common.extract_os(self.buf)))
-        self.global_features.extend(list(capa.features.extractors.common.extract_arch(self.buf)))
-
-        self.format: set[str] = set()
-        self.os: set[str] = set()
-        self.arch: set[str] = set()
-
-        for feature, _ in self.global_features:
-            assert isinstance(feature.value, str)
-
-            if isinstance(feature, Format):
-                self.format.add(feature.value)
-            elif isinstance(feature, OS):
-                self.os.add(feature.value)
-            elif isinstance(feature, Arch):
-                self.arch.add(feature.value)
-            else:
-                raise ValueError("unexpected global feature: %s", feature)
-
-    def get_base_address(self) -> AbsoluteVirtualAddress:
-        return AbsoluteVirtualAddress(self.analysis.base_address)
-
-    def extract_global_features(self) -> Iterator[tuple[Feature, Address]]:
-        yield from self.global_features
-
-    def extract_file_features(self) -> Iterator[tuple[Feature, Address]]:
-        yield from capa.features.extractors.binexport2.file.extract_features(self.be2, self.buf)
-
-    def get_functions(self) -> Iterator[FunctionHandle]:
-        for flow_graph_index, flow_graph in enumerate(self.be2.flow_graph):
-            entry_basic_block_index: int = flow_graph.entry_basic_block_index
-            flow_graph_address: int = self.idx.get_basic_block_address(entry_basic_block_index)
-
-            vertex_idx: int = self.idx.vertex_index_by_address[flow_graph_address]
-            be2_vertex: BinExport2.CallGraph.Vertex = self.be2.call_graph.vertex[vertex_idx]
-
-            # skip thunks
-            if capa.features.extractors.binexport2.helpers.is_vertex_type(
-                be2_vertex, BinExport2.CallGraph.Vertex.Type.THUNK
-            ):
-                continue
-
-            yield FunctionHandle(
-                AbsoluteVirtualAddress(flow_graph_address),
-                inner=FunctionContext(self.ctx, flow_graph_index, self.format, self.os, self.arch),
-            )
-
-    def extract_function_features(self, fh: FunctionHandle) -> Iterator[tuple[Feature, Address]]:
-        yield from capa.features.extractors.binexport2.function.extract_features(fh)
-
-    def get_basic_blocks(self, fh: FunctionHandle) -> Iterator[BBHandle]:
-        fhi: FunctionContext = fh.inner
-        flow_graph_index: int = fhi.flow_graph_index
-        flow_graph: BinExport2.FlowGraph = self.be2.flow_graph[flow_graph_index]
-
-        for basic_block_index in flow_graph.basic_block_index:
-            basic_block_address: int = self.idx.get_basic_block_address(basic_block_index)
-            yield BBHandle(
-                address=AbsoluteVirtualAddress(basic_block_address),
-                inner=BasicBlockContext(basic_block_index),
-            )
-
-    def extract_basic_block_features(self, fh: FunctionHandle, bbh: BBHandle) -> Iterator[tuple[Feature, Address]]:
-        yield from capa.features.extractors.binexport2.basicblock.extract_features(fh, bbh)
-
-    def get_instructions(self, fh: FunctionHandle, bbh: BBHandle) -> Iterator[InsnHandle]:
-        bbi: BasicBlockContext = bbh.inner
-        basic_block: BinExport2.BasicBlock = self.be2.basic_block[bbi.basic_block_index]
-        for instruction_index, _, instruction_address in self.idx.basic_block_instructions(basic_block):
-            yield InsnHandle(
-                address=AbsoluteVirtualAddress(instruction_address),
-                inner=InstructionContext(instruction_index),
-            )
-
-    def extract_insn_features(
-        self, fh: FunctionHandle, bbh: BBHandle, ih: InsnHandle
-    ) -> Iterator[tuple[Feature, Address]]:
-        yield from capa.features.extractors.binexport2.insn.extract_features(fh, bbh, ih)
--- a/capa/features/extractors/binexport2/file.py
+++ b/capa/features/extractors/binexport2/file.py
@@ -1,80 +0,0 @@
-# Copyright (C) 2023 Mandiant, Inc. All Rights Reserved.
-# Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at: [package root]/LICENSE.txt
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-#  is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and limitations under the License.
-import io
-import logging
-from typing import Iterator
-
-import pefile
-from elftools.elf.elffile import ELFFile
-
-import capa.features.common
-import capa.features.extractors.common
-import capa.features.extractors.pefile
-import capa.features.extractors.elffile
-from capa.features.common import Feature
-from capa.features.address import Address
-from capa.features.extractors.binexport2.binexport2_pb2 import BinExport2
-
-logger = logging.getLogger(__name__)
-
-
-def extract_file_export_names(_be2: BinExport2, buf: bytes) -> Iterator[tuple[Feature, Address]]:
-    if buf.startswith(capa.features.extractors.common.MATCH_PE):
-        pe: pefile.PE = pefile.PE(data=buf)
-        yield from capa.features.extractors.pefile.extract_file_export_names(pe)
-    elif buf.startswith(capa.features.extractors.common.MATCH_ELF):
-        elf: ELFFile = ELFFile(io.BytesIO(buf))
-        yield from capa.features.extractors.elffile.extract_file_export_names(elf)
-    else:
-        logger.warning("unsupported format")
-
-
-def extract_file_import_names(_be2: BinExport2, buf: bytes) -> Iterator[tuple[Feature, Address]]:
-    if buf.startswith(capa.features.extractors.common.MATCH_PE):
-        pe: pefile.PE = pefile.PE(data=buf)
-        yield from capa.features.extractors.pefile.extract_file_import_names(pe)
-    elif buf.startswith(capa.features.extractors.common.MATCH_ELF):
-        elf: ELFFile = ELFFile(io.BytesIO(buf))
-        yield from capa.features.extractors.elffile.extract_file_import_names(elf)
-    else:
-        logger.warning("unsupported format")
-
-
-def extract_file_section_names(_be2: BinExport2, buf: bytes) -> Iterator[tuple[Feature, Address]]:
-    if buf.startswith(capa.features.extractors.common.MATCH_PE):
-        pe: pefile.PE = pefile.PE(data=buf)
-        yield from capa.features.extractors.pefile.extract_file_section_names(pe)
-    elif buf.startswith(capa.features.extractors.common.MATCH_ELF):
-        elf: ELFFile = ELFFile(io.BytesIO(buf))
-        yield from capa.features.extractors.elffile.extract_file_section_names(elf)
-    else:
-        logger.warning("unsupported format")
-
-
-def extract_file_strings(_be2: BinExport2, buf: bytes) -> Iterator[tuple[Feature, Address]]:
-    yield from capa.features.extractors.common.extract_file_strings(buf)
-
-
-def extract_file_format(_be2: BinExport2, buf: bytes) -> Iterator[tuple[Feature, Address]]:
-    yield from capa.features.extractors.common.extract_format(buf)
-
-
-def extract_features(be2: BinExport2, buf: bytes) -> Iterator[tuple[Feature, Address]]:
-    """extract file features"""
-    for file_handler in FILE_HANDLERS:
-        for feature, addr in file_handler(be2, buf):
-            yield feature, addr
-
-
-FILE_HANDLERS = (
-    extract_file_export_names,
-    extract_file_import_names,
-    extract_file_strings,
-    extract_file_section_names,
-    extract_file_format,
-)
--- a/capa/features/extractors/binexport2/function.py
+++ b/capa/features/extractors/binexport2/function.py
@@ -1,72 +0,0 @@
-# Copyright (C) 2023 Mandiant, Inc. All Rights Reserved.
-# Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at: [package root]/LICENSE.txt
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-#  is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and limitations under the License.
-from typing import Iterator
-
-from capa.features.file import FunctionName
-from capa.features.common import Feature, Characteristic
-from capa.features.address import Address, AbsoluteVirtualAddress
-from capa.features.extractors import loops
-from capa.features.extractors.binexport2 import BinExport2Index, FunctionContext
-from capa.features.extractors.base_extractor import FunctionHandle
-from capa.features.extractors.binexport2.binexport2_pb2 import BinExport2
-
-
-def extract_function_calls_to(fh: FunctionHandle) -> Iterator[tuple[Feature, Address]]:
-    fhi: FunctionContext = fh.inner
-
-    be2: BinExport2 = fhi.ctx.be2
-    idx: BinExport2Index = fhi.ctx.idx
-
-    flow_graph_index: int = fhi.flow_graph_index
-    flow_graph_address: int = idx.flow_graph_address_by_index[flow_graph_index]
-    vertex_index: int = idx.vertex_index_by_address[flow_graph_address]
-
-    for caller_index in idx.callers_by_vertex_index[vertex_index]:
-        caller: BinExport2.CallGraph.Vertex = be2.call_graph.vertex[caller_index]
-        caller_address: int = caller.address
-        yield Characteristic("calls to"), AbsoluteVirtualAddress(caller_address)
-
-
-def extract_function_loop(fh: FunctionHandle) -> Iterator[tuple[Feature, Address]]:
-    fhi: FunctionContext = fh.inner
-
-    be2: BinExport2 = fhi.ctx.be2
-
-    flow_graph_index: int = fhi.flow_graph_index
-    flow_graph: BinExport2.FlowGraph = be2.flow_graph[flow_graph_index]
-
-    edges: list[tuple[int, int]] = []
-    for edge in flow_graph.edge:
-        edges.append((edge.source_basic_block_index, edge.target_basic_block_index))
-
-    if loops.has_loop(edges):
-        yield Characteristic("loop"), fh.address
-
-
-def extract_function_name(fh: FunctionHandle) -> Iterator[tuple[Feature, Address]]:
-    fhi: FunctionContext = fh.inner
-
-    be2: BinExport2 = fhi.ctx.be2
-    idx: BinExport2Index = fhi.ctx.idx
-    flow_graph_index: int = fhi.flow_graph_index
-
-    flow_graph_address: int = idx.flow_graph_address_by_index[flow_graph_index]
-    vertex_index: int = idx.vertex_index_by_address[flow_graph_address]
-    vertex: BinExport2.CallGraph.Vertex = be2.call_graph.vertex[vertex_index]
-
-    if vertex.HasField("mangled_name"):
-        yield FunctionName(vertex.mangled_name), fh.address
-
-
-def extract_features(fh: FunctionHandle) -> Iterator[tuple[Feature, Address]]:
-    for func_handler in FUNCTION_HANDLERS:
-        for feature, addr in func_handler(fh):
-            yield feature, addr
-
-
-FUNCTION_HANDLERS = (extract_function_calls_to, extract_function_loop, extract_function_name)
--- a/capa/features/extractors/binexport2/helpers.py
+++ b/capa/features/extractors/binexport2/helpers.py
@@ -1,692 +0,0 @@
-# Copyright (C) 2024 Mandiant, Inc. All Rights Reserved.
-# Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at: [package root]/LICENSE.txt
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-#  is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and limitations under the License.
-import re
-from typing import Union, Iterator, Optional
-from collections import defaultdict
-from dataclasses import dataclass
-
-import capa.features.extractors.helpers
-import capa.features.extractors.binexport2.helpers
-from capa.features.common import ARCH_I386, ARCH_AMD64, ARCH_AARCH64
-from capa.features.extractors.binexport2.binexport2_pb2 import BinExport2
-
-HAS_ARCH32 = {ARCH_I386}
-HAS_ARCH64 = {ARCH_AARCH64, ARCH_AMD64}
-
-HAS_ARCH_INTEL = {ARCH_I386, ARCH_AMD64}
-HAS_ARCH_ARM = {ARCH_AARCH64}
-
-
-def mask_immediate(arch: set[str], immediate: int) -> int:
-    if arch & HAS_ARCH64:
-        immediate &= 0xFFFFFFFFFFFFFFFF
-    elif arch & HAS_ARCH32:
-        immediate &= 0xFFFFFFFF
-    return immediate
-
-
-def twos_complement(arch: set[str], immediate: int, default: Optional[int] = None) -> int:
-    if default is not None:
-        return capa.features.extractors.helpers.twos_complement(immediate, default)
-    elif arch & HAS_ARCH64:
-        return capa.features.extractors.helpers.twos_complement(immediate, 64)
-    elif arch & HAS_ARCH32:
-        return capa.features.extractors.helpers.twos_complement(immediate, 32)
-    return immediate
-
-
-def is_address_mapped(be2: BinExport2, address: int) -> bool:
-    """return True if the given address is mapped"""
-    sections_with_perms: Iterator[BinExport2.Section] = filter(lambda s: s.flag_r or s.flag_w or s.flag_x, be2.section)
-    return any(section.address <= address < section.address + section.size for section in sections_with_perms)
-
-
-def is_vertex_type(vertex: BinExport2.CallGraph.Vertex, type_: BinExport2.CallGraph.Vertex.Type.ValueType) -> bool:
-    return vertex.HasField("type") and vertex.type == type_
-
-
-# internal to `build_expression_tree`
-# this is unstable: it is subject to change, so don't rely on it!
-def _prune_expression_tree_references_to_tree_index(
-    expression_tree: list[list[int]],
-    tree_index: int,
-):
-    # `i` is the index of the tree node that we'll search for `tree_index`
-    # if we remove `tree_index` from it, and it is now empty,
-    # then we'll need to prune references to `i`.
-    for i, tree_node in enumerate(expression_tree):
-        if tree_index in tree_node:
-            tree_node.remove(tree_index)
-
-            if len(tree_node) == 0:
-                # if the parent node is now empty,
-                # remove references to that parent node.
-                _prune_expression_tree_references_to_tree_index(expression_tree, i)
-
-
-# internal to `build_expression_tree`
-# this is unstable: it is subject to change, so don't rely on it!
-def _prune_expression_tree_empty_shifts(
-    be2: BinExport2,
-    operand: BinExport2.Operand,
-    expression_tree: list[list[int]],
-    tree_index: int,
-):
-    expression_index = operand.expression_index[tree_index]
-    expression = be2.expression[expression_index]
-    children_tree_indexes: list[int] = expression_tree[tree_index]
-
-    if expression.type == BinExport2.Expression.OPERATOR:
-        if len(children_tree_indexes) == 0 and expression.symbol in ("lsl", "lsr"):
-            # Ghidra may emit superfluous lsl nodes with no children.
-            # https://github.com/mandiant/capa/pull/2340/files#r1750003919
-            # Which is maybe: https://github.com/NationalSecurityAgency/ghidra/issues/6821#issuecomment-2295394697
-            #
-            # Which seems to be as if the shift wasn't there (shift of #0)
-            # so we want to remove references to this node from any parent nodes.
-            _prune_expression_tree_references_to_tree_index(expression_tree, tree_index)
-
-            return
-
-    for child_tree_index in children_tree_indexes:
-        _prune_expression_tree_empty_shifts(be2, operand, expression_tree, child_tree_index)
-
-
-# internal to `build_expression_tree`
-# this is unstable: it is subject to change, so don't rely on it!
-def _fixup_expression_tree_references_to_tree_index(
-    expression_tree: list[list[int]],
-    existing_index: int,
-    new_index: int,
-):
-    for tree_node in expression_tree:
-        for i, index in enumerate(tree_node):
-            if index == existing_index:
-                tree_node[i] = new_index
-
-
-# internal to `build_expression_tree`
-# this is unstable: it is subject to change, so don't rely on it!
-def _fixup_expression_tree_lonely_commas(
-    be2: BinExport2,
-    operand: BinExport2.Operand,
-    expression_tree: list[list[int]],
-    tree_index: int,
-):
-    expression_index = operand.expression_index[tree_index]
-    expression = be2.expression[expression_index]
-    children_tree_indexes: list[int] = expression_tree[tree_index]
-
-    if expression.type == BinExport2.Expression.OPERATOR:
-        if len(children_tree_indexes) == 1 and expression.symbol == ",":
-            existing_index = tree_index
-            new_index = children_tree_indexes[0]
-            _fixup_expression_tree_references_to_tree_index(expression_tree, existing_index, new_index)
-
-    for child_tree_index in children_tree_indexes:
-        _fixup_expression_tree_lonely_commas(be2, operand, expression_tree, child_tree_index)
-
-
-# internal to `build_expression_tree`
-# this is unstable: it is subject to change, so don't rely on it!
-def _prune_expression_tree(
-    be2: BinExport2,
-    operand: BinExport2.Operand,
-    expression_tree: list[list[int]],
-):
-    _prune_expression_tree_empty_shifts(be2, operand, expression_tree, 0)
-    _fixup_expression_tree_lonely_commas(be2, operand, expression_tree, 0)
-
-
-# this is unstable: it is subject to change, so don't rely on it!
-def _build_expression_tree(
-    be2: BinExport2,
-    operand: BinExport2.Operand,
-) -> list[list[int]]:
-    # The reconstructed expression tree layout, linking parent nodes to their children.
-    #
-    # There is one list of integers for each expression in the operand.
-    # These integers are indexes of other expressions in the same operand,
-    # which are the children of that expression.
-    #
-    # So:
-    #
-    #   [ [1, 3], [2], [], [4], [5], []]
-    #
-    # means the first expression has two children, at index 1 and 3,
-    # and the tree looks like:
-    #
-    #        0
-    #       / \
-    #      1   3
-    #      |   |
-    #      2   4
-    #          |
-    #          5
-    #
-    # Remember, these are the indices into the entries in operand.expression_index.
-    if len(operand.expression_index) == 0:
-        # Ghidra bug where empty operands (no expressions) may
-        # exist (see https://github.com/NationalSecurityAgency/ghidra/issues/6817)
-        return []
-
-    tree: list[list[int]] = []
-    for i, expression_index in enumerate(operand.expression_index):
-        children = []
-
-        # scan all subsequent expressions, looking for those that have parent_index == current.expression_index
-        for j, candidate_index in enumerate(operand.expression_index[i + 1 :]):
-            candidate = be2.expression[candidate_index]
-
-            if candidate.parent_index == expression_index:
-                children.append(i + j + 1)
-
-        tree.append(children)
-
-    _prune_expression_tree(be2, operand, tree)
-
-    return tree
-
-
-def _fill_operand_expression_list(
-    be2: BinExport2,
-    operand: BinExport2.Operand,
-    expression_tree: list[list[int]],
-    tree_index: int,
-    expression_list: list[BinExport2.Expression],
-):
-    """
-    Walk the given expression tree and collect the expression nodes in-order.
-    """
-    expression_index = operand.expression_index[tree_index]
-    expression = be2.expression[expression_index]
-    children_tree_indexes: list[int] = expression_tree[tree_index]
-
-    if expression.type == BinExport2.Expression.REGISTER:
-        assert len(children_tree_indexes) <= 1
-        expression_list.append(expression)
-
-        if len(children_tree_indexes) == 0:
-            return
-        elif len(children_tree_indexes) == 1:
-            # like for aarch64 with vector instructions, indicating vector data size:
-            #
-            #     FADD V0.4S, V1.4S, V2.4S
-            #
-            # see: https://github.com/mandiant/capa/issues/2528
-            child_index = children_tree_indexes[0]
-            _fill_operand_expression_list(be2, operand, expression_tree, child_index, expression_list)
-            return
-        else:
-            raise NotImplementedError(len(children_tree_indexes))
-
-    elif expression.type == BinExport2.Expression.SYMBOL:
-        assert len(children_tree_indexes) <= 1
-        expression_list.append(expression)
-
-        if len(children_tree_indexes) == 0:
-            return
-        elif len(children_tree_indexes) == 1:
-            # like: v
-            # from: mov v0.D[0x1], x9
-            #           |
-            #           0
-            #           .
-            #           |
-            #           D
-            child_index = children_tree_indexes[0]
-            _fill_operand_expression_list(be2, operand, expression_tree, child_index, expression_list)
-            return
-        else:
-            raise NotImplementedError(len(children_tree_indexes))
-
-    elif expression.type == BinExport2.Expression.IMMEDIATE_INT:
-        assert len(children_tree_indexes) <= 1
-        expression_list.append(expression)
-
-        if len(children_tree_indexes) == 0:
-            return
-        elif len(children_tree_indexes) == 1:
-            # the ghidra exporter can produce some weird expressions,
-            # particularly for MSRs, like for:
-            #
-            #     sreg(3, 0, c.0, c.4, 4)
-            #
-            # see: https://github.com/mandiant/capa/issues/2530
-            child_index = children_tree_indexes[0]
-            _fill_operand_expression_list(be2, operand, expression_tree, child_index, expression_list)
-            return
-        else:
-            raise NotImplementedError(len(children_tree_indexes))
-
-    elif expression.type == BinExport2.Expression.SIZE_PREFIX:
-        # like: b4
-        #
-        # We might want to use this occasionally, such as to disambiguate the
-        # size of MOVs into/out of memory. But I'm not sure when/where we need that yet.
-        #
-        # IDA spams this size prefix hint *everywhere*, so we can't rely on the exporter
-        # to provide it only when necessary.
-        assert len(children_tree_indexes) == 1
-        child_index = children_tree_indexes[0]
-        _fill_operand_expression_list(be2, operand, expression_tree, child_index, expression_list)
-        return
-
-    elif expression.type == BinExport2.Expression.OPERATOR:
-        if len(children_tree_indexes) == 1:
-            # prefix operator, like "ds:"
-            expression_list.append(expression)
-            child_index = children_tree_indexes[0]
-            _fill_operand_expression_list(be2, operand, expression_tree, child_index, expression_list)
-            return
-
-        elif len(children_tree_indexes) == 2:
-            # infix operator: like "+" in "ebp+10"
-            child_a = children_tree_indexes[0]
-            child_b = children_tree_indexes[1]
-            _fill_operand_expression_list(be2, operand, expression_tree, child_a, expression_list)
-            expression_list.append(expression)
-            _fill_operand_expression_list(be2, operand, expression_tree, child_b, expression_list)
-            return
-
-        elif len(children_tree_indexes) == 3:
-            # infix operator: like "+" in "ebp+ecx+10"
-            child_a = children_tree_indexes[0]
-            child_b = children_tree_indexes[1]
-            child_c = children_tree_indexes[2]
-            _fill_operand_expression_list(be2, operand, expression_tree, child_a, expression_list)
-            expression_list.append(expression)
-            _fill_operand_expression_list(be2, operand, expression_tree, child_b, expression_list)
-            expression_list.append(expression)
-            _fill_operand_expression_list(be2, operand, expression_tree, child_c, expression_list)
-            return
-
-        else:
-            raise NotImplementedError(len(children_tree_indexes))
-
-    elif expression.type == BinExport2.Expression.DEREFERENCE:
-        assert len(children_tree_indexes) == 1
-        expression_list.append(expression)
-
-        child_index = children_tree_indexes[0]
-        _fill_operand_expression_list(be2, operand, expression_tree, child_index, expression_list)
-        return
-
-    elif expression.type == BinExport2.Expression.IMMEDIATE_FLOAT:
-        raise NotImplementedError(expression.type)
-
-    else:
-        raise NotImplementedError(expression.type)
-
-
-def get_operand_expressions(be2: BinExport2, op: BinExport2.Operand) -> list[BinExport2.Expression]:
-    tree = _build_expression_tree(be2, op)
-
-    expressions: list[BinExport2.Expression] = []
-    _fill_operand_expression_list(be2, op, tree, 0, expressions)
-
-    return expressions
-
-
-def get_operand_register_expression(be2: BinExport2, operand: BinExport2.Operand) -> Optional[BinExport2.Expression]:
-    if len(operand.expression_index) == 1:
-        expression: BinExport2.Expression = be2.expression[operand.expression_index[0]]
-        if expression.type == BinExport2.Expression.REGISTER:
-            return expression
-    return None
-
-
-def get_operand_immediate_expression(be2: BinExport2, operand: BinExport2.Operand) -> Optional[BinExport2.Expression]:
-    if len(operand.expression_index) == 1:
-        # - type: IMMEDIATE_INT
-        #   immediate: 20588728364
-        #   parent_index: 0
-        expression: BinExport2.Expression = be2.expression[operand.expression_index[0]]
-        if expression.type == BinExport2.Expression.IMMEDIATE_INT:
-            return expression
-
-    elif len(operand.expression_index) == 2:
-        # from IDA, which provides a size hint for every operand,
-        # we get the following pattern for immediate constants:
-        #
-        # - type: SIZE_PREFIX
-        #   symbol: "b8"
-        # - type: IMMEDIATE_INT
-        #   immediate: 20588728364
-        #   parent_index: 0
-        expression0: BinExport2.Expression = be2.expression[operand.expression_index[0]]
-        expression1: BinExport2.Expression = be2.expression[operand.expression_index[1]]
-
-        if expression0.type == BinExport2.Expression.SIZE_PREFIX:
-            if expression1.type == BinExport2.Expression.IMMEDIATE_INT:
-                return expression1
-
-    return None
-
-
-def get_instruction_mnemonic(be2: BinExport2, instruction: BinExport2.Instruction) -> str:
-    return be2.mnemonic[instruction.mnemonic_index].name.lower()
-
-
-def get_instruction_operands(be2: BinExport2, instruction: BinExport2.Instruction) -> list[BinExport2.Operand]:
-    return [be2.operand[operand_index] for operand_index in instruction.operand_index]
-
-
-def split_with_delimiters(s: str, delimiters: tuple[str, ...]) -> Iterator[str]:
-    """
-    Splits a string by any of the provided delimiter characters,
-    including the delimiters in the results.
-
-    Args:
-        string: The string to split.
-        delimiters: A string containing the characters to use as delimiters.
-    """
-    start = 0
-    for i, char in enumerate(s):
-        if char in delimiters:
-            yield s[start:i]
-            yield char
-            start = i + 1
-
-    if start < len(s):
-        yield s[start:]
-
-
-BinExport2OperandPattern = Union[str, tuple[str, ...]]
-
-
-@dataclass
-class BinExport2InstructionPattern:
-    """
-    This describes a way to match disassembled instructions, with mnemonics and operands.
-
-    You can specify constraints on the instruction, via:
-      - the mnemonics, like "mov",
-      - number of operands, and
-      - format of each operand, "[reg, reg, #int]".
-
-    During matching, you can also capture a single element, to see its concrete value.
-    For example, given the pattern:
-
-        mov reg0, #int0  ; capture int0
-
-    and the instruction:
-
-        mov eax, 1
-
-    Then the capture will contain the immediate integer 1.
-
-    This matcher uses the BinExport2 data layout under the hood.
-    """
-
-    mnemonics: tuple[str, ...]
-    operands: tuple[Union[str, BinExport2OperandPattern], ...]
-    capture: Optional[str]
-
-    @classmethod
-    def from_str(cls, query: str):
-        """
-        Parse a pattern string into a Pattern instance.
-        The supported syntax is like this:
-
-            br      reg
-            br      reg                          ; capture reg
-            br      reg(stack)                   ; capture reg
-            br      reg(not-stack)               ; capture reg
-            mov     reg0, reg1                   ; capture reg0
-            adrp    reg, #int                    ; capture #int
-            add     reg, reg, #int               ; capture #int
-            ldr     reg0, [reg1]                 ; capture reg1
-            ldr|str reg, [reg, #int]             ; capture #int
-            ldr|str reg, [reg(stack), #int]      ; capture #int
-            ldr|str reg, [reg(not-stack), #int]  ; capture #int
-            ldr|str reg, [reg, #int]!            ; capture #int
-            ldr|str reg, [reg], #int             ; capture #int
-            ldp|stp reg, reg, [reg, #int]        ; capture #int
-            ldp|stp reg, reg, [reg, #int]!       ; capture #int
-            ldp|stp reg, reg, [reg], #int        ; capture #int
-        """
-        #
-        # The implementation of the parser here is obviously ugly.
-        # Its handwritten and probably fragile. But since we don't
-        # expect this to be widely used, its probably ok.
-        # Don't hesitate to rewrite this if it becomes more important.
-        #
-        # Note that this doesn't have to be very performant.
-        # We expect these patterns to be parsed once upfront and then reused
-        # (globally at the module level?) rather than within any loop.
-        #
-
-        pattern, _, comment = query.strip().partition(";")
-
-        # we don't support fs: yet
-        assert ":" not in pattern
-
-        # from "capture #int" to "#int"
-        if comment:
-            comment = comment.strip()
-            assert comment.startswith("capture ")
-            capture = comment[len("capture ") :]
-        else:
-            capture = None
-
-        # from "ldr|str ..." to ["ldr", "str"]
-        pattern = pattern.strip()
-        mnemonic, _, rest = pattern.partition(" ")
-        mnemonics = mnemonic.split("|")
-
-        operands: list[Union[str, tuple[str, ...]]] = []
-        while rest:
-            rest = rest.strip()
-            if not rest.startswith("["):
-                # If its not a dereference, which looks like `[op, op, op, ...]`,
-                # then its a simple operand, which we can split by the next comma.
-                operand, _, rest = rest.partition(", ")
-                rest = rest.strip()
-                operands.append(operand)
-
-            else:
-                # This looks like a dereference, something like `[op, op, op, ...]`.
-                # Since these can't be nested, look for the next ] and then parse backwards.
-                deref_end = rest.index("]")
-                try:
-                    deref_end = rest.index(", ", deref_end)
-                    deref_end += len(", ")
-                except ValueError:
-                    deref = rest
-                    rest = ""
-                else:
-                    deref = rest[:deref_end]
-                    rest = rest[deref_end:]
-                    rest = rest.strip()
-                    deref = deref.rstrip(" ")
-                    deref = deref.rstrip(",")
-
-                # like: [reg, #int]!
-                has_postindex_writeback = deref.endswith("!")
-
-                deref = deref.rstrip("!")
-                deref = deref.rstrip("]")
-                deref = deref.lstrip("[")
-
-                parts = tuple(split_with_delimiters(deref, (",", "+", "*")))
-                parts = tuple(s.strip() for s in parts)
-
-                # emit operands in this order to match
-                # how BinExport2 expressions are flatted
-                # by get_operand_expressions
-                if has_postindex_writeback:
-                    operands.append(("!", "[") + parts)
-                else:
-                    operands.append(("[",) + parts)
-
-        for operand in operands:  # type: ignore
-            # Try to ensure we've parsed the operands correctly.
-            # This is just sanity checking.
-            for o in (operand,) if isinstance(operand, str) else operand:
-                # operands can look like:
-                #  - reg
-                #  - reg0
-                #  - reg(stack)
-                #  - reg0(stack)
-                #  - reg(not-stack)
-                #  - reg0(not-stack)
-                #  - #int
-                #  - #int0
-                # and a limited set of supported operators.
-                # use an inline regex so that its easy to read. not perf critical.
-                assert re.match(r"^(reg|#int)[0-9]?(\(stack\)|\(not-stack\))?$", o) or o in ("[", ",", "!", "+", "*")
-
-        return cls(tuple(mnemonics), tuple(operands), capture)
-
-    @dataclass
-    class MatchResult:
-        operand_index: int
-        expression_index: int
-        expression: BinExport2.Expression
-
-    def match(
-        self, mnemonic: str, operand_expressions: list[list[BinExport2.Expression]]
-    ) -> Optional["BinExport2InstructionPattern.MatchResult"]:
-        """
-        Match the given BinExport2 data against this pattern.
-
-        The BinExport2 expression tree must have been flattened, such as with
-        capa.features.extractors.binexport2.helpers.get_operand_expressions.
-
-        If there's a match, the captured Expression instance is returned.
-        Otherwise, you get None back.
-        """
-        if mnemonic not in self.mnemonics:
-            return None
-
-        if len(self.operands) != len(operand_expressions):
-            return None
-
-        captured = None
-
-        for operand_index, found_expressions in enumerate(operand_expressions):
-            wanted_expressions = self.operands[operand_index]
-
-            # from `"reg"` to `("reg", )`
-            if isinstance(wanted_expressions, str):
-                wanted_expressions = (wanted_expressions,)
-            assert isinstance(wanted_expressions, tuple)
-
-            if len(wanted_expressions) != len(found_expressions):
-                return None
-
-            for expression_index, (wanted_expression, found_expression) in enumerate(
-                zip(wanted_expressions, found_expressions)
-            ):
-                if wanted_expression.startswith("reg"):
-                    if found_expression.type != BinExport2.Expression.REGISTER:
-                        return None
-
-                    if wanted_expression.endswith(")"):
-                        if wanted_expression.endswith("(not-stack)"):
-                            # intel 64: rsp, esp, sp,
-                            # intel 32: ebp, ebp, bp
-                            # arm: sp
-                            register_name = found_expression.symbol.lower()
-                            if register_name in ("rsp", "esp", "sp", "rbp", "ebp", "bp"):
-                                return None
-
-                        elif wanted_expression.endswith("(stack)"):
-                            register_name = found_expression.symbol.lower()
-                            if register_name not in ("rsp", "esp", "sp", "rbp", "ebp", "bp"):
-                                return None
-
-                        else:
-                            raise ValueError("unexpected expression suffix", wanted_expression)
-
-                    if self.capture == wanted_expression:
-                        captured = BinExport2InstructionPattern.MatchResult(
-                            operand_index, expression_index, found_expression
-                        )
-
-                elif wanted_expression.startswith("#int"):
-                    if found_expression.type != BinExport2.Expression.IMMEDIATE_INT:
-                        return None
-
-                    if self.capture == wanted_expression:
-                        captured = BinExport2InstructionPattern.MatchResult(
-                            operand_index, expression_index, found_expression
-                        )
-
-                elif wanted_expression == "[":
-                    if found_expression.type != BinExport2.Expression.DEREFERENCE:
-                        return None
-
-                elif wanted_expression in (",", "!", "+", "*"):
-                    if found_expression.type != BinExport2.Expression.OPERATOR:
-                        return None
-
-                    if found_expression.symbol != wanted_expression:
-                        return None
-
-                else:
-                    raise ValueError(found_expression)
-
-        if captured:
-            return captured
-        else:
-            # There were no captures, so
-            # return arbitrary non-None expression
-            return BinExport2InstructionPattern.MatchResult(operand_index, expression_index, found_expression)
-
-
-class BinExport2InstructionPatternMatcher:
-    """Index and match a collection of instruction patterns."""
-
-    def __init__(self, queries: list[BinExport2InstructionPattern]):
-        self.queries = queries
-        # shard the patterns by (mnemonic, #operands)
-        self._index: dict[tuple[str, int], list[BinExport2InstructionPattern]] = defaultdict(list)
-
-        for query in queries:
-            for mnemonic in query.mnemonics:
-                self._index[(mnemonic.lower(), len(query.operands))].append(query)
-
-    @classmethod
-    def from_str(cls, patterns: str):
-        return cls(
-            [
-                BinExport2InstructionPattern.from_str(line)
-                for line in filter(
-                    lambda line: not line.startswith("#"), (line.strip() for line in patterns.split("\n"))
-                )
-            ]
-        )
-
-    def match(
-        self, mnemonic: str, operand_expressions: list[list[BinExport2.Expression]]
-    ) -> Optional[BinExport2InstructionPattern.MatchResult]:
-        queries = self._index.get((mnemonic.lower(), len(operand_expressions)), [])
-        for query in queries:
-            captured = query.match(mnemonic.lower(), operand_expressions)
-            if captured:
-                return captured
-
-        return None
-
-    def match_with_be2(
-        self, be2: BinExport2, instruction_index: int
-    ) -> Optional[BinExport2InstructionPattern.MatchResult]:
-        instruction: BinExport2.Instruction = be2.instruction[instruction_index]
-        mnemonic: str = get_instruction_mnemonic(be2, instruction)
-
-        if (mnemonic.lower(), len(instruction.operand_index)) not in self._index:
-            # verify that we might have a hit before we realize the operand expression list
-            return None
-
-        operands = []
-        for operand_index in instruction.operand_index:
-            operands.append(get_operand_expressions(be2, be2.operand[operand_index]))
-
-        return self.match(mnemonic, operands)
--- a/capa/features/extractors/binexport2/insn.py
+++ b/capa/features/extractors/binexport2/insn.py
@@ -1,254 +0,0 @@
-# Copyright (C) 2023 Mandiant, Inc. All Rights Reserved.
-# Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at: [package root]/LICENSE.txt
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-#  is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and limitations under the License.
-import logging
-from typing import Iterator
-
-import capa.features.extractors.helpers
-import capa.features.extractors.strings
-import capa.features.extractors.binexport2.helpers
-import capa.features.extractors.binexport2.arch.arm.insn
-import capa.features.extractors.binexport2.arch.intel.insn
-from capa.features.insn import API, Mnemonic
-from capa.features.common import Bytes, String, Feature, Characteristic
-from capa.features.address import Address, AbsoluteVirtualAddress
-from capa.features.extractors.binexport2 import (
-    AddressSpace,
-    AnalysisContext,
-    BinExport2Index,
-    FunctionContext,
-    ReadMemoryError,
-    BinExport2Analysis,
-    InstructionContext,
-)
-from capa.features.extractors.base_extractor import BBHandle, InsnHandle, FunctionHandle
-from capa.features.extractors.binexport2.helpers import HAS_ARCH_ARM, HAS_ARCH_INTEL
-from capa.features.extractors.binexport2.binexport2_pb2 import BinExport2
-
-logger = logging.getLogger(__name__)
-
-
-def extract_insn_api_features(fh: FunctionHandle, _bbh: BBHandle, ih: InsnHandle) -> Iterator[tuple[Feature, Address]]:
-    fhi: FunctionContext = fh.inner
-    ii: InstructionContext = ih.inner
-
-    be2: BinExport2 = fhi.ctx.be2
-    be2_index: BinExport2Index = fhi.ctx.idx
-    be2_analysis: BinExport2Analysis = fhi.ctx.analysis
-    insn: BinExport2.Instruction = be2.instruction[ii.instruction_index]
-
-    for addr in insn.call_target:
-        addr = be2_analysis.thunks.get(addr, addr)
-
-        if addr not in be2_index.vertex_index_by_address:
-            # disassembler did not define function at address
-            logger.debug("0x%x is not a vertex", addr)
-            continue
-
-        vertex_idx: int = be2_index.vertex_index_by_address[addr]
-        vertex: BinExport2.CallGraph.Vertex = be2.call_graph.vertex[vertex_idx]
-
-        if not capa.features.extractors.binexport2.helpers.is_vertex_type(
-            vertex, BinExport2.CallGraph.Vertex.Type.IMPORTED
-        ):
-            continue
-
-        if not vertex.HasField("mangled_name"):
-            logger.debug("vertex %d does not have mangled_name", vertex_idx)
-            continue
-
-        api_name: str = vertex.mangled_name
-        for name in capa.features.extractors.helpers.generate_symbols("", api_name):
-            yield API(name), ih.address
-
-
-def extract_insn_number_features(
-    fh: FunctionHandle, bbh: BBHandle, ih: InsnHandle
-) -> Iterator[tuple[Feature, Address]]:
-    fhi: FunctionContext = fh.inner
-
-    if fhi.arch & HAS_ARCH_INTEL:
-        yield from capa.features.extractors.binexport2.arch.intel.insn.extract_insn_number_features(fh, bbh, ih)
-    elif fhi.arch & HAS_ARCH_ARM:
-        yield from capa.features.extractors.binexport2.arch.arm.insn.extract_insn_number_features(fh, bbh, ih)
-
-
-def extract_insn_bytes_features(fh: FunctionHandle, bbh: BBHandle, ih: InsnHandle) -> Iterator[tuple[Feature, Address]]:
-    fhi: FunctionContext = fh.inner
-    ii: InstructionContext = ih.inner
-
-    ctx: AnalysisContext = fhi.ctx
-    be2: BinExport2 = ctx.be2
-    idx: BinExport2Index = ctx.idx
-    address_space: AddressSpace = ctx.address_space
-
-    instruction_index: int = ii.instruction_index
-
-    if instruction_index in idx.string_reference_index_by_source_instruction_index:
-        # disassembler already identified string reference from instruction
-        return
-
-    reference_addresses: list[int] = []
-
-    if instruction_index in idx.data_reference_index_by_source_instruction_index:
-        for data_reference_index in idx.data_reference_index_by_source_instruction_index[instruction_index]:
-            data_reference: BinExport2.DataReference = be2.data_reference[data_reference_index]
-            data_reference_address: int = data_reference.address
-
-            if data_reference_address in idx.insn_address_by_index:
-                # appears to be code
-                continue
-
-            reference_addresses.append(data_reference_address)
-
-    for reference_address in reference_addresses:
-        try:
-            # if at end of segment then there might be an overrun here.
-            buf: bytes = address_space.read_memory(reference_address, 0x100)
-        except ReadMemoryError:
-            logger.debug("failed to read memory: 0x%x", reference_address)
-            continue
-
-        if capa.features.extractors.helpers.all_zeros(buf):
-            continue
-
-        is_string: bool = False
-
-        # note: we *always* break after the first iteration
-        for s in capa.features.extractors.strings.extract_ascii_strings(buf):
-            if s.offset != 0:
-                break
-
-            yield String(s.s), ih.address
-            is_string = True
-            break
-
-        # note: we *always* break after the first iteration
-        for s in capa.features.extractors.strings.extract_unicode_strings(buf):
-            if s.offset != 0:
-                break
-
-            yield String(s.s), ih.address
-            is_string = True
-            break
-
-        if not is_string:
-            yield Bytes(buf), ih.address
-
-
-def extract_insn_string_features(
-    fh: FunctionHandle, _bbh: BBHandle, ih: InsnHandle
-) -> Iterator[tuple[Feature, Address]]:
-    fhi: FunctionContext = fh.inner
-    ii: InstructionContext = ih.inner
-
-    be2: BinExport2 = fhi.ctx.be2
-    idx: BinExport2Index = fhi.ctx.idx
-
-    instruction_index: int = ii.instruction_index
-
-    if instruction_index in idx.string_reference_index_by_source_instruction_index:
-        for string_reference_index in idx.string_reference_index_by_source_instruction_index[instruction_index]:
-            string_reference: BinExport2.Reference = be2.string_reference[string_reference_index]
-            string_index: int = string_reference.string_table_index
-            string: str = be2.string_table[string_index]
-            yield String(string), ih.address
-
-
-def extract_insn_offset_features(
-    fh: FunctionHandle, bbh: BBHandle, ih: InsnHandle
-) -> Iterator[tuple[Feature, Address]]:
-    fhi: FunctionContext = fh.inner
-
-    if fhi.arch & HAS_ARCH_INTEL:
-        yield from capa.features.extractors.binexport2.arch.intel.insn.extract_insn_offset_features(fh, bbh, ih)
-    elif fhi.arch & HAS_ARCH_ARM:
-        yield from capa.features.extractors.binexport2.arch.arm.insn.extract_insn_offset_features(fh, bbh, ih)
-
-
-def extract_insn_nzxor_characteristic_features(
-    fh: FunctionHandle, bbh: BBHandle, ih: InsnHandle
-) -> Iterator[tuple[Feature, Address]]:
-    fhi: FunctionContext = fh.inner
-
-    if fhi.arch & HAS_ARCH_INTEL:
-        yield from capa.features.extractors.binexport2.arch.intel.insn.extract_insn_nzxor_characteristic_features(
-            fh, bbh, ih
-        )
-    elif fhi.arch & HAS_ARCH_ARM:
-        yield from capa.features.extractors.binexport2.arch.arm.insn.extract_insn_nzxor_characteristic_features(
-            fh, bbh, ih
-        )
-
-
-def extract_insn_mnemonic_features(
-    fh: FunctionHandle, bbh: BBHandle, ih: InsnHandle
-) -> Iterator[tuple[Feature, Address]]:
-    fhi: FunctionContext = fh.inner
-    ii: InstructionContext = ih.inner
-
-    be2: BinExport2 = fhi.ctx.be2
-
-    instruction: BinExport2.Instruction = be2.instruction[ii.instruction_index]
-    mnemonic: BinExport2.Mnemonic = be2.mnemonic[instruction.mnemonic_index]
-    mnemonic_name: str = mnemonic.name.lower()
-    yield Mnemonic(mnemonic_name), ih.address
-
-
-def extract_function_calls_from(fh: FunctionHandle, bbh: BBHandle, ih: InsnHandle) -> Iterator[tuple[Feature, Address]]:
-    """extract functions calls from features
-
-    most relevant at the function scope;
-    however, its most efficient to extract at the instruction scope.
-    """
-    fhi: FunctionContext = fh.inner
-    ii: InstructionContext = ih.inner
-
-    be2: BinExport2 = fhi.ctx.be2
-
-    instruction: BinExport2.Instruction = be2.instruction[ii.instruction_index]
-    for call_target_address in instruction.call_target:
-        addr: AbsoluteVirtualAddress = AbsoluteVirtualAddress(call_target_address)
-        yield Characteristic("calls from"), addr
-
-        if fh.address == addr:
-            yield Characteristic("recursive call"), addr
-
-
-def extract_function_indirect_call_characteristic_features(
-    fh: FunctionHandle, bbh: BBHandle, ih: InsnHandle
-) -> Iterator[tuple[Feature, Address]]:
-    fhi: FunctionContext = fh.inner
-
-    if fhi.arch & HAS_ARCH_INTEL:
-        yield from capa.features.extractors.binexport2.arch.intel.insn.extract_function_indirect_call_characteristic_features(
-            fh, bbh, ih
-        )
-    elif fhi.arch & HAS_ARCH_ARM:
-        yield from capa.features.extractors.binexport2.arch.arm.insn.extract_function_indirect_call_characteristic_features(
-            fh, bbh, ih
-        )
-
-
-def extract_features(f: FunctionHandle, bbh: BBHandle, insn: InsnHandle) -> Iterator[tuple[Feature, Address]]:
-    """extract instruction features"""
-    for inst_handler in INSTRUCTION_HANDLERS:
-        for feature, ea in inst_handler(f, bbh, insn):
-            yield feature, ea
-
-
-INSTRUCTION_HANDLERS = (
-    extract_insn_api_features,
-    extract_insn_number_features,
-    extract_insn_bytes_features,
-    extract_insn_string_features,
-    extract_insn_offset_features,
-    extract_insn_nzxor_characteristic_features,
-    extract_insn_mnemonic_features,
-    extract_function_calls_from,
-    extract_function_indirect_call_characteristic_features,
-)
--- a/capa/features/extractors/binja/init.py
+++ b/capa/features/extractors/binja/init.py
--- a/capa/features/extractors/binja/basicblock.py
+++ b/capa/features/extractors/binja/basicblock.py
@@ -1,34 +0,0 @@
-# Copyright (C) 2023 Mandiant, Inc. All Rights Reserved.
-# Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at: [package root]/LICENSE.txt
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-#  is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and limitations under the License.
-from typing import Iterator
-
-from binaryninja import BasicBlock as BinjaBasicBlock
-
-from capa.features.common import Feature, Characteristic
-from capa.features.address import Address
-from capa.features.basicblock import BasicBlock
-from capa.features.extractors.base_extractor import BBHandle, FunctionHandle
-
-
-def extract_bb_tight_loop(fh: FunctionHandle, bbh: BBHandle) -> Iterator[tuple[Feature, Address]]:
-    """extract tight loop indicators from a basic block"""
-    bb: BinjaBasicBlock = bbh.inner
-    for edge in bb.outgoing_edges:
-        if edge.target.start == bb.start:
-            yield Characteristic("tight loop"), bbh.address
-
-
-def extract_features(fh: FunctionHandle, bbh: BBHandle) -> Iterator[tuple[Feature, Address]]:
-    """extract basic block features"""
-    for bb_handler in BASIC_BLOCK_HANDLERS:
-        for feature, addr in bb_handler(fh, bbh):
-            yield feature, addr
-    yield BasicBlock(), bbh.address
-
-
-BASIC_BLOCK_HANDLERS = (extract_bb_tight_loop,)
--- a/capa/features/extractors/binja/extractor.py
+++ b/capa/features/extractors/binja/extractor.py
@@ -1,74 +0,0 @@
-# Copyright (C) 2023 Mandiant, Inc. All Rights Reserved.
-# Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at: [package root]/LICENSE.txt
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-#  is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and limitations under the License.
-from typing import Iterator
-
-import binaryninja as binja
-
-import capa.features.extractors.elf
-import capa.features.extractors.binja.file
-import capa.features.extractors.binja.insn
-import capa.features.extractors.binja.global_
-import capa.features.extractors.binja.function
-import capa.features.extractors.binja.basicblock
-from capa.features.common import Feature
-from capa.features.address import Address, AbsoluteVirtualAddress
-from capa.features.extractors.base_extractor import (
-    BBHandle,
-    InsnHandle,
-    SampleHashes,
-    FunctionHandle,
-    StaticFeatureExtractor,
-)
-
-
-class BinjaFeatureExtractor(StaticFeatureExtractor):
-    def __init__(self, bv: binja.BinaryView):
-        super().__init__(hashes=SampleHashes.from_bytes(bv.file.raw.read(0, bv.file.raw.length)))
-        self.bv = bv
-        self.global_features: list[tuple[Feature, Address]] = []
-        self.global_features.extend(capa.features.extractors.binja.file.extract_file_format(self.bv))
-        self.global_features.extend(capa.features.extractors.binja.global_.extract_os(self.bv))
-        self.global_features.extend(capa.features.extractors.binja.global_.extract_arch(self.bv))
-
-    def get_base_address(self):
-        return AbsoluteVirtualAddress(self.bv.start)
-
-    def extract_global_features(self):
-        yield from self.global_features
-
-    def extract_file_features(self):
-        yield from capa.features.extractors.binja.file.extract_features(self.bv)
-
-    def get_functions(self) -> Iterator[FunctionHandle]:
-        for f in self.bv.functions:
-            yield FunctionHandle(address=AbsoluteVirtualAddress(f.start), inner=f)
-
-    def extract_function_features(self, fh: FunctionHandle) -> Iterator[tuple[Feature, Address]]:
-        yield from capa.features.extractors.binja.function.extract_features(fh)
-
-    def get_basic_blocks(self, fh: FunctionHandle) -> Iterator[BBHandle]:
-        f: binja.Function = fh.inner
-        for bb in f.basic_blocks:
-            yield BBHandle(address=AbsoluteVirtualAddress(bb.start), inner=bb)
-
-    def extract_basic_block_features(self, fh: FunctionHandle, bbh: BBHandle) -> Iterator[tuple[Feature, Address]]:
-        yield from capa.features.extractors.binja.basicblock.extract_features(fh, bbh)
-
-    def get_instructions(self, fh: FunctionHandle, bbh: BBHandle) -> Iterator[InsnHandle]:
-        import capa.features.extractors.binja.helpers as binja_helpers
-
-        bb: binja.BasicBlock = bbh.inner
-        addr = bb.start
-
-        for text, length in bb:
-            insn = binja_helpers.DisassemblyInstruction(addr, length, text)
-            yield InsnHandle(address=AbsoluteVirtualAddress(addr), inner=insn)
-            addr += length
-
-    def extract_insn_features(self, fh: FunctionHandle, bbh: BBHandle, ih: InsnHandle):
-        yield from capa.features.extractors.binja.insn.extract_features(fh, bbh, ih)
--- a/capa/features/extractors/binja/file.py
+++ b/capa/features/extractors/binja/file.py
@@ -1,178 +0,0 @@
-# Copyright (C) 2023 Mandiant, Inc. All Rights Reserved.
-# Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at: [package root]/LICENSE.txt
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-#  is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and limitations under the License.
-from typing import Iterator
-
-from binaryninja import Segment, BinaryView, SymbolType, SymbolBinding
-
-import capa.features.extractors.common
-import capa.features.extractors.helpers
-import capa.features.extractors.strings
-from capa.features.file import Export, Import, Section, FunctionName
-from capa.features.common import (
-    FORMAT_PE,
-    FORMAT_ELF,
-    FORMAT_SC32,
-    FORMAT_SC64,
-    FORMAT_BINJA_DB,
-    Format,
-    String,
-    Feature,
-    Characteristic,
-)
-from capa.features.address import NO_ADDRESS, Address, FileOffsetAddress, AbsoluteVirtualAddress
-from capa.features.extractors.binja.helpers import read_c_string, unmangle_c_name
-
-
-def check_segment_for_pe(bv: BinaryView, seg: Segment) -> Iterator[tuple[Feature, Address]]:
-    """check segment for embedded PE"""
-    start = 0
-    if bv.view_type == "PE" and seg.start == bv.start:
-        # If this is the first segment of the binary, skip the first bytes.
-        # Otherwise, there will always be a matched PE at the start of the binaryview.
-        start += 1
-
-    buf = bv.read(seg.start, seg.length)
-
-    for offset, _ in capa.features.extractors.helpers.carve_pe(buf, start):
-        yield Characteristic("embedded pe"), FileOffsetAddress(seg.start + offset)
-
-
-def extract_file_embedded_pe(bv: BinaryView) -> Iterator[tuple[Feature, Address]]:
-    """extract embedded PE features"""
-    for seg in bv.segments:
-        yield from check_segment_for_pe(bv, seg)
-
-
-def extract_file_export_names(bv: BinaryView) -> Iterator[tuple[Feature, Address]]:
-    """extract function exports"""
-    for sym in bv.get_symbols_of_type(SymbolType.FunctionSymbol) + bv.get_symbols_of_type(SymbolType.DataSymbol):
-        if sym.binding in [SymbolBinding.GlobalBinding, SymbolBinding.WeakBinding]:
-            name = sym.short_name
-            if name.startswith("__forwarder_name(") and name.endswith(")"):
-                yield Export(name[17:-1]), AbsoluteVirtualAddress(sym.address)
-                yield Characteristic("forwarded export"), AbsoluteVirtualAddress(sym.address)
-            else:
-                yield Export(name), AbsoluteVirtualAddress(sym.address)
-
-                unmangled_name = unmangle_c_name(name)
-                if name != unmangled_name:
-                    yield Export(unmangled_name), AbsoluteVirtualAddress(sym.address)
-
-    for sym in bv.get_symbols_of_type(SymbolType.DataSymbol):
-        if sym.binding not in [SymbolBinding.GlobalBinding]:
-            continue
-
-        name = sym.short_name
-        if not name.startswith("__forwarder_name"):
-            continue
-
-        # Due to https://github.com/Vector35/binaryninja-api/issues/4641, in binja version 3.5, the symbol's name
-        # does not contain the DLL name. As a workaround, we read the C string at the symbol's address, which contains
-        # both the DLL name and the function name.
-        # Once the above issue is closed in the next binjs stable release, we can update the code here to use the
-        # symbol name directly.
-        name = read_c_string(bv, sym.address, 1024)
-        forwarded_name = capa.features.extractors.helpers.reformat_forwarded_export_name(name)
-        yield Export(forwarded_name), AbsoluteVirtualAddress(sym.address)
-        yield Characteristic("forwarded export"), AbsoluteVirtualAddress(sym.address)
-
-
-def extract_file_import_names(bv: BinaryView) -> Iterator[tuple[Feature, Address]]:
-    """extract function imports
-
-    1. imports by ordinal:
-     - modulename.#ordinal
-
-    2. imports by name, results in two features to support importname-only
-       matching:
-     - modulename.importname
-     - importname
-    """
-    for sym in bv.get_symbols_of_type(SymbolType.ImportAddressSymbol):
-        lib_name = str(sym.namespace)
-        addr = AbsoluteVirtualAddress(sym.address)
-        for name in capa.features.extractors.helpers.generate_symbols(lib_name, sym.short_name, include_dll=True):
-            yield Import(name), addr
-
-        ordinal = sym.ordinal
-        if ordinal != 0 and (lib_name != ""):
-            ordinal_name = f"#{ordinal}"
-            for name in capa.features.extractors.helpers.generate_symbols(lib_name, ordinal_name, include_dll=True):
-                yield Import(name), addr
-
-
-def extract_file_section_names(bv: BinaryView) -> Iterator[tuple[Feature, Address]]:
-    """extract section names"""
-    for name, section in bv.sections.items():
-        yield Section(name), AbsoluteVirtualAddress(section.start)
-
-
-def extract_file_strings(bv: BinaryView) -> Iterator[tuple[Feature, Address]]:
-    """extract ASCII and UTF-16 LE strings"""
-    for s in bv.strings:
-        yield String(s.value), FileOffsetAddress(s.start)
-
-
-def extract_file_function_names(bv: BinaryView) -> Iterator[tuple[Feature, Address]]:
-    """
-    extract the names of statically-linked library functions.
-    """
-    for sym_name in bv.symbols:
-        for sym in bv.symbols[sym_name]:
-            if sym.type not in [SymbolType.LibraryFunctionSymbol, SymbolType.FunctionSymbol]:
-                continue
-
-            name = sym.short_name
-            yield FunctionName(name), sym.address
-            if name.startswith("_"):
-                # some linkers may prefix linked routines with a `_` to avoid name collisions.
-                # extract features for both the mangled and un-mangled representations.
-                # e.g. `_fwrite` -> `fwrite`
-                # see: https://stackoverflow.com/a/2628384/87207
-                yield FunctionName(name[1:]), sym.address
-
-
-def extract_file_format(bv: BinaryView) -> Iterator[tuple[Feature, Address]]:
-    if bv.file.database is not None:
-        yield Format(FORMAT_BINJA_DB), NO_ADDRESS
-
-    view_type = bv.view_type
-    if view_type in ["PE", "COFF"]:
-        yield Format(FORMAT_PE), NO_ADDRESS
-    elif view_type == "ELF":
-        yield Format(FORMAT_ELF), NO_ADDRESS
-    elif view_type == "Mapped":
-        if bv.arch.name == "x86":
-            yield Format(FORMAT_SC32), NO_ADDRESS
-        elif bv.arch.name == "x86_64":
-            yield Format(FORMAT_SC64), NO_ADDRESS
-        else:
-            raise NotImplementedError(f"unexpected raw file with arch: {bv.arch}")
-    elif view_type == "Raw":
-        # no file type to return when processing a binary file, but we want to continue processing
-        return
-    else:
-        raise NotImplementedError(f"unexpected file format: {view_type}")
-
-
-def extract_features(bv: BinaryView) -> Iterator[tuple[Feature, Address]]:
-    """extract file features"""
-    for file_handler in FILE_HANDLERS:
-        for feature, addr in file_handler(bv):
-            yield feature, addr
-
-
-FILE_HANDLERS = (
-    extract_file_export_names,
-    extract_file_import_names,
-    extract_file_strings,
-    extract_file_section_names,
-    extract_file_embedded_pe,
-    extract_file_function_names,
-    extract_file_format,
-)
--- a/capa/features/extractors/binja/find_binja_api.py
+++ b/capa/features/extractors/binja/find_binja_api.py
@@ -1,179 +0,0 @@
-# Copyright (C) 2023 Mandiant, Inc. All Rights Reserved.
-# Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at: [package root]/LICENSE.txt
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-#  is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and limitations under the License.
-import os
-import sys
-import logging
-import subprocess
-import importlib.util
-from typing import Optional
-from pathlib import Path
-
-logger = logging.getLogger(__name__)
-
-
-# When the script gets executed as a standalone executable (via PyInstaller), `import binaryninja` does not work because
-# we have excluded the binaryninja module in `pyinstaller.spec`. The trick here is to call the system Python and try
-# to find out the path of the binaryninja module that has been installed.
-# Note, including the binaryninja module in the `pyinstaller.spec` would not work, since the binaryninja module tries to
-# find the binaryninja core e.g., `libbinaryninjacore.dylib`, using a relative path. And this does not work when the
-# binaryninja module is extracted by the PyInstaller.
-CODE = r"""
-from pathlib import Path
-from importlib import util
-spec = util.find_spec('binaryninja')
-if spec is not None:
-    if len(spec.submodule_search_locations) > 0:
-        path = Path(spec.submodule_search_locations[0])
-        # encode the path with utf8 then convert to hex, make sure it can be read and restored properly
-        print(str(path.parent).encode('utf8').hex())
-"""
-
-
-def find_binaryninja_path_via_subprocess() -> Optional[Path]:
-    raw_output = subprocess.check_output(["python", "-c", CODE]).decode("ascii").strip()
-    output = bytes.fromhex(raw_output).decode("utf8")
-    if not output.strip():
-        return None
-    return Path(output)
-
-
-def get_desktop_entry(name: str) -> Optional[Path]:
-    """
-    Find the path for the given XDG Desktop Entry name.
-
-    Like:
-
-        >> get_desktop_entry("com.vector35.binaryninja.desktop")
-        Path("~/.local/share/applications/com.vector35.binaryninja.desktop")
-    """
-    assert sys.platform in ("linux", "linux2")
-    assert name.endswith(".desktop")
-
-    data_dirs = os.environ.get("XDG_DATA_DIRS", "/usr/share") + f":{Path.home()}/.local/share"
-    for data_dir in data_dirs.split(":"):
-        applications = Path(data_dir) / "applications"
-        for application in applications.glob("*.desktop"):
-            if application.name == name:
-                return application
-
-    return None
-
-
-def get_binaryninja_path(desktop_entry: Path) -> Optional[Path]:
-    # from: Exec=/home/wballenthin/software/binaryninja/binaryninja %u
-    # to:        /home/wballenthin/software/binaryninja/
-    for line in desktop_entry.read_text(encoding="utf-8").splitlines():
-        if not line.startswith("Exec="):
-            continue
-
-        if not line.endswith("binaryninja %u"):
-            continue
-
-        binaryninja_path = Path(line[len("Exec=") : -len("binaryninja %u")])
-        if not binaryninja_path.exists():
-            return None
-
-        return binaryninja_path
-
-    return None
-
-
-def validate_binaryninja_path(binaryninja_path: Path) -> bool:
-    if not binaryninja_path:
-        return False
-
-    module_path = binaryninja_path / "python"
-    if not module_path.is_dir():
-        return False
-
-    if not (module_path / "binaryninja" / "__init__.py").is_file():
-        return False
-
-    return True
-
-
-def find_binaryninja() -> Optional[Path]:
-    binaryninja_path = find_binaryninja_path_via_subprocess()
-    if not binaryninja_path or not validate_binaryninja_path(binaryninja_path):
-        if sys.platform == "linux" or sys.platform == "linux2":
-            # ok
-            logger.debug("detected OS: linux")
-        elif sys.platform == "darwin":
-            logger.warning("unsupported platform to find Binary Ninja: %s", sys.platform)
-            return None
-        elif sys.platform == "win32":
-            logger.warning("unsupported platform to find Binary Ninja: %s", sys.platform)
-            return None
-        else:
-            logger.warning("unsupported platform to find Binary Ninja: %s", sys.platform)
-            return None
-
-        desktop_entry = get_desktop_entry("com.vector35.binaryninja.desktop")
-        if not desktop_entry:
-            logger.debug("failed to find Binary Ninja application")
-            return None
-        logger.debug("found Binary Ninja application: %s", desktop_entry)
-
-        binaryninja_path = get_binaryninja_path(desktop_entry)
-        if not binaryninja_path:
-            logger.debug("failed to determine Binary Ninja installation path")
-            return None
-
-        if not validate_binaryninja_path(binaryninja_path):
-            logger.debug("failed to validate Binary Ninja installation")
-            return None
-
-    logger.debug("found Binary Ninja installation: %s", binaryninja_path)
-
-    return binaryninja_path / "python"
-
-
-def is_binaryninja_installed() -> bool:
-    """Is the binaryninja module ready to import?"""
-    try:
-        return importlib.util.find_spec("binaryninja") is not None
-    except ModuleNotFoundError:
-        return False
-
-
-def has_binaryninja() -> bool:
-    if is_binaryninja_installed():
-        logger.debug("found installed Binary Ninja API")
-        return True
-
-    logger.debug("Binary Ninja API not installed, searching...")
-
-    binaryninja_path = find_binaryninja()
-    if not binaryninja_path:
-        logger.debug("failed to find Binary Ninja installation")
-
-    logger.debug("found Binary Ninja API: %s", binaryninja_path)
-    return binaryninja_path is not None
-
-
-def load_binaryninja() -> bool:
-    try:
-        import binaryninja
-
-        return True
-    except ImportError:
-        binaryninja_path = find_binaryninja()
-        if not binaryninja_path:
-            return False
-
-        sys.path.append(binaryninja_path.absolute().as_posix())
-        try:
-            import binaryninja  # noqa: F401 unused import
-
-            return True
-        except ImportError:
-            return False
-
-
-if __name__ == "__main__":
-    print(find_binaryninja_path_via_subprocess())
--- a/capa/features/extractors/binja/function.py
+++ b/capa/features/extractors/binja/function.py
@@ -1,210 +0,0 @@
-# Copyright (C) 2023 Mandiant, Inc. All Rights Reserved.
-# Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at: [package root]/LICENSE.txt
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-#  is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and limitations under the License.
-import string
-from typing import Iterator
-
-from binaryninja import (
-    Function,
-    BinaryView,
-    SymbolType,
-    ILException,
-    RegisterValueType,
-    VariableSourceType,
-    LowLevelILOperation,
-    MediumLevelILOperation,
-    MediumLevelILBasicBlock,
-    MediumLevelILInstruction,
-)
-
-from capa.features.file import FunctionName
-from capa.features.common import Feature, Characteristic
-from capa.features.address import Address, AbsoluteVirtualAddress
-from capa.features.extractors import loops
-from capa.features.extractors.helpers import MIN_STACKSTRING_LEN
-from capa.features.extractors.binja.helpers import get_llil_instr_at_addr
-from capa.features.extractors.base_extractor import FunctionHandle
-
-
-def extract_function_calls_to(fh: FunctionHandle):
-    """extract callers to a function"""
-    func: Function = fh.inner
-
-    for caller in func.caller_sites:
-        # Everything that is a code reference to the current function is considered a caller, which actually includes
-        # many other references that are NOT a caller. For example, an instruction `push function_start` will also be
-        # considered a caller to the function
-        llil = get_llil_instr_at_addr(func.view, caller.address)
-        if (llil is None) or llil.operation not in [
-            LowLevelILOperation.LLIL_CALL,
-            LowLevelILOperation.LLIL_CALL_STACK_ADJUST,
-            LowLevelILOperation.LLIL_JUMP,
-            LowLevelILOperation.LLIL_TAILCALL,
-        ]:
-            continue
-
-        if llil.dest.operation not in [
-            LowLevelILOperation.LLIL_CONST,
-            LowLevelILOperation.LLIL_CONST_PTR,
-        ]:
-            continue
-
-        address = llil.dest.constant
-        if address != func.start:
-            continue
-
-        yield Characteristic("calls to"), AbsoluteVirtualAddress(caller.address)
-
-
-def extract_function_loop(fh: FunctionHandle):
-    """extract loop indicators from a function"""
-    func: Function = fh.inner
-
-    edges = []
-
-    # construct control flow graph
-    for bb in func.basic_blocks:
-        for edge in bb.outgoing_edges:
-            edges.append((bb.start, edge.target.start))
-
-    if loops.has_loop(edges):
-        yield Characteristic("loop"), fh.address
-
-
-def extract_recursive_call(fh: FunctionHandle):
-    """extract recursive function call"""
-    func: Function = fh.inner
-    bv: BinaryView = func.view
-    if bv is None:
-        return
-
-    for ref in bv.get_code_refs(func.start):
-        if ref.function == func:
-            yield Characteristic("recursive call"), fh.address
-
-
-def extract_function_name(fh: FunctionHandle):
-    """extract function names (e.g., symtab names)"""
-    func: Function = fh.inner
-    bv: BinaryView = func.view
-    if bv is None:
-        return
-
-    for sym in bv.get_symbols(func.start):
-        if sym.type not in [SymbolType.LibraryFunctionSymbol, SymbolType.FunctionSymbol]:
-            continue
-
-        name = sym.short_name
-        yield FunctionName(name), sym.address
-        if name.startswith("_"):
-            # some linkers may prefix linked routines with a `_` to avoid name collisions.
-            # extract features for both the mangled and un-mangled representations.
-            # e.g. `_fwrite` -> `fwrite`
-            # see: https://stackoverflow.com/a/2628384/87207
-            yield FunctionName(name[1:]), sym.address
-
-
-def get_printable_len_ascii(s: bytes) -> int:
-    """Return string length if all operand bytes are ascii or utf16-le printable"""
-    count = 0
-    for c in s:
-        if c == 0:
-            return count
-        if c < 127 and chr(c) in string.printable:
-            count += 1
-    return count
-
-
-def get_printable_len_wide(s: bytes) -> int:
-    """Return string length if all operand bytes are ascii or utf16-le printable"""
-    if all(c == 0x00 for c in s[1::2]):
-        return get_printable_len_ascii(s[::2])
-    return 0
-
-
-def get_stack_string_len(f: Function, il: MediumLevelILInstruction) -> int:
-    bv: BinaryView = f.view
-
-    if il.operation != MediumLevelILOperation.MLIL_CALL:
-        return 0
-
-    target = il.dest
-    if target.operation not in [MediumLevelILOperation.MLIL_CONST, MediumLevelILOperation.MLIL_CONST_PTR]:
-        return 0
-
-    addr = target.value.value
-    sym = bv.get_symbol_at(addr)
-    if not sym or sym.type not in [SymbolType.LibraryFunctionSymbol, SymbolType.SymbolicFunctionSymbol]:
-        return 0
-
-    if sym.name not in ["__builtin_strncpy", "__builtin_strcpy", "__builtin_wcscpy"]:
-        return 0
-
-    if len(il.params) < 2:
-        return 0
-
-    dest = il.params[0]
-    if dest.operation in [MediumLevelILOperation.MLIL_ADDRESS_OF, MediumLevelILOperation.MLIL_VAR]:
-        var = dest.src
-    else:
-        return 0
-
-    if var.source_type != VariableSourceType.StackVariableSourceType:
-        return 0
-
-    src = il.params[1]
-    if src.value.type != RegisterValueType.ConstantDataAggregateValue:
-        return 0
-
-    s = f.get_constant_data(RegisterValueType.ConstantDataAggregateValue, src.value.value)
-    return max(get_printable_len_ascii(bytes(s)), get_printable_len_wide(bytes(s)))
-
-
-def bb_contains_stackstring(f: Function, bb: MediumLevelILBasicBlock) -> bool:
-    """check basic block for stackstring indicators
-
-    true if basic block contains enough moves of constant bytes to the stack
-    """
-    count = 0
-    for il in bb:
-        count += get_stack_string_len(f, il)
-        if count > MIN_STACKSTRING_LEN:
-            return True
-
-    return False
-
-
-def extract_stackstring(fh: FunctionHandle):
-    """extract stackstring indicators"""
-    func: Function = fh.inner
-    bv: BinaryView = func.view
-    if bv is None:
-        return
-
-    try:
-        mlil = func.mlil
-    except ILException:
-        return
-
-    for block in mlil.basic_blocks:
-        if bb_contains_stackstring(func, block):
-            yield Characteristic("stack string"), block.source_block.start
-
-
-def extract_features(fh: FunctionHandle) -> Iterator[tuple[Feature, Address]]:
-    for func_handler in FUNCTION_HANDLERS:
-        for feature, addr in func_handler(fh):
-            yield feature, addr
-
-
-FUNCTION_HANDLERS = (
-    extract_function_calls_to,
-    extract_function_loop,
-    extract_recursive_call,
-    extract_function_name,
-    extract_stackstring,
-)
--- a/capa/features/extractors/binja/global_.py
+++ b/capa/features/extractors/binja/global_.py
@@ -1,60 +0,0 @@
-# Copyright (C) 2023 Mandiant, Inc. All Rights Reserved.
-# Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at: [package root]/LICENSE.txt
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-#  is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and limitations under the License.
-import logging
-from typing import Iterator
-
-from binaryninja import BinaryView
-
-from capa.features.common import OS, OS_MACOS, ARCH_I386, ARCH_AMD64, OS_WINDOWS, Arch, Feature
-from capa.features.address import NO_ADDRESS, Address
-
-logger = logging.getLogger(__name__)
-
-
-def extract_os(bv: BinaryView) -> Iterator[tuple[Feature, Address]]:
-    name = bv.platform.name
-    if "-" in name:
-        name = name.split("-")[0]
-
-    if name == "windows":
-        yield OS(OS_WINDOWS), NO_ADDRESS
-
-    elif name == "macos":
-        yield OS(OS_MACOS), NO_ADDRESS
-
-    elif name in ["linux", "freebsd", "decree"]:
-        yield OS(name), NO_ADDRESS
-
-    else:
-        # we likely end up here:
-        #  1. handling shellcode, or
-        #  2. handling a new file format (e.g. macho)
-        #
-        # for (1) we can't do much - its shellcode and all bets are off.
-        # we could maybe accept a further CLI argument to specify the OS,
-        # but i think this would be rarely used.
-        # rules that rely on OS conditions will fail to match on shellcode.
-        #
-        # for (2), this logic will need to be updated as the format is implemented.
-        logger.debug("unsupported file format: %s, will not guess OS", name)
-        return
-
-
-def extract_arch(bv: BinaryView) -> Iterator[tuple[Feature, Address]]:
-    arch = bv.arch.name
-    if arch == "x86_64":
-        yield Arch(ARCH_AMD64), NO_ADDRESS
-    elif arch == "x86":
-        yield Arch(ARCH_I386), NO_ADDRESS
-    else:
-        # we likely end up here:
-        #  1. handling a new architecture (e.g. aarch64)
-        #
-        # for (1), this logic will need to be updated as the format is implemented.
-        logger.debug("unsupported architecture: %s", arch)
-        return
--- a/capa/features/extractors/binja/helpers.py
+++ b/capa/features/extractors/binja/helpers.py
@@ -1,79 +0,0 @@
-# Copyright (C) 2023 Mandiant, Inc. All Rights Reserved.
-# Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at: [package root]/LICENSE.txt
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-#  is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and limitations under the License.
-import re
-from typing import Callable, Optional
-from dataclasses import dataclass
-
-from binaryninja import BinaryView, LowLevelILFunction, LowLevelILInstruction
-from binaryninja.architecture import InstructionTextToken
-
-
-@dataclass
-class DisassemblyInstruction:
-    address: int
-    length: int
-    text: list[InstructionTextToken]
-
-
-LLIL_VISITOR = Callable[[LowLevelILInstruction, LowLevelILInstruction, int], bool]
-
-
-def visit_llil_exprs(il: LowLevelILInstruction, func: LLIL_VISITOR):
-    # BN does not really support operand index at the disassembly level, so use the LLIL operand index as a substitute.
-    # Note, this is NOT always guaranteed to be the same as disassembly operand.
-    for i, op in enumerate(il.operands):
-        if isinstance(op, LowLevelILInstruction) and func(op, il, i):
-            visit_llil_exprs(op, func)
-
-
-def unmangle_c_name(name: str) -> str:
-    # https://learn.microsoft.com/en-us/cpp/build/reference/decorated-names?view=msvc-170#FormatC
-    # Possible variations for BaseThreadInitThunk:
-    # @BaseThreadInitThunk@12
-    # _BaseThreadInitThunk
-    # _BaseThreadInitThunk@12
-    # It is also possible for a function to have a `Stub` appended to its name:
-    # _lstrlenWStub@4
-
-    # A small optimization to avoid running the regex too many times
-    # this still increases the unit test execution time from 170s to 200s, should be able to accelerate it
-    #
-    # TODO(xusheng): performance optimizations to improve test execution time
-    # https://github.com/mandiant/capa/issues/1610
-    if name[0] in ["@", "_"]:
-        match = re.match(r"^[@|_](.*?)(Stub)?(@\d+)?$", name)
-        if match:
-            return match.group(1)
-
-    return name
-
-
-def read_c_string(bv: BinaryView, offset: int, max_len: int) -> str:
-    s: list[str] = []
-    while len(s) < max_len:
-        try:
-            c = bv.read(offset + len(s), 1)[0]
-        except Exception:
-            break
-
-        if c == 0:
-            break
-
-        s.append(chr(c))
-
-    return "".join(s)
-
-
-def get_llil_instr_at_addr(bv: BinaryView, addr: int) -> Optional[LowLevelILInstruction]:
-    arch = bv.arch
-    buffer = bv.read(addr, arch.max_instr_length)
-    llil = LowLevelILFunction(arch=arch)
-    llil.current_address = addr
-    if arch.get_instruction_low_level_il(buffer, addr, llil) == 0:
-        return None
-    return llil[0]
--- a/capa/features/extractors/binja/insn.py
+++ b/capa/features/extractors/binja/insn.py
@@ -1,578 +0,0 @@
-# Copyright (C) 2023 Mandiant, Inc. All Rights Reserved.
-# Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at: [package root]/LICENSE.txt
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-#  is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and limitations under the License.
-from typing import Any, Iterator, Optional
-
-from binaryninja import Function
-from binaryninja import BasicBlock as BinjaBasicBlock
-from binaryninja import (
-    BinaryView,
-    ILRegister,
-    SymbolType,
-    BinaryReader,
-    RegisterValueType,
-    LowLevelILOperation,
-    LowLevelILInstruction,
-)
-
-import capa.features.extractors.helpers
-from capa.features.insn import API, MAX_STRUCTURE_SIZE, Number, Offset, Mnemonic, OperandNumber, OperandOffset
-from capa.features.common import MAX_BYTES_FEATURE_SIZE, Bytes, String, Feature, Characteristic
-from capa.features.address import Address, AbsoluteVirtualAddress
-from capa.features.extractors.binja.helpers import DisassemblyInstruction, visit_llil_exprs, get_llil_instr_at_addr
-from capa.features.extractors.base_extractor import BBHandle, InsnHandle, FunctionHandle
-
-# security cookie checks may perform non-zeroing XORs, these are expected within a certain
-# byte range within the first and returning basic blocks, this helps to reduce FP features
-SECURITY_COOKIE_BYTES_DELTA = 0x40
-
-
-# check if a function is a stub function to another function/symbol. The criteria is:
-# 1. The function must only have one basic block
-# 2. The function must only make one call/jump to another address
-# If the function being checked is a stub function, returns the target address. Otherwise, return None.
-def is_stub_function(bv: BinaryView, addr: int) -> Optional[int]:
-    llil = get_llil_instr_at_addr(bv, addr)
-    if llil is None or llil.operation not in [
-        LowLevelILOperation.LLIL_CALL,
-        LowLevelILOperation.LLIL_CALL_STACK_ADJUST,
-        LowLevelILOperation.LLIL_JUMP,
-        LowLevelILOperation.LLIL_TAILCALL,
-    ]:
-        return None
-
-    # The LLIL instruction retrieved by `get_llil_instr_at_addr` did not go through a full analysis, so we cannot check
-    # `llil.dest.value.type` here
-    if llil.dest.operation not in [
-        LowLevelILOperation.LLIL_CONST,
-        LowLevelILOperation.LLIL_CONST_PTR,
-    ]:
-        return None
-
-    return llil.dest.constant
-
-
-def extract_insn_api_features(fh: FunctionHandle, bbh: BBHandle, ih: InsnHandle) -> Iterator[tuple[Feature, Address]]:
-    """
-    parse instruction API features
-
-    example:
-       call dword [0x00473038]
-    """
-    func: Function = fh.inner
-    bv: BinaryView = func.view
-
-    for llil in func.get_llils_at(ih.address):
-        if llil.operation in [
-            LowLevelILOperation.LLIL_CALL,
-            LowLevelILOperation.LLIL_CALL_STACK_ADJUST,
-            LowLevelILOperation.LLIL_JUMP,
-            LowLevelILOperation.LLIL_TAILCALL,
-        ]:
-            if llil.dest.value.type not in [
-                RegisterValueType.ImportedAddressValue,
-                RegisterValueType.ConstantValue,
-                RegisterValueType.ConstantPointerValue,
-            ]:
-                continue
-            address = llil.dest.value.value
-            candidate_addrs = [address]
-            stub_addr = is_stub_function(bv, address)
-            if stub_addr is not None:
-                candidate_addrs.append(stub_addr)
-
-            for address in candidate_addrs:
-                for sym in func.view.get_symbols(address):
-                    if sym is None or sym.type not in [
-                        SymbolType.ImportAddressSymbol,
-                        SymbolType.ImportedFunctionSymbol,
-                        SymbolType.FunctionSymbol,
-                    ]:
-                        continue
-
-                    sym_name = sym.short_name
-
-                    lib_name = ""
-                    import_lib = bv.lookup_imported_object_library(sym.address)
-                    if import_lib is not None:
-                        lib_name = import_lib[0].name
-                        if lib_name.endswith(".dll"):
-                            lib_name = lib_name[:-4]
-                        elif lib_name.endswith(".so"):
-                            lib_name = lib_name[:-3]
-
-                    for name in capa.features.extractors.helpers.generate_symbols(lib_name, sym_name):
-                        yield API(name), ih.address
-
-                    if sym_name.startswith("_"):
-                        for name in capa.features.extractors.helpers.generate_symbols(lib_name, sym_name[1:]):
-                            yield API(name), ih.address
-
-
-def extract_insn_number_features(
-    fh: FunctionHandle, bbh: BBHandle, ih: InsnHandle
-) -> Iterator[tuple[Feature, Address]]:
-    """
-    parse instruction number features
-    example:
-        push    3136B0h         ; dwControlCode
-    """
-    func: Function = fh.inner
-
-    results: list[tuple[Any[Number, OperandNumber], Address]] = []
-
-    def llil_checker(il: LowLevelILInstruction, parent: LowLevelILInstruction, index: int) -> bool:
-        if il.operation == LowLevelILOperation.LLIL_LOAD:
-            return False
-
-        if il.operation not in [LowLevelILOperation.LLIL_CONST, LowLevelILOperation.LLIL_CONST_PTR]:
-            return True
-
-        for op in parent.operands:
-            if isinstance(op, ILRegister) and op.name in ["esp", "ebp", "rsp", "rbp", "sp"]:
-                return False
-            elif isinstance(op, LowLevelILInstruction) and op.operation == LowLevelILOperation.LLIL_REG:
-                if op.src.name in ["esp", "ebp", "rsp", "rbp", "sp"]:
-                    return False
-
-        raw_value = il.value.value
-        if parent.operation == LowLevelILOperation.LLIL_SUB:
-            raw_value = -raw_value
-
-        results.append((Number(raw_value), ih.address))
-        results.append((OperandNumber(index, raw_value), ih.address))
-
-        return False
-
-    for llil in func.get_llils_at(ih.address):
-        visit_llil_exprs(llil, llil_checker)
-
-    yield from results
-
-
-def extract_insn_bytes_features(fh: FunctionHandle, bbh: BBHandle, ih: InsnHandle) -> Iterator[tuple[Feature, Address]]:
-    """
-    parse referenced byte sequences
-    example:
-        push    offset iid_004118d4_IShellLinkA ; riid
-    """
-    func: Function = fh.inner
-    bv: BinaryView = func.view
-
-    candidate_addrs = set()
-
-    llil = func.get_llil_at(ih.address)
-    if llil is None or llil.operation in [LowLevelILOperation.LLIL_CALL, LowLevelILOperation.LLIL_CALL_STACK_ADJUST]:
-        return
-
-    for ref in bv.get_code_refs_from(ih.address):
-        if ref == ih.address:
-            continue
-
-        if len(bv.get_functions_containing(ref)) > 0:
-            continue
-
-        candidate_addrs.add(ref)
-
-    # collect candidate address by enumerating all integers, https://github.com/Vector35/binaryninja-api/issues/3966
-    def llil_checker(il: LowLevelILInstruction, parent: LowLevelILInstruction, index: int) -> bool:
-        if il.operation in [LowLevelILOperation.LLIL_CONST, LowLevelILOperation.LLIL_CONST_PTR]:
-            value = il.value.value
-            if value > 0:
-                candidate_addrs.add(value)
-            return False
-
-        return True
-
-    for llil in func.get_llils_at(ih.address):
-        visit_llil_exprs(llil, llil_checker)
-
-    for addr in candidate_addrs:
-        extracted_bytes = bv.read(addr, MAX_BYTES_FEATURE_SIZE)
-        if extracted_bytes and not capa.features.extractors.helpers.all_zeros(extracted_bytes):
-            if bv.get_string_at(addr) is None:
-                # don't extract byte features for obvious strings
-                yield Bytes(extracted_bytes), ih.address
-
-
-def extract_insn_string_features(
-    fh: FunctionHandle, bbh: BBHandle, ih: InsnHandle
-) -> Iterator[tuple[Feature, Address]]:
-    """
-    parse instruction string features
-
-    example:
-        push offset aAcr     ; "ACR  > "
-    """
-    func: Function = fh.inner
-    bv: BinaryView = func.view
-
-    candidate_addrs = set()
-
-    # collect candidate address from code refs directly
-    for ref in bv.get_code_refs_from(ih.address):
-        if ref == ih.address:
-            continue
-
-        if len(bv.get_functions_containing(ref)) > 0:
-            continue
-
-        candidate_addrs.add(ref)
-
-    # collect candidate address by enumerating all integers, https://github.com/Vector35/binaryninja-api/issues/3966
-    def llil_checker(il: LowLevelILInstruction, parent: LowLevelILInstruction, index: int) -> bool:
-        if il.operation in [LowLevelILOperation.LLIL_CONST, LowLevelILOperation.LLIL_CONST_PTR]:
-            value = il.value.value
-            if value > 0:
-                candidate_addrs.add(value)
-            return False
-
-        return True
-
-    for llil in func.get_llils_at(ih.address):
-        visit_llil_exprs(llil, llil_checker)
-
-    # Now we have all the candidate address, check them for string or pointer to string
-    br = BinaryReader(bv)
-    for addr in candidate_addrs:
-        found = bv.get_string_at(addr)
-        if found:
-            yield String(found.value), ih.address
-
-        br.seek(addr)
-        pointer = None
-        if bv.arch.address_size == 4:
-            pointer = br.read32()
-        elif bv.arch.address_size == 8:
-            pointer = br.read64()
-
-        if pointer is not None:
-            found = bv.get_string_at(pointer)
-            if found:
-                yield String(found.value), ih.address
-
-
-def extract_insn_offset_features(
-    fh: FunctionHandle, bbh: BBHandle, ih: InsnHandle
-) -> Iterator[tuple[Feature, Address]]:
-    """
-    parse instruction structure offset features
-
-    example:
-        .text:0040112F cmp [esi+4], ebx
-    """
-    func: Function = fh.inner
-
-    results: list[tuple[Any[Offset, OperandOffset], Address]] = []
-    address_size = func.view.arch.address_size * 8
-
-    def llil_checker(il: LowLevelILInstruction, parent: LowLevelILInstruction, index: int) -> bool:
-        #  The most common case, read/write dereference to something like `dword [eax+0x28]`
-        if il.operation in [LowLevelILOperation.LLIL_ADD, LowLevelILOperation.LLIL_SUB]:
-            left = il.left
-            right = il.right
-            # Exclude offsets based on stack/franme pointers
-            if left.operation == LowLevelILOperation.LLIL_REG and left.src.name in ["esp", "ebp", "rsp", "rbp", "sp"]:
-                return True
-
-            if right.operation != LowLevelILOperation.LLIL_CONST:
-                return True
-
-            raw_value = right.value.value
-            # If this is not a dereference, then this must be an add and the offset must be in the range \
-            # [0, MAX_STRUCTURE_SIZE]. For example,
-            # add eax, 0x10,
-            # lea ebx, [eax + 1]
-            if parent.operation not in [LowLevelILOperation.LLIL_LOAD, LowLevelILOperation.LLIL_STORE]:
-                if il.operation != LowLevelILOperation.LLIL_ADD or (not 0 < raw_value < MAX_STRUCTURE_SIZE):
-                    return False
-
-            if address_size > 0:
-                # BN also encodes the constant value as two's complement, we need to restore its original value
-                value = capa.features.extractors.helpers.twos_complement(raw_value, address_size)
-            else:
-                value = raw_value
-
-            results.append((Offset(value), ih.address))
-            results.append((OperandOffset(index, value), ih.address))
-            return False
-
-        # An edge case: for code like `push dword [esi]`, we need to generate a feature for offset 0x0
-        elif il.operation in [LowLevelILOperation.LLIL_LOAD, LowLevelILOperation.LLIL_STORE]:
-            if il.operands[0].operation == LowLevelILOperation.LLIL_REG:
-                results.append((Offset(0), ih.address))
-                results.append((OperandOffset(index, 0), ih.address))
-                return False
-
-        return True
-
-    for llil in func.get_llils_at(ih.address):
-        visit_llil_exprs(llil, llil_checker)
-
-    yield from results
-
-
-def is_nzxor_stack_cookie(f: Function, bb: BinjaBasicBlock, llil: LowLevelILInstruction) -> bool:
-    """check if nzxor exists within stack cookie delta"""
-    # TODO(xusheng): use LLIL SSA to do more accurate analysis
-    # https://github.com/mandiant/capa/issues/1609
-
-    reg_names = []
-    if llil.left.operation == LowLevelILOperation.LLIL_REG:
-        reg_names.append(llil.left.src.name)
-
-    if llil.right.operation == LowLevelILOperation.LLIL_REG:
-        reg_names.append(llil.right.src.name)
-
-    # stack cookie reg should be stack/frame pointer
-    if not any(reg in ["ebp", "esp", "rbp", "rsp", "sp"] for reg in reg_names):
-        return False
-
-    # expect security cookie init in first basic block within first bytes (instructions)
-    if len(bb.incoming_edges) == 0 and llil.address < (bb.start + SECURITY_COOKIE_BYTES_DELTA):
-        return True
-
-    # ... or within last bytes (instructions) before a return
-    if len(bb.outgoing_edges) == 0 and llil.address > (bb.end - SECURITY_COOKIE_BYTES_DELTA):
-        return True
-
-    return False
-
-
-def extract_insn_nzxor_characteristic_features(
-    fh: FunctionHandle, bbh: BBHandle, ih: InsnHandle
-) -> Iterator[tuple[Feature, Address]]:
-    """
-    parse instruction non-zeroing XOR instruction
-    ignore expected non-zeroing XORs, e.g. security cookies
-    """
-    func: Function = fh.inner
-
-    results = []
-
-    def llil_checker(il: LowLevelILInstruction, parent: LowLevelILInstruction, index: int) -> bool:
-        # If the two operands of the xor instruction are the same, the LLIL will be translated to other instructions,
-        # e.g., <llil: eax = 0>, (LLIL_SET_REG). So we do not need to check whether the two operands are the same.
-        if il.operation == LowLevelILOperation.LLIL_XOR:
-            # Exclude cases related to the stack cookie
-            if is_nzxor_stack_cookie(fh.inner, bbh.inner, il):
-                return False
-            results.append((Characteristic("nzxor"), ih.address))
-            return False
-        else:
-            return True
-
-    for llil in func.get_llils_at(ih.address):
-        visit_llil_exprs(llil, llil_checker)
-
-    yield from results
-
-
-def extract_insn_mnemonic_features(
-    fh: FunctionHandle, bbh: BBHandle, ih: InsnHandle
-) -> Iterator[tuple[Feature, Address]]:
-    """parse instruction mnemonic features"""
-    insn: DisassemblyInstruction = ih.inner
-    yield Mnemonic(insn.text[0].text), ih.address
-
-
-def extract_insn_obfs_call_plus_5_characteristic_features(
-    fh: FunctionHandle, bbh: BBHandle, ih: InsnHandle
-) -> Iterator[tuple[Feature, Address]]:
-    """
-    parse call $+5 instruction from the given instruction.
-    """
-    insn: DisassemblyInstruction = ih.inner
-    if insn.text[0].text == "call" and insn.text[2].text == "$+5" and insn.length == 5:
-        yield Characteristic("call $+5"), ih.address
-
-
-def extract_insn_peb_access_characteristic_features(
-    fh: FunctionHandle, bbh: BBHandle, ih: InsnHandle
-) -> Iterator[tuple[Feature, Address]]:
-    """parse instruction peb access
-
-    fs:[0x30] on x86, gs:[0x60] on x64
-    """
-    func: Function = fh.inner
-
-    results = []
-
-    def llil_checker(il: LowLevelILInstruction, parent: LowLevelILOperation, index: int) -> bool:
-        if il.operation != LowLevelILOperation.LLIL_LOAD:
-            return True
-
-        src = il.src
-        if src.operation != LowLevelILOperation.LLIL_ADD:
-            return True
-
-        left = src.left
-        right = src.right
-
-        if left.operation != LowLevelILOperation.LLIL_REG:
-            return True
-
-        reg = left.src.name
-
-        if right.operation != LowLevelILOperation.LLIL_CONST:
-            return True
-
-        value = right.value.value
-        if (reg, value) not in (("fsbase", 0x30), ("gsbase", 0x60)):
-            return True
-
-        results.append((Characteristic("peb access"), ih.address))
-        return False
-
-    for llil in func.get_llils_at(ih.address):
-        visit_llil_exprs(llil, llil_checker)
-
-    yield from results
-
-
-def extract_insn_segment_access_features(
-    fh: FunctionHandle, bbh: BBHandle, ih: InsnHandle
-) -> Iterator[tuple[Feature, Address]]:
-    """parse instruction fs or gs access"""
-    func: Function = fh.inner
-
-    results = []
-
-    def llil_checker(il: LowLevelILInstruction, parent: LowLevelILInstruction, index: int) -> bool:
-        if il.operation == LowLevelILOperation.LLIL_REG:
-            reg = il.src.name
-            if reg == "fsbase":
-                results.append((Characteristic("fs access"), ih.address))
-                return False
-            elif reg == "gsbase":
-                results.append((Characteristic("gs access"), ih.address))
-                return False
-            return False
-
-        return True
-
-    for llil in func.get_llils_at(ih.address):
-        visit_llil_exprs(llil, llil_checker)
-
-    yield from results
-
-
-def extract_insn_cross_section_cflow(
-    fh: FunctionHandle, bbh: BBHandle, ih: InsnHandle
-) -> Iterator[tuple[Feature, Address]]:
-    """inspect the instruction for a CALL or JMP that crosses section boundaries"""
-    func: Function = fh.inner
-    bv: BinaryView = func.view
-
-    if bv is None:
-        return
-
-    seg1 = bv.get_segment_at(ih.address)
-    sections1 = bv.get_sections_at(ih.address)
-    for ref in bv.get_code_refs_from(ih.address):
-        if len(bv.get_functions_at(ref)) == 0:
-            continue
-
-        seg2 = bv.get_segment_at(ref)
-        sections2 = bv.get_sections_at(ref)
-        if seg1 != seg2 or sections1 != sections2:
-            yield Characteristic("cross section flow"), ih.address
-
-
-def extract_function_calls_from(fh: FunctionHandle, bbh: BBHandle, ih: InsnHandle) -> Iterator[tuple[Feature, Address]]:
-    """extract functions calls from features
-
-    most relevant at the function scope, however, its most efficient to extract at the instruction scope
-    """
-    func: Function = fh.inner
-    bv: BinaryView = func.view
-
-    if bv is None:
-        return
-
-    for il in func.get_llils_at(ih.address):
-        if il.operation not in [
-            LowLevelILOperation.LLIL_CALL,
-            LowLevelILOperation.LLIL_CALL_STACK_ADJUST,
-            LowLevelILOperation.LLIL_TAILCALL,
-        ]:
-            continue
-
-        dest = il.dest
-        if dest.operation == LowLevelILOperation.LLIL_CONST_PTR:
-            value = dest.value.value
-            yield Characteristic("calls from"), AbsoluteVirtualAddress(value)
-        elif dest.operation == LowLevelILOperation.LLIL_CONST:
-            yield Characteristic("calls from"), AbsoluteVirtualAddress(dest.value)
-        elif dest.operation == LowLevelILOperation.LLIL_LOAD:
-            indirect_src = dest.src
-            if indirect_src.operation == LowLevelILOperation.LLIL_CONST_PTR:
-                value = indirect_src.value.value
-                yield Characteristic("calls from"), AbsoluteVirtualAddress(value)
-            elif indirect_src.operation == LowLevelILOperation.LLIL_CONST:
-                yield Characteristic("calls from"), AbsoluteVirtualAddress(indirect_src.value)
-        elif dest.operation == LowLevelILOperation.LLIL_REG:
-            if dest.value.type in [
-                RegisterValueType.ImportedAddressValue,
-                RegisterValueType.ConstantValue,
-                RegisterValueType.ConstantPointerValue,
-            ]:
-                yield Characteristic("calls from"), AbsoluteVirtualAddress(dest.value.value)
-
-
-def extract_function_indirect_call_characteristic_features(
-    fh: FunctionHandle, bbh: BBHandle, ih: InsnHandle
-) -> Iterator[tuple[Feature, Address]]:
-    """extract indirect function calls (e.g., call eax or call dword ptr [edx+4])
-    does not include calls like => call ds:dword_ABD4974
-
-    most relevant at the function or basic block scope;
-    however, its most efficient to extract at the instruction scope
-    """
-    func: Function = fh.inner
-
-    llil = func.get_llil_at(ih.address)
-    if llil is None or llil.operation not in [
-        LowLevelILOperation.LLIL_CALL,
-        LowLevelILOperation.LLIL_CALL_STACK_ADJUST,
-        LowLevelILOperation.LLIL_TAILCALL,
-    ]:
-        return
-
-    if llil.dest.operation in [LowLevelILOperation.LLIL_CONST, LowLevelILOperation.LLIL_CONST_PTR]:
-        return
-
-    if llil.dest.operation == LowLevelILOperation.LLIL_LOAD:
-        src = llil.dest.src
-        if src.operation in [LowLevelILOperation.LLIL_CONST, LowLevelILOperation.LLIL_CONST_PTR]:
-            return
-
-    yield Characteristic("indirect call"), ih.address
-
-
-def extract_features(f: FunctionHandle, bbh: BBHandle, insn: InsnHandle) -> Iterator[tuple[Feature, Address]]:
-    """extract instruction features"""
-    for inst_handler in INSTRUCTION_HANDLERS:
-        for feature, ea in inst_handler(f, bbh, insn):
-            yield feature, ea
-
-
-INSTRUCTION_HANDLERS = (
-    extract_insn_api_features,
-    extract_insn_number_features,
-    extract_insn_bytes_features,
-    extract_insn_string_features,
-    extract_insn_offset_features,
-    extract_insn_nzxor_characteristic_features,
-    extract_insn_mnemonic_features,
-    extract_insn_obfs_call_plus_5_characteristic_features,
-    extract_insn_peb_access_characteristic_features,
-    extract_insn_cross_section_cflow,
-    extract_insn_segment_access_features,
-    extract_function_calls_from,
-    extract_function_indirect_call_characteristic_features,
-)
--- a/capa/features/extractors/cape/init.py
+++ b/capa/features/extractors/cape/init.py
--- a/capa/features/extractors/cape/call.py
+++ b/capa/features/extractors/cape/call.py
@@ -1,64 +0,0 @@
-# Copyright (C) 2023 Mandiant, Inc. All Rights Reserved.
-# Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at: [package root]/LICENSE.txt
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-#  is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and limitations under the License.
-
-import logging
-from typing import Iterator
-
-import capa.features.extractors.helpers
-from capa.helpers import assert_never
-from capa.features.insn import API, Number
-from capa.features.common import String, Feature
-from capa.features.address import Address
-from capa.features.extractors.cape.models import Call
-from capa.features.extractors.base_extractor import CallHandle, ThreadHandle, ProcessHandle
-
-logger = logging.getLogger(__name__)
-
-
-def extract_call_features(ph: ProcessHandle, th: ThreadHandle, ch: CallHandle) -> Iterator[tuple[Feature, Address]]:
-    """
-    this method extracts the given call's features (such as API name and arguments),
-    and returns them as API, Number, and String features.
-
-    args:
-      ph: process handle (for defining the extraction scope)
-      th: thread handle (for defining the extraction scope)
-      ch: call handle (for defining the extraction scope)
-
-    yields:
-      Feature, address; where Feature is either: API, Number, or String.
-    """
-    call: Call = ch.inner
-
-    # list similar to disassembly: arguments right-to-left, call
-    for arg in reversed(call.arguments):
-        value = arg.value
-        if isinstance(value, list) and len(value) == 0:
-            # unsure why CAPE captures arguments as empty lists?
-            continue
-
-        elif isinstance(value, str):
-            yield String(value), ch.address
-
-        elif isinstance(value, int):
-            yield Number(value), ch.address
-
-        else:
-            assert_never(value)
-
-    for name in capa.features.extractors.helpers.generate_symbols("", call.api):
-        yield API(name), ch.address
-
-
-def extract_features(ph: ProcessHandle, th: ThreadHandle, ch: CallHandle) -> Iterator[tuple[Feature, Address]]:
-    for handler in CALL_HANDLERS:
-        for feature, addr in handler(ph, th, ch):
-            yield feature, addr
-
-
-CALL_HANDLERS = (extract_call_features,)
--- a/capa/features/extractors/cape/extractor.py
+++ b/capa/features/extractors/cape/extractor.py
@@ -1,153 +0,0 @@
-# Copyright (C) 2023 Mandiant, Inc. All Rights Reserved.
-# Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at: [package root]/LICENSE.txt
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-#  is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and limitations under the License.
-
-import logging
-from typing import Union, Iterator
-
-import capa.features.extractors.cape.call
-import capa.features.extractors.cape.file
-import capa.features.extractors.cape.thread
-import capa.features.extractors.cape.global_
-import capa.features.extractors.cape.process
-from capa.exceptions import EmptyReportError, UnsupportedFormatError
-from capa.features.common import Feature, Characteristic
-from capa.features.address import NO_ADDRESS, Address, AbsoluteVirtualAddress, _NoAddress
-from capa.features.extractors.cape.models import Call, Static, Process, CapeReport
-from capa.features.extractors.base_extractor import (
-    CallHandle,
-    SampleHashes,
-    ThreadHandle,
-    ProcessHandle,
-    DynamicFeatureExtractor,
-)
-
-logger = logging.getLogger(__name__)
-
-TESTED_VERSIONS = {"2.2-CAPE", "2.4-CAPE"}
-
-
-class CapeExtractor(DynamicFeatureExtractor):
-    def __init__(self, report: CapeReport):
-        super().__init__(
-            hashes=SampleHashes(
-                md5=report.target.file.md5.lower(),
-                sha1=report.target.file.sha1.lower(),
-                sha256=report.target.file.sha256.lower(),
-            )
-        )
-        self.report: CapeReport = report
-
-        # pre-compute these because we'll yield them at *every* scope.
-        self.global_features = list(capa.features.extractors.cape.global_.extract_features(self.report))
-
-    def get_base_address(self) -> Union[AbsoluteVirtualAddress, _NoAddress, None]:
-        # value according to the PE header, the actual trace may use a different imagebase
-        assert self.report.static is not None and self.report.static.pe is not None
-        return AbsoluteVirtualAddress(self.report.static.pe.imagebase)
-
-    def extract_global_features(self) -> Iterator[tuple[Feature, Address]]:
-        yield from self.global_features
-
-    def extract_file_features(self) -> Iterator[tuple[Feature, Address]]:
-        yield from capa.features.extractors.cape.file.extract_features(self.report)
-
-    def get_processes(self) -> Iterator[ProcessHandle]:
-        yield from capa.features.extractors.cape.file.get_processes(self.report)
-
-    def extract_process_features(self, ph: ProcessHandle) -> Iterator[tuple[Feature, Address]]:
-        yield from capa.features.extractors.cape.process.extract_features(ph)
-
-    def get_process_name(self, ph) -> str:
-        process: Process = ph.inner
-        return process.process_name
-
-    def get_threads(self, ph: ProcessHandle) -> Iterator[ThreadHandle]:
-        yield from capa.features.extractors.cape.process.get_threads(ph)
-
-    def extract_thread_features(self, ph: ProcessHandle, th: ThreadHandle) -> Iterator[tuple[Feature, Address]]:
-        if False:
-            # force this routine to be a generator,
-            # but we don't actually have any elements to generate.
-            yield Characteristic("never"), NO_ADDRESS
-        return
-
-    def get_calls(self, ph: ProcessHandle, th: ThreadHandle) -> Iterator[CallHandle]:
-        yield from capa.features.extractors.cape.thread.get_calls(ph, th)
-
-    def extract_call_features(
-        self, ph: ProcessHandle, th: ThreadHandle, ch: CallHandle
-    ) -> Iterator[tuple[Feature, Address]]:
-        yield from capa.features.extractors.cape.call.extract_features(ph, th, ch)
-
-    def get_call_name(self, ph, th, ch) -> str:
-        call: Call = ch.inner
-
-        parts = []
-        parts.append(call.api)
-        parts.append("(")
-        for argument in call.arguments:
-            parts.append(argument.name)
-            parts.append("=")
-
-            if argument.pretty_value:
-                parts.append(argument.pretty_value)
-            else:
-                if isinstance(argument.value, int):
-                    parts.append(hex(argument.value))
-                elif isinstance(argument.value, str):
-                    parts.append('"')
-                    parts.append(argument.value)
-                    parts.append('"')
-                elif isinstance(argument.value, list):
-                    pass
-                else:
-                    capa.helpers.assert_never(argument.value)
-
-            parts.append(", ")
-        if call.arguments:
-            # remove the trailing comma
-            parts.pop()
-        parts.append(")")
-        parts.append(" -> ")
-        if call.pretty_return:
-            parts.append(call.pretty_return)
-        else:
-            parts.append(hex(call.return_))
-
-        return "".join(parts)
-
-    @classmethod
-    def from_report(cls, report: dict) -> "CapeExtractor":
-        cr = CapeReport.model_validate(report)
-
-        if cr.info.version not in TESTED_VERSIONS:
-            logger.warning("CAPE version '%s' not tested/supported yet", cr.info.version)
-
-        # TODO(mr-tz): support more file types
-        # https://github.com/mandiant/capa/issues/1933
-        if "PE" not in cr.target.file.type:
-            logger.error(
-                "capa currently only supports PE target files, this target file's type is: '%s'.\nPlease report this at: https://github.com/mandiant/capa/issues/1933",
-                cr.target.file.type,
-            )
-
-        # observed in 2.4-CAPE reports from capesandbox.com
-        if cr.static is None and cr.target.file.pe is not None:
-            cr.static = Static()
-            cr.static.pe = cr.target.file.pe
-
-        if cr.static is None:
-            raise UnsupportedFormatError("CAPE report missing static analysis")
-
-        if cr.static.pe is None:
-            raise UnsupportedFormatError("CAPE report missing PE analysis")
-
-        if len(cr.behavior.processes) == 0:
-            raise EmptyReportError("CAPE did not capture any processes")
-
-        return cls(cr)
--- a/capa/features/extractors/cape/file.py
+++ b/capa/features/extractors/cape/file.py
@@ -1,132 +0,0 @@
-# Copyright (C) 2023 Mandiant, Inc. All Rights Reserved.
-# Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at: [package root]/LICENSE.txt
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-#  is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and limitations under the License.
-
-import logging
-from typing import Iterator
-
-from capa.features.file import Export, Import, Section
-from capa.features.common import String, Feature
-from capa.features.address import NO_ADDRESS, Address, ProcessAddress, AbsoluteVirtualAddress
-from capa.features.extractors.helpers import generate_symbols
-from capa.features.extractors.cape.models import CapeReport
-from capa.features.extractors.base_extractor import ProcessHandle
-
-logger = logging.getLogger(__name__)
-
-
-def get_processes(report: CapeReport) -> Iterator[ProcessHandle]:
-    """
-    get all the created processes for a sample
-    """
-    seen_processes = {}
-    for process in report.behavior.processes:
-        addr = ProcessAddress(pid=process.process_id, ppid=process.parent_id)
-        yield ProcessHandle(address=addr, inner=process)
-
-        # check for pid and ppid reuse
-        if addr not in seen_processes:
-            seen_processes[addr] = [process]
-        else:
-            logger.warning(
-                "pid and ppid reuse detected between process %s and process%s: %s",
-                process,
-                "es" if len(seen_processes[addr]) > 1 else "",
-                seen_processes[addr],
-            )
-            seen_processes[addr].append(process)
-
-
-def extract_import_names(report: CapeReport) -> Iterator[tuple[Feature, Address]]:
-    """
-    extract imported function names
-    """
-    assert report.static is not None and report.static.pe is not None
-    imports = report.static.pe.imports
-
-    if isinstance(imports, dict):
-        imports = list(imports.values())
-
-    assert isinstance(imports, list)
-
-    for library in imports:
-        for function in library.imports:
-            if not function.name:
-                continue
-
-            for name in generate_symbols(library.dll, function.name, include_dll=True):
-                yield Import(name), AbsoluteVirtualAddress(function.address)
-
-
-def extract_export_names(report: CapeReport) -> Iterator[tuple[Feature, Address]]:
-    assert report.static is not None and report.static.pe is not None
-    for function in report.static.pe.exports:
-        yield Export(function.name), AbsoluteVirtualAddress(function.address)
-
-
-def extract_section_names(report: CapeReport) -> Iterator[tuple[Feature, Address]]:
-    assert report.static is not None and report.static.pe is not None
-    for section in report.static.pe.sections:
-        yield Section(section.name), AbsoluteVirtualAddress(section.virtual_address)
-
-
-def extract_file_strings(report: CapeReport) -> Iterator[tuple[Feature, Address]]:
-    if report.strings is not None:
-        for string in report.strings:
-            yield String(string), NO_ADDRESS
-
-
-def extract_used_regkeys(report: CapeReport) -> Iterator[tuple[Feature, Address]]:
-    for regkey in report.behavior.summary.keys:
-        yield String(regkey), NO_ADDRESS
-
-
-def extract_used_files(report: CapeReport) -> Iterator[tuple[Feature, Address]]:
-    for file in report.behavior.summary.files:
-        yield String(file), NO_ADDRESS
-
-
-def extract_used_mutexes(report: CapeReport) -> Iterator[tuple[Feature, Address]]:
-    for mutex in report.behavior.summary.mutexes:
-        yield String(mutex), NO_ADDRESS
-
-
-def extract_used_commands(report: CapeReport) -> Iterator[tuple[Feature, Address]]:
-    for cmd in report.behavior.summary.executed_commands:
-        yield String(cmd), NO_ADDRESS
-
-
-def extract_used_apis(report: CapeReport) -> Iterator[tuple[Feature, Address]]:
-    for symbol in report.behavior.summary.resolved_apis:
-        yield String(symbol), NO_ADDRESS
-
-
-def extract_used_services(report: CapeReport) -> Iterator[tuple[Feature, Address]]:
-    for svc in report.behavior.summary.created_services:
-        yield String(svc), NO_ADDRESS
-    for svc in report.behavior.summary.started_services:
-        yield String(svc), NO_ADDRESS
-
-
-def extract_features(report: CapeReport) -> Iterator[tuple[Feature, Address]]:
-    for handler in FILE_HANDLERS:
-        for feature, addr in handler(report):
-            yield feature, addr
-
-
-FILE_HANDLERS = (
-    extract_import_names,
-    extract_export_names,
-    extract_section_names,
-    extract_file_strings,
-    extract_used_regkeys,
-    extract_used_files,
-    extract_used_mutexes,
-    extract_used_commands,
-    extract_used_apis,
-    extract_used_services,
-)
--- a/capa/features/extractors/cape/global_.py
+++ b/capa/features/extractors/cape/global_.py
@@ -1,93 +0,0 @@
-# Copyright (C) 2023 Mandiant, Inc. All Rights Reserved.
-# Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at: [package root]/LICENSE.txt
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-#  is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and limitations under the License.
-
-import logging
-from typing import Iterator
-
-from capa.features.common import (
-    OS,
-    OS_ANY,
-    OS_LINUX,
-    ARCH_I386,
-    FORMAT_PE,
-    ARCH_AMD64,
-    FORMAT_ELF,
-    OS_WINDOWS,
-    Arch,
-    Format,
-    Feature,
-)
-from capa.features.address import NO_ADDRESS, Address
-from capa.features.extractors.cape.models import CapeReport
-
-logger = logging.getLogger(__name__)
-
-
-def extract_arch(report: CapeReport) -> Iterator[tuple[Feature, Address]]:
-    if "Intel 80386" in report.target.file.type:
-        yield Arch(ARCH_I386), NO_ADDRESS
-    elif "x86-64" in report.target.file.type:
-        yield Arch(ARCH_AMD64), NO_ADDRESS
-    else:
-        logger.warning("unrecognized Architecture: %s", report.target.file.type)
-        raise ValueError(
-            f"unrecognized Architecture from the CAPE report; output of file command: {report.target.file.type}"
-        )
-
-
-def extract_format(report: CapeReport) -> Iterator[tuple[Feature, Address]]:
-    if "PE" in report.target.file.type:
-        yield Format(FORMAT_PE), NO_ADDRESS
-    elif "ELF" in report.target.file.type:
-        yield Format(FORMAT_ELF), NO_ADDRESS
-    else:
-        logger.warning("unknown file format, file command output: %s", report.target.file.type)
-        raise ValueError(
-            f"unrecognized file format from the CAPE report; output of file command: {report.target.file.type}"
-        )
-
-
-def extract_os(report: CapeReport) -> Iterator[tuple[Feature, Address]]:
-    # this variable contains the output of the file command
-    file_output = report.target.file.type
-
-    if "windows" in file_output.lower():
-        yield OS(OS_WINDOWS), NO_ADDRESS
-    elif "elf" in file_output.lower():
-        # operating systems recognized by the file command: https://github.com/file/file/blob/master/src/readelf.c#L609
-        if "Linux" in file_output:
-            yield OS(OS_LINUX), NO_ADDRESS
-        elif "Hurd" in file_output:
-            yield OS("hurd"), NO_ADDRESS
-        elif "Solaris" in file_output:
-            yield OS("solaris"), NO_ADDRESS
-        elif "kFreeBSD" in file_output:
-            yield OS("freebsd"), NO_ADDRESS
-        elif "kNetBSD" in file_output:
-            yield OS("netbsd"), NO_ADDRESS
-        else:
-            # if the operating system information is missing from the cape report, it's likely a bug
-            logger.warning("unrecognized OS: %s", file_output)
-            raise ValueError(f"unrecognized OS from the CAPE report; output of file command: {file_output}")
-    else:
-        # the sample is shellcode
-        logger.debug("unsupported file format, file command output: %s", file_output)
-        yield OS(OS_ANY), NO_ADDRESS
-
-
-def extract_features(report: CapeReport) -> Iterator[tuple[Feature, Address]]:
-    for global_handler in GLOBAL_HANDLER:
-        for feature, addr in global_handler(report):
-            yield feature, addr
-
-
-GLOBAL_HANDLER = (
-    extract_format,
-    extract_os,
-    extract_arch,
-)
--- a/capa/features/extractors/cape/helpers.py
+++ b/capa/features/extractors/cape/helpers.py
@@ -1,29 +0,0 @@
-# Copyright (C) 2023 Mandiant, Inc. All Rights Reserved.
-# Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at: [package root]/LICENSE.txt
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-#  is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and limitations under the License.
-
-from typing import Any
-
-from capa.features.extractors.base_extractor import ProcessHandle
-
-
-def find_process(processes: list[dict[str, Any]], ph: ProcessHandle) -> dict[str, Any]:
-    """
-    find a specific process identified by a process handler.
-
-    args:
-      processes: a list of processes extracted by CAPE
-      ph: handle of the sought process
-
-    return:
-      a CAPE-defined dictionary for the sought process' information
-    """
-
-    for process in processes:
-        if ph.address.ppid == process["parent_id"] and ph.address.pid == process["process_id"]:
-            return process
-    return {}
--- a/capa/features/extractors/cape/models.py
+++ b/capa/features/extractors/cape/models.py
@@ -1,448 +0,0 @@
-# Copyright (C) 2023 Mandiant, Inc. All Rights Reserved.
-# Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at: [package root]/LICENSE.txt
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-#  is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and limitations under the License.
-import binascii
-from typing import Any, Union, Literal, Optional, Annotated, TypeAlias
-
-from pydantic import Field, BaseModel, ConfigDict
-from pydantic.functional_validators import BeforeValidator
-
-
-def validate_hex_int(value):
-    if isinstance(value, str):
-        return int(value, 16) if value.startswith("0x") else int(value, 10)
-    else:
-        return value
-
-
-def validate_hex_bytes(value):
-    return binascii.unhexlify(value) if isinstance(value, str) else value
-
-
-HexInt = Annotated[int, BeforeValidator(validate_hex_int)]
-HexBytes = Annotated[bytes, BeforeValidator(validate_hex_bytes)]
-
-
-# a model that *cannot* have extra fields
-# if they do, pydantic raises an exception.
-# use this for models we rely upon and cannot change.
-#
-# for things that may be extended and we don't care,
-# use FlexibleModel.
-class ExactModel(BaseModel):
-    model_config = ConfigDict(extra="forbid")
-
-
-# a model that can have extra fields that we ignore.
-# use this if we don't want to raise an exception for extra
-# data fields that we didn't expect.
-class FlexibleModel(BaseModel):
-    pass
-
-
-# use this type to indicate that we won't model this data.
-# because it's not relevant to our use in capa.
-#
-# while its nice to have full coverage of the data shape,
-# it can easily change and break our parsing.
-# so we really only want to describe what we'll use.
-Skip: TypeAlias = Optional[Any]
-
-
-# mark fields that we haven't seen yet and need to model.
-# pydantic should raise an error when encountering data
-# in a field with this type.
-# then we can update the model with the discovered shape.
-TODO: TypeAlias = None
-ListTODO: TypeAlias = list[None]
-DictTODO: TypeAlias = ExactModel
-
-Emptydict: TypeAlias = BaseModel
-EmptyList: TypeAlias = list[Any]
-
-
-class Info(FlexibleModel):
-    version: str
-
-
-class ImportedSymbol(ExactModel):
-    address: HexInt
-    name: Optional[str] = None
-
-
-class ImportedDll(ExactModel):
-    dll: str
-    imports: list[ImportedSymbol]
-
-
-class DirectoryEntry(ExactModel):
-    name: str
-    virtual_address: HexInt
-    size: HexInt
-
-
-class Section(ExactModel):
-    name: str
-    raw_address: HexInt
-    virtual_address: HexInt
-    virtual_size: HexInt
-    size_of_data: HexInt
-    characteristics: str
-    characteristics_raw: HexInt
-    entropy: float
-
-
-class Resource(ExactModel):
-    name: str
-    language: Optional[str] = None
-    sublanguage: str
-    filetype: Optional[str]
-    offset: HexInt
-    size: HexInt
-    entropy: float
-
-
-class DigitalSigner(FlexibleModel):
-    md5_fingerprint: str
-    not_after: str
-    not_before: str
-    serial_number: str
-    sha1_fingerprint: str
-    sha256_fingerprint: str
-
-    issuer_commonName: Optional[str] = None
-    issuer_countryName: Optional[str] = None
-    issuer_localityName: Optional[str] = None
-    issuer_organizationName: Optional[str] = None
-    issuer_stateOrProvinceName: Optional[str] = None
-
-    subject_commonName: Optional[str] = None
-    subject_countryName: Optional[str] = None
-    subject_localityName: Optional[str] = None
-    subject_organizationName: Optional[str] = None
-    subject_stateOrProvinceName: Optional[str] = None
-
-    extensions_authorityInfoAccess_caIssuers: Optional[str] = None
-    extensions_authorityKeyIdentifier: Optional[str] = None
-    extensions_cRLDistributionPoints_0: Optional[str] = None
-    extensions_certificatePolicies_0: Optional[str] = None
-    extensions_subjectAltName_0: Optional[str] = None
-    extensions_subjectKeyIdentifier: Optional[str] = None
-
-
-class AuxSigner(ExactModel):
-    name: str
-    issued_to: str = Field(alias="Issued to")
-    issued_by: str = Field(alias="Issued by")
-    expires: str = Field(alias="Expires")
-    sha1_hash: str = Field(alias="SHA1 hash")
-
-
-class Signer(ExactModel):
-    aux_sha1: Optional[str] = None
-    aux_timestamp: Optional[str] = None
-    aux_valid: Optional[bool] = None
-    aux_error: Optional[bool] = None
-    aux_error_desc: Optional[str] = None
-    aux_signers: Optional[list[AuxSigner]] = None
-
-
-class Overlay(ExactModel):
-    offset: HexInt
-    size: HexInt
-
-
-class KV(ExactModel):
-    name: str
-    value: str
-
-
-class ExportedSymbol(ExactModel):
-    address: HexInt
-    name: str
-    ordinal: int
-
-
-class PE(ExactModel):
-    peid_signatures: TODO
-    imagebase: HexInt
-    entrypoint: HexInt
-    reported_checksum: HexInt
-    actual_checksum: HexInt
-    osversion: str
-    pdbpath: Optional[str] = None
-    timestamp: str
-
-    # list[ImportedDll], or dict[basename(dll), ImportedDll]
-    imports: Union[list[ImportedDll], dict[str, ImportedDll]]
-    imported_dll_count: Optional[int] = None
-    imphash: str
-
-    exported_dll_name: Optional[str] = None
-    exports: list[ExportedSymbol]
-
-    dirents: list[DirectoryEntry]
-    sections: list[Section]
-
-    ep_bytes: Optional[HexBytes] = None
-
-    overlay: Optional[Overlay] = None
-    resources: list[Resource]
-    versioninfo: list[KV]
-
-    # base64 encoded data
-    icon: Optional[str] = None
-    # MD5-like hash
-    icon_hash: Optional[str] = None
-    # MD5-like hash
-    icon_fuzzy: Optional[str] = None
-    # short hex string
-    icon_dhash: Optional[str] = None
-
-    digital_signers: list[DigitalSigner]
-    guest_signers: Signer
-
-
-# TODO(mr-tz): target.file.dotnet, target.file.extracted_files, target.file.extracted_files_tool,
-#  target.file.extracted_files_time
-# https://github.com/mandiant/capa/issues/1814
-class File(FlexibleModel):
-    type: str
-    cape_type_code: Optional[int] = None
-    cape_type: Optional[str] = None
-
-    pid: Optional[Union[int, Literal[""]]] = None
-    name: Union[list[str], str]
-    path: str
-    guest_paths: Union[list[str], str, None]
-    timestamp: Optional[str] = None
-
-    #
-    # hashes
-    #
-    crc32: str
-    md5: str
-    sha1: str
-    sha256: str
-    sha512: str
-    sha3_384: Optional[str] = None
-    ssdeep: str
-    # unsure why this would ever be "False"
-    tlsh: Optional[Union[str, bool]] = None
-    rh_hash: Optional[str] = None
-
-    #
-    # other metadata, static analysis
-    #
-    size: int
-    pe: Optional[PE] = None
-    ep_bytes: Optional[HexBytes] = None
-    entrypoint: Optional[int] = None
-    data: Optional[str] = None
-    strings: Optional[list[str]] = None
-
-    #
-    # detections (skip)
-    #
-    yara: Skip = None
-    cape_yara: Skip = None
-    clamav: Skip = None
-    virustotal: Skip = None
-
-
-class ProcessFile(File):
-    #
-    # like a File, but also has dynamic analysis results
-    #
-    pid: Optional[int] = None
-    process_path: Optional[str] = None
-    process_name: Optional[str] = None
-    module_path: Optional[str] = None
-    virtual_address: Optional[HexInt] = None
-    target_pid: Optional[Union[int, str]] = None
-    target_path: Optional[str] = None
-    target_process: Optional[str] = None
-
-
-class Argument(ExactModel):
-    name: str
-    # unsure why empty list is provided here
-    value: Union[HexInt, int, str, EmptyList]
-    pretty_value: Optional[str] = None
-
-
-class Call(ExactModel):
-    timestamp: str
-    thread_id: int
-    category: str
-
-    api: str
-
-    arguments: list[Argument]
-    status: bool
-    return_: HexInt = Field(alias="return")
-    pretty_return: Optional[str] = None
-
-    repeated: int
-
-    # virtual addresses
-    caller: HexInt
-    parentcaller: HexInt
-
-    # index into calls array
-    id: int
-
-
-# FlexibleModel to account for extended fields
-# refs: https://github.com/mandiant/capa/issues/2466
-# https://github.com/kevoreilly/CAPEv2/pull/2199
-class Process(FlexibleModel):
-    process_id: int
-    process_name: str
-    parent_id: int
-    module_path: str
-    first_seen: str
-    calls: list[Call]
-    threads: list[int]
-    environ: dict[str, str]
-
-
-class ProcessTree(ExactModel):
-    name: str
-    pid: int
-    parent_id: int
-    module_path: str
-    threads: list[int]
-    environ: dict[str, str]
-    children: list["ProcessTree"]
-
-
-class Summary(ExactModel):
-    files: list[str]
-    read_files: list[str]
-    write_files: list[str]
-    delete_files: list[str]
-    keys: list[str]
-    read_keys: list[str]
-    write_keys: list[str]
-    delete_keys: list[str]
-    executed_commands: list[str]
-    resolved_apis: list[str]
-    mutexes: list[str]
-    created_services: list[str]
-    started_services: list[str]
-
-
-class EncryptedBuffer(ExactModel):
-    process_name: str
-    pid: int
-
-    api_call: str
-    buffer: str
-    buffer_size: Optional[int] = None
-    crypt_key: Optional[Union[HexInt, str]] = None
-
-
-class Behavior(ExactModel):
-    summary: Summary
-
-    # list of processes, of threads, of calls
-    processes: list[Process]
-    # tree of processes
-    processtree: list[ProcessTree]
-
-    anomaly: list[str]
-    encryptedbuffers: list[EncryptedBuffer]
-    # these are small objects that describe atomic events,
-    # like file move, registry access.
-    # we'll detect the same with our API call analysis.
-    enhanced: Skip = None
-
-
-class Target(ExactModel):
-    category: str
-    file: File
-    pe: Optional[PE] = None
-
-
-class Static(ExactModel):
-    pe: Optional[PE] = None
-    flare_capa: Skip = None
-
-
-class Cape(ExactModel):
-    payloads: list[ProcessFile]
-    configs: Skip = None
-
-
-# flexible because there may be more sorts of analysis
-# but we only care about the ones described here.
-class CapeReport(FlexibleModel):
-    # the input file, I think
-    target: Target
-    # info about the processing job, like machine and distributed metadata.
-    info: Info
-
-    #
-    # static analysis results
-    #
-    static: Optional[Static] = None
-    strings: Optional[list[str]] = None
-
-    #
-    # dynamic analysis results
-    #
-    # post-processed results: process tree, anomalies, etc
-    behavior: Behavior
-
-    # post-processed results: payloads and extracted configs
-    CAPE: Optional[Union[Cape, list]] = None
-    dropped: Optional[list[File]] = None
-    procdump: Optional[list[ProcessFile]] = None
-    procmemory: Optional[ListTODO] = None
-
-    # =========================================================================
-    # information we won't use in capa
-    #
-
-    #
-    # NBIs and HBIs
-    # these are super interesting, but they don't enable use to detect behaviors.
-    # they take a lot of code to model and details to maintain.
-    #
-    # if we come up with a future use for this, go ahead and re-enable!
-    #
-    network: Skip = None
-    suricata: Skip = None
-    curtain: Skip = None
-    sysmon: Skip = None
-    url_analysis: Skip = None
-
-    # screenshot hash values
-    deduplicated_shots: Skip = None
-    # k-v pairs describing the time it took to run each stage.
-    statistics: Skip = None
-    # k-v pairs of ATT&CK ID to signature name or similar.
-    ttps: Skip = None
-    # debug log messages
-    debug: Skip = None
-
-    # various signature matches
-    # we could potentially extend capa to use this info one day,
-    # though it would be quite sandbox-specific,
-    # and more detection-oriented than capability detection.
-    signatures: Skip = None
-    malfamily_tag: Optional[str] = None
-    malscore: float
-    detections: Skip = None
-    detections2pid: Optional[dict[int, list[str]]] = None
-    # AV detections for the sample.
-    virustotal: Skip = None
-
-    @classmethod
-    def from_buf(cls, buf: bytes) -> "CapeReport":
-        return cls.model_validate_json(buf)
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Willi Ballenthin	ed870ea563	changelog	2022-07-06 20:47:46 +00:00
Willi Ballenthin	61869c5654	v3.2.1	2022-07-06 20:45:13 +00:00
Mike Hunhoff	7f4291f4b5	update pinned smda version	2022-07-06 20:44:13 +00:00