bump ghidra in flake

.envrc

@@ -0,0 +1 @@
+use flake

.github/workflows/main.yml

@@ -65,7 +65,7 @@ jobs:
         file(APPEND "$ENV{GITHUB_ENV}" "CACHE_TIMESTAMP=${current_date}\n")
 
     - name: Update the cache (ccache)
-      uses: actions/cache@v4
+      uses: actions/cache@v3
       with:
         path: "${{ github.workspace }}/ccache"
         key: ${{ env.CACHE_KEY }}_ccache_${{ env.CACHE_TIMESTAMP }}
@@ -127,10 +127,7 @@ jobs:
         --prefix install
 
     - name: Smoketest sleigh lift
-      run: |
-        ./install/bin/sleigh-lift --version
-        ./install/bin/sleigh-lift disassemble x86-64.sla 4881ecc00f0000
-        ./install/bin/sleigh-lift pcode x86-64.sla 4881ecc00f0000
+      run: ./install/bin/sleigh-lift disassemble x86-64.sla 4881ecc00f0000
 
     - name: Test install directory
       working-directory: tests/find_package
@@ -185,7 +182,7 @@ jobs:
     # DEB Package
     - name: Upload the DEB package artifact (RelWithDebInfo only)
       if: matrix.build_type == 'RelWithDebInfo' && runner.os == 'Linux'
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v3
       with:
         name: ${{ env.DEB_PACKAGE_NAME }}
         path: ${{ env.DEB_PACKAGE_PATH }}
@@ -199,7 +196,7 @@ jobs:
     # RPM Package
     - name: Upload the RPM package artifact (RelWithDebInfo only)
       if: matrix.build_type == 'RelWithDebInfo' && runner.os == 'Linux'
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v3
       with:
         name: ${{ env.RPM_PACKAGE_NAME }}
         path: ${{ env.RPM_PACKAGE_PATH }}
@@ -212,7 +209,7 @@ jobs:
     # TGZ Package
     - name: Upload the TGZ package artifact (RelWithDebInfo only)
       if: matrix.build_type == 'RelWithDebInfo'
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v3
       with:
         name: ${{ env.TGZ_PACKAGE_NAME }}
         path: ${{ env.TGZ_PACKAGE_PATH }}

.github/workflows/update_head.yml

@@ -14,7 +14,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
-    - uses: actions/setup-python@v5
+    - uses: actions/setup-python@v4
       with:
         # Use oldest supported version for maximum script compatibility
         python-version: '3.7'

.gitignore

@@ -4,3 +4,5 @@ build
 # FetchContent Ghidra source directories
 /src/ghidra*
 cmake_fc_*
+
+.direnv/

CMakeLists.txt

@@ -30,7 +30,7 @@ include(cmake/project-is-top-level.cmake)
 include(cmake/options.cmake)
 
 #
-# Move headers so we can prefix with "ghidra/"
+# Move headers so we can prefix with "sleigh/"
 #
 set(public_include_header_list
   "${library_root}/action.hh"
@@ -135,28 +135,21 @@ set(public_include_header_list
   "${library_root}/xml_arch.hh"
   "${library_root}/unionresolve.hh"
   "${library_root}/marshal.hh"
-  "${library_root}/analyzesigs.hh"
-  "${library_root}/modelrules.hh"
-  "${library_root}/signature.hh"
-  "${library_root}/signature_ghidra.hh"
 )
-# if(sleigh_RELEASE_IS_HEAD)
-#   list(APPEND public_include_header_list
-#   )
-# endif()
+#if(sleigh_RELEASE_IS_HEAD)
+#  list(APPEND public_include_header_list
+#  )
+#endif()
 # Create custom target so that IDEs know these files are part of the sources
 add_custom_target(sleigh_all_headers SOURCES ${public_include_header_list})
 set(public_headers_dir ${CMAKE_CURRENT_BINARY_DIR}/include)
-file(MAKE_DIRECTORY "${public_headers_dir}/ghidra")
-# Copy the public headers into our build directory so that we can control the layout.
-# Ideally, we want to let people '#include <ghidra/{header}>' without installing sleigh
-foreach(public_header ${public_include_header_list})
-  configure_file("${public_header}" "${public_headers_dir}/ghidra" COPYONLY)
-endforeach()
-# This project also generates a helper header for managing sleigh versions.
-# We intentionally use the `sleigh` directory for this header because it's
-# not from upstream.
+file(MAKE_DIRECTORY "${public_headers_dir}/sleigh")
 configure_file(cmake/libconfig.h.in "${public_headers_dir}/sleigh/libconfig.h")
+# Copy the public headers into our build directory so that we can control the layout.
+# Ideally, we want to let people '#include <sleigh/{header}>' without installing sleigh
+foreach(public_header ${public_include_header_list})
+  configure_file("${public_header}" "${public_headers_dir}/sleigh" COPYONLY)
+endforeach()
 
 #
 # sla

flake.lock

@@ -0,0 +1,95 @@
+{
+  "nodes": {
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1681202837,
+        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1682291304,
+        "narHash": "sha256-VkufTQNEclnZ0HnSXxmXC2Qvtj6/3/8SyZfRyL4AllI=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "b2d51541a37678ad4e870f75326b6e68daf3b3c7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1680945546,
+        "narHash": "sha256-8FuaH5t/aVi/pR1XxnF0qi4WwMYC+YxlfdsA0V+TEuQ=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "d9f759f2ea8d265d974a6e1259bd510ac5844c5d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs",
+        "treefmt-nix": "treefmt-nix"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "treefmt-nix": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_2"
+      },
+      "locked": {
+        "lastModified": 1681486253,
+        "narHash": "sha256-EjiQZvXQH9tUPCyLC6lQpfGnoq4+kI9v59bDJWPicYo=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "b25d1a3c2c7554d0462ab1dfddf2f13128638b90",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

flake.nix

@@ -0,0 +1,80 @@
+{
+  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs";
+    flake-utils.url = "github:numtide/flake-utils";
+    treefmt-nix.url = "github:numtide/treefmt-nix";
+  };
+  outputs = {
+    self,
+    nixpkgs,
+    flake-utils,
+    treefmt-nix,
+  }:
+    {
+      overlays.default = final: prev: {
+        ghidra = with final;
+          applyPatches {
+            src = fetchFromGitHub {
+              owner = "NationalSecurityAgency";
+              repo = "ghidra";
+              rev = "refs/tags/Ghidra_10.3.3_build";
+              sha256 = "sha256-KDSiZ/JwAqX6Obg9UD8ZQut01l/eMXbioJy//GluXn0=";
+            };
+            patches = [
+              ./src/patches/stable/0001-Fix-UBSAN-errors-in-decompiler.patch
+              ./src/patches/stable/0002-Use-stroull-instead-of-stroul-to-parse-address-offse.patch
+            ];
+          };
+
+        sleigh = with final;
+          stdenv.mkDerivation {
+            name = "sleigh";
+            src = ./.;
+            nativeBuildInputs = [
+              cmake
+              ninja
+              git
+            ];
+            buildInputs = [
+              ghidra
+            ];
+            cmakeFlags = [
+              "-DFETCHCONTENT_SOURCE_DIR_GHIDRASOURCE=${ghidra}"
+            ];
+          };
+        sleigh-debug = with final;
+          final.sleigh.overrideAttrs (o: {
+            dontStrip = true;
+            enableDebugging = true;
+            separateDebugInfo = true;
+          });
+        sleigh-asan = with final;
+          final.sleigh-debug.overrideAttrs (o: {
+            cmakeFlags = o.cmakeFlags ++ ["-DCMAKE_C_FLAGS=-fsanitize=address" "-DCMAKE_CXX_FLAGS=-fsanitize=address"];
+          });
+      };
+    }
+    // flake-utils.lib.eachDefaultSystem (
+      system: let
+        pkgs = import nixpkgs {
+          inherit system;
+          overlays = [self.overlays.default];
+        };
+      in {
+        packages.default = pkgs.sleigh;
+        devShells.default = pkgs.mkShell {
+          packages = with pkgs; [
+            sleigh-asan
+            clang-tools
+          ];
+        };
+        formatter = treefmt-nix.lib.mkWrapper pkgs {
+          projectRootFile = ".git/config";
+          programs = {
+            alejandra.enable = true;
+            clang-format.enable = true;
+          };
+        };
+      }
+    );
+}

src/setup-ghidra-source.cmake

@@ -22,7 +22,7 @@ set_property(CACHE sleigh_RELEASE_TYPE PROPERTY STRINGS "stable" "HEAD")
 find_package(Git REQUIRED)
 
 # Ghidra pinned stable version commit
-set(ghidra_version "11.0.1")
+set(ghidra_version "10.3.3")
 set(ghidra_git_tag "Ghidra_${ghidra_version}_build")
 set(ghidra_shallow TRUE)
 
@@ -46,9 +46,9 @@ set(ghidra_patches
 if("${sleigh_RELEASE_TYPE}" STREQUAL "HEAD")
   # TODO: Try to remember to look at Ghidra/application.properties
   # TODO: CMake only likes numeric characters in the version string....
-  set(ghidra_head_version "11.1")
+  set(ghidra_head_version "10.5")
   set(ghidra_version "${ghidra_head_version}")
-  set(ghidra_head_git_tag "e73d2088e4b154b27a063007b84527ae49ba7298")
+  set(ghidra_head_git_tag "4561e8335d3b62329c4afdf5a91bc6ce113b7002")
   set(ghidra_git_tag "${ghidra_head_git_tag}")
   set(ghidra_shallow FALSE)
   set(ghidra_patches
@@ -162,13 +162,11 @@ set(sleigh_deccore_source_list
   "${library_root}/opbehavior.cc"
   "${library_root}/paramid.cc"
   "${library_root}/unionresolve.cc"
-  "${library_root}/modelrules.cc"
-  "${library_root}/signature.cc"
 )
-# if("${sleigh_RELEASE_TYPE}" STREQUAL "HEAD")
-#   list(APPEND sleigh_deccore_source_list
-#   )
-# endif()
+#if("${sleigh_RELEASE_TYPE}" STREQUAL "HEAD")
+#  list(APPEND sleigh_deccore_source_list
+#  )
+#endif()
 
 set(sleigh_extra_source_list
   "${library_root}/callgraph.cc"
@@ -211,12 +209,7 @@ set(sleigh_ghidra_source_list
   "${library_root}/ghidra_process.cc"
   "${library_root}/comment_ghidra.cc"
   "${library_root}/string_ghidra.cc"
-  "${library_root}/signature_ghidra.cc"
 )
-# if("${sleigh_RELEASE_TYPE}" STREQUAL "HEAD")
-#   list(APPEND sleigh_ghidra_source_list
-#   )
-# endif()
 
 set(sleigh_slacomp_source_list
   "${library_root}/slgh_compile.cc"

src/spec_files_HEAD.cmake

@@ -57,10 +57,6 @@ set(spec_file_list
   "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/HCS12/data/languages/HCS12.slaspec"
   "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/HCS12/data/languages/HCS12X.slaspec"
   "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/JVM/data/languages/JVM.slaspec"
-  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/Loongarch/data/languages/loongarch32_f32.slaspec"
-  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/Loongarch/data/languages/loongarch32_f64.slaspec"
-  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/Loongarch/data/languages/loongarch64_f32.slaspec"
-  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/Loongarch/data/languages/loongarch64_f64.slaspec"
   "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/M8C/data/languages/m8c.slaspec"
   "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/MC6800/data/languages/6805.slaspec"
   "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/MC6800/data/languages/6809.slaspec"
@@ -91,8 +87,6 @@ set(spec_file_list
   "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/PowerPC/data/languages/ppc_32_be.slaspec"
   "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/PowerPC/data/languages/ppc_32_e500_be.slaspec"
   "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/PowerPC/data/languages/ppc_32_e500_le.slaspec"
-  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/PowerPC/data/languages/ppc_32_e500mc_be.slaspec"
-  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/PowerPC/data/languages/ppc_32_e500mc_le.slaspec"
   "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/PowerPC/data/languages/ppc_32_le.slaspec"
   "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/PowerPC/data/languages/ppc_32_quicciii_be.slaspec"
   "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/PowerPC/data/languages/ppc_32_quicciii_le.slaspec"
@@ -128,8 +122,6 @@ set(spec_file_list
   "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/Toy/data/languages/toy_wsz_be.slaspec"
   "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/Toy/data/languages/toy_wsz_le.slaspec"
   "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/V850/data/languages/V850.slaspec"
-  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/Xtensa/data/languages/xtensa_be.slaspec"
-  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/Xtensa/data/languages/xtensa_le.slaspec"
   "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/Z80/data/languages/z180.slaspec"
   "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/Z80/data/languages/z80.slaspec"
   "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/eBPF/data/languages/eBPF_le.slaspec"

src/spec_files_stable.cmake

@@ -57,10 +57,6 @@ set(spec_file_list
   "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/HCS12/data/languages/HCS12.slaspec"
   "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/HCS12/data/languages/HCS12X.slaspec"
   "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/JVM/data/languages/JVM.slaspec"
-  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/Loongarch/data/languages/loongarch32_f32.slaspec"
-  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/Loongarch/data/languages/loongarch32_f64.slaspec"
-  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/Loongarch/data/languages/loongarch64_f32.slaspec"
-  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/Loongarch/data/languages/loongarch64_f64.slaspec"
   "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/M8C/data/languages/m8c.slaspec"
   "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/MC6800/data/languages/6805.slaspec"
   "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/MC6800/data/languages/6809.slaspec"
@@ -91,8 +87,6 @@ set(spec_file_list
   "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/PowerPC/data/languages/ppc_32_be.slaspec"
   "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/PowerPC/data/languages/ppc_32_e500_be.slaspec"
   "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/PowerPC/data/languages/ppc_32_e500_le.slaspec"
-  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/PowerPC/data/languages/ppc_32_e500mc_be.slaspec"
-  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/PowerPC/data/languages/ppc_32_e500mc_le.slaspec"
   "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/PowerPC/data/languages/ppc_32_le.slaspec"
   "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/PowerPC/data/languages/ppc_32_quicciii_be.slaspec"
   "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/PowerPC/data/languages/ppc_32_quicciii_le.slaspec"
@@ -128,8 +122,6 @@ set(spec_file_list
   "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/Toy/data/languages/toy_wsz_be.slaspec"
   "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/Toy/data/languages/toy_wsz_le.slaspec"
   "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/V850/data/languages/V850.slaspec"
-  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/Xtensa/data/languages/xtensa_be.slaspec"
-  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/Xtensa/data/languages/xtensa_le.slaspec"
   "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/Z80/data/languages/z180.slaspec"
   "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/Z80/data/languages/z80.slaspec"
   "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/eBPF/data/languages/eBPF_le.slaspec"

support/include/sleigh/libsleigh.hh

@@ -15,118 +15,110 @@
 #pragma GCC diagnostic ignored "-Wsign-compare"
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #endif
-#include <ghidra/action.hh>
-#include <ghidra/address.hh>
-#include <ghidra/architecture.hh>
-#include <ghidra/block.hh>
-#include <ghidra/blockaction.hh>
-#include <ghidra/callgraph.hh>
-#include <ghidra/capability.hh>
-#include <ghidra/cast.hh>
-#include <ghidra/codedata.hh>
-#include <ghidra/comment.hh>
-#include <ghidra/comment_ghidra.hh>
-#include <ghidra/condexe.hh>
-#include <ghidra/context.hh>
-#include <ghidra/coreaction.hh>
-#include <ghidra/cover.hh>
-#include <ghidra/cpool.hh>
-#include <ghidra/cpool_ghidra.hh>
-#include <ghidra/crc32.hh>
-#include <ghidra/database.hh>
-#include <ghidra/database_ghidra.hh>
-#include <ghidra/doccore.hh>
-#include <ghidra/docmain.hh>
-#include <ghidra/double.hh>
-#include <ghidra/dynamic.hh>
-#include <ghidra/emulate.hh>
-#include <ghidra/emulateutil.hh>
-#include <ghidra/error.hh>
-#include <ghidra/filemanage.hh>
-#include <ghidra/float.hh>
-#include <ghidra/flow.hh>
-#include <ghidra/fspec.hh>
-#include <ghidra/funcdata.hh>
-#include <ghidra/ghidra_arch.hh>
-#include <ghidra/ghidra_context.hh>
-#include <ghidra/ghidra_process.hh>
-#include <ghidra/ghidra_translate.hh>
-#include <ghidra/globalcontext.hh>
-#include <ghidra/grammar.hh>
-#include <ghidra/graph.hh>
-#include <ghidra/heritage.hh>
-#include <ghidra/ifacedecomp.hh>
-#include <ghidra/ifaceterm.hh>
-#include <ghidra/inject_ghidra.hh>
-#include <ghidra/inject_sleigh.hh>
-#include <ghidra/interface.hh>
-#include <ghidra/jumptable.hh>
-#include <ghidra/libdecomp.hh>
-#include <ghidra/loadimage.hh>
-#include <ghidra/loadimage_ghidra.hh>
-#include <ghidra/loadimage_xml.hh>
-#include <ghidra/memstate.hh>
-#include <ghidra/merge.hh>
-#include <ghidra/op.hh>
-#include <ghidra/opbehavior.hh>
-#include <ghidra/opcodes.hh>
-#include <ghidra/options.hh>
-#include <ghidra/override.hh>
-#include <ghidra/paramid.hh>
-#include <ghidra/partmap.hh>
-#include <ghidra/pcodecompile.hh>
-#include <ghidra/pcodeinject.hh>
-#include <ghidra/pcodeparse.hh>
-#include <ghidra/pcoderaw.hh>
-#include <ghidra/prefersplit.hh>
-#include <ghidra/prettyprint.hh>
-#include <ghidra/printc.hh>
-#include <ghidra/printjava.hh>
-#include <ghidra/printlanguage.hh>
-#include <ghidra/rangemap.hh>
-#include <ghidra/rangeutil.hh>
-#include <ghidra/raw_arch.hh>
-#include <ghidra/ruleaction.hh>
-#include <ghidra/rulecompile.hh>
-#include <ghidra/semantics.hh>
-#include <ghidra/sleigh.hh>
-#include <ghidra/sleigh_arch.hh>
-#include <ghidra/sleighbase.hh>
-#include <ghidra/slgh_compile.hh>
-// This is required because slghparse.hh does not have a namespace block
+#include <sleigh/action.hh>
+#include <sleigh/address.hh>
+#include <sleigh/architecture.hh>
+#include <sleigh/block.hh>
+#include <sleigh/blockaction.hh>
+#include <sleigh/callgraph.hh>
+#include <sleigh/capability.hh>
+#include <sleigh/cast.hh>
+#include <sleigh/codedata.hh>
+#include <sleigh/comment.hh>
+#include <sleigh/comment_ghidra.hh>
+#include <sleigh/condexe.hh>
+#include <sleigh/context.hh>
+#include <sleigh/coreaction.hh>
+#include <sleigh/cover.hh>
+#include <sleigh/cpool.hh>
+#include <sleigh/cpool_ghidra.hh>
+#include <sleigh/crc32.hh>
+#include <sleigh/database.hh>
+#include <sleigh/database_ghidra.hh>
+#include <sleigh/doccore.hh>
+#include <sleigh/docmain.hh>
+#include <sleigh/double.hh>
+#include <sleigh/dynamic.hh>
+#include <sleigh/emulate.hh>
+#include <sleigh/emulateutil.hh>
+#include <sleigh/error.hh>
+#include <sleigh/filemanage.hh>
+#include <sleigh/float.hh>
+#include <sleigh/flow.hh>
+#include <sleigh/fspec.hh>
+#include <sleigh/funcdata.hh>
+#include <sleigh/ghidra_arch.hh>
+#include <sleigh/ghidra_context.hh>
+#include <sleigh/ghidra_process.hh>
+#include <sleigh/ghidra_translate.hh>
+#include <sleigh/globalcontext.hh>
+#include <sleigh/grammar.hh>
+#include <sleigh/graph.hh>
+#include <sleigh/heritage.hh>
+#include <sleigh/ifacedecomp.hh>
+#include <sleigh/ifaceterm.hh>
+#include <sleigh/inject_ghidra.hh>
+#include <sleigh/inject_sleigh.hh>
+#include <sleigh/interface.hh>
+#include <sleigh/jumptable.hh>
+#include <sleigh/libdecomp.hh>
+#include <sleigh/loadimage.hh>
+#include <sleigh/loadimage_ghidra.hh>
+#include <sleigh/loadimage_xml.hh>
+#include <sleigh/memstate.hh>
+#include <sleigh/merge.hh>
+#include <sleigh/op.hh>
+#include <sleigh/opbehavior.hh>
+#include <sleigh/opcodes.hh>
+#include <sleigh/options.hh>
+#include <sleigh/override.hh>
+#include <sleigh/paramid.hh>
+#include <sleigh/partmap.hh>
+#include <sleigh/pcodecompile.hh>
+#include <sleigh/pcodeinject.hh>
+#include <sleigh/pcodeparse.hh>
+#include <sleigh/pcoderaw.hh>
+#include <sleigh/prefersplit.hh>
+#include <sleigh/prettyprint.hh>
+#include <sleigh/printc.hh>
+#include <sleigh/printjava.hh>
+#include <sleigh/printlanguage.hh>
+#include <sleigh/rangemap.hh>
+#include <sleigh/rangeutil.hh>
+#include <sleigh/raw_arch.hh>
+#include <sleigh/ruleaction.hh>
+#include <sleigh/rulecompile.hh>
+#include <sleigh/semantics.hh>
+#include <sleigh/sleigh.hh>
+#include <sleigh/sleigh_arch.hh>
+#include <sleigh/sleighbase.hh>
+#include <sleigh/slgh_compile.hh>
 namespace ghidra {
-#include <ghidra/slghparse.hh>
+#include <sleigh/slghparse.hh>
 } // End namespace ghidra
-#include <ghidra/slghpatexpress.hh>
-#include <ghidra/slghpattern.hh>
-#include <ghidra/slghsymbol.hh>
-#include <ghidra/space.hh>
-#include <ghidra/string_ghidra.hh>
-#include <ghidra/stringmanage.hh>
-#include <ghidra/subflow.hh>
-#include <ghidra/testfunction.hh>
-#include <ghidra/transform.hh>
-#include <ghidra/translate.hh>
-#include <ghidra/type.hh>
-#include <ghidra/typegrp_ghidra.hh>
-#include <ghidra/typeop.hh>
-#include <ghidra/types.h>
-#include <ghidra/unify.hh>
-#include <ghidra/userop.hh>
-#include <ghidra/variable.hh>
-#include <ghidra/varmap.hh>
-#include <ghidra/varnode.hh>
-#include <ghidra/xml.hh>
-#include <ghidra/xml_arch.hh>
-#include <ghidra/unionresolve.hh>
-#include <ghidra/marshal.hh>
-#include <ghidra/analyzesigs.hh>
-#include <ghidra/modelrules.hh>
-#include <ghidra/signature.hh>
-#include <ghidra/signature_ghidra.hh>
-
-// #ifdef sleigh_RELEASE_IS_HEAD
-// #endif
+#include <sleigh/slghpatexpress.hh>
+#include <sleigh/slghpattern.hh>
+#include <sleigh/slghsymbol.hh>
+#include <sleigh/space.hh>
+#include <sleigh/string_ghidra.hh>
+#include <sleigh/stringmanage.hh>
+#include <sleigh/subflow.hh>
+#include <sleigh/testfunction.hh>
+#include <sleigh/transform.hh>
+#include <sleigh/translate.hh>
+#include <sleigh/type.hh>
+#include <sleigh/typegrp_ghidra.hh>
+#include <sleigh/typeop.hh>
+#include <sleigh/types.h>
+#include <sleigh/unify.hh>
+#include <sleigh/userop.hh>
+#include <sleigh/variable.hh>
+#include <sleigh/varmap.hh>
+#include <sleigh/varnode.hh>
+#include <sleigh/xml.hh>
+#include <sleigh/xml_arch.hh>
+#include <sleigh/unionresolve.hh>
+#include <sleigh/marshal.hh>
 
 #ifndef _MSC_VER
 #pragma GCC diagnostic pop

tests/CMakeLists.txt

@@ -23,7 +23,6 @@ add_executable(sleigh_ghidra_test
   "${library_root}/../unittests/testfuncproto.cc"
   "${library_root}/../unittests/testtypes.cc"
   "${library_root}/../unittests/testmarshal.cc"
-  "${library_root}/../unittests/testparamstore.cc"
 )
 
 # if(sleigh_RELEASE_IS_HEAD)