Update Ghidra HEAD to commit 97097daa6 (#145 )

Bump Ghidra HEAD commit 97097daa6 Co-authored-by: pgoodman <pgoodman@users.noreply.github.com>
Update Ghidra HEAD to commit 69b07161b (#144 )
2026-06-21 13:56:12 +00:00 · 2022-11-14 12:00:58 +11:00 · 2022-11-07 12:49:12 +11:00 · 2022-11-05 10:39:27 -04:00 · 2022-11-04 18:08:16 -04:00 · 2022-11-03 10:26:57 -04:00
56 changed files with 3127 additions and 1038 deletions
@@ -18,13 +18,14 @@ jobs:
    runs-on: ${{ matrix.os }}

    strategy:
+      fail-fast: false
      matrix:
-        os: [ubuntu-latest, macos-latest]
+        os: [ubuntu-latest, macos-latest, windows-latest]
        build_type: [RelWithDebInfo, Debug]
        release: [stable, HEAD]

    steps:
-    - uses: actions/checkout@v2.4.0
+    - uses: actions/checkout@v3

    - name: Setup Git User for Applying Patches
      # See this thread for more details https://github.community/t/github-actions-bot-email-address/17204/5
@@ -35,33 +36,27 @@ jobs:
    - name: Install Linux system dependencies
      if: runner.os == 'Linux'
      run: |
-        sudo apt-get install -y \
-          clang \
-          rpm \
-          doxygen \
-          xdot \
-          graphviz
-
-        # Minimum supported CMake version testing
-        curl -L "https://github.com/Kitware/CMake/releases/download/v3.21.0/cmake-3.21.0-linux-$(uname -m).sh" -o /tmp/cmake-install.sh
-        mkdir -p "${HOME}/.local"
-        bash /tmp/cmake-install.sh --skip-license --exclude-subdir "--prefix=${HOME}/.local"
-
-        # Use Homebrew for latest build tool version for use in CI
-        brew install \
-          ccache \
-          ninja
+        sudo apt-get update
+        sudo apt-get install -y rpm ccache doxygen graphviz xdot

    - name: Install macOS system dependencies
      if: runner.os == 'macOS'
      run: |
+        echo "MACOSX_DEPLOYMENT_TARGET=10.15" >> ${GITHUB_ENV}
        brew install \
          ccache \
-          ninja \
          cmake \
          doxygen \
          graphviz

+    - name: Install Windows system dependencies
+      if: runner.os == 'Windows'
+      uses: nick-fields/retry@v2
+      with:
+        timeout_minutes: 10
+        max_attempts: 3
+        command: choco install ccache doxygen.install graphviz
+
    - name: Generate cache key
      id: cache_key
      shell: cmake -P {0}
@@ -71,7 +66,7 @@ jobs:
        message("::set-output name=timestamp::${current_date}")

    - name: Update the cache (ccache)
-      uses: actions/cache@v2
+      uses: actions/cache@v3
      with:
        path: "${{ github.workspace }}/ccache"
        key: ${{ steps.cache_key.outputs.VALUE }}_ccache_${{ steps.cache_key.outputs.timestamp }}
@@ -79,70 +74,84 @@ jobs:
          ${{ steps.cache_key.outputs.VALUE }}_ccache_

    - name: Setup ccache
+      working-directory: "${{ github.workspace }}"
      shell: cmake -P {0}
      run: |
-        file(MAKE_DIRECTORY "${{ github.workspace }}/ccache")
-        file(APPEND "$ENV{GITHUB_ENV}" "CCACHE_BASEDIR=${{ github.workspace }}\n")
-        file(APPEND "$ENV{GITHUB_ENV}" "CCACHE_DIR=${{ github.workspace }}/ccache\n")
+        file(MAKE_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/ccache")
+        file(APPEND "$ENV{GITHUB_ENV}" "CCACHE_BASEDIR=${CMAKE_CURRENT_SOURCE_DIR}\n")
+        file(APPEND "$ENV{GITHUB_ENV}" "CCACHE_DIR=${CMAKE_CURRENT_SOURCE_DIR}/ccache\n")
        file(APPEND "$ENV{GITHUB_ENV}" "CCACHE_COMPRESS=true\n")
        # Trial and error to get all files in here
        file(APPEND "$ENV{GITHUB_ENV}" "CCACHE_COMPRESSLEVEL=10\n")
        # This should be multiplied by the number of compilation jobs and be no
        # larger than 5G, which is the cache max size
        file(APPEND "$ENV{GITHUB_ENV}" "CCACHE_MAXSIZE=400M\n")
+        # Tell CMake to use ccache
+        file(APPEND "$ENV{GITHUB_ENV}" "CMAKE_CXX_COMPILER_LAUNCHER=ccache\n")
+        file(APPEND "$ENV{GITHUB_ENV}" "CMAKE_C_COMPILER_LAUNCHER=ccache\n")
        # Clear stats before every build
        execute_process(COMMAND ccache -z)

+    - name: CMake version
+      run: cmake --version
+
    - name: Configure the project
-      run: |
-        cmake --version
-        cmake \
-          -S . \
-          -B build \
-          -G Ninja \
-          -DCMAKE_C_COMPILER=clang \
-          -DCMAKE_CXX_COMPILER=clang++ \
-          -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-          -DCMAKE_C_COMPILER_LAUNCHER=ccache \
-          -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \
-          -Dsleigh_GHIDRA_RELEASE_TYPE=${{ matrix.release }} \
-          -Dsleigh_ENABLE_TESTS=ON \
-          -Dsleigh_ENABLE_EXAMPLES=ON \
-          -Dsleigh_ENABLE_PACKAGING=ON \
-          -Dsleigh_ENABLE_DOCUMENTATION=ON
+      shell: pwsh
+      run: cmake "--preset=ci-$("${{ matrix.os }}".split("-")[0])"
+        -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
+        -Dsleigh_RELEASE_TYPE=${{ matrix.release }}

    - name: Build the project
-      run: |
-        cmake \
-          --build build \
-          -v
+      run: cmake
+        --build build
+        --config ${{ matrix.build_type }}
+        -j 2
+        -v

-    - name: Run the tests
-      run: |
-        ( cd build && ctest -V )
+    - name: Build the docs
+      run: cmake
+        --build build
+        --config ${{ matrix.build_type }}
+        --target docs
+        -v

    - name: Run the example
-      run: |
-        cmake \
-          --build build \
-          --target sleighexample_runner
+      run: cmake
+        --build build
+        -j 2
+        --config ${{ matrix.build_type }}
+        --target sleigh_example_runner

    - name: Run the install target
-      run: |
-        cmake --install build \
-          --prefix install
+      run: cmake --install build
+        --config ${{ matrix.build_type }}
+        --prefix install
+
+    - name: Smoketest sleigh lift
+      run: ./install/bin/sleigh-lift disassemble x86-64.sla 4881ecc00f0000

    - name: Test install directory
      working-directory: tests/find_package
      run: |
-        cmake -B build -S . -Dsleigh_DIR=${{ github.workspace }}/install/lib/cmake/sleigh
-        cmake --build build
-        ./build/sleigh_test
+        cmake -B build -S . "-Dsleigh_DIR=${{ github.workspace }}/install/lib/cmake/sleigh" -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
+        cmake --build build -j 2 --config ${{ matrix.build_type }}
+        cd build
+        ctest -V -C ${{ matrix.build_type }}
+
+    - name: Test tool install directory
+      working-directory: extra-tools/sleigh-lift
+      run: |
+        cmake -B build -S . "-Dsleigh_DIR=${{ github.workspace }}/install/lib/cmake/sleigh" -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
+        cmake --build build -j 2 --config ${{ matrix.build_type }}
+        cmake --install build --config ${{ matrix.build_type }} --prefix install
+        ./install/bin/sleigh-lift --version
+        ./install/bin/sleigh-lift disassemble x86-64.sla 4881ecc00f0000

    - name: Create the packages
-      run: |
-        cmake \
-          --build build \
+      run: cmake
+          --build build
+          -j 2
+          --config ${{ matrix.build_type }}
          --target package

    - name: Test the DEB package
@@ -150,15 +159,12 @@ jobs:
      run: |
        sudo dpkg -i build/*.deb

-        cmake \
-          -S tests/find_package \
-          -B find_package_build
-
-        cmake \
-          --build find_package_build --verbose
+        cmake -S tests/find_package -B find_package_build -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
+        cmake --build find_package_build -j 2 --config ${{ matrix.build_type }} --verbose

    - name: Locate the packages (RelWithDebInfo only)
      if: matrix.build_type == 'RelWithDebInfo'
+      shell: bash
      id: package_locations
      run: |
        echo ::set-output name=DEB_PACKAGE_PATH::$(ls build/*.deb)
@@ -178,43 +184,52 @@ jobs:
    # DEB Package
    - name: Upload the DEB package artifact (RelWithDebInfo only)
      if: matrix.build_type == 'RelWithDebInfo' && runner.os == 'Linux'
-      uses: actions/upload-artifact@v2.3.1
+      uses: actions/upload-artifact@v3
      with:
        name: ${{ steps.package_locations.outputs.DEB_PACKAGE_NAME }}
        path: ${{ steps.package_locations.outputs.DEB_PACKAGE_PATH }}

    - name: Release DEB package artifact (RelWithDebInfo only)
      uses: softprops/action-gh-release@v0.1.14
-      if: matrix.build_type == 'RelWithDebInfo' && runner.os == 'Linux' && startsWith(github.ref, 'refs/tags/')
+      if: matrix.build_type == 'RelWithDebInfo' && runner.os == 'Linux' && startsWith(github.ref, 'refs/tags/') && matrix.release == 'stable'
      with:
        files: ${{ steps.package_locations.outputs.DEB_PACKAGE_PATH }}

    # RPM Package
    - name: Upload the RPM package artifact (RelWithDebInfo only)
      if: matrix.build_type == 'RelWithDebInfo' && runner.os == 'Linux'
-      uses: actions/upload-artifact@v2.3.1
+      uses: actions/upload-artifact@v3
      with:
        name: ${{ steps.package_locations.outputs.RPM_PACKAGE_NAME }}
        path: ${{ steps.package_locations.outputs.RPM_PACKAGE_PATH }}
    - name: Release RPM package artifact (RelWithDebInfo only)
      uses: softprops/action-gh-release@v0.1.14
-      if: matrix.build_type == 'RelWithDebInfo' && runner.os == 'Linux' && startsWith(github.ref, 'refs/tags/')
+      if: matrix.build_type == 'RelWithDebInfo' && runner.os == 'Linux' && startsWith(github.ref, 'refs/tags/') && matrix.release == 'stable'
      with:
        files: ${{ steps.package_locations.outputs.RPM_PACKAGE_PATH }}

    # TGZ Package
    - name: Upload the TGZ package artifact (RelWithDebInfo only)
      if: matrix.build_type == 'RelWithDebInfo'
-      uses: actions/upload-artifact@v2.3.1
+      uses: actions/upload-artifact@v3
      with:
        name: ${{ steps.package_locations.outputs.TGZ_PACKAGE_NAME }}
        path: ${{ steps.package_locations.outputs.TGZ_PACKAGE_PATH }}

    - name: Release TGZ package artifact (RelWithDebInfo only)
      uses: softprops/action-gh-release@v0.1.14
-      if: matrix.build_type == 'RelWithDebInfo' && startsWith(github.ref, 'refs/tags/')
+      if: matrix.build_type == 'RelWithDebInfo' && startsWith(github.ref, 'refs/tags/') && matrix.release == 'stable'
      with:
        files: ${{ steps.package_locations.outputs.TGZ_PACKAGE_PATH }}

+    # This step is down at the bottom because Windows fails but we still want
+    # to upload the built binaries, regardless. We also want to see if/when
+    # Windows tests start passing or are still failing, so there is no special
+    # handling. GitHub Actions does not support the concept of an allowable
+    # failure state
+    - name: Run the tests
+      working-directory: build
+      run: ctest -VV -C ${{ matrix.build_type }}
+
    - name: ccache stats
-      run: ccache -s --verbose
+      run: ccache -s
@@ -12,9 +12,9 @@ jobs:
    runs-on: ubuntu-latest

    steps:
-    - uses: actions/checkout@v2.4.0
+    - uses: actions/checkout@v3

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

    - name: Create PR
      if: steps.head_update.outputs.did_update
-      uses: peter-evans/create-pull-request@v3
+      uses: peter-evans/create-pull-request@v4
      with:
        title: Update Ghidra HEAD to commit ${{ steps.head_update.outputs.short_sha }}
        commit-message: Bump Ghidra HEAD commit ${{ steps.head_update.outputs.short_sha }}
@@ -6,381 +6,155 @@
 # the LICENSE file found in the root directory of this source tree.
 #

-cmake_minimum_required(VERSION 3.21.0)
+cmake_minimum_required(VERSION 3.18)
+
+include(cmake/prelude.cmake)

 # Sets "library_root" variable for decompiler cpp root directory
 # Sets "ghidra_version" for numeric version number
 # Use "ghidrasource_SOURCE_DIR" variable for Ghidra repo root
 include(src/setup-ghidra-source.cmake)
+set(sleigh_RELEASE_IS_HEAD FALSE)
+if("${sleigh_RELEASE_TYPE}" STREQUAL "HEAD")
+  set(sleigh_RELEASE_IS_HEAD TRUE)
+endif()

-project("sleigh"
+project(sleigh
  VERSION "${ghidra_version}"
+  DESCRIPTION "Unofficial CMake build for Ghidra Sleigh"
+  HOMEPAGE_URL "https://github.com/lifting-bits/sleigh"
+  LANGUAGES CXX
 )

-include("cmake/options.cmake")
-
-if(sleigh_ENABLE_TESTS)
-  include("CTest")
-endif()
-
-if(sleigh_ENABLE_PACKAGING)
-  include("cmake/packaging.cmake")
-
-  if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-    message(WARNING "sleigh: Packaging a Debug version")
-  endif()
-endif()
+include(cmake/project-is-top-level.cmake)
+include(cmake/options.cmake)

+#
+# Move headers so we can prefix with "sleigh/"
+#
 set(public_include_header_list
-  "${PROJECT_SOURCE_DIR}/include/libsleigh.hh"
-  "${PROJECT_SOURCE_DIR}/support/Support.h"
-  "${PROJECT_SOURCE_DIR}/support/Version.h"
+  "${library_root}/action.hh"
  "${library_root}/address.hh"
+  "${library_root}/architecture.hh"
+  "${library_root}/block.hh"
+  "${library_root}/blockaction.hh"
+  "${library_root}/callgraph.hh"
+  "${library_root}/capability.hh"
+  "${library_root}/cast.hh"
+  "${library_root}/codedata.hh"
+  "${library_root}/comment.hh"
+  "${library_root}/comment_ghidra.hh"
+  "${library_root}/condexe.hh"
  "${library_root}/context.hh"
+  "${library_root}/coreaction.hh"
+  "${library_root}/cover.hh"
+  "${library_root}/cpool.hh"
+  "${library_root}/cpool_ghidra.hh"
+  "${library_root}/crc32.hh"
+  "${library_root}/database.hh"
+  "${library_root}/database_ghidra.hh"
+  "${library_root}/doccore.hh"
+  "${library_root}/docmain.hh"
+  "${library_root}/double.hh"
+  "${library_root}/dynamic.hh"
  "${library_root}/emulate.hh"
+  "${library_root}/emulateutil.hh"
  "${library_root}/error.hh"
+  "${library_root}/filemanage.hh"
  "${library_root}/float.hh"
+  "${library_root}/flow.hh"
+  "${library_root}/fspec.hh"
+  "${library_root}/funcdata.hh"
+  "${library_root}/ghidra_arch.hh"
+  "${library_root}/ghidra_context.hh"
+  "${library_root}/ghidra_process.hh"
+  "${library_root}/ghidra_translate.hh"
  "${library_root}/globalcontext.hh"
+  "${library_root}/grammar.hh"
+  "${library_root}/graph.hh"
+  "${library_root}/heritage.hh"
+  "${library_root}/ifacedecomp.hh"
+  "${library_root}/ifaceterm.hh"
+  "${library_root}/inject_ghidra.hh"
+  "${library_root}/inject_sleigh.hh"
+  "${library_root}/interface.hh"
+  "${library_root}/jumptable.hh"
+  "${library_root}/libdecomp.hh"
  "${library_root}/loadimage.hh"
+  "${library_root}/loadimage_ghidra.hh"
+  "${library_root}/loadimage_xml.hh"
  "${library_root}/memstate.hh"
+  "${library_root}/merge.hh"
+  "${library_root}/op.hh"
  "${library_root}/opbehavior.hh"
  "${library_root}/opcodes.hh"
+  "${library_root}/options.hh"
+  "${library_root}/override.hh"
+  "${library_root}/paramid.hh"
  "${library_root}/partmap.hh"
+  "${library_root}/pcodecompile.hh"
+  "${library_root}/pcodeinject.hh"
+  "${library_root}/pcodeparse.hh"
  "${library_root}/pcoderaw.hh"
+  "${library_root}/prefersplit.hh"
+  "${library_root}/prettyprint.hh"
+  "${library_root}/printc.hh"
+  "${library_root}/printjava.hh"
+  "${library_root}/printlanguage.hh"
+  "${library_root}/rangemap.hh"
+  "${library_root}/rangeutil.hh"
+  "${library_root}/raw_arch.hh"
+  "${library_root}/ruleaction.hh"
+  "${library_root}/rulecompile.hh"
  "${library_root}/semantics.hh"
  "${library_root}/sleigh.hh"
+  "${library_root}/sleigh_arch.hh"
  "${library_root}/sleighbase.hh"
+  "${library_root}/slgh_compile.hh"
+  "${library_root}/slghparse.hh"
  "${library_root}/slghpatexpress.hh"
  "${library_root}/slghpattern.hh"
  "${library_root}/slghsymbol.hh"
  "${library_root}/space.hh"
+  "${library_root}/string_ghidra.hh"
+  "${library_root}/stringmanage.hh"
+  "${library_root}/subflow.hh"
+  "${library_root}/testfunction.hh"
+  "${library_root}/transform.hh"
  "${library_root}/translate.hh"
+  "${library_root}/type.hh"
+  "${library_root}/typegrp_ghidra.hh"
+  "${library_root}/typeop.hh"
  "${library_root}/types.h"
+  "${library_root}/unify.hh"
+  "${library_root}/userop.hh"
+  "${library_root}/variable.hh"
+  "${library_root}/varmap.hh"
+  "${library_root}/varnode.hh"
  "${library_root}/xml.hh"
+  "${library_root}/xml_arch.hh"
+  "${library_root}/unionresolve.hh"
+  "${library_root}/marshal.hh"
 )
+#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}/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()

-set(sleigh_core_source_list
-  "${library_root}/xml.cc"
-  "${library_root}/space.cc"
-  "${library_root}/float.cc"
-  "${library_root}/address.cc"
-  "${library_root}/pcoderaw.cc"
-  "${library_root}/translate.cc"
-  "${library_root}/opcodes.cc"
-  "${library_root}/globalcontext.cc"
-)
-
-set(sleigh_deccore_source_list
-  "${library_root}/capability.cc"
-  "${library_root}/architecture.cc"
-  "${library_root}/options.cc"
-  "${library_root}/graph.cc"
-  "${library_root}/cover.cc"
-  "${library_root}/block.cc"
-  "${library_root}/cast.cc"
-  "${library_root}/typeop.cc"
-  "${library_root}/database.cc"
-  "${library_root}/cpool.cc"
-  "${library_root}/comment.cc"
-  "${library_root}/stringmanage.cc"
-  "${library_root}/fspec.cc"
-  "${library_root}/action.cc"
-  "${library_root}/loadimage.cc"
-  "${library_root}/grammar.cc"
-  "${library_root}/varnode.cc"
-  "${library_root}/op.cc"
-  "${library_root}/type.cc"
-  "${library_root}/variable.cc"
-  "${library_root}/varmap.cc"
-  "${library_root}/jumptable.cc"
-  "${library_root}/emulate.cc"
-  "${library_root}/emulateutil.cc"
-  "${library_root}/flow.cc"
-  "${library_root}/userop.cc"
-  "${library_root}/funcdata.cc"
-  "${library_root}/funcdata_block.cc"
-  "${library_root}/funcdata_op.cc"
-  "${library_root}/funcdata_varnode.cc"
-  "${library_root}/pcodeinject.cc"
-  "${library_root}/heritage.cc"
-  "${library_root}/prefersplit.cc"
-  "${library_root}/rangeutil.cc"
-  "${library_root}/ruleaction.cc"
-  "${library_root}/subflow.cc"
-  "${library_root}/blockaction.cc"
-  "${library_root}/merge.cc"
-  "${library_root}/double.cc"
-  "${library_root}/transform.cc"
-  "${library_root}/coreaction.cc"
-  "${library_root}/condexe.cc"
-  "${library_root}/override.cc"
-  "${library_root}/dynamic.cc"
-  "${library_root}/crc32.cc"
-  "${library_root}/prettyprint.cc"
-  "${library_root}/printlanguage.cc"
-  "${library_root}/printc.cc"
-  "${library_root}/printjava.cc"
-  "${library_root}/memstate.cc"
-  "${library_root}/opbehavior.cc"
-  "${library_root}/paramid.cc"
-)
-
-set(sleigh_extra_source_list
-  "${library_root}/callgraph.cc"
-  "${library_root}/ifacedecomp.cc"
-  "${library_root}/ifaceterm.cc"
-  "${library_root}/inject_sleigh.cc"
-  "${library_root}/interface.cc"
-  "${library_root}/libdecomp.cc"
-  "${library_root}/loadimage_xml.cc"
-  "${library_root}/raw_arch.cc"
-  "${library_root}/rulecompile.cc"
-  "${library_root}/sleigh_arch.cc"
-  "${library_root}/testfunction.cc"
-  "${library_root}/unify.cc"
-  "${library_root}/xml_arch.cc"
-)
-
-set(sleigh_source_list
-  "${library_root}/sleigh.cc"
-  "${library_root}/pcodeparse.cc"
-  "${library_root}/pcodecompile.cc"
-  "${library_root}/sleighbase.cc"
-  "${library_root}/slghsymbol.cc"
-  "${library_root}/slghpatexpress.cc"
-  "${library_root}/slghpattern.cc"
-  "${library_root}/semantics.cc"
-  "${library_root}/context.cc"
-  "${library_root}/filemanage.cc"
-)
-
-set(sleigh_ghidra_source_list
-  "${library_root}/ghidra_arch.cc"
-  "${library_root}/inject_ghidra.cc"
-  "${library_root}/ghidra_translate.cc"
-  "${library_root}/loadimage_ghidra.cc"
-  "${library_root}/typegrp_ghidra.cc"
-  "${library_root}/database_ghidra.cc"
-  "${library_root}/ghidra_context.cc"
-  "${library_root}/cpool_ghidra.cc"
-  "${library_root}/ghidra_process.cc"
-  "${library_root}/comment_ghidra.cc"
-  "${library_root}/string_ghidra.cc"
-)
-
-set(sleigh_slacomp_source_list
-  "${library_root}/slgh_compile.cc"
-  "${library_root}/slghparse.cc"
-  "${library_root}/slghscan.cc"
-)
-
 #
-# sleigh settings
+# sla
 #
-
-add_library(sleigh_settings INTERFACE)
-add_library(sleigh::sleigh_settings ALIAS sleigh_settings)
-
-target_compile_features(sleigh_settings INTERFACE
-  cxx_std_17
-)
-
-set(sleigh_SPEC_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/sleigh/specfiles/")
-set(sleigh_SPEC_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}/specfiles/")
-
-set_target_properties(sleigh_settings PROPERTIES
-  INTERFACE_POSITION_INDEPENDENT_CODE ON
-)
-
-if(sleigh_ENABLE_SANITIZERS)
-  message(STATUS "sleigh: Sanitizers have been enabled")
-
-  if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
-    message(WARNING "sleigh: Debug builds are preferred when sanitizers are enabled")
-  endif()
-
-  set(flag_list
-    -fno-omit-frame-pointer -fsanitize=undefined,address
-  )
-
-  target_compile_options(sleigh_settings INTERFACE ${flag_list})
-  target_link_options(sleigh_settings INTERFACE ${flag_list})
-endif()
-
-if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-  set(debug_setting_list
-    OPACTION_DEBUG
-    MERGEMULTI_DEBUG
-    BLOCKCONSISTENT_DEBUG
-    DFSVERIFY_DEBUG
-  )
-
-  foreach(debug_setting ${debug_setting_list})
-    if(NOT sleigh_${debug_setting})
-      continue()
-    endif()
-
-    message(STATUS "sleigh: Enabling debug setting: sleigh_${debug_setting}")
-
-    target_compile_definitions(sleigh_settings INTERFACE
-      ${debug_setting}
-    )
-  endforeach()
-endif()
-
-set(internal_setting_list
-  CPUI_STATISTICS
-  CPUI_RULECOMPILE
-)
-
-foreach(internal_setting ${internal_setting_list})
-  if(NOT sleigh_${internal_setting})
-    continue()
-  endif()
-
-  message(STATUS "sleigh: Enabling internal setting: sleigh_${internal_setting}")
-
-  target_compile_definitions(sleigh_settings INTERFACE
-    ${internal_setting}
-  )
-endforeach()
-
-#
-# decomp_opt, decomp_dbg
-#
-
-add_executable(decomp_opt
-  ${sleigh_core_source_list}
-  ${sleigh_deccore_source_list}
-  ${sleigh_extra_source_list}
-  ${sleigh_source_list}
-
-  "${library_root}/consolemain.cc"
-)
-add_executable(sleigh::decomp_opt ALIAS decomp_opt)
-
-target_compile_definitions(decomp_opt PRIVATE
-  __TERMINAL__
-)
-
-target_link_libraries(decomp_opt PRIVATE
-  sleigh::sleigh_settings
-)
-target_include_directories(decomp_opt PRIVATE $<BUILD_INTERFACE:${library_root}>)
-
-if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-  target_compile_definitions(decomp_opt PRIVATE
-    CPUI_DEBUG
-  )
-
-  set_target_properties(decomp_opt PROPERTIES
-    OUTPUT_NAME "decomp_dbg"
-  )
-endif()
-
-#
-# ghidra_test_dbg
-#
-
-if(sleigh_ENABLE_TESTS)
-  add_executable(ghidra_test_dbg
-    ${sleigh_core_source_list}
-    ${sleigh_deccore_source_list}
-    ${sleigh_source_list}
-    ${sleigh_extra_source_list}
-
-    "${library_root}/test.cc"
-
-    "${library_root}/../unittests/testcirclerange.cc"
-    "${library_root}/../unittests/testfloatemu.cc"
-    "${library_root}/../unittests/testtypes.cc"
-    )
-
-  target_link_libraries(ghidra_test_dbg PRIVATE
-    sleigh::sleigh_settings
-  )
-  target_include_directories(ghidra_test_dbg PRIVATE $<BUILD_INTERFACE:${library_root}>)
-
-  target_compile_definitions(ghidra_test_dbg PRIVATE
-    __TERMINAL__
-  )
-
-  add_test(
-    NAME ghidra_test_dbg
-    COMMAND ghidra_test_dbg -sleighpath "${CMAKE_CURRENT_BINARY_DIR}" unittests
-  )
-endif()
-
-#
-# ghidra_opt, ghidra_dbg
-#
-
-add_executable(ghidra_opt
-  ${sleigh_core_source_list}
-  ${sleigh_deccore_source_list}
-  ${sleigh_ghidra_source_list}
-)
-add_executable(sleigh::ghidra_opt ALIAS ghidra_opt)
-
-target_link_libraries(ghidra_opt PRIVATE
-  sleigh::sleigh_settings
-)
-target_include_directories(ghidra_opt PRIVATE $<BUILD_INTERFACE:${library_root}>)
-
-if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-  target_sources(ghidra_opt PRIVATE
-    "${library_root}/callgraph.cc"
-    "${library_root}/ifacedecomp.cc"
-    "${library_root}/ifaceterm.cc"
-    "${library_root}/interface.cc"
-    "${library_root}/testfunction.cc"
-  )
-
-  target_compile_definitions(ghidra_opt PRIVATE
-    CPUI_DEBUG
-  )
-
-  set_target_properties(ghidra_opt PROPERTIES
-    OUTPUT_NAME "ghidra_dbg"
-  )
-endif()
-
-#
-# sleigh_opt, sleigh_dbg
-#
-
-add_executable(sleigh_opt
-  ${sleigh_core_source_list}
-  ${sleigh_source_list}
-  ${sleigh_slacomp_source_list}
-)
-add_executable(sleigh::sleigh_opt ALIAS sleigh_opt)
-
-target_link_libraries(sleigh_opt PRIVATE
-  sleigh::sleigh_settings
-)
-target_include_directories(sleigh_opt PRIVATE $<BUILD_INTERFACE:${library_root}>)
-
-if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-  set_target_properties(sleigh_opt PROPERTIES
-    OUTPUT_NAME "sleigh_dbg"
-  )
-endif()
-
-#
-# sla, sla_dbg
-#
-
-add_library(sla
+add_library(sleigh_sla
  ${sleigh_core_source_list}
  ${sleigh_source_list}

@@ -390,370 +164,110 @@ add_library(sla
  "${library_root}/emulate.cc"
  "${library_root}/opbehavior.cc"
 )
-add_library(sleigh::sla ALIAS sla)
+add_library(sleigh::sla ALIAS sleigh_sla)

-target_link_libraries(sla PUBLIC
-  sleigh::sleigh_settings
-)
+target_compile_features(sleigh_sla PUBLIC cxx_std_11)
 # Private include search path '#include "..."
-target_include_directories(sla PRIVATE $<BUILD_INTERFACE:${library_root}>)
+target_include_directories(sleigh_sla PRIVATE "$<BUILD_INTERFACE:${library_root}>")
 # Public include search path in build directory
 target_include_directories(
-  sla SYSTEM
-  INTERFACE $<BUILD_INTERFACE:${public_headers_dir}>
+  sleigh_sla SYSTEM
+  INTERFACE "$<BUILD_INTERFACE:${public_headers_dir}>"
+)
+target_compile_definitions(sleigh_sla PRIVATE "$<$<CONFIG:Debug>:YYDEBUG>")
+sleigh_add_optional_defines(sleigh_sla PUBLIC)
+
+set_target_properties(sleigh_sla PROPERTIES
+  EXPORT_NAME sla
+  OUTPUT_NAME sla
+  OUTPUT_NAME_DEBUG sla_dbg
 )

-if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-  target_compile_definitions(sla PRIVATE
-    YYDEBUG
-  )
-
-  set_target_properties(sla PROPERTIES
-    OUTPUT_NAME "sla_dbg"
-  )
-endif()
-
 #
-# decomp, decomp_dbg
+# decomp
 #
-
-add_library(decomp
+add_library(sleigh_decomp
  ${sleigh_core_source_list}
  ${sleigh_deccore_source_list}
  ${sleigh_extra_source_list}
  ${sleigh_source_list}
 )
-add_library(sleigh::decomp ALIAS decomp)
+add_library(sleigh::decomp ALIAS sleigh_decomp)

-target_link_libraries(decomp PUBLIC
-  sleigh::sleigh_settings
-)
+target_compile_features(sleigh_decomp PUBLIC cxx_std_11)
 # Private include search path '#include "..."
-target_include_directories(decomp PRIVATE $<BUILD_INTERFACE:${library_root}>)
+target_include_directories(sleigh_decomp PRIVATE "$<BUILD_INTERFACE:${library_root}>")
 # Public include search path in build directory
 target_include_directories(
-  decomp SYSTEM
-  INTERFACE $<BUILD_INTERFACE:${public_headers_dir}>
+  sleigh_decomp SYSTEM
+  INTERFACE "$<BUILD_INTERFACE:${public_headers_dir}>"
+)
+sleigh_add_optional_defines(sleigh_decomp PUBLIC)
+
+set_target_properties(sleigh_decomp PROPERTIES
+  EXPORT_NAME decomp
+  OUTPUT_NAME decomp
+  OUTPUT_NAME_DEBUG decomp_dbg
 )

-if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-  set_target_properties(decomp PROPERTIES
-    OUTPUT_NAME "decomp_dbg"
-  )
+# This is the root directory where all individual processor spec file directories will be created.
+# NOTE: Needs to be defined here before the install rules
+set(spec_files_build_dir "${CMAKE_CURRENT_BINARY_DIR}/specfiles")
+
+#
+# Install rules
+#
+if(NOT CMAKE_SKIP_INSTALL_RULES)
+  include(cmake/install-rules.cmake)
 endif()

 #
-# Documentation
+# Build tool projects
 #
-
-if(sleigh_ENABLE_DOCUMENTATION)
-  message(STATUS "sleigh: Documentation has been enabled")
-
-  find_package(Doxygen REQUIRED COMPONENTS dot)
-
-  set(documentation_output "${CMAKE_CURRENT_BINARY_DIR}/doc")
-  # Always run this target because we have no source file tracking for incremental builds
-  add_custom_target(sleigh_documentation
-    COMMAND "${CMAKE_COMMAND}" -E rm -rf "${library_root}/../doc" "${documentation_output}"
-    COMMAND Doxygen::doxygen Doxyfile
-    COMMAND "${CMAKE_COMMAND}" -E copy_directory "${library_root}/../doc" "${documentation_output}"
-    COMMENT "sleigh: Generating the Doxygen documentation"
-    WORKING_DIRECTORY "${library_root}"
-    VERBATIM
-  )
+if(sleigh_BUILD_TOOLS)
+  add_subdirectory(tools)
 endif()

 #
 # Spec files
 #
-# Sets 'spec_file_list' variable
-if(NOT "${sleigh_GHIDRA_RELEASE_TYPE}" STREQUAL "HEAD")
-  include(spec-files-list/spec_files_stable.cmake)
-else()
-  include(spec-files-list/spec_files_HEAD.cmake)
+if(sleigh_BUILD_SLEIGHSPECS)
+  add_subdirectory(sleighspecs)
 endif()

-# This prefix should match the Ghidra repo to where the sla spec files are located
-set(spec_files_dir_prefix Ghidra/Processors)
-# This is the root directory where all individual processor spec file directories will be created
-set(spec_files_build_dir "${CMAKE_CURRENT_BINARY_DIR}/specfiles")
-# This is where we will be copying the generated artifacts for each processor
-set(spec_files_root_dir "${spec_files_build_dir}/${spec_files_dir_prefix}")
-set(spec_files_build_log_dir ${CMAKE_CURRENT_BINARY_DIR}/spec_build_logs)
-
-add_custom_command(
-  OUTPUT ${spec_files_build_log_dir}
-  COMMAND ${CMAKE_COMMAND} -E make_directory ${spec_files_build_log_dir}
-)
-
-# Start processing all `.slaspec` files individually
-set(spec_targets)
-set(spec_files)
-set(spec_dirs)
-include(cmake/modules/sleighCompile.cmake)
-# Example: '<ghidra_source_prefix>/Ghidra/Processors/8051/data/languages/mx51.slaspec'
-foreach(spec_file ${spec_file_list})
-  # Get 'mx51'
-  cmake_path(GET spec_file STEM LAST_ONLY spec_name)
-  # Get '<ghidra_source_prefix>/Ghidra/Processors/8051/data/languages'
-  cmake_path(GET spec_file PARENT_PATH spec_dir)
-  # Get '8051/data/languages'
-  cmake_path(RELATIVE_PATH spec_dir
-    BASE_DIRECTORY "${ghidrasource_SOURCE_DIR}/${spec_files_dir_prefix}"
-    OUTPUT_VARIABLE spec_proc_dir
-  )
-  # Get '8051'
-  cmake_path(GET spec_proc_dir PARENT_PATH proc_name)
-  cmake_path(GET proc_name PARENT_PATH proc_name)
-
-  set(spec_build_log "${spec_files_build_log_dir}/${spec_name}_build.log")
-  # Combine back again for the build directory output like
-  # '<build_prefix>/Ghidra/Processors/8051/data/languages'
-  set(spec_out_dir "${spec_files_root_dir}/${spec_proc_dir}")
-  # '<build_prefix>/Ghidra/Processors/8051/data/languages/mx51.sla'
-  set(spec_out "${spec_out_dir}/${spec_name}.sla")
-
-  # Add relative spec processor directory for later processing
-  list(APPEND spec_dirs "${spec_proc_dir}")
-
-  string(REPLACE "." "_" spec_target_name ${spec_name})
-  set(spec_target "sleigh_spec_${spec_target_name}")
-
-  # Compile the sla file
-  sleigh_compile(
-    TARGET "${spec_target}"
-    SLASPEC "${spec_file}"
-    LOG_FILE "${spec_build_log}"
-    OUT_FILE "${spec_out}"
-  )
-  add_dependencies(${spec_target} sleigh_copy_${proc_name}_dir)
-
-  list(APPEND spec_targets ${spec_target})
-  list(APPEND spec_files ${spec_out})
-endforeach()
-
-# Copy and create specfile directories
-list(REMOVE_DUPLICATES spec_dirs)
-foreach(spec_dir ${spec_dirs})
-  set(spec_src_dir "${ghidrasource_SOURCE_DIR}/${spec_files_dir_prefix}/${spec_dir}")
-  set(spec_out_dir "${spec_files_root_dir}/${spec_dir}")
-  cmake_path(GET spec_dir PARENT_PATH proc_name)
-  cmake_path(GET proc_name PARENT_PATH proc_name)
-  # Copy all other files from the slaspec source directory:
-  # '<ghidra_source_prefix>/Ghidra/Processors/8051/data/languages'
-  # NOTE: This only copies the directory once, so you will need to remove the
-  # whole directory if you update any of the other files, like '*.cspec' or
-  # '*.ldef' files
-  # CMake only guarantees update monitoring for files listed explicitly
-  add_custom_command(
-    OUTPUT "${spec_out_dir}"
-    COMMAND ${CMAKE_COMMAND} -E copy_directory "${spec_src_dir}" "${spec_out_dir}"
-  )
-  add_custom_target(sleigh_copy_${proc_name}_dir
-    DEPENDS "${spec_out_dir}"
-  )
-endforeach()
-
-# All of the sla spec targets are combined into this one
-add_custom_target(sleigh_all_sla_specs ALL DEPENDS
-  ${spec_targets}
-)
-
 #
-# Examples
+# Included Example
 #
-
-if(sleigh_ENABLE_EXAMPLES)
-  add_executable(sleighexample
-    "${library_root}/sleighexample.cc"
-  )
-
-  target_link_libraries(sleighexample PRIVATE
-    sleigh::sla
-    sleigh::decomp
-  )
-
-  add_custom_target(sleighexample_runner
-    "${CMAKE_COMMAND}" -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/specfiles"
-    COMMAND "${CMAKE_COMMAND}" -E create_symlink "${spec_files_root_dir}/x86/data/languages/x86.sla" "${CMAKE_CURRENT_BINARY_DIR}/specfiles/x86.sla"
-    COMMAND sleighexample disassemble
-    WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
-  )
-
-  add_dependencies(
-    sleighexample_runner
-    sleigh_spec_x86
-  )
-endif()
-
-# Add support library before configuring install targets
-add_subdirectory(support)
-
-#
-# Install targets
-#
-
-if(NOT CMAKE_SKIP_INSTALL_RULES)
-  include("GNUInstallDirs")
-
-  install(
-    TARGETS
-      sleigh_settings
-
-      sla
-      decomp
-      support
-
-      decomp_opt
-      ghidra_opt
-      sleigh_opt
-
-    EXPORT
-      sleighTargets
-
-    INCLUDES DESTINATION
-      ${CMAKE_INSTALL_INCLUDEDIR}
-  )
-
-  install(
-    FILES
-    ${public_include_header_list}
-
-    DESTINATION
-    ${CMAKE_INSTALL_INCLUDEDIR}/sleigh
-  )
-
-  # Install the compiled sla files found in 'Ghidra' top-level directory
-  install(
-    DIRECTORY
-      "${spec_files_build_dir}"
-
-    DESTINATION
-      "${CMAKE_INSTALL_DATADIR}/sleigh"
-  )
-
-  set(CMAKE_INSTALL_DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/sleigh")
-
-  if(sleigh_ENABLE_DOCUMENTATION)
-    # Build docs during install
-    install(CODE
-      "execute_process(
-        COMMAND \"${CMAKE_COMMAND}\" --build \"${CMAKE_BINARY_DIR}\" --target sleigh_documentation
-        COMMAND_ECHO STDOUT
-      )"
-    )
-    install(
-      DIRECTORY
-        "${documentation_output}/html/"
-
-      DESTINATION
-        "${CMAKE_INSTALL_DOCDIR}"
-    )
-  endif(sleigh_ENABLE_DOCUMENTATION)
-
-  if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-    set(output_folder_path "${CMAKE_CURRENT_BINARY_DIR}/symlinks")
-
-    add_custom_command(
-      OUTPUT "${output_folder_path}"
-      COMMAND "${CMAKE_COMMAND}" -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/symlinks"
-      COMMENT "sleigh: Generating symlink folder"
-      VERBATIM
-    )
-
-    add_custom_target(sleigh_symlinks_folder_builder DEPENDS
-      "${output_folder_path}"
-    )
-
-    add_custom_target(sleigh_symlinks_builder ALL)
-
-    foreach(target_name "decomp"
-                        "ghidra"
-                        "sleigh")
-
-      set(source_name "${target_name}_dbg")
-      set(destination_name "${target_name}_opt")
-      set(output_path "${output_folder_path}/${destination_name}")
-
-      add_custom_command(
-        OUTPUT "${output_path}"
-        COMMAND "${CMAKE_COMMAND}" -E create_symlink "${source_name}" "${destination_name}"
-        WORKING_DIRECTORY "${output_folder_path}"
-        COMMENT "sleigh: Generating executable symlink: ${source_name} -> ${destination_name}"
-        VERBATIM
-      )
-
-      set(target_name "sleigh_${source_name}_symlink_builder")
-      add_custom_target("${target_name}" DEPENDS
-        "${output_path}"
-      )
-
-      add_dependencies("${target_name}"
-        sleigh_symlinks_folder_builder
-      )
-
-      add_dependencies(sleigh_symlinks_builder
-        "${target_name}"
-      )
-
-      install(
-        FILES
-          "${output_path}"
-
-        DESTINATION
-          "${CMAKE_INSTALL_BINDIR}"
-
-        PERMISSIONS
-          OWNER_READ OWNER_WRITE OWNER_EXECUTE
-          GROUP_READ GROUP_EXECUTE
-          WORLD_READ WORLD_EXECUTE
-      )
-    endforeach()
+if(PROJECT_IS_TOP_LEVEL)
+  include(CMakeDependentOption)
+  cmake_dependent_option(sleigh_BUILD_EXAMPLE "Build included sleigh example" "${sleigh_DEVELOPER_MODE}" "sleigh_BUILD_SLEIGHSPECS" OFF)
+  if(sleigh_BUILD_EXAMPLE)
+    add_subdirectory(example)
  endif()
-
-  set(
-    sleigh_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/sleigh"
-    CACHE PATH "CMake package config location relative to the install prefix"
-  )
-  mark_as_advanced(sleigh_INSTALL_CMAKEDIR)
-
-  install(
-    EXPORT sleighTargets
-    DESTINATION "${sleigh_INSTALL_CMAKEDIR}"
-    NAMESPACE sleigh::
-  )
-
-  # Specfiles installation setup
-  set(
-    sleigh_INSTALL_DATADIR "${CMAKE_INSTALL_DATADIR}/sleigh"
-    CACHE PATH "sleigh data installation location relative to the install prefix"
-  )
-  mark_as_advanced(sleigh_INSTALL_DATADIR)
-
-  set(sleigh_INSTALL_SPECDIR "${sleigh_INSTALL_DATADIR}/specfiles"
-    CACHE PATH "sleigh specfile root destination relative to the install prefix"
-  )
-  mark_as_advanced(sleigh_INSTALL_SPECDIR)
-
-  include(CMakePackageConfigHelpers)
-
-  configure_package_config_file(cmake/install-config.cmake.in
-    ${PROJECT_BINARY_DIR}/install-config.cmake
-    INSTALL_DESTINATION "${sleigh_INSTALL_CMAKEDIR}"
-    NO_CHECK_REQUIRED_COMPONENTS_MACRO
-    PATH_VARS sleigh_INSTALL_SPECDIR
-  )
-
-  install(
-    FILES ${PROJECT_BINARY_DIR}/install-config.cmake
-    RENAME sleighConfig.cmake
-    DESTINATION "${sleigh_INSTALL_CMAKEDIR}"
-  )
-
-  install(
-    FILES cmake/modules/sleighCompile.cmake
-    DESTINATION "${sleigh_INSTALL_CMAKEDIR}/modules"
-  )
 endif()

-add_subdirectory(tools)
+#
+# Support library provided by Trail of Bits
+#
+if(sleigh_BUILD_SUPPORT)
+  # Add support library before configuring install targets
+  add_subdirectory(support)
+endif()
+
+#
+# Extras provided by Trail of Bits
+#
+if(sleigh_BUILD_EXTRATOOLS)
+  add_subdirectory(extra-tools)
+endif()
+
+#
+# Developer mode
+#
+if(NOT sleigh_DEVELOPER_MODE)
+  return()
+elseif(NOT PROJECT_IS_TOP_LEVEL)
+  message(AUTHOR_WARNING "Developer mode is intended for developers of sleigh")
+endif()
+
+include(cmake/dev-mode.cmake)
@@ -0,0 +1,130 @@
+{
+  "version": 2,
+  "cmakeMinimumRequired": {
+    "major": 3,
+    "minor": 18,
+    "patch": 0
+  },
+  "configurePresets": [
+    {
+      "name": "cmake-pedantic",
+      "hidden": true,
+      "warnings": {
+        "dev": true,
+        "deprecated": true,
+        "uninitialized": true,
+        "unusedCli": true,
+        "systemVars": false
+      },
+      "errors": {
+        "dev": true,
+        "deprecated": true
+      }
+    },
+    {
+      "name": "dev-mode",
+      "hidden": true,
+      "inherits": "cmake-pedantic",
+      "cacheVariables": {
+        "sleigh_DEVELOPER_MODE": "ON",
+        "sleigh_BUILD_DOCUMENTATION": "ON"
+      }
+    },
+    {
+      "name": "ci-std",
+      "description": "This preset makes sure the project actually builds with at least the specified standard",
+      "hidden": true,
+      "cacheVariables": {
+        "CMAKE_CXX_EXTENSIONS": "OFF",
+        "CMAKE_CXX_STANDARD": "11",
+        "CMAKE_CXX_STANDARD_REQUIRED": "ON"
+      }
+    },
+    {
+      "name": "ci-std-tools",
+      "description": "This preset makes sure the project actually builds with at least the specified standard for extra sleigh tools",
+      "hidden": true,
+      "inherits": "ci-std",
+      "cacheVariables": {
+        "CMAKE_CXX_STANDARD": "17"
+      }
+    },
+    {
+      "name": "flags-unix",
+      "hidden": true,
+      "cacheVariables": {
+        "CMAKE_CXX_FLAGS": "-Wall -Wextra -Wpedantic -Wconversion -Wsign-conversion -Wcast-qual -Wshadow -Wformat=2 -Wundef"
+      }
+    },
+    {
+      "name": "flags-windows",
+      "description": "Note that all the flags after /W4 are required for MSVC to conform to the language standard",
+      "hidden": true,
+      "cacheVariables": {
+        "CMAKE_CXX_FLAGS": "/utf-8 /W4 /permissive- /volatile:iso /Zc:preprocessor /EHsc /Zc:__cplusplus /Zc:externConstexpr /Zc:throwingNew"
+      }
+    },
+    {
+      "name": "ci-unix",
+      "generator": "Unix Makefiles",
+      "hidden": true,
+      "inherits": ["flags-unix", "ci-std"],
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "RelWithDebInfo"
+      }
+    },
+    {
+      "name": "ci-win64",
+      "inherits": ["flags-windows", "ci-std"],
+      "generator": "Visual Studio 17 2022",
+      "architecture": "x64",
+      "hidden": true
+    },
+    {
+      "name": "coverage-unix",
+      "binaryDir": "${sourceDir}/build/coverage",
+      "inherits": "ci-unix",
+      "hidden": true,
+      "cacheVariables": {
+        "ENABLE_COVERAGE": "ON",
+        "CMAKE_BUILD_TYPE": "Coverage",
+        "CMAKE_CXX_FLAGS_COVERAGE": "-Og -g --coverage -fkeep-static-functions",
+        "CMAKE_EXE_LINKER_FLAGS_COVERAGE": "--coverage",
+        "CMAKE_SHARED_LINKER_FLAGS_COVERAGE": "--coverage"
+      }
+    },
+    {
+      "name": "ci-coverage",
+      "inherits": ["coverage-unix", "dev-mode"],
+      "cacheVariables": {
+        "COVERAGE_HTML_COMMAND": ""
+      }
+    },
+    {
+      "name": "ci-sanitize",
+      "binaryDir": "${sourceDir}/build/sanitize",
+      "inherits": ["ci-unix", "dev-mode"],
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Sanitize",
+        "CMAKE_CXX_FLAGS_SANITIZE": "-O2 -g -fsanitize=address,undefined -fno-omit-frame-pointer -fno-common"
+      }
+    },
+    {
+      "name": "ci-build",
+      "binaryDir": "${sourceDir}/build",
+      "hidden": true
+    },
+    {
+      "name": "ci-macos",
+      "inherits": ["ci-build", "ci-unix", "dev-mode"]
+    },
+    {
+      "name": "ci-ubuntu",
+      "inherits": ["ci-build", "ci-unix", "dev-mode"]
+    },
+    {
+      "name": "ci-windows",
+      "inherits": ["ci-build", "ci-win64", "dev-mode"]
+    }
+  ]
+}
@@ -1,8 +1,8 @@
-# SLEIGH Library
+# Sleigh Library

-[SLEIGH](https://ghidra.re/courses/languages/html/sleigh.html) is a language used to describe the semantics of instruction sets of general-purpose microprocessors, with enough detail to facilitate the reverse engineering of software compiled for these architectures. It is part of the [GHIDRA reverse engineering platform](https://github.com/NationalSecurityAgency/ghidra), and underpins two of its major components: its disassembly and decompilation engines.
+[Sleigh](https://ghidra.re/courses/languages/html/sleigh.html) is a language used to describe the semantics of instruction sets of general-purpose microprocessors, with enough detail to facilitate the reverse engineering of software compiled for these architectures. It is part of the [Ghidra reverse engineering platform](https://github.com/NationalSecurityAgency/ghidra) and underpins two of its major components: its disassembly and decompilation engines.

-This repository provides a CMake-based build project for SLEIGH so that it can be built and packaged as a standalone library, and be reused in projects other than GHIDRA.
+This repository provides a CMake-based build project for Sleigh so that it can be built and packaged as a standalone library and be reused in projects other than Ghidra.

 ## Supported Platforms

@@ -10,7 +10,7 @@ This repository provides a CMake-based build project for SLEIGH so that it can b
 | ---- | ------- |
 | Linux | Yes |
 | macOS | Yes |
-| Windows | Not yet |
+| Windows | Yes |

 ## Dependencies and Prerequisites

@@ -19,7 +19,7 @@ This repository provides a CMake-based build project for SLEIGH so that it can b
 | Name | Version | Linux Package to Install | macOS Homebrew Package to Install |
 | ---- | ------- | ------------------------ | --------------------------------- |
 | [Git](https://git-scm.com/) | Latest | git | N/A |
-| [CMake](https://cmake.org/) | 3.21+ | cmake | cmake |
+| [CMake](https://cmake.org/) | 3.18+ | cmake | cmake |

 **NOTE**: This CMake project pulls the Ghidra source code from the internet during configuration. See the [note on Ghidra source code section](#note-on-ghidra-source-code) for more details.

@@ -32,49 +32,43 @@ For building documentation:
 | [Doxygen](https://www.doxygen.nl/) | Latest | doxygen | doxygen |
 | [GraphViz](https://graphviz.org/) | Latest | graphviz | graphviz |

-## Build and Install the SLEIGH Library
+## Build and Install the Sleigh Library

 ```sh
-# Clone this repository (CMake project for SLEIGH)
+# Clone this repository (CMake project for sleigh)
 git clone https://github.com/lifting-bits/sleigh.git
 cd sleigh

 # Configure CMake
 cmake -B build -S .

-# Build SLEIGH
-cmake --build build -j
+# Build Sleigh
+cmake --build build --parallel 8

-# Install SLEIGH
-cmake --install build --prefix <path where SLEIGH will install>
+# Install Sleigh
+cmake --install build --prefix ./install
 ```

 ### Note on Ghidra source code

 The Ghidra source code is not actually included in this git repo, and by default, CMake will automatically pull a stable version from the internet for you.

-Please see [`src/README.md`](./src/README.md) for more information on how to customize which Ghidra source code commit will be used/compiled, including specifying your own local copy of the Ghidra source.
+Please see [`src/README.md`](src/README.md) for more information on how to customize which Ghidra source code commit will be used/compiled, including specifying your own local copy of the Ghidra source.

 ## Packaging

-The CMake configuration also supports building packages for SLEIGH. If the `sleigh_ENABLE_PACKAGING` option is set during the configuration step, the build step will generate a tarball containing the SLEIGH installation. Additionally, the build will create an RPM package if it finds `rpm` in the `PATH` and/or a DEB package if it finds `dpkg` in the `PATH`.
+The CMake configuration also supports building packages for Sleigh.

 For example:

 ```sh
-cmake -B build -S . \
-    -Dsleigh_ENABLE_PACKAGING=ON
-
-# Build SLEIGH
-cmake --build build -j
-
-# Package SLEIGH
+# Package Sleigh
 cmake --build build --target package
 ```

 ## API Usage

-An example program called `sleigh-lift` has been included to demonstrate how to use the SLEIGH API. It takes a hexadecimal string of bytes and either disassembles it or lifts it to p-code. The program can be invoked like so, where the `action` argument must be either `disassemble` or `pcode`:
+An example program called `sleigh-lift` has been included to demonstrate how to use the Sleigh API. It takes a hexadecimal string of bytes and can disassemble it or lift it to p-code. The program can be invoked as follows, where the `action` argument must be either `disassemble` or `pcode`:

 ```sh
 sleigh-lift [action] [sla_file] [bytes] [-a address] [-p root_sla_dir] [-s pspec_file]
@@ -102,11 +96,11 @@ $ sleigh-lift pcode x86-64.sla 4881ecc00f0000
 (register,0x202,1) = INT_EQUAL (unique,0x12d00,1) (const,0x0,1)
 ```

-The `sleigh_ENABLE_EXAMPLES` option must be set to `ON` during the configuration step in order to build `sleigh-lift`.
+If you do not want to build `sleigh-lift`, you must set the CMake variable `sleigh_BUILD_EXTRATOOLS` option to `OFF` during CMake configuration.

 ## Helpers

-This repository contains a helper that is not part of SLEIGH/GHIDRA, which can be found under `support/`. It has the following signature and can help the user find the location of a given spec file on the system:
+This repository contains a helper not part of Sleigh/Ghidra, which you can find in the `support` directory. It has the following signature and can help the user find the location of a given spec file on the system:

 ```c++
 std::optional<std::filesystem::path>
@@ -115,20 +109,24 @@ FindSpecFile(std::string_view file_name,
                 gDefaultSearchPaths);
 ```

-The `sleigh::FindSpecFile` function will search the the paths provided by the user via the `search_paths` argument for a spec file with the name `file_name`. The default argument for `search_paths` is `sleigh::gDefaultSearchPaths` which contains the install/build directories that the CMake project was configured with as well as a set of common installation locations.
+The `sleigh::FindSpecFile` function will search the paths provided by the user via the `search_paths` argument for a spec file with the name `file_name`. The default argument for `search_paths` is `sleigh::gDefaultSearchPaths` which contains the install/build directories generated during CMake configuration and a set of common installation locations.
+
+If you do not want to build the helpers, you must set the CMake variable `sleigh_BUILD_SUPPORT` option to `OFF` during CMake configuration.

 ## Integration as a Dependency

-An installation of sleigh provides a CMake interface that can be used to assist in building your project.
+An installation of Sleigh provides a CMake interface that you can use when building your project.

-An example of how to use the CMake package config file can be found in the [find_package](tests/find_package/CMakeLists.txt) example.
+You can find an example of how to use the CMake package config file in the [find_package](tests/find_package/CMakeLists.txt) example.

-We also provide a CMake helper function [`sleigh_compile`](cmake/modules/sleighCompile.cmake) to compile your own `.slaspec` files using the installed sleigh compiler from this project.
+We also provide a CMake helper function [`sleigh_compile`](cmake/modules/sleighCompile.cmake) to compile your `.slaspec` files using a sleigh compiler.

-Lastly, the installed compiled sleigh files can be located through the CMake variable `sleigh_INSTALL_SPECDIR`, which is an absolute path to the root directory for where the compiled sleigh files are located---you should manually inspect this to know what to expect.
+You can find a more complex CMake example with compiling Sleigh specifications in the [`example`](example/CMakeLists.txt) directory, which uses the upstream-provided sleigh example source code.

-Referencing the [CMake config file](cmake/install-config.cmake.in) is also suggested for learning more about the exposed CMake variables and modules.
+Lastly, you can locate the installed compiled sleigh files through the CMake variable `sleigh_INSTALL_SPECDIR`, which is an absolute path to the root directory for the compiled sleigh files---you should manually inspect this to know what to expect.
+
+Referencing the [CMake config file](cmake/install-config.cmake.in) and [`specfiles` CMake file](sleighspecs/specfiles.cmake.in) is also suggested for learning more about the exposed CMake variables and modules.

 ## License

-See the LICENSE file in the top directory of this repo.
+See the [LICENSE file](LICENSE).
@@ -0,0 +1,33 @@
+# ---- Variables ----
+
+# We use variables separate from what CTest uses, because those have
+# customization issues
+set(
+    COVERAGE_TRACE_COMMAND
+    lcov -c -q
+    -o "${PROJECT_BINARY_DIR}/coverage.info"
+    -d "${PROJECT_BINARY_DIR}"
+    --include "${library_root}/*"
+    CACHE STRING
+    "; separated command to generate a trace for the 'coverage' target"
+)
+
+set(
+    COVERAGE_HTML_COMMAND
+    genhtml --legend -f -q
+    "${PROJECT_BINARY_DIR}/coverage.info"
+    -p "${library_root}"
+    -o "${PROJECT_BINARY_DIR}/coverage_html"
+    CACHE STRING
+    "; separated command to generate an HTML report for the 'coverage' target"
+)
+
+# ---- Coverage target ----
+
+add_custom_target(
+    coverage
+    COMMAND ${COVERAGE_TRACE_COMMAND}
+    COMMAND ${COVERAGE_HTML_COMMAND}
+    COMMENT "Generating coverage report"
+    VERBATIM
+)
@@ -0,0 +1,13 @@
+include(CTest)
+if(BUILD_TESTING)
+  add_subdirectory(tests)
+endif()
+
+if(sleigh_BUILD_DOCUMENTATION)
+  include(cmake/docs.cmake)
+endif()
+
+option(ENABLE_COVERAGE "Enable coverage support separate from CTest's" OFF)
+if(ENABLE_COVERAGE)
+  include(cmake/coverage.cmake)
+endif()
@@ -0,0 +1,11 @@
+find_package(Doxygen REQUIRED COMPONENTS dot)
+
+# Always run this target because we have no source file tracking for incremental builds
+add_custom_target(docs
+  COMMAND "${CMAKE_COMMAND}" -E remove_directory "${DOXYGEN_OUTPUT_DIRECTORY}/html"
+  COMMAND Doxygen::doxygen Doxyfile
+  COMMAND "${CMAKE_COMMAND}" -E copy_directory "${library_root}/../doc" "${DOXYGEN_OUTPUT_DIRECTORY}"
+  COMMENT "sleigh: Generating the Doxygen documentation"
+  WORKING_DIRECTORY "${library_root}"
+  VERBATIM
+)
@@ -1,9 +1,52 @@
+#
+# Copyright (c) 2022-present, Trail of Bits, Inc.
+# All rights reserved.
+#
+# This source code is licensed in accordance with the terms specified in
+# the LICENSE file found in the root directory of this source tree.
+#
+
+# This file provides access to the installed sleigh targets.
+#
+# There are optional components that could also be installed:
+#   * Specs - Compiled sleigh specification files
+#   * Support - Support library for easier use of sleigh
+#   * ExtraTools - Extra tools created by Trail of Bits
+
@PACKAGE_INIT@

 include("${CMAKE_CURRENT_LIST_DIR}/sleighTargets.cmake")

-# Path relative-root to reach installed specfiles directory
-set_and_check(sleigh_INSTALL_SPECDIR "@PACKAGE_sleigh_INSTALL_SPECDIR@")
+# Extra version details. Either 'stable' or 'HEAD'
+set(sleigh_RELEASE_IS_HEAD "@sleigh_RELEASE_IS_HEAD@")

 # Helpers exposed by default when finding sleigh
 include("${CMAKE_CURRENT_LIST_DIR}/modules/sleighCompile.cmake")
+
+# Find-package component handling for Support library and ExtraTools
+set(_sleigh_supported_components Specs Support ExtraTools)
+
+# Specs just sets a variable to the directory of installation
+set(_sleigh_Specs_targets "${CMAKE_CURRENT_LIST_DIR}/specfiles.cmake")
+set(_sleigh_Support_targets "${CMAKE_CURRENT_LIST_DIR}/sleighSupportTargets.cmake")
+set(_sleigh_ExtraTools_targets "${CMAKE_CURRENT_LIST_DIR}/sleighExtraToolsTargets.cmake")
+
+macro(sleigh_load_component comp)
+  if(NOT EXISTS "${_sleigh_${comp}_targets}" AND ${sleigh_FIND_REQUIRED_${comp}})
+    set(sleigh_NOT_FOUND_MESSAGE
+      "sleigh `${comp}` component targets were requested but not found.")
+    set(sleigh_FOUND FALSE)
+    return()
+  endif()
+  if(EXISTS "${_sleigh_${comp}_targets}")
+    include("${_sleigh_${comp}_targets}")
+  endif()
+endmacro()
+
+foreach(_comp ${sleigh_FIND_COMPONENTS})
+  if (NOT _comp IN_LIST _sleigh_supported_components)
+    set(sleigh_FOUND FALSE)
+    set(sleigh_NOT_FOUND_MESSAGE "Unsupported component: ${_comp}")
+  endif()
+  sleigh_load_component("${_comp}")
+endforeach()
@@ -0,0 +1,93 @@
+#
+# Copyright (c) 2022-present, Trail of Bits, Inc.
+# All rights reserved.
+#
+# This source code is licensed in accordance with the terms specified in
+# the LICENSE file found in the root directory of this source tree.
+#
+
+if(PROJECT_IS_TOP_LEVEL)
+  set(CMAKE_INSTALL_INCLUDEDIR include/sleigh CACHE PATH "")
+endif()
+
+include(GNUInstallDirs)
+
+install(
+  TARGETS
+    sleigh_sla
+    sleigh_decomp
+  EXPORT
+    sleighTargets
+  RUNTIME #
+    COMPONENT sleigh_Runtime
+  LIBRARY #
+    COMPONENT sleigh_Runtime
+    NAMELINK_COMPONENT sleigh_Development
+  ARCHIVE #
+    COMPONENT sleigh_Development
+  INCLUDES DESTINATION
+    "${CMAKE_INSTALL_INCLUDEDIR}"
+)
+
+install(
+  DIRECTORY "${public_headers_dir}/"
+  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+  COMPONENT sleigh_Development
+)
+
+if(sleigh_BUILD_DOCUMENTATION)
+  install(
+    DIRECTORY "${DOXYGEN_OUTPUT_DIRECTORY}/html/"
+    DESTINATION "${CMAKE_INSTALL_DOCDIR}"
+    COMPONENT sleigh_Documentation
+  )
+endif()
+
+set(
+  sleigh_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/sleigh"
+  CACHE PATH "CMake package config location relative to the install prefix"
+)
+mark_as_advanced(sleigh_INSTALL_CMAKEDIR)
+
+install(
+  EXPORT sleighTargets
+  DESTINATION "${sleigh_INSTALL_CMAKEDIR}"
+  NAMESPACE sleigh::
+  COMPONENT sleigh_Development
+)
+
+include(CMakePackageConfigHelpers)
+
+write_basic_package_version_file(
+    "sleighConfigVersion.cmake"
+    COMPATIBILITY SameMinorVersion
+)
+
+install(
+    FILES "${PROJECT_BINARY_DIR}/sleighConfigVersion.cmake"
+    DESTINATION "${sleigh_INSTALL_CMAKEDIR}"
+    COMPONENT sleigh_Development
+)
+
+configure_package_config_file(cmake/install-config.cmake.in
+  "${PROJECT_BINARY_DIR}/install-config.cmake"
+  INSTALL_DESTINATION "${sleigh_INSTALL_CMAKEDIR}"
+  NO_CHECK_REQUIRED_COMPONENTS_MACRO
+)
+
+install(
+  FILES "${PROJECT_BINARY_DIR}/install-config.cmake"
+  RENAME sleighConfig.cmake
+  DESTINATION "${sleigh_INSTALL_CMAKEDIR}"
+  COMPONENT sleigh_Development
+)
+
+install(
+  FILES cmake/modules/sleighCompile.cmake
+  DESTINATION "${sleigh_INSTALL_CMAKEDIR}/modules"
+  COMPONENT sleigh_Development
+)
+
+if(PROJECT_IS_TOP_LEVEL)
+  include(cmake/packaging.cmake)
+endif()
@@ -0,0 +1,19 @@
+/*
+  Copyright (c) 2022-present, Trail of Bits, Inc.
+  All rights reserved.
+
+  This source code is licensed in accordance with the terms specified in
+  the LICENSE file found in the root directory of this source tree.
+*/
+
+#ifndef SLEIGH_LIBCONFIG_H
+#define SLEIGH_LIBCONFIG_H
+
+#cmakedefine sleigh_RELEASE_IS_HEAD
+#cmakedefine sleigh_VERSION "@sleigh_VERSION@"
+#cmakedefine sleigh_VERSION_MAJOR @sleigh_VERSION_MAJOR@
+#cmakedefine sleigh_VERSION_MINOR @sleigh_VERSION_MINOR@
+#cmakedefine sleigh_VERSION_PATCH @sleigh_VERSION_PATCH@
+#cmakedefine sleigh_VERSION_TWEAK @sleigh_VERSION_TWEAK@
+
+#endif
@@ -6,11 +6,12 @@
 # the LICENSE file found in the root directory of this source tree.
 #

-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required(VERSION 3.18)

 # Takes the following required arguments:
 #
 #   TARGET: Named CMake target for performing sleigh compilation
+#   COMPILER: Path to sleigh compiler executable
 #   SLASPEC: Path to slaspec file
 #   LOG_FILE: File to write logs
 #   OUT_FILE: Compiled sleigh output file (should be in build directory somewhere)
@@ -20,7 +21,7 @@ cmake_minimum_required(VERSION 3.15)
 # rebuild the sleigh file then you must delete the OUT_FILE
 function(sleigh_compile)
  set(options)
-  set(oneValueArgs TARGET SLASPEC LOG_FILE OUT_FILE)
+  set(oneValueArgs TARGET COMPILER SLASPEC LOG_FILE OUT_FILE)
  set(multiValueArgs)
  cmake_parse_arguments(parsed
    "${options}"
@@ -54,7 +55,7 @@ function(sleigh_compile)
    MAIN_DEPENDENCY "${spec_file}"
    COMMAND ${CMAKE_COMMAND} -E make_directory "${spec_out_dir}"
    COMMAND ${CMAKE_COMMAND} -E make_directory "${spec_build_log_dir}"
-    COMMAND "$<TARGET_FILE:sleigh::sleigh_opt>" ${spec_file} "${spec_out}" > "${spec_build_log}" 2>&1
+    COMMAND "${parsed_COMPILER}" ${spec_file} "${spec_out}" > "${spec_build_log}" 2>&1
    WORKING_DIRECTORY "${spec_dir}"
    COMMENT "sleigh: Compiling the '${spec_name}' spec file (logs written in '${spec_build_log}')"
    BYPRODUCTS "${spec_build_log}"
@@ -6,21 +6,34 @@
 # the LICENSE file found in the root directory of this source tree.
 #

-option(sleigh_ENABLE_TESTS "Set to true to enable tests" ON)
-option(sleigh_ENABLE_EXAMPLES "Set to true to build examples" ON)
-option(sleigh_ENABLE_DOCUMENTATION "Set to true to enable the documentation")
-option(sleigh_ENABLE_PACKAGING "Set to true to enable packaging")
-option(sleigh_ENABLE_SANITIZERS "Set to true to enable sanitizers")
+# ---- Developer mode ----

-# Internal debug settings
-option(sleigh_OPACTION_DEBUG "Turns on all the action tracing facilities")
-option(sleigh_MERGEMULTI_DEBUG "Check for MULTIEQUAL and INDIRECT intersections")
-option(sleigh_BLOCKCONSISTENT_DEBUG "Check that block graph structure is consistent")
-option(sleigh_DFSVERIFY_DEBUG "Make sure that the block ordering algorithm produces a true depth first traversal of the dominator tree")
+# Developer mode enables targets and code paths in the CMake scripts that are
+# only relevant for the developer(s) of sleigh
+# Targets necessary to build the project must be provided unconditionally, so
+# consumers can trivially build and package the project
+if(PROJECT_IS_TOP_LEVEL)
+  option(sleigh_DEVELOPER_MODE "Enable developer mode")
+  option(BUILD_SHARED_LIBS "Build shared libs. (Untested and not supported)")
+endif()

-# Additional internal settings
-option(sleigh_CPUI_STATISTICS "Turn on collection of cover and cast statistics")
-option(sleigh_CPUI_RULECOMPILE "Allow user defined dynamic rules")
+if(sleigh_DEVELOPER_MODE)
+  option(sleigh_BUILD_DOCUMENTATION "Build documentation using Doxygen")
+  set(
+    DOXYGEN_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/docs"
+    CACHE PATH "Path for the generated Doxygen documentation"
+  )
+endif()
+
+include(CMakeDependentOption)
+
+# Optional project target building
+option(sleigh_BUILD_TOOLS "Build and install executable tools" "${PROJECT_IS_TOP_LEVEL}")
+option(sleigh_BUILD_SLEIGHSPECS "Build and install sleigh spec files" "${PROJECT_IS_TOP_LEVEL}")
+
+# Add-ons by ToB
+option(sleigh_BUILD_SUPPORT "Build ToB support libraries" "${PROJECT_IS_TOP_LEVEL}")
+cmake_dependent_option(sleigh_BUILD_EXTRATOOLS "Build extra ToB sleigh tools" "${PROJECT_IS_TOP_LEVEL}" "sleigh_BUILD_SUPPORT" OFF)

 # ---- Warning guard ----

@@ -29,12 +42,14 @@ option(sleigh_CPUI_RULECOMPILE "Allow user defined dynamic rules")
 # This is to provide a user experience similar to find_package when
 # add_subdirectory or FetchContent is used to consume this project
 set(warning_guard "")
+
 if(NOT PROJECT_IS_TOP_LEVEL)
  option(sleigh_INCLUDES_WITH_SYSTEM
    "Use SYSTEM modifier for sleigh's includes, disabling warnings"
    ON
  )
  mark_as_advanced(sleigh_INCLUDES_WITH_SYSTEM)
+
  if(sleigh_INCLUDES_WITH_SYSTEM)
    set(warning_guard SYSTEM)
  endif()
@@ -7,48 +7,45 @@
 #

 set(PACKAGE_VERSION 1)
-if("${sleigh_GHIDRA_RELEASE_TYPE}" STREQUAL "HEAD")
+if("${sleigh_RELEASE_TYPE}" STREQUAL "HEAD")
  set(PACKAGE_VERSION "DEV.${ghidra_short_commit}")
 endif()

-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "SLEIGH was designed for the GHIDRA reverse engineering platform and is used to describe microprocessors with enough detail to facilitate two major components of GHIDRA, the disassembly and decompilation engines.")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Sleigh was designed for the Ghidra reverse engineering platform built by the National Security Agency and is used to describe microprocessors with enough detail to facilitate two major components of Ghidra, the disassembly and decompilation engines. This is an unofficial release by Trail of Bits.")
 set(CPACK_PACKAGE_NAME "sleigh")
-set(CPACK_PACKAGE_VENDOR "NSA")
+set(CPACK_PACKAGE_VENDOR "Trail of Bits")
 set(CPACK_PACKAGE_CONTACT "info@trailofbits.com")
 set(CPACK_PACKAGE_HOMEPAGE_URL "https://github.com/lifting-bits/sleigh")
-set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${PROJECT_VERSION}-${PACKAGE_VERSION}.x86_64")
+set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${PROJECT_VERSION}-${PACKAGE_VERSION}.${CMAKE_SYSTEM_PROCESSOR}")
 set(CPACK_PACKAGE_RELOCATABLE ON)

-set(CPACK_DEBIAN_PACKAGE_RELEASE "${PACKAGE_VERSION}")
-set(CPACK_DEBIAN_PACKAGE_PRIORITY "extra")
-set(CPACK_DEBIAN_PACKAGE_SECTION "default")
-set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "${CPACK_PACKAGE_HOMEPAGE_URL}")
-set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc-dev-bin (>=2.31)")
-
-set(CPACK_RPM_PACKAGE_RELEASE_DIST "${PACKAGE_VERSION}")
-set(CPACK_RPM_PACKAGE_DESCRIPTION "${CPACK_PACKAGE_DESCRIPTION_SUMMARY}")
-set(CPACK_RPM_PACKAGE_GROUP "default")
-set(CPACK_RPM_PACKAGE_REQUIRES "glibc >= 2.31")
-
 set(CPACK_GENERATOR "TGZ")

-unset(rpm_executable_path CACHE)
-find_program(rpm_executable_path "rpm")
-if("${rpm_executable_path}" STREQUAL "rpm_executable_path-NOTFOUND")
-  message(WARNING "sleigh: the RPM package generator requires the 'rpm' tool")
+if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
+  unset(rpm_executable_path CACHE)
+  find_program(rpm_executable_path "rpm")
+  if("${rpm_executable_path}" STREQUAL "rpm_executable_path-NOTFOUND")
+    message(WARNING "sleigh: the RPM package generator requires the 'rpm' tool")
+  else()
+    list(APPEND CPACK_GENERATOR "RPM")
+    message(STATUS "sleigh: the RPM generator has been enabled")
+  endif()
+  set(CPACK_RPM_PACKAGE_RELEASE_DIST "${PACKAGE_VERSION}")
+  set(CPACK_RPM_PACKAGE_DESCRIPTION "${CPACK_PACKAGE_DESCRIPTION_SUMMARY}")
+  set(CPACK_RPM_PACKAGE_GROUP "default")

-else()
-  list(APPEND CPACK_GENERATOR "RPM")
-  message(STATUS "sleigh: the RPM generator has been enabled")
-endif()
-
-unset(dpkg_executable_path CACHE)
-find_program(dpkg_executable_path "dpkg")
-if("${dpkg_executable_path}" STREQUAL "dpkg_executable_path-NOTFOUND")
-  message(WARNING "sleigh: the DEB package generator requires the 'dpkg' tool")
-else()
-  list(APPEND CPACK_GENERATOR "DEB")
-  message(STATUS "sleigh: the DEB generator has been enabled")
+  unset(dpkg_executable_path CACHE)
+  find_program(dpkg_executable_path "dpkg")
+  if("${dpkg_executable_path}" STREQUAL "dpkg_executable_path-NOTFOUND")
+    message(WARNING "sleigh: the DEB package generator requires the 'dpkg' tool")
+  else()
+    list(APPEND CPACK_GENERATOR "DEB")
+    message(STATUS "sleigh: the DEB generator has been enabled")
+  endif()
+  set(CPACK_DEBIAN_PACKAGE_RELEASE "${PACKAGE_VERSION}")
+  set(CPACK_DEBIAN_PACKAGE_PRIORITY "extra")
+  set(CPACK_DEBIAN_PACKAGE_SECTION "default")
+  set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "${CPACK_PACKAGE_HOMEPAGE_URL}")
 endif()

 include(CPack)
@@ -0,0 +1,10 @@
+# ---- In-source guard ----
+
+if(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
+  message(
+      FATAL_ERROR
+      "In-source builds are not supported. "
+      "Please read the documentation before trying to build this project. "
+      "You may need to delete 'CMakeCache.txt' and 'CMakeFiles/' first."
+  )
+endif()
@@ -0,0 +1,6 @@
+# This variable is set by project() in CMake 3.21+
+string(
+    COMPARE EQUAL
+    "${CMAKE_SOURCE_DIR}" "${PROJECT_SOURCE_DIR}"
+    PROJECT_IS_TOP_LEVEL
+)
@@ -0,0 +1,115 @@
+#
+# Copyright (c) 2022-present, Trail of Bits, Inc.
+# All rights reserved.
+#
+# This source code is licensed in accordance with the terms specified in
+# the LICENSE file found in the root directory of this source tree.
+#
+
+cmake_minimum_required(VERSION 3.18)
+
+include(../cmake/prelude.cmake)
+
+# We include this because the source code for this example is in upstream
+include(../src/setup-ghidra-source.cmake)
+
+project(sleigh_example
+    VERSION "${ghidra_version}"
+    DESCRIPTION "Sleigh example"
+    HOMEPAGE_URL "https://github.com/lifting-bits/sleigh"
+    LANGUAGES CXX
+)
+
+include(../cmake/project-is-top-level.cmake)
+
+if(NOT TARGET sleigh::sla)
+  find_package(sleigh)
+  if(NOT sleigh_FOUND)
+    message(WARNING "Could not find sleigh library, building from source")
+    # Exclude from all because there are no install rules for the example
+    # See sleigh-lift for example with install rules
+    add_subdirectory(.. sleigh EXCLUDE_FROM_ALL)
+  endif()
+endif()
+
+add_executable(sleigh_example
+  "${library_root}/sleighexample.cc"
+)
+
+target_compile_features(sleigh_example PRIVATE cxx_std_11)
+sleigh_add_optional_defines(sleigh_example PRIVATE)
+target_link_libraries(sleigh_example PRIVATE
+  sleigh::sla
+)
+
+set_target_properties(sleigh_example PROPERTIES
+  OUTPUT_NAME sleighexample
+)
+
+#
+# Compile our required sleigh spec file
+#
+# Get the native machine's sleigh compiler or use the one we're about to build
+# if not cross compiling
+if(CMAKE_CROSSCOMPILING)
+  find_program(
+    SLEIGH_EXECUTABLE sleigh
+    DOC "Path to host system sleigh compiler"
+    REQUIRED
+  )
+  set(sleigh_compiler "${SLEIGH_EXECUTABLE}")
+else()
+  # Try to find/acquire or bootstrap the sleigh spec compiler
+  # Logic is repeated in sleighspecs/CMakeLists.txt
+  if(NOT TARGET sleigh::sleigh)
+    find_package(sleigh QUIET)
+    if(NOT sleigh_FOUND OR NOT TARGET sleigh::sleigh)
+      find_program(
+        SLEIGH_EXECUTABLE sleigh
+        DOC "Path to host system sleigh compiler"
+      )
+      if(NOT SLEIGH_EXECUTABLE)
+        message(WARNING "Could not find sleigh compiler, building from source")
+        set(saved_skip_install_rules "${CMAKE_SKIP_INSTALL_RULES}")
+        set(CMAKE_SKIP_INSTALL_RULES TRUE)
+        add_subdirectory(../tools/spec-compiler spec-compiler EXCLUDE_FROM_ALL)
+        set(CMAKE_SKIP_INSTALL_RULES "${saved_skip_install_rules}")
+      endif()
+    endif()
+  endif()
+endif()
+if(SLEIGH_EXECUTABLE)
+  set(sleigh_compiler "${SLEIGH_EXECUTABLE}")
+else()
+  set(sleigh_compiler "$<TARGET_FILE:sleigh::sleigh>")
+endif()
+
+# Compile the sla file
+include(../cmake/modules/sleighCompile.cmake)
+
+sleigh_compile(
+  TARGET sleigh_example_sleigh_spec_x86
+  COMPILER "${sleigh_compiler}"
+  SLASPEC "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/x86/data/languages/x86.slaspec"
+  LOG_FILE "${CMAKE_CURRENT_BINARY_DIR}/specfiles/x86.sla.log"
+  OUT_FILE "${CMAKE_CURRENT_BINARY_DIR}/specfiles/x86.sla"
+)
+set_property(
+  TARGET sleigh_example_sleigh_spec_x86
+  PROPERTY EXCLUDE_FROM_ALL FALSE
+)
+
+#
+# Run the example
+#
+add_custom_target(sleigh_example_runner)
+set(example_actions disassemble pcode emulate)
+foreach(action ${example_actions})
+  add_custom_target(sleigh_example_${action}
+    COMMAND sleigh_example ${action}
+    COMMENT "Running example ${action}"
+    WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
+  )
+  add_dependencies(sleigh_example_${action} sleigh_example_sleigh_spec_x86)
+  add_dependencies(sleigh_example_runner sleigh_example_${action})
+endforeach()
@@ -0,0 +1,9 @@
+#
+# Copyright (c) 2022-present, Trail of Bits, Inc.
+# All rights reserved.
+#
+# This source code is licensed in accordance with the terms specified in
+# the LICENSE file found in the root directory of this source tree.
+#
+
+add_subdirectory(sleigh-lift)
@@ -0,0 +1,63 @@
+#
+# Copyright (c) 2021-present, Trail of Bits, Inc.
+# All rights reserved.
+#
+# This source code is licensed in accordance with the terms specified in
+# the LICENSE file found in the root directory of this source tree.
+#
+
+cmake_minimum_required(VERSION 3.18)
+
+project(sleighLift CXX)
+
+set(build_from_source FALSE)
+if(NOT TARGET sleigh::support)
+  find_package(sleigh)
+  if(NOT sleigh_FOUND)
+    message(WARNING "Could not find sleigh, building from source")
+    set(sleigh_BUILD_SUPPORT ON CACHE BOOL "" FORCE)
+    set(sleigh_BUILD_SLEIGHSPECS ON CACHE BOOL "" FORCE)
+    add_subdirectory(../.. sleigh)
+  else()
+    find_package(sleigh REQUIRED COMPONENTS Support Specs)
+  endif()
+endif()
+
+add_executable(sleigh_lift
+  src/main.cpp
+)
+add_executable(sleigh::lift ALIAS sleigh_lift)
+
+target_link_libraries(sleigh_lift PRIVATE
+  sleigh::sla
+  sleigh::decomp
+  sleigh::support
+)
+target_compile_features(sleigh_lift PRIVATE cxx_std_17)
+set_target_properties(sleigh_lift PROPERTIES
+  EXPORT_NAME lift
+  OUTPUT_NAME sleigh-lift
+)
+
+if(NOT CMAKE_SKIP_INSTALL_RULES)
+  include(GNUInstallDirs)
+
+  set(
+    sleigh_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/sleigh"
+    CACHE PATH "CMake package config location relative to the install prefix"
+  )
+  mark_as_advanced(sleigh_INSTALL_CMAKEDIR)
+
+  install(
+    TARGETS sleigh_lift
+    EXPORT sleighExtraToolsTargets
+    RUNTIME #
+      COMPONENT sleigh_ExtraToolsRuntime
+  )
+  install(
+    EXPORT sleighExtraToolsTargets
+    DESTINATION "${sleigh_INSTALL_CMAKEDIR}"
+    NAMESPACE sleigh::
+    COMPONENT sleigh_ExtraToolsDevelopment
+  )
+endif()
@@ -88,7 +88,7 @@ static std::string ParseHexBytes(std::string_view bytes, uint64_t addr,
                << "' specified in bytes arg." << std::endl;
      exit(EXIT_FAILURE);
    }
-    const uint64_t addr_mask = ~0ULL >> (64UL - addr_size);
+    const uint64_t addr_mask = ~0ULL >> (64UL - addr_size * 8);
    auto byte_addr = addr + (i / 2);
    auto masked_addr = byte_addr & addr_mask;
    // Make sure that if a really big number is specified for `address`,
@@ -199,10 +199,10 @@ std::optional<LiftArgs> ParseArgs(int argc, char *argv[]) {
      const char *addr_str = argv[arg_index++];
      try {
        addr = std::stoul(addr_str);
-      } catch (const std::invalid_argument &ia) {
+      } catch (const std::invalid_argument &) {
        std::cerr << "Invalid address argument: " << addr_str << std::endl;
        return {};
-      } catch (const std::out_of_range &oor) {
+      } catch (const std::out_of_range &) {
        std::cerr << "Address argument out of range: " << addr_str << std::endl;
        return {};
      }
@@ -256,12 +256,14 @@ int main(int argc, char *argv[]) {
              << std::endl;
    return EXIT_FAILURE;
  }
-  // Put together SLEIGH components
+  // Put together Sleigh components
+  AttributeId::initialize();
+  ElementId::initialize();
  InMemoryLoadImage load_image(addr);
  ContextInternal ctx;
  Sleigh engine(&load_image, &ctx);
  DocumentStorage storage;
-  Element *root = storage.openDocument(*sla_file_path)->getRoot();
+  Element *root = storage.openDocument(sla_file_path->string())->getRoot();
  storage.registerTag(root);
  std::optional<std::filesystem::path> pspec_file_path;
  if (args->pspec_file_name) {
@@ -285,7 +287,7 @@ int main(int argc, char *argv[]) {
    }
  }
  if (pspec_file_path) {
-    Element *pspec_root = storage.openDocument(*pspec_file_path)->getRoot();
+    Element *pspec_root = storage.openDocument(pspec_file_path->string())->getRoot();
    storage.registerTag(pspec_root);
  }
  engine.initialize(storage);
@@ -296,17 +298,24 @@ int main(int argc, char *argv[]) {
  //   void Architecture::parseProcessorConfig(DocumentStorage &store)
  const Element *el = storage.getTag("processor_spec");
  if (el) {
-    const List &list(el->getChildren());
-    for (List::const_iterator iter = list.begin(); iter != list.end(); ++iter) {
-      const string &elname((*iter)->getName());
-      if (elname == "context_data") {
-        ctx.restoreFromSpec(*iter, &engine);
+    XmlDecode decoder(&engine, el);
+    uint4 elemId = decoder.openElement(ELEM_PROCESSOR_SPEC);
+    for(;;) {
+      uint4 subId = decoder.peekElement();
+      if (subId == 0) break;
+      else if (subId == ELEM_CONTEXT_DATA) {
+        ctx.decodeFromSpec(decoder);
        break;
+      } else {
+        decoder.openElement();
+        decoder.closeElementSkipping(subId);
      }
    }
+    decoder.closeElement(elemId);
  }
+
  // In order to parse and validate the byte string properly, we need to get the
-  // address size from SLEIGH. Therefore this needs to happen after
+  // address size from Sleigh. Therefore this needs to happen after
  // initialization.
  //
  // Ensure that we don't start disassembling until we've set the image buffer.
@@ -1,39 +0,0 @@
-/*
-  Copyright (c) 2021-present, Trail of Bits, Inc.
-  All rights reserved.
-
-  This source code is licensed in accordance with the terms specified in
-  the LICENSE file found in the root directory of this source tree.
-*/
-
-#pragma once
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated"
-#pragma GCC diagnostic ignored "-Wsign-compare"
-#pragma GCC diagnostic ignored "-Wunused-parameter"
-#include "address.hh"
-#include "context.hh"
-#include "emulate.hh"
-#include "error.hh"
-#include "float.hh"
-#include "globalcontext.hh"
-#include "loadimage.hh"
-#include "memstate.hh"
-#include "opbehavior.hh"
-#include "opcodes.hh"
-#include "partmap.hh"
-#include "pcoderaw.hh"
-#include "semantics.hh"
-#include "sleigh.hh"
-#include "sleighbase.hh"
-#include "slghpatexpress.hh"
-#include "slghpattern.hh"
-#include "slghsymbol.hh"
-#include "space.hh"
-#include "translate.hh"
-#include "types.h"
-#include "xml.hh"
-#pragma GCC diagnostic pop
-
-#include "Support.h"
-#include "Version.h"
@@ -1,53 +0,0 @@
-From d0b7efa848938b880332a729629c31a724dbf855 Mon Sep 17 00:00:00 2001
-From: Eric Kilmer <eric.d.kilmer@gmail.com>
-Date: Mon, 1 Nov 2021 17:10:18 -0400
-Subject: [PATCH] Fix arg parsing in sleigh C++ test runner
-
---
- Ghidra/Features/Decompiler/src/decompile/cpp/test.cc | 12 +++++++-----
- 1 file changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/test.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/test.cc
-index e81f2564a..7c5557158 100644
--- a/Ghidra/Features/Decompiler/src/decompile/cpp/test.cc
-+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/test.cc
-@@ -85,7 +85,7 @@ int main(int argc, char **argv) {
-   set<string> dataTestNames;
-   string dirname("../datatests");
-   string sleighdirname("../../../../../../..");
-  if (argc > 0) {
-+  while (argc > 0) {
-     string command(argv[0]);
-     if (command == "-path") {
-       dirname = argv[1];
-@@ -109,21 +109,23 @@ int main(int argc, char **argv) {
-       argv += 1;
-       argc -= 1;
-     }
-  }
-  if (argc > 0) {
-    string command(argv[0]);
-    if (command == "unittests") {
-+    else if (command == "unittests") {
-       runUnitTests = true;
-       runDataTests = false;	// Run only unit tests
-       unitTestNames.insert(argv + 1,argv + argc);
-+      argv += 1;
-+      argc -=1;
-     }
-     else if (command == "datatests") {
-       runUnitTests = false;	// Run only data-tests
-       runDataTests = true;
-       dataTestNames.insert(argv + 1,argv + argc);
-+      argv += 1;
-+      argc -=1;
-     }
-     else {
-       cout << "USAGE: ghidra_test [-path <datatestdir>] [[unittests|datatests] [testname1 testname2 ...]]" << endl;
-+      return -1;
-     }
-   }
-   startDecompilerLibrary(sleighdirname.c_str());
-- 
-2.33.1
-
@@ -8,7 +8,7 @@ import tempfile
 from typing import AnyStr, Union

 PROJECT_ROOT = pathlib.Path(__file__).parent.parent.resolve()
-HEAD_SPEC_FILE = PROJECT_ROOT / "spec-files-list" / "spec_files_HEAD.cmake"
+HEAD_SPEC_FILE = PROJECT_ROOT / "src" / "spec_files_HEAD.cmake"
 assert HEAD_SPEC_FILE.exists()
 SETUP_GHIDRA_FILE = PROJECT_ROOT / "src" / "setup-ghidra-source.cmake"
 assert SETUP_GHIDRA_FILE.exists()
@@ -0,0 +1,203 @@
+#
+# Copyright (c) 2022-present, Trail of Bits, Inc.
+# All rights reserved.
+#
+# This source code is licensed in accordance with the terms specified in
+# the LICENSE file found in the root directory of this source tree.
+#
+
+cmake_minimum_required(VERSION 3.18)
+
+include(../cmake/prelude.cmake)
+include(../src/setup-ghidra-source.cmake)
+
+project(sleigh_specs
+    VERSION "${ghidra_version}"
+    DESCRIPTION "Sleigh specifications"
+    HOMEPAGE_URL "https://github.com/lifting-bits/sleigh"
+    # Language is for installing the helper CMake file
+    LANGUAGES CXX
+)
+
+include(../cmake/project-is-top-level.cmake)
+
+# This is the root directory where all individual processor spec file directories will be created.
+if(NOT DEFINED spec_files_build_dir)
+  set(spec_files_build_dir "${CMAKE_CURRENT_BINARY_DIR}/specfiles")
+endif()
+
+# This prefix should match the Ghidra repo to where the sla spec files are located
+set(spec_files_dir_prefix "Ghidra/Processors")
+
+# This is where we will be copying the generated artifacts for each processor
+set(spec_files_root_dir "${spec_files_build_dir}/${spec_files_dir_prefix}")
+set(spec_files_build_log_dir "${CMAKE_CURRENT_BINARY_DIR}/spec_build_logs")
+
+add_custom_command(
+  OUTPUT "${spec_files_build_log_dir}"
+  COMMAND ${CMAKE_COMMAND} -E make_directory "${spec_files_build_log_dir}"
+)
+
+# Get the native machine's sleigh compiler or use the one we're about to build
+# if not cross compiling
+if(CMAKE_CROSSCOMPILING)
+  find_program(
+    SLEIGH_EXECUTABLE sleigh
+    DOC "Path to host system sleigh compiler"
+    REQUIRED
+  )
+else()
+  # Try to find/acquire or bootstrap the sleigh spec compiler
+  # Logic is repeated in example/CMakeLists.txt
+  if(NOT TARGET sleigh::sleigh)
+    find_package(sleigh QUIET)
+    if(NOT sleigh_FOUND OR NOT TARGET sleigh::sleigh)
+      find_program(
+        SLEIGH_EXECUTABLE sleigh
+        DOC "Path to host system sleigh compiler"
+      )
+      if(NOT SLEIGH_EXECUTABLE)
+        message(WARNING "Could not find sleigh compiler, building from source")
+        set(saved_skip_install_rules "${CMAKE_SKIP_INSTALL_RULES}")
+        set(CMAKE_SKIP_INSTALL_RULES TRUE)
+        add_subdirectory(../tools/spec-compiler spec-compiler EXCLUDE_FROM_ALL)
+        set(CMAKE_SKIP_INSTALL_RULES "${saved_skip_install_rules}")
+      endif()
+    endif()
+  endif()
+endif()
+if(SLEIGH_EXECUTABLE)
+  set(sleigh_compiler "${SLEIGH_EXECUTABLE}")
+else()
+  set(sleigh_compiler "$<TARGET_FILE:sleigh::sleigh>")
+endif()
+
+# Start processing all `.slaspec` files individually
+set(spec_targets)
+set(spec_files)
+set(spec_dirs)
+include(../cmake/modules/sleighCompile.cmake)
+
+# Example: '<ghidra_source_prefix>/Ghidra/Processors/8051/data/languages/mx51.slaspec'
+foreach(spec_file ${spec_file_list})
+  # Get 'mx51'
+  get_filename_component(spec_name "${spec_file}" NAME_WLE)
+
+  # Get '<ghidra_source_prefix>/Ghidra/Processors/8051/data/languages'
+  get_filename_component(spec_dir "${spec_file}" DIRECTORY)
+
+  # Get '8051/data/languages'
+  file(RELATIVE_PATH spec_proc_dir
+    "${ghidrasource_SOURCE_DIR}/${spec_files_dir_prefix}"
+    "${spec_dir}"
+  )
+
+  # Add relative spec processor directory for later processing
+  list(APPEND spec_dirs ${spec_proc_dir})
+
+  # Get '8051'
+  get_filename_component(proc_name "${spec_proc_dir}" DIRECTORY)
+  get_filename_component(proc_name "${proc_name}" DIRECTORY)
+
+  set(spec_build_log "${spec_files_build_log_dir}/${spec_name}_build.log")
+
+  # Combine back again for the build directory output like
+  # '<build_prefix>/Ghidra/Processors/8051/data/languages'
+  set(spec_out_dir "${spec_files_root_dir}/${spec_proc_dir}")
+
+  # '<build_prefix>/Ghidra/Processors/8051/data/languages/mx51.sla'
+  set(spec_out "${spec_out_dir}/${spec_name}.sla")
+
+  string(REPLACE "." "_" spec_target_name ${spec_name})
+  set(spec_target "sleigh_spec_${spec_target_name}")
+
+  # Compile the sla file
+  sleigh_compile(
+    TARGET "${spec_target}"
+    COMPILER "${sleigh_compiler}"
+    SLASPEC "${spec_file}"
+    LOG_FILE "${spec_build_log}"
+    OUT_FILE "${spec_out}"
+  )
+  add_dependencies(${spec_target} sleigh_copy_${proc_name}_dir)
+
+  list(APPEND spec_targets ${spec_target})
+  list(APPEND spec_files ${spec_out})
+endforeach()
+
+# Copy and create specfile directories
+list(REMOVE_DUPLICATES spec_dirs)
+
+foreach(spec_dir ${spec_dirs})
+  set(spec_src_dir "${ghidrasource_SOURCE_DIR}/${spec_files_dir_prefix}/${spec_dir}")
+  set(spec_out_dir "${spec_files_root_dir}/${spec_dir}")
+
+  # Get the processor directory name
+  get_filename_component(proc_name "${spec_dir}" DIRECTORY)
+  get_filename_component(proc_name "${proc_name}" DIRECTORY)
+
+  # Copy all other files from the slaspec source directory:
+  # '<ghidra_source_prefix>/Ghidra/Processors/8051/data/languages'
+  # NOTE: This only copies the directory once, so you will need to remove the
+  # whole directory if you update any of the other files, like '*.cspec' or
+  # '*.ldef' files
+  # CMake only guarantees update monitoring for files listed explicitly
+  add_custom_command(
+    OUTPUT "${spec_out_dir}"
+    COMMAND ${CMAKE_COMMAND} -E copy_directory "${spec_src_dir}" "${spec_out_dir}"
+  )
+  add_custom_target(sleigh_copy_${proc_name}_dir
+    DEPENDS "${spec_out_dir}"
+  )
+endforeach()
+
+# All of the sla spec targets are combined into this one
+add_custom_target(sleigh_all_sla_specs ALL DEPENDS
+  ${spec_targets}
+)
+
+if(NOT CMAKE_SKIP_INSTALL_RULES)
+  include(GNUInstallDirs)
+
+  # Specfiles installation setup
+  set(sleigh_INSTALL_DATADIR "${CMAKE_INSTALL_DATADIR}/sleigh"
+    CACHE PATH "sleigh data installation location relative to the install prefix"
+  )
+  mark_as_advanced(sleigh_INSTALL_DATADIR)
+
+  set(sleigh_INSTALL_SPECDIR "${sleigh_INSTALL_DATADIR}/specfiles"
+    CACHE PATH "sleigh specfile root destination relative to the install prefix"
+  )
+  mark_as_advanced(sleigh_INSTALL_SPECDIR)
+
+  # Install the compiled sla files found in 'Ghidra' top-level directory
+  install(
+    DIRECTORY "${spec_files_build_dir}/"
+    DESTINATION "${sleigh_INSTALL_SPECDIR}"
+    COMPONENT sleigh_Runtime
+  )
+
+  set(
+    sleigh_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/sleigh"
+    CACHE PATH "CMake package config location relative to the install prefix"
+  )
+  mark_as_advanced(sleigh_INSTALL_CMAKEDIR)
+
+  include(CMakePackageConfigHelpers)
+  configure_package_config_file(specfiles.cmake.in
+    "${PROJECT_BINARY_DIR}/specfiles.cmake"
+    INSTALL_DESTINATION "${sleigh_INSTALL_CMAKEDIR}"
+    NO_CHECK_REQUIRED_COMPONENTS_MACRO
+    PATH_VARS sleigh_INSTALL_SPECDIR
+  )
+
+  install(
+    FILES "${PROJECT_BINARY_DIR}/specfiles.cmake"
+    DESTINATION "${sleigh_INSTALL_CMAKEDIR}"
+    COMPONENT sleigh_Development
+  )
+
+  if(PROJECT_IS_TOP_LEVEL)
+    include(CPack)
+  endif()
+endif()
@@ -0,0 +1,12 @@
+#
+# Copyright (c) 2022-present, Trail of Bits, Inc.
+# All rights reserved.
+#
+# This source code is licensed in accordance with the terms specified in
+# the LICENSE file found in the root directory of this source tree.
+#
+
+@PACKAGE_INIT@
+
+# Path relative-root to reach installed specfiles directory
+set_and_check(sleigh_INSTALL_SPECDIR "@PACKAGE_sleigh_INSTALL_SPECDIR@")
@@ -1,45 +1,45 @@
 # Ghidra Source code

-This project uses CMake's [FetchContent](https://cmake.org/cmake/help/latest/module/FetchContent.html) module to set up the Ghidra source tree. This means we can apply [patches](../patches) that live only in this repo for small changes to features like packaging or running tests.
+This project uses CMake's [FetchContent](https://cmake.org/cmake/help/latest/module/FetchContent.html) module to set up the Ghidra source tree. Using `FetchContent` means we can apply [patches](patches) that live only in this repo for minor changes that affect usage, packaging, or running tests.

-By default, CMake pulls a stable version of Ghidra. You may use a more recent commit by specifying `-Dsleigh_GHIDRA_RELEASE_TYPE=HEAD` during CMake configuration.
-
-See the `sleigh_GHIDRA_*` CMake cache variable comments for more details on how to customize your Ghidra source checkout.
+By default, CMake pulls a stable version of Ghidra. During CMake configuration, you may use a more recent commit by specifying `-Dsleigh_RELEASE_TYPE=HEAD`.

 ## Advanced Usage Notes

-Always reference the [CMake Documentation](https://cmake.org/cmake/help/latest/) for explanation of features and cache variable usages/effects.
+Always reference the [CMake Documentation](https://cmake.org/cmake/help/latest/) and check CMake cache variables with `ccmake build` to discover all available options.

 ### Using your own Ghidra checkout

-This method is useful for developing new features on top of the latest commits in Ghidra's default branch. If the commit(s) at the tip of Ghidra's default branch are not supported by this repo, we welcome pull requests to update support and pin that commit.
+This method helps develop new features on top of the latest commits in Ghidra's default branch. Please open an issue or pull request if the commit at the tip of Ghidra's default branch does not build.

-**Arbitrary Ghidra checkouts are not officially supported.**
+**Arbitrary Ghidra checkouts/commits are not officially supported.**

-If you want to use your own Ghidra source checkout, then set the following during CMake configuration:
+Set the following during CMake configuration if you want to use your own Ghidra source checkout:

-* `-Dsleigh_GHIDRA_RELEASE_TYPE=HEAD` if using commits on Ghidra's default branch (`master`) or any branch that may be incompatible with the current stable version.
+* `-Dsleigh_RELEASE_TYPE=HEAD` if using commits on Ghidra's default branch (`master`) or any branch that may be incompatible with the current stable version.

-* `-DFETCHCONTENT_SOURCE_DIR_GHIDRASOURCE=<path to your own Ghidra source>`. Remember, no existing [patches](../patches/HEAD) will be applied to your own source directory.
+* `-DFETCHCONTENT_SOURCE_DIR_GHIDRASOURCE=<path to your own Ghidra source>`. Remember, CMake will not apply any [patches](patches/HEAD) to the specified source directory.

 ```bash
 git clone https://github.com/NationalSecurityAgency/ghidra src/ghidra

 cmake -B build-dev-head -S . \
-  -Dsleigh_GHIDRA_RELEASE_TYPE=HEAD \
-  -DFETCHCONTENT_SOURCE_DIR_GHIDRASOURCE="$(pwd)/src/ghidra"
+  -Dsleigh_RELEASE_TYPE=HEAD \
+  "-DFETCHCONTENT_SOURCE_DIR_GHIDRASOURCE=$PWD/src/ghidra"
 ```

 ### Reusing Downloaded Ghidra Source

-If you want to share a single Ghidra source checkout/clone for multiple build directories, the [_FetchContent Base Directory_](https://cmake.org/cmake/help/latest/module/FetchContent.html#variable:FETCHCONTENT_BASE_DIR) (`FETCHCONTENT_BASE_DIR`) should encode the build generator name and be located outside of the build directory (the name would look something like `cmake_fc_ghidra_${sleigh_GHIDRA_RELEASE_TYPE}_${CMAKE_GENERATOR}`).
+The following scenario is discouraged. It can be brittle if everything does not match up. It is only helpful if you do not want to apply Ghidra source patches yourself.

-Initially, this means that every new build generator used for building the project will have to re-download the ghidra source tree, but any subsequent run with an already-initialize generator should be faster and skip the download.
+Suppose you want to share a single Ghidra source checkout/clone for multiple build directories. In that case, the _FetchContent Base Directory_ (`FETCHCONTENT_BASE_DIR`) should encode the build generator name and be located outside of the build directory (the name would look something like `cmake_fc_ghidra_${sleigh_RELEASE_TYPE}_${CMAKE_GENERATOR}`).
+
+Initially, this means that every new build generator used for building the project will have to re-download the Ghidra source tree. Still, any subsequent run with an already-initialize generator should be faster and skip the download.

 ```bash
 $ cmake -B build-release -S . -G Ninja \
    -DCMAKE_BUILD_TYPE=Release \
-    -DFETCHCONTENT_BASE_DIR=./src/cmake_fc_ghidra_stable_Ninja
+    "-DFETCHCONTENT_BASE_DIR=$PWD/src/cmake_fc_ghidra_stable_Ninja"
 -- Using Ghidra version 10.0.4 at commit 5b07797
 -- Populating ghidrasource
 -- Configuring done
@@ -69,7 +69,7 @@ HEAD is now at 5b07797cb Updated 10.0.4 Change History

 $ cmake -B build-debug -S . -G Ninja \
    -DCMAKE_BUILD_TYPE=Debug \
-    -DFETCHCONTENT_BASE_DIR=./src/cmake_fc_ghidra_stable_Ninja
+    "-DFETCHCONTENT_BASE_DIR=$PWD/src/cmake_fc_ghidra_stable_Ninja"
 -- Using Ghidra version 10.0.4 at commit 5b07797
 -- Populating ghidrasource
 -- Configuring done
@@ -88,19 +88,19 @@ $ cmake -B build-debug -S . -G Ninja \
 ...
 ```

-The above also works when using `HEAD` commit of Ghidra.
+The above also works when using the `HEAD` commit of Ghidra.

 ```bash
 $ cmake -B build-head-release -S . -G Ninja \
    -DCMAKE_BUILD_TYPE=Release \
-    -Dsleigh_GHIDRA_RELEASE_TYPE=HEAD \
-    -DFETCHCONTENT_BASE_DIR=./src/cmake_fc_ghidra_HEAD_Ninja
+    -Dsleigh_RELEASE_TYPE=HEAD \
+    "-DFETCHCONTENT_BASE_DIR=$PWD/src/cmake_fc_ghidra_HEAD_Ninja"
 ...

 $ cmake -B build-head-debug -S . -G Ninja \
    -DCMAKE_BUILD_TYPE=Debug \
-    -Dsleigh_GHIDRA_RELEASE_TYPE=HEAD \
-    -DFETCHCONTENT_BASE_DIR=./src/cmake_fc_ghidra_HEAD_Ninja
+    -Dsleigh_RELEASE_TYPE=HEAD \
+    "-DFETCHCONTENT_BASE_DIR=$PWD/src/cmake_fc_ghidra_HEAD_Ninja"
 ...
 ```

@@ -0,0 +1,46 @@
+#
+# Copyright (c) 2022-present, Trail of Bits, Inc.
+# All rights reserved.
+#
+# This source code is licensed in accordance with the terms specified in
+# the LICENSE file found in the root directory of this source tree.
+#
+
+# Internal settings
+option(sleigh_CPUI_RULECOMPILE "Allow user defined dynamic rules")
+option(sleigh_CPUI_STATISTICS "Turn on collection of cover and cast statistics")
+
+# Internal debug settings (naming is swapped to help with discoverability in CMake options)
+option(sleigh_DEBUG_BLOCKCONSISTENT "Check that block graph structure is consistent")
+option(sleigh_DEBUG_DFSVERIFY "Make sure that the block ordering algorithm produces a true depth first traversal of the dominator tree")
+option(sleigh_DEBUG_MERGEMULTI "Check for MULTIEQUAL and INDIRECT intersections")
+option(sleigh_DEBUG_OPACTION "Turns on all the action tracing facilities")
+
+#
+# Common options that can apply to all project targets
+#
+macro(sleigh_add_optional_defines target visibility)
+  set(opt_defines "")
+  if(sleigh_CPUI_RULECOMPILE)
+    list(APPEND opt_defines "CPUI_RULECOMPILE")
+  endif()
+  if(sleigh_CPUI_STATISTICS)
+    list(APPEND opt_defines "CPUI_STATISTICS")
+  endif()
+  if(sleigh_DEBUG_BLOCKCONSISTENT)
+    list(APPEND opt_defines "BLOCKCONSISTENT_DEBUG")
+  endif()
+  if(sleigh_DEBUG_DFSVERIFY)
+    list(APPEND opt_defines "DFSVERIFY_DEBUG")
+  endif()
+  if(sleigh_DEBUG_MERGEMULTI)
+    list(APPEND opt_defines "MERGEMULTI_DEBUG")
+  endif()
+  if(sleigh_DEBUG_OPACTION)
+    list(APPEND opt_defines "OPACTION_DEBUG")
+  endif()
+  if(WIN32)
+    list(APPEND opt_defines "_WINDOWS")
+  endif()
+  target_compile_definitions("${target}" ${visibility} ${opt_defines})
+endmacro()
@@ -0,0 +1,165 @@
+From 031d9830abe8517540389672fd22dc479e46d696 Mon Sep 17 00:00:00 2001
+From: Eric Kilmer <eric.d.kilmer@gmail.com>
+Date: Sun, 13 Feb 2022 12:59:42 -0500
+Subject: [PATCH] Small improvements to C++ decompiler testing from CLI
+
+* Fixes argument parsing to accept more than one option for specifying
+  paths.
+
+* Return a non-zero exit code (clamped to max value 255, even if more
+  than 255 tests fail) indicating number of failed tests. This is
+  helpful when running in a script (like in CI) to detect failures
+  instead of detecting failures through manual visual inspection of
+  output text.
+---
+ .../Decompiler/src/decompile/cpp/test.cc      | 42 ++++++++++++++-----
+ .../Decompiler/src/decompile/cpp/test.hh      |  2 +-
+ .../src/decompile/cpp/testfunction.cc         |  3 +-
+ .../src/decompile/cpp/testfunction.hh         |  2 +-
+ 4 files changed, 36 insertions(+), 13 deletions(-)
+
+diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/test.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/test.cc
+index e81f2564a..ebc049c29 100644
+--- a/Ghidra/Features/Decompiler/src/decompile/cpp/test.cc
+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/test.cc
+@@ -14,6 +14,9 @@
+  * limitations under the License.
+  */
+ #include "test.hh"
+
+#include <algorithm>
+
+ #include "libdecomp.hh"
+ 
+ vector<UnitTest *> UnitTest::tests;
+@@ -21,7 +24,8 @@ vector<UnitTest *> UnitTest::tests;
+ /// Run all the tests unless a non-empty set of names is passed in.
+ /// In which case, only the named tests in the set are run.
+ /// \param testNames is the set of names
+-void UnitTest::run(set<string> &testNames)
+/// \return number of failed tests
+int UnitTest::run(set<string> &testNames)
+ 
+ {
+   int total = 0;
+@@ -42,6 +46,7 @@ void UnitTest::run(set<string> &testNames)
+   }
+   std::cerr << "==============================" << std::endl;
+   std::cerr << passed << "/" << total << " tests passed." << std::endl;
+  return total - passed;
+ }
+ 
+ /// Create list of the absolute path of all tests to be run
+@@ -85,7 +90,7 @@ int main(int argc, char **argv) {
+   set<string> dataTestNames;
+   string dirname("../datatests");
+   string sleighdirname("../../../../../../..");
+-  if (argc > 0) {
+  while (argc > 0) {
+     string command(argv[0]);
+     if (command == "-path") {
+       dirname = argv[1];
+@@ -109,30 +114,47 @@ int main(int argc, char **argv) {
+       argv += 1;
+       argc -= 1;
+     }
+-  }
+-  if (argc > 0) {
+-    string command(argv[0]);
+-    if (command == "unittests") {
+    else if (command == "unittests") {
+       runUnitTests = true;
+       runDataTests = false;	// Run only unit tests
+       unitTestNames.insert(argv + 1,argv + argc);
+      break;
+     }
+     else if (command == "datatests") {
+       runUnitTests = false;	// Run only data-tests
+       runDataTests = true;
+       dataTestNames.insert(argv + 1,argv + argc);
+      break;
+     }
+     else {
+-      cout << "USAGE: ghidra_test [-path <datatestdir>] [[unittests|datatests] [testname1 testname2 ...]]" << endl;
+      cout << "USAGE: ghidra_test [-usesleighenv] [-sleighpath <sleighdir>] [-path <datatestdir>] [[unittests|datatests] [testname1 testname2 ...]]" << endl;
+      return -1;
+     }
+   }
+   startDecompilerLibrary(sleighdirname.c_str());
+-  if (runUnitTests)
+-    UnitTest::run(unitTestNames);
+
+  // Keep track of failed tests as return code to indicate failures, clamped at
+  // max 255 value
+  int failedTests = 0;
+  if (runUnitTests) {
+    int errors = UnitTest::run(unitTestNames);
+    // Clamp at 255 max return code
+    failedTests = std::min(
+        failedTests +
+            (errors < 0 ? 255 : std::min(errors, 255)),
+        255);
+  }
+   if (runDataTests) {
+     vector<string> testFiles;
+     gatherDataTests(dirname,dataTestNames,testFiles);
+     cout << endl << endl;
+-    FunctionTestCollection::runTestFiles(testFiles,cout);
+    int errors = FunctionTestCollection::runTestFiles(testFiles,cout);
+    // Clamp at 255 max return code
+    failedTests = std::min(
+        failedTests +
+          (errors < 0 ? 255 : std::min(errors, 255)),
+        255);
+   }
+
+  return failedTests;
+ }
+diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/test.hh b/Ghidra/Features/Decompiler/src/decompile/cpp/test.hh
+index 8b762c5b1..a138f511d 100644
+--- a/Ghidra/Features/Decompiler/src/decompile/cpp/test.hh
+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/test.hh
+@@ -54,7 +54,7 @@ struct UnitTest {
+     tests.push_back(this);
+   }
+ 
+-  static void run(std::set<std::string> &testNames);	///< Run all the instantiated tests
+  static int run(std::set<std::string> &testNames);	///< Run all the instantiated tests
+ };
+ 
+ 
+diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/testfunction.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/testfunction.cc
+index 66f8d3fa2..c136a964b 100644
+--- a/Ghidra/Features/Decompiler/src/decompile/cpp/testfunction.cc
+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/testfunction.cc
+@@ -304,7 +304,7 @@ void FunctionTestCollection::runTests(list<string> &lateStream)
+ /// Run through all XML files in the given list, processing each in turn.
+ /// \param testFiles is the given list of test files
+ /// \param s is the output stream to print results to
+-void FunctionTestCollection::runTestFiles(const vector<string> &testFiles,ostream &s)
+int FunctionTestCollection::runTestFiles(const vector<string> &testFiles,ostream &s)
+ 
+ {
+   int4 totalTestsApplied = 0;
+@@ -344,4 +344,5 @@ void FunctionTestCollection::runTestFiles(const vector<string> &testFiles,ostrea
+       if (iter == failures.end()) break;
+     }
+   }
+  return totalTestsApplied - totalTestsSucceeded;
+ }
+diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/testfunction.hh b/Ghidra/Features/Decompiler/src/decompile/cpp/testfunction.hh
+index 52125b401..46abd6bce 100644
+--- a/Ghidra/Features/Decompiler/src/decompile/cpp/testfunction.hh
+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/testfunction.hh
+@@ -91,7 +91,7 @@ class FunctionTestCollection {
+   void restoreXml(DocumentStorage &store,const Element *el);	///< Load tests from a \<decompilertest> tag.
+   void restoreXmlOldForm(DocumentStorage &store,const Element *el);	///< Load tests from \<binaryimage> tag.
+   void runTests(list<string> &lateStream);	///< Run the script and perform the tests
+-  static void runTestFiles(const vector<string> &testFiles,ostream &s);	///< Run tests for each listed file
+  static int runTestFiles(const vector<string> &testFiles,ostream &s);	///< Run tests for each listed file
+ };
+ 
+ #endif
+-- 
+2.35.1
+
@@ -0,0 +1,137 @@
+From 44c439d879c18c2873d5605821132957680a4405 Mon Sep 17 00:00:00 2001
+From: Eric Kilmer <eric.d.kilmer@gmail.com>
+Date: Thu, 28 Jul 2022 09:20:03 -0400
+Subject: [PATCH] Add include guards to decompiler C++ headers
+
+---
+ Ghidra/Features/Decompiler/src/decompile/cpp/bfd_arch.hh    | 5 +++++
+ Ghidra/Features/Decompiler/src/decompile/cpp/graph.hh       | 6 ++++++
+ Ghidra/Features/Decompiler/src/decompile/cpp/ifaceterm.hh   | 5 +++++
+ Ghidra/Features/Decompiler/src/decompile/cpp/raw_arch.hh    | 5 +++++
+ .../Features/Decompiler/src/decompile/cpp/slgh_compile.hh   | 5 +++++
+ Ghidra/Features/Decompiler/src/decompile/cpp/xml_arch.hh    | 6 ++++++
+ 6 files changed, 32 insertions(+)
+
+diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/bfd_arch.hh b/Ghidra/Features/Decompiler/src/decompile/cpp/bfd_arch.hh
+index 875d3bb78..6ade01ecc 100644
+--- a/Ghidra/Features/Decompiler/src/decompile/cpp/bfd_arch.hh
+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/bfd_arch.hh
+@@ -17,6 +17,9 @@
+ /// \file bfd_arch.hh
+ /// \brief Specific implementation of Architecture using GNU BFD libraries
+ 
+#ifndef __BFD_ARCH__
+#define __BFD_ARCH__
+
+ #include "sleigh_arch.hh"
+ #include "loadimage_bfd.hh"
+ 
+@@ -47,3 +50,5 @@ class BfdArchitecture : public SleighArchitecture {
+   BfdArchitecture(const string &fname,const string &targ,ostream *estream);	///< Constructor
+   virtual ~BfdArchitecture(void) {}
+ };
+
+#endif
+diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/graph.hh b/Ghidra/Features/Decompiler/src/decompile/cpp/graph.hh
+index 364a5258d..edd6ce865 100644
+--- a/Ghidra/Features/Decompiler/src/decompile/cpp/graph.hh
+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/graph.hh
+@@ -14,8 +14,14 @@
+  * See the License for the specific language governing permissions and
+  * limitations under the License.
+  */
+
+#ifndef __GRAPH__
+#define __GRAPH__
+
+ #include "funcdata.hh"
+ 
+ extern void dump_dataflow_graph(Funcdata &data,ostream &s);
+ extern void dump_controlflow_graph(const string &name,const BlockGraph &graph,ostream &s);
+ extern void dump_dom_graph(const string &name,const BlockGraph &graph,ostream &s);
+
+#endif
+diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/ifaceterm.hh b/Ghidra/Features/Decompiler/src/decompile/cpp/ifaceterm.hh
+index 3ca912dd6..0b70d8b22 100644
+--- a/Ghidra/Features/Decompiler/src/decompile/cpp/ifaceterm.hh
+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/ifaceterm.hh
+@@ -16,6 +16,9 @@
+ /// \file ifaceterm.hh
+ /// \brief Add some terminal capabilities to the command-line interface (IfaceStatus)
+ 
+#ifndef __IFACE_TERM__
+#define __IFACE_TERM__
+
+ #include "interface.hh"
+ 
+ #ifdef __TERMINAL__
+@@ -48,3 +51,5 @@ class IfaceTerm : public IfaceStatus {
+   virtual void popScript(void);
+   virtual bool isStreamFinished(void) const;
+ };
+
+#endif
+diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/raw_arch.hh b/Ghidra/Features/Decompiler/src/decompile/cpp/raw_arch.hh
+index 2245840a0..490abf901 100644
+--- a/Ghidra/Features/Decompiler/src/decompile/cpp/raw_arch.hh
+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/raw_arch.hh
+@@ -15,6 +15,10 @@
+  */
+ /// \file raw_arch.hh
+ /// \brief Bare bones capability for treating a file as a raw executable image
+
+#ifndef __RAW_ARCH__
+#define __RAW_ARCH__
+
+ #include "sleigh_arch.hh"
+ #include "loadimage.hh"
+ 
+@@ -46,3 +50,4 @@ class RawBinaryArchitecture : public SleighArchitecture {
+   virtual ~RawBinaryArchitecture(void) {}
+ };
+ 
+#endif
+diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/slgh_compile.hh b/Ghidra/Features/Decompiler/src/decompile/cpp/slgh_compile.hh
+index e7ab19185..8fd9ba2fd 100644
+--- a/Ghidra/Features/Decompiler/src/decompile/cpp/slgh_compile.hh
+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/slgh_compile.hh
+@@ -16,6 +16,9 @@
+ /// \file slgh_compile.hh
+ /// \brief High-level control of the sleigh compilation process
+ 
+#ifndef __SLGH_COMPILE__
+#define __SLGH_COMPILE__
+
+ #include "sleighbase.hh"
+ #include "pcodecompile.hh"
+ #include "filemanage.hh"
+@@ -446,3 +449,5 @@ class SleighCompile : public SleighBase {
+ 
+ extern SleighCompile *slgh;		///< A global reference to the SLEIGH compiler accessible to the parse functions
+ extern int yydebug;			///< Debug state for the SLEIGH parse functions
+
+#endif
+diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/xml_arch.hh b/Ghidra/Features/Decompiler/src/decompile/cpp/xml_arch.hh
+index d395fb8a3..6371148b0 100644
+--- a/Ghidra/Features/Decompiler/src/decompile/cpp/xml_arch.hh
+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/xml_arch.hh
+@@ -15,6 +15,10 @@
+  */
+ /// \file xml_arch.hh
+ /// \brief Extension to read executables based on an XML format
+
+#ifndef __XML_ARCH__
+#define __XML_ARCH__
+
+ #include "sleigh_arch.hh"
+ #include "loadimage_xml.hh"
+ 
+@@ -45,3 +49,5 @@ class XmlArchitecture : public SleighArchitecture {
+   XmlArchitecture(const string &fname,const string &targ,ostream *estream);	///< Constructor
+   virtual ~XmlArchitecture(void) {}
+ };
+
+#endif
+-- 
+2.37.1
+
@@ -0,0 +1,293 @@
+From f62b1e5483a99efe3ae6598291ec010ecee749d4 Mon Sep 17 00:00:00 2001
+From: Alex Cameron <asc@tetsuo.sh>
+Date: Mon, 7 Feb 2022 02:02:03 +1100
+Subject: [PATCH] Fix UBSAN errors in decompiler
+
+---
+ .../Decompiler/src/decompile/cpp/address.cc    |  4 ++--
+ .../Decompiler/src/decompile/cpp/fspec.cc      |  8 ++++++--
+ .../src/decompile/cpp/funcdata_varnode.cc      |  8 +++++++-
+ .../Decompiler/src/decompile/cpp/op.cc         |  6 +++++-
+ .../Decompiler/src/decompile/cpp/opbehavior.cc |  8 +++++++-
+ .../src/decompile/cpp/pcodecompile.cc          | 18 +++++++++++-------
+ .../Decompiler/src/decompile/cpp/ruleaction.cc | 18 ++++++++++++++----
+ .../Decompiler/src/decompile/cpp/semantics.cc  |  2 ++
+ .../Decompiler/src/decompile/cpp/semantics.hh  |  2 +-
+ .../src/decompile/cpp/slgh_compile.cc          |  2 +-
+ .../Decompiler/src/decompile/cpp/slghsymbol.cc |  2 +-
+ .../Decompiler/src/decompile/cpp/type.cc       |  2 +-
+ .../src/decompile/unittests/testfloatemu.cc    |  2 +-
+ 13 files changed, 59 insertions(+), 23 deletions(-)
+
+diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/address.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/address.cc
+index 1cb02c5b2..3a60d1322 100644
+--- a/Ghidra/Features/Decompiler/src/decompile/cpp/address.cc
+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/address.cc
+@@ -685,7 +685,7 @@ uintb sign_extend(uintb in,int4 sizein,int4 sizeout)
+ void sign_extend(intb &val,int4 bit)
+ 
+ {
+-  intb mask = 0;
+  uintb mask = 0;
+   mask = (~mask)<<bit;
+   if (((val>>bit)&1)!=0)
+     val |= mask;
+@@ -699,7 +699,7 @@ void sign_extend(intb &val,int4 bit)
+ void zero_extend(intb &val,int4 bit)
+ 
+ {
+-  intb mask = 0;
+  uintb mask = 0;
+   mask = (~mask)<<bit;
+   mask <<= 1;
+   val &= (~mask);
+diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/fspec.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/fspec.cc
+index 0526ed04c..e79fd041e 100644
+--- a/Ghidra/Features/Decompiler/src/decompile/cpp/fspec.cc
+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/fspec.cc
+@@ -2633,8 +2633,12 @@ void ProtoModelMerged::decode(Decoder &decoder)
+     modellist.push_back(mymodel);
+   }
+   decoder.closeElement(elemId);
+-  ((ParamListMerged *)input)->finalize();
+-  ((ParamListMerged *)output)->finalize();
+  if (input->getType() == ParamList::p_merged) {
+    ((ParamListMerged *)input)->finalize();
+  }
+  if (output->getType() == ParamList::p_merged) {
+    ((ParamListMerged *)output)->finalize();
+  }
+ }
+ 
+ void ParameterBasic::setTypeLock(bool val)
+diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/funcdata_varnode.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/funcdata_varnode.cc
+index e6b282ac7..f6a35728f 100644
+--- a/Ghidra/Features/Decompiler/src/decompile/cpp/funcdata_varnode.cc
+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/funcdata_varnode.cc
+@@ -501,7 +501,13 @@ void Funcdata::setHighLevel(void)
+ void Funcdata::transferVarnodeProperties(Varnode *vn,Varnode *newVn,int4 lsbOffset)
+ 
+ {
+-  uintb newConsume = (vn->getConsume() >> 8*lsbOffset) & calc_mask(newVn->getSize());
+  uintb newConsume = vn->getConsume();
+  if (8*lsbOffset < sizeof(newConsume)) {
+    newConsume >>= 8*lsbOffset;
+  } else {
+    newConsume = 0;
+  }
+  newConsume &= calc_mask(newVn->getSize());
+ 
+   uint4 vnFlags = vn->getFlags() & (Varnode::directwrite|Varnode::addrforce);
+ 
+diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/op.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/op.cc
+index b4f8a3f8e..068393416 100644
+--- a/Ghidra/Features/Decompiler/src/decompile/cpp/op.cc
+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/op.cc
+@@ -667,7 +667,11 @@ uintb PcodeOp::getNZMaskLocal(bool cliploop) const
+     break;
+   case CPUI_PIECE:
+     resmask = getIn(0)->getNZMask();
+-    resmask <<= 8*getIn(1)->getSize();
+    if (8*getIn(1)->getSize() < sizeof(resmask)) {
+      resmask <<= 8*getIn(1)->getSize();
+    } else {
+      resmask = 0;
+    }
+     resmask |= getIn(1)->getNZMask();
+     break;
+   case CPUI_INT_MULT:
+diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/opbehavior.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/opbehavior.cc
+index 3b84bac6a..3e0c39904 100644
+--- a/Ghidra/Features/Decompiler/src/decompile/cpp/opbehavior.cc
+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/opbehavior.cc
+@@ -747,7 +747,13 @@ uintb OpBehaviorPiece::evaluateBinary(int4 sizeout,int4 sizein,uintb in1,uintb i
+ uintb OpBehaviorSubpiece::evaluateBinary(int4 sizeout,int4 sizein,uintb in1,uintb in2) const
+ 
+ {
+-  uintb res = (in1>>(in2*8)) & calc_mask(sizeout);
+  uintb res = in1;
+  if ((in2*8) < sizeof(in1)) {
+    res >>= (in2*8);
+  } else {
+    res = 0;
+  }
+  res &= calc_mask(sizeout);
+   return res;
+ }
+ 
+diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/pcodecompile.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/pcodecompile.cc
+index 49128f7e6..133da8178 100644
+--- a/Ghidra/Features/Decompiler/src/decompile/cpp/pcodecompile.cc
+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/pcodecompile.cc
+@@ -619,8 +619,10 @@ vector<OpTpl *> *PcodeCompile::assignBitRange(VarnodeTpl *vn,uint4 bitoffset,uin
+   uint4 smallsize = (numbits+7)/8; // Size of input (output of rhs)
+   bool shiftneeded = (bitoffset != 0);
+   bool zextneeded = true;
+-  uintb mask = (uintb)2;
+-  mask = ~(((mask<<(numbits-1))-1) << bitoffset);
+  uintb mask = 0;
+  const int4 masknumbits = sizeof(mask) * 8;
+  if (numbits - 1 < masknumbits && bitoffset < masknumbits)
+    mask = ~(((static_cast<uintb>(2) << (numbits - 1)) - 1) << bitoffset);
+ 
+   if (vn->getSize().getType()==ConstTpl::real) {
+     // If we know the size of the bitranged varnode, we can
+@@ -724,9 +726,6 @@ ExprTree *PcodeCompile::createBitRange(SpecificSymbol *sym,uint4 bitoffset,uint4
+     }
+   }
+ 
+-  uintb mask = (uintb)2;
+-  mask = ((mask<<(numbits-1))-1);
+-  
+   if (truncneeded && ((bitoffset % 8)==0)) {
+     truncshift = bitoffset/8;
+     bitoffset = 0;
+@@ -749,8 +748,13 @@ ExprTree *PcodeCompile::createBitRange(SpecificSymbol *sym,uint4 bitoffset,uint4
+     appendOp(CPUI_INT_RIGHT,res,bitoffset,4);
+   if (truncneeded)
+     appendOp(CPUI_SUBPIECE,res,truncshift,4);
+-  if (maskneeded)
+-    appendOp(CPUI_INT_AND,res,mask,finalsize);
+  if (maskneeded) {
+    uintb mask = 0;
+    if (numbits - 1 < sizeof(mask) * 8)
+      mask = static_cast<uintb>(2) << (numbits - 1);
+    --mask;
+    appendOp(CPUI_INT_AND, res, mask, finalsize);
+  }
+   force_size(res->outvn,ConstTpl(ConstTpl::real,finalsize),*res->ops);
+   return res;
+ }
+diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/ruleaction.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/ruleaction.cc
+index b5bdb4700..ef741545c 100644
+--- a/Ghidra/Features/Decompiler/src/decompile/cpp/ruleaction.cc
+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/ruleaction.cc
+@@ -974,7 +974,12 @@ int4 RulePullsubIndirect::applyOp(PcodeOp *op,Funcdata &data)
+   Varnode *outvn = op->getOut();
+   if (outvn->isPrecisLo()||outvn->isPrecisHi()) return 0; // Don't pull apart double precision object
+ 
+-  uintb consume = calc_mask(newSize) << 8 * minByte;
+  uintb consume = calc_mask(newSize);
+  if (8 * minByte < sizeof(consume)) {
+    consume <<= 8 * minByte;
+  } else {
+    consume = 0;
+  }
+   consume = ~consume;
+   if ((consume & indir->getIn(0)->getConsume())!=0) return 0;
+ 
+@@ -6785,8 +6790,9 @@ int4 RulePtrsubCharConstant::applyOp(PcodeOp *op,Funcdata &data)
+   Varnode *sb = op->getIn(0);
+   Datatype *sbType = sb->getTypeReadFacing(op);
+   if (sbType->getMetatype() != TYPE_PTR) return 0;
+-  TypeSpacebase *sbtype = (TypeSpacebase *)((TypePointer *)sbType)->getPtrTo();
+-  if (sbtype->getMetatype() != TYPE_SPACEBASE) return 0;
+  Datatype *sbTypePtr = ((TypePointer *)sbType)->getPtrTo();
+  if (sbTypePtr->getMetatype() != TYPE_SPACEBASE) return 0;
+  TypeSpacebase *sbtype = (TypeSpacebase *)sbTypePtr;
+   Varnode *vn1 = op->getIn(1);
+   if (!vn1->isConstant()) return 0;
+   Varnode *outvn = op->getOut();
+@@ -7822,7 +7828,11 @@ int4 RuleSubvarSubpiece::applyOp(PcodeOp *op,Funcdata &data)
+   Varnode *outvn = op->getOut();
+   int4 flowsize = outvn->getSize();
+   uintb mask = calc_mask( flowsize );
+-  mask <<= 8*((int4)op->getIn(1)->getOffset());
+  if (8*((int4)op->getIn(1)->getOffset()) < sizeof(mask)) {
+    mask <<= 8*((int4)op->getIn(1)->getOffset());
+  } else {
+    mask = 0;
+  }
+   bool aggressive = outvn->isPtrFlow();
+   if (!aggressive) {
+     if ((vn->getConsume() & mask) != vn->getConsume()) return 0;
+diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/semantics.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/semantics.cc
+index f8c1580a8..8ae5ff293 100644
+--- a/Ghidra/Features/Decompiler/src/decompile/cpp/semantics.cc
+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/semantics.cc
+@@ -20,6 +20,7 @@ ConstTpl::ConstTpl(const_type tp)
+ 
+ {				// Constructor for relative jump constants and uniques
+   type = tp;
+  select = v_space;
+ }
+ 
+ ConstTpl::ConstTpl(const_type tp,uintb val)
+@@ -54,6 +55,7 @@ ConstTpl::ConstTpl(AddrSpace *sid)
+ {
+   type = spaceid;
+   value.spaceid = sid;
+  select = v_space;
+ }
+ 
+ bool ConstTpl::isConstSpace(void) const
+diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/semantics.hh b/Ghidra/Features/Decompiler/src/decompile/cpp/semantics.hh
+index dccf0437d..f7f598667 100644
+--- a/Ghidra/Features/Decompiler/src/decompile/cpp/semantics.hh
+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/semantics.hh
+@@ -46,7 +46,7 @@ private:
+   static void printHandleSelector(ostream &s,v_field val);
+   static v_field readHandleSelector(const string &name);
+ public:
+-  ConstTpl(void) { type = real; value_real = 0; }
+  ConstTpl(void) { type = real; value_real = 0; select = v_space; }
+   ConstTpl(const ConstTpl &op2) {
+     type=op2.type; value=op2.value; value_real=op2.value_real; select=op2.select; }
+   ConstTpl(const_type tp,uintb val);
+diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/slgh_compile.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/slgh_compile.cc
+index 3ec58b9d0..55fcfd7c8 100644
+--- a/Ghidra/Features/Decompiler/src/decompile/cpp/slgh_compile.cc
+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/slgh_compile.cc
+@@ -2150,8 +2150,8 @@ string SleighCompile::checkSymbols(SymbolScope *scope)
+   ostringstream msg;
+   SymbolTree::const_iterator iter;
+   for(iter=scope->begin();iter!=scope->end();++iter) {
+    if ((*iter)->getType() != SleighSymbol::label_symbol) continue;
+     LabelSymbol *sym = (LabelSymbol *)*iter;
+-    if (sym->getType() != SleighSymbol::label_symbol) continue;
+     if (sym->getRefCount() == 0)
+       msg << "   Label <" << sym->getName() << "> was placed but not used" << endl;
+     else if (!sym->isPlaced())
+diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/slghsymbol.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/slghsymbol.cc
+index 5f4a8fe32..50bc33b8b 100644
+--- a/Ghidra/Features/Decompiler/src/decompile/cpp/slghsymbol.cc
+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/slghsymbol.cc
+@@ -2499,7 +2499,7 @@ void ContextOp::restoreXml(const Element *el,SleighBase *trans)
+   const List &list(el->getChildren());
+   List::const_iterator iter;
+   iter = list.begin();
+-  patexp = (PatternValue *)PatternExpression::restoreExpression(*iter,trans);
+  patexp = PatternExpression::restoreExpression(*iter,trans);
+   patexp->layClaim();
+ }
+ 
+diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/type.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/type.cc
+index b8dbcd55b..b2d0c1bb6 100644
+--- a/Ghidra/Features/Decompiler/src/decompile/cpp/type.cc
+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/type.cc
+@@ -3073,8 +3073,8 @@ void TypeFactory::recalcPointerSubmeta(Datatype *base,sub_metatype sub)
+   top.submeta = sub;			// Search on the incorrect submeta
+   iter = tree.lower_bound(&top);
+   while(iter != tree.end()) {
+    if ((*iter)->getMetatype() != TYPE_PTR) break;
+     TypePointer *ptr = (TypePointer *)*iter;
+-    if (ptr->getMetatype() != TYPE_PTR) break;
+     if (ptr->ptrto != base) break;
+     ++iter;
+     if (ptr->submeta == sub) {
+diff --git a/Ghidra/Features/Decompiler/src/decompile/unittests/testfloatemu.cc b/Ghidra/Features/Decompiler/src/decompile/unittests/testfloatemu.cc
+index ab99382a3..67d92c573 100644
+--- a/Ghidra/Features/Decompiler/src/decompile/unittests/testfloatemu.cc
+++ b/Ghidra/Features/Decompiler/src/decompile/unittests/testfloatemu.cc
+@@ -338,7 +338,7 @@ TEST(float_opTrunc_to_int) {
+ 
+     for(float f:float_test_values) {
+         // avoid undefined behavior
+-        if((int64_t)f > std::numeric_limits<int>::max() || (int64_t)f < std::numeric_limits<int>::min())
+        if(f > std::numeric_limits<int>::max() || f < std::numeric_limits<int>::min() || std::isnan(f))
+             continue;
+         uintb true_result = ((uintb)(int32_t)f) & 0xffffffff;
+         uintb encoding = format.getEncoding(f);
+-- 
+2.32.1 (Apple Git-133)
+
@@ -0,0 +1,37 @@
+From 773dda85b84a03c8795e27f1df87e6024bdb208a Mon Sep 17 00:00:00 2001
+From: Alex Cameron <asc@tetsuo.sh>
+Date: Wed, 3 Aug 2022 20:01:18 +1000
+Subject: [PATCH] Use `stroull` instead of `stroul` to parse address offsets
+
+---
+ Ghidra/Features/Decompiler/src/decompile/cpp/space.cc | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/space.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/space.cc
+index c51e58560..c5cc7541d 100644
+--- a/Ghidra/Features/Decompiler/src/decompile/cpp/space.cc
+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/space.cc
+@@ -16,6 +16,8 @@
+ #include "space.hh"
+ #include "translate.hh"
+ 
+#include <climits>
+
+ AttributeId ATTRIB_BASE = AttributeId("base",89);
+ AttributeId ATTRIB_DEADCODEDELAY = AttributeId("deadcodedelay",90);
+ AttributeId ATTRIB_DELAY = AttributeId("delay", 91);
+@@ -268,7 +270,10 @@ uintb AddrSpace::read(const string &s,int4 &size) const
+     }
+   }
+   catch(LowlevelError &err) {	// Name doesn't exist
+-    offset = strtoul(s.c_str(),&tmpdata,0);
+    offset = strtoull(s.c_str(),&tmpdata,0);
+    if (offset == ULLONG_MAX) {
+      throw LowlevelError("Offset outside of valid range");
+    }
+     offset = addressToByte(offset,wordsize);
+     enddata = (const char *) tmpdata;
+     if (enddata - s.c_str() == s.size()) { // If no size or offset override
+-- 
+2.32.1 (Apple Git-133)
+
@@ -1,6 +1,6 @@
 # Ghidra Patches

-This directory contains small patches that should not affect any deployed Ghidra sleigh functionality from its original intent.
+This directory contains small patches that do not affect any deployed Ghidra sleigh functionality from its original intent unless otherwise specified.

 These patches primarily support packaging and testing, or fixing critical issues that prevent building for one reason or another.

@@ -0,0 +1,165 @@
+From 3100df1ece29160185e1bc9602a3b4c299914965 Mon Sep 17 00:00:00 2001
+From: Eric Kilmer <eric.d.kilmer@gmail.com>
+Date: Sun, 13 Feb 2022 12:59:42 -0500
+Subject: [PATCH 1/4] Small improvements to C++ decompiler testing from CLI
+
+* Fixes argument parsing to accept more than one option for specifying
+  paths.
+
+* Return a non-zero exit code (clamped to max value 255, even if more
+  than 255 tests fail) indicating number of failed tests. This is
+  helpful when running in a script (like in CI) to detect failures
+  instead of detecting failures through manual visual inspection of
+  output text.
+---
+ .../Decompiler/src/decompile/cpp/test.cc      | 42 ++++++++++++++-----
+ .../Decompiler/src/decompile/cpp/test.hh      |  2 +-
+ .../src/decompile/cpp/testfunction.cc         |  3 +-
+ .../src/decompile/cpp/testfunction.hh         |  2 +-
+ 4 files changed, 36 insertions(+), 13 deletions(-)
+
+diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/test.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/test.cc
+index e81f2564a..ebc049c29 100644
+--- a/Ghidra/Features/Decompiler/src/decompile/cpp/test.cc
+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/test.cc
+@@ -14,6 +14,9 @@
+  * limitations under the License.
+  */
+ #include "test.hh"
+
+#include <algorithm>
+
+ #include "libdecomp.hh"
+ 
+ vector<UnitTest *> UnitTest::tests;
+@@ -21,7 +24,8 @@ vector<UnitTest *> UnitTest::tests;
+ /// Run all the tests unless a non-empty set of names is passed in.
+ /// In which case, only the named tests in the set are run.
+ /// \param testNames is the set of names
+-void UnitTest::run(set<string> &testNames)
+/// \return number of failed tests
+int UnitTest::run(set<string> &testNames)
+ 
+ {
+   int total = 0;
+@@ -42,6 +46,7 @@ void UnitTest::run(set<string> &testNames)
+   }
+   std::cerr << "==============================" << std::endl;
+   std::cerr << passed << "/" << total << " tests passed." << std::endl;
+  return total - passed;
+ }
+ 
+ /// Create list of the absolute path of all tests to be run
+@@ -85,7 +90,7 @@ int main(int argc, char **argv) {
+   set<string> dataTestNames;
+   string dirname("../datatests");
+   string sleighdirname("../../../../../../..");
+-  if (argc > 0) {
+  while (argc > 0) {
+     string command(argv[0]);
+     if (command == "-path") {
+       dirname = argv[1];
+@@ -109,30 +114,47 @@ int main(int argc, char **argv) {
+       argv += 1;
+       argc -= 1;
+     }
+-  }
+-  if (argc > 0) {
+-    string command(argv[0]);
+-    if (command == "unittests") {
+    else if (command == "unittests") {
+       runUnitTests = true;
+       runDataTests = false;	// Run only unit tests
+       unitTestNames.insert(argv + 1,argv + argc);
+      break;
+     }
+     else if (command == "datatests") {
+       runUnitTests = false;	// Run only data-tests
+       runDataTests = true;
+       dataTestNames.insert(argv + 1,argv + argc);
+      break;
+     }
+     else {
+-      cout << "USAGE: ghidra_test [-path <datatestdir>] [[unittests|datatests] [testname1 testname2 ...]]" << endl;
+      cout << "USAGE: ghidra_test [-usesleighenv] [-sleighpath <sleighdir>] [-path <datatestdir>] [[unittests|datatests] [testname1 testname2 ...]]" << endl;
+      return -1;
+     }
+   }
+   startDecompilerLibrary(sleighdirname.c_str());
+-  if (runUnitTests)
+-    UnitTest::run(unitTestNames);
+
+  // Keep track of failed tests as return code to indicate failures, clamped at
+  // max 255 value
+  int failedTests = 0;
+  if (runUnitTests) {
+    int errors = UnitTest::run(unitTestNames);
+    // Clamp at 255 max return code
+    failedTests = std::min(
+        failedTests +
+            (errors < 0 ? 255 : std::min(errors, 255)),
+        255);
+  }
+   if (runDataTests) {
+     vector<string> testFiles;
+     gatherDataTests(dirname,dataTestNames,testFiles);
+     cout << endl << endl;
+-    FunctionTestCollection::runTestFiles(testFiles,cout);
+    int errors = FunctionTestCollection::runTestFiles(testFiles,cout);
+    // Clamp at 255 max return code
+    failedTests = std::min(
+        failedTests +
+          (errors < 0 ? 255 : std::min(errors, 255)),
+        255);
+   }
+
+  return failedTests;
+ }
+diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/test.hh b/Ghidra/Features/Decompiler/src/decompile/cpp/test.hh
+index 8b762c5b1..a138f511d 100644
+--- a/Ghidra/Features/Decompiler/src/decompile/cpp/test.hh
+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/test.hh
+@@ -54,7 +54,7 @@ struct UnitTest {
+     tests.push_back(this);
+   }
+ 
+-  static void run(std::set<std::string> &testNames);	///< Run all the instantiated tests
+  static int run(std::set<std::string> &testNames);	///< Run all the instantiated tests
+ };
+ 
+ 
+diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/testfunction.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/testfunction.cc
+index 6311dba06..4f7110bb4 100644
+--- a/Ghidra/Features/Decompiler/src/decompile/cpp/testfunction.cc
+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/testfunction.cc
+@@ -304,7 +304,7 @@ void FunctionTestCollection::runTests(list<string> &lateStream)
+ /// Run through all XML files in the given list, processing each in turn.
+ /// \param testFiles is the given list of test files
+ /// \param s is the output stream to print results to
+-void FunctionTestCollection::runTestFiles(const vector<string> &testFiles,ostream &s)
+int FunctionTestCollection::runTestFiles(const vector<string> &testFiles,ostream &s)
+ 
+ {
+   int4 totalTestsApplied = 0;
+@@ -344,4 +344,5 @@ void FunctionTestCollection::runTestFiles(const vector<string> &testFiles,ostrea
+       if (iter == failures.end()) break;
+     }
+   }
+  return totalTestsApplied - totalTestsSucceeded;
+ }
+diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/testfunction.hh b/Ghidra/Features/Decompiler/src/decompile/cpp/testfunction.hh
+index 52125b401..46abd6bce 100644
+--- a/Ghidra/Features/Decompiler/src/decompile/cpp/testfunction.hh
+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/testfunction.hh
+@@ -91,7 +91,7 @@ class FunctionTestCollection {
+   void restoreXml(DocumentStorage &store,const Element *el);	///< Load tests from a \<decompilertest> tag.
+   void restoreXmlOldForm(DocumentStorage &store,const Element *el);	///< Load tests from \<binaryimage> tag.
+   void runTests(list<string> &lateStream);	///< Run the script and perform the tests
+-  static void runTestFiles(const vector<string> &testFiles,ostream &s);	///< Run tests for each listed file
+  static int runTestFiles(const vector<string> &testFiles,ostream &s);	///< Run tests for each listed file
+ };
+ 
+ #endif
+-- 
+2.38.1
+
@@ -0,0 +1,137 @@
+From 5189064a0b81b74b5844b461f2f2b4d1a398ab59 Mon Sep 17 00:00:00 2001
+From: Eric Kilmer <eric.d.kilmer@gmail.com>
+Date: Thu, 28 Jul 2022 09:20:03 -0400
+Subject: [PATCH 2/4] Add include guards to decompiler C++ headers
+
+---
+ Ghidra/Features/Decompiler/src/decompile/cpp/bfd_arch.hh    | 5 +++++
+ Ghidra/Features/Decompiler/src/decompile/cpp/graph.hh       | 6 ++++++
+ Ghidra/Features/Decompiler/src/decompile/cpp/ifaceterm.hh   | 5 +++++
+ Ghidra/Features/Decompiler/src/decompile/cpp/raw_arch.hh    | 5 +++++
+ .../Features/Decompiler/src/decompile/cpp/slgh_compile.hh   | 5 +++++
+ Ghidra/Features/Decompiler/src/decompile/cpp/xml_arch.hh    | 6 ++++++
+ 6 files changed, 32 insertions(+)
+
+diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/bfd_arch.hh b/Ghidra/Features/Decompiler/src/decompile/cpp/bfd_arch.hh
+index 875d3bb78..6ade01ecc 100644
+--- a/Ghidra/Features/Decompiler/src/decompile/cpp/bfd_arch.hh
+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/bfd_arch.hh
+@@ -17,6 +17,9 @@
+ /// \file bfd_arch.hh
+ /// \brief Specific implementation of Architecture using GNU BFD libraries
+ 
+#ifndef __BFD_ARCH__
+#define __BFD_ARCH__
+
+ #include "sleigh_arch.hh"
+ #include "loadimage_bfd.hh"
+ 
+@@ -47,3 +50,5 @@ class BfdArchitecture : public SleighArchitecture {
+   BfdArchitecture(const string &fname,const string &targ,ostream *estream);	///< Constructor
+   virtual ~BfdArchitecture(void) {}
+ };
+
+#endif
+diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/graph.hh b/Ghidra/Features/Decompiler/src/decompile/cpp/graph.hh
+index 364a5258d..edd6ce865 100644
+--- a/Ghidra/Features/Decompiler/src/decompile/cpp/graph.hh
+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/graph.hh
+@@ -14,8 +14,14 @@
+  * See the License for the specific language governing permissions and
+  * limitations under the License.
+  */
+
+#ifndef __GRAPH__
+#define __GRAPH__
+
+ #include "funcdata.hh"
+ 
+ extern void dump_dataflow_graph(Funcdata &data,ostream &s);
+ extern void dump_controlflow_graph(const string &name,const BlockGraph &graph,ostream &s);
+ extern void dump_dom_graph(const string &name,const BlockGraph &graph,ostream &s);
+
+#endif
+diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/ifaceterm.hh b/Ghidra/Features/Decompiler/src/decompile/cpp/ifaceterm.hh
+index 3ca912dd6..0b70d8b22 100644
+--- a/Ghidra/Features/Decompiler/src/decompile/cpp/ifaceterm.hh
+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/ifaceterm.hh
+@@ -16,6 +16,9 @@
+ /// \file ifaceterm.hh
+ /// \brief Add some terminal capabilities to the command-line interface (IfaceStatus)
+ 
+#ifndef __IFACE_TERM__
+#define __IFACE_TERM__
+
+ #include "interface.hh"
+ 
+ #ifdef __TERMINAL__
+@@ -48,3 +51,5 @@ class IfaceTerm : public IfaceStatus {
+   virtual void popScript(void);
+   virtual bool isStreamFinished(void) const;
+ };
+
+#endif
+diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/raw_arch.hh b/Ghidra/Features/Decompiler/src/decompile/cpp/raw_arch.hh
+index 2245840a0..490abf901 100644
+--- a/Ghidra/Features/Decompiler/src/decompile/cpp/raw_arch.hh
+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/raw_arch.hh
+@@ -15,6 +15,10 @@
+  */
+ /// \file raw_arch.hh
+ /// \brief Bare bones capability for treating a file as a raw executable image
+
+#ifndef __RAW_ARCH__
+#define __RAW_ARCH__
+
+ #include "sleigh_arch.hh"
+ #include "loadimage.hh"
+ 
+@@ -46,3 +50,4 @@ class RawBinaryArchitecture : public SleighArchitecture {
+   virtual ~RawBinaryArchitecture(void) {}
+ };
+ 
+#endif
+diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/slgh_compile.hh b/Ghidra/Features/Decompiler/src/decompile/cpp/slgh_compile.hh
+index e7ab19185..8fd9ba2fd 100644
+--- a/Ghidra/Features/Decompiler/src/decompile/cpp/slgh_compile.hh
+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/slgh_compile.hh
+@@ -16,6 +16,9 @@
+ /// \file slgh_compile.hh
+ /// \brief High-level control of the sleigh compilation process
+ 
+#ifndef __SLGH_COMPILE__
+#define __SLGH_COMPILE__
+
+ #include "sleighbase.hh"
+ #include "pcodecompile.hh"
+ #include "filemanage.hh"
+@@ -446,3 +449,5 @@ class SleighCompile : public SleighBase {
+ 
+ extern SleighCompile *slgh;		///< A global reference to the SLEIGH compiler accessible to the parse functions
+ extern int yydebug;			///< Debug state for the SLEIGH parse functions
+
+#endif
+diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/xml_arch.hh b/Ghidra/Features/Decompiler/src/decompile/cpp/xml_arch.hh
+index d395fb8a3..6371148b0 100644
+--- a/Ghidra/Features/Decompiler/src/decompile/cpp/xml_arch.hh
+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/xml_arch.hh
+@@ -15,6 +15,10 @@
+  */
+ /// \file xml_arch.hh
+ /// \brief Extension to read executables based on an XML format
+
+#ifndef __XML_ARCH__
+#define __XML_ARCH__
+
+ #include "sleigh_arch.hh"
+ #include "loadimage_xml.hh"
+ 
+@@ -45,3 +49,5 @@ class XmlArchitecture : public SleighArchitecture {
+   XmlArchitecture(const string &fname,const string &targ,ostream *estream);	///< Constructor
+   virtual ~XmlArchitecture(void) {}
+ };
+
+#endif
+-- 
+2.38.1
+
@@ -0,0 +1,293 @@
+From 42dd4d97396e7769bbbaca78c7a546835d72d974 Mon Sep 17 00:00:00 2001
+From: Alex Cameron <asc@tetsuo.sh>
+Date: Mon, 7 Feb 2022 02:02:03 +1100
+Subject: [PATCH 3/4] Fix UBSAN errors in decompiler
+
+---
+ .../Decompiler/src/decompile/cpp/address.cc    |  4 ++--
+ .../Decompiler/src/decompile/cpp/fspec.cc      |  8 ++++++--
+ .../src/decompile/cpp/funcdata_varnode.cc      |  8 +++++++-
+ .../Decompiler/src/decompile/cpp/op.cc         |  6 +++++-
+ .../Decompiler/src/decompile/cpp/opbehavior.cc |  8 +++++++-
+ .../src/decompile/cpp/pcodecompile.cc          | 18 +++++++++++-------
+ .../Decompiler/src/decompile/cpp/ruleaction.cc | 18 ++++++++++++++----
+ .../Decompiler/src/decompile/cpp/semantics.cc  |  2 ++
+ .../Decompiler/src/decompile/cpp/semantics.hh  |  2 +-
+ .../src/decompile/cpp/slgh_compile.cc          |  2 +-
+ .../Decompiler/src/decompile/cpp/slghsymbol.cc |  2 +-
+ .../Decompiler/src/decompile/cpp/type.cc       |  2 +-
+ .../src/decompile/unittests/testfloatemu.cc    |  2 +-
+ 13 files changed, 59 insertions(+), 23 deletions(-)
+
+diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/address.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/address.cc
+index b3758ddd1..0b3bf04c8 100644
+--- a/Ghidra/Features/Decompiler/src/decompile/cpp/address.cc
+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/address.cc
+@@ -685,7 +685,7 @@ uintb sign_extend(uintb in,int4 sizein,int4 sizeout)
+ void sign_extend(intb &val,int4 bit)
+ 
+ {
+-  intb mask = 0;
+  uintb mask = 0;
+   mask = (~mask)<<bit;
+   if (((val>>bit)&1)!=0)
+     val |= mask;
+@@ -699,7 +699,7 @@ void sign_extend(intb &val,int4 bit)
+ void zero_extend(intb &val,int4 bit)
+ 
+ {
+-  intb mask = 0;
+  uintb mask = 0;
+   mask = (~mask)<<bit;
+   mask <<= 1;
+   val &= (~mask);
+diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/fspec.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/fspec.cc
+index 19ed41c63..d1bd842d8 100644
+--- a/Ghidra/Features/Decompiler/src/decompile/cpp/fspec.cc
+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/fspec.cc
+@@ -2656,8 +2656,12 @@ void ProtoModelMerged::decode(Decoder &decoder)
+     modellist.push_back(mymodel);
+   }
+   decoder.closeElement(elemId);
+-  ((ParamListMerged *)input)->finalize();
+-  ((ParamListMerged *)output)->finalize();
+  if (input->getType() == ParamList::p_merged) {
+    ((ParamListMerged *)input)->finalize();
+  }
+  if (output->getType() == ParamList::p_merged) {
+    ((ParamListMerged *)output)->finalize();
+  }
+ }
+ 
+ void ParameterBasic::setTypeLock(bool val)
+diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/funcdata_varnode.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/funcdata_varnode.cc
+index 2b26961f0..117518e24 100644
+--- a/Ghidra/Features/Decompiler/src/decompile/cpp/funcdata_varnode.cc
+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/funcdata_varnode.cc
+@@ -501,7 +501,13 @@ void Funcdata::setHighLevel(void)
+ void Funcdata::transferVarnodeProperties(Varnode *vn,Varnode *newVn,int4 lsbOffset)
+ 
+ {
+-  uintb newConsume = (vn->getConsume() >> 8*lsbOffset) & calc_mask(newVn->getSize());
+  uintb newConsume = vn->getConsume();
+  if (8*lsbOffset < sizeof(newConsume)) {
+    newConsume >>= 8*lsbOffset;
+  } else {
+    newConsume = 0;
+  }
+  newConsume &= calc_mask(newVn->getSize());
+ 
+   uint4 vnFlags = vn->getFlags() & (Varnode::directwrite|Varnode::addrforce);
+ 
+diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/op.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/op.cc
+index b4f8a3f8e..068393416 100644
+--- a/Ghidra/Features/Decompiler/src/decompile/cpp/op.cc
+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/op.cc
+@@ -667,7 +667,11 @@ uintb PcodeOp::getNZMaskLocal(bool cliploop) const
+     break;
+   case CPUI_PIECE:
+     resmask = getIn(0)->getNZMask();
+-    resmask <<= 8*getIn(1)->getSize();
+    if (8*getIn(1)->getSize() < sizeof(resmask)) {
+      resmask <<= 8*getIn(1)->getSize();
+    } else {
+      resmask = 0;
+    }
+     resmask |= getIn(1)->getNZMask();
+     break;
+   case CPUI_INT_MULT:
+diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/opbehavior.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/opbehavior.cc
+index 3b84bac6a..3e0c39904 100644
+--- a/Ghidra/Features/Decompiler/src/decompile/cpp/opbehavior.cc
+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/opbehavior.cc
+@@ -747,7 +747,13 @@ uintb OpBehaviorPiece::evaluateBinary(int4 sizeout,int4 sizein,uintb in1,uintb i
+ uintb OpBehaviorSubpiece::evaluateBinary(int4 sizeout,int4 sizein,uintb in1,uintb in2) const
+ 
+ {
+-  uintb res = (in1>>(in2*8)) & calc_mask(sizeout);
+  uintb res = in1;
+  if ((in2*8) < sizeof(in1)) {
+    res >>= (in2*8);
+  } else {
+    res = 0;
+  }
+  res &= calc_mask(sizeout);
+   return res;
+ }
+ 
+diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/pcodecompile.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/pcodecompile.cc
+index 49128f7e6..133da8178 100644
+--- a/Ghidra/Features/Decompiler/src/decompile/cpp/pcodecompile.cc
+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/pcodecompile.cc
+@@ -619,8 +619,10 @@ vector<OpTpl *> *PcodeCompile::assignBitRange(VarnodeTpl *vn,uint4 bitoffset,uin
+   uint4 smallsize = (numbits+7)/8; // Size of input (output of rhs)
+   bool shiftneeded = (bitoffset != 0);
+   bool zextneeded = true;
+-  uintb mask = (uintb)2;
+-  mask = ~(((mask<<(numbits-1))-1) << bitoffset);
+  uintb mask = 0;
+  const int4 masknumbits = sizeof(mask) * 8;
+  if (numbits - 1 < masknumbits && bitoffset < masknumbits)
+    mask = ~(((static_cast<uintb>(2) << (numbits - 1)) - 1) << bitoffset);
+ 
+   if (vn->getSize().getType()==ConstTpl::real) {
+     // If we know the size of the bitranged varnode, we can
+@@ -724,9 +726,6 @@ ExprTree *PcodeCompile::createBitRange(SpecificSymbol *sym,uint4 bitoffset,uint4
+     }
+   }
+ 
+-  uintb mask = (uintb)2;
+-  mask = ((mask<<(numbits-1))-1);
+-  
+   if (truncneeded && ((bitoffset % 8)==0)) {
+     truncshift = bitoffset/8;
+     bitoffset = 0;
+@@ -749,8 +748,13 @@ ExprTree *PcodeCompile::createBitRange(SpecificSymbol *sym,uint4 bitoffset,uint4
+     appendOp(CPUI_INT_RIGHT,res,bitoffset,4);
+   if (truncneeded)
+     appendOp(CPUI_SUBPIECE,res,truncshift,4);
+-  if (maskneeded)
+-    appendOp(CPUI_INT_AND,res,mask,finalsize);
+  if (maskneeded) {
+    uintb mask = 0;
+    if (numbits - 1 < sizeof(mask) * 8)
+      mask = static_cast<uintb>(2) << (numbits - 1);
+    --mask;
+    appendOp(CPUI_INT_AND, res, mask, finalsize);
+  }
+   force_size(res->outvn,ConstTpl(ConstTpl::real,finalsize),*res->ops);
+   return res;
+ }
+diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/ruleaction.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/ruleaction.cc
+index 9701f642b..7e8030ae8 100644
+--- a/Ghidra/Features/Decompiler/src/decompile/cpp/ruleaction.cc
+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/ruleaction.cc
+@@ -974,7 +974,12 @@ int4 RulePullsubIndirect::applyOp(PcodeOp *op,Funcdata &data)
+   Varnode *outvn = op->getOut();
+   if (outvn->isPrecisLo()||outvn->isPrecisHi()) return 0; // Don't pull apart double precision object
+ 
+-  uintb consume = calc_mask(newSize) << 8 * minByte;
+  uintb consume = calc_mask(newSize);
+  if (8 * minByte < sizeof(consume)) {
+    consume <<= 8 * minByte;
+  } else {
+    consume = 0;
+  }
+   consume = ~consume;
+   if ((consume & indir->getIn(0)->getConsume())!=0) return 0;
+ 
+@@ -6788,8 +6793,9 @@ int4 RulePtrsubCharConstant::applyOp(PcodeOp *op,Funcdata &data)
+   Varnode *sb = op->getIn(0);
+   Datatype *sbType = sb->getTypeReadFacing(op);
+   if (sbType->getMetatype() != TYPE_PTR) return 0;
+-  TypeSpacebase *sbtype = (TypeSpacebase *)((TypePointer *)sbType)->getPtrTo();
+-  if (sbtype->getMetatype() != TYPE_SPACEBASE) return 0;
+  Datatype *sbTypePtr = ((TypePointer *)sbType)->getPtrTo();
+  if (sbTypePtr->getMetatype() != TYPE_SPACEBASE) return 0;
+  TypeSpacebase *sbtype = (TypeSpacebase *)sbTypePtr;
+   Varnode *vn1 = op->getIn(1);
+   if (!vn1->isConstant()) return 0;
+   Varnode *outvn = op->getOut();
+@@ -8272,7 +8278,11 @@ int4 RuleSubvarSubpiece::applyOp(PcodeOp *op,Funcdata &data)
+   Varnode *outvn = op->getOut();
+   int4 flowsize = outvn->getSize();
+   uintb mask = calc_mask( flowsize );
+-  mask <<= 8*((int4)op->getIn(1)->getOffset());
+  if (8*((int4)op->getIn(1)->getOffset()) < sizeof(mask)) {
+    mask <<= 8*((int4)op->getIn(1)->getOffset());
+  } else {
+    mask = 0;
+  }
+   bool aggressive = outvn->isPtrFlow();
+   if (!aggressive) {
+     if ((vn->getConsume() & mask) != vn->getConsume()) return 0;
+diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/semantics.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/semantics.cc
+index ecebc0970..1c9ab7560 100644
+--- a/Ghidra/Features/Decompiler/src/decompile/cpp/semantics.cc
+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/semantics.cc
+@@ -20,6 +20,7 @@ ConstTpl::ConstTpl(const_type tp)
+ 
+ {				// Constructor for relative jump constants and uniques
+   type = tp;
+  select = v_space;
+ }
+ 
+ ConstTpl::ConstTpl(const_type tp,uintb val)
+@@ -54,6 +55,7 @@ ConstTpl::ConstTpl(AddrSpace *sid)
+ {
+   type = spaceid;
+   value.spaceid = sid;
+  select = v_space;
+ }
+ 
+ bool ConstTpl::isConstSpace(void) const
+diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/semantics.hh b/Ghidra/Features/Decompiler/src/decompile/cpp/semantics.hh
+index 3b836244c..1fbd169c9 100644
+--- a/Ghidra/Features/Decompiler/src/decompile/cpp/semantics.hh
+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/semantics.hh
+@@ -46,7 +46,7 @@ class ConstTpl {
+   static void printHandleSelector(ostream &s,v_field val);
+   static v_field readHandleSelector(const string &name);
+ public:
+-  ConstTpl(void) { type = real; value_real = 0; }
+  ConstTpl(void) { type = real; value_real = 0; select = v_space; }
+   ConstTpl(const ConstTpl &op2) {
+     type=op2.type; value=op2.value; value_real=op2.value_real; select=op2.select; }
+   ConstTpl(const_type tp,uintb val);
+diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/slgh_compile.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/slgh_compile.cc
+index c26cd468f..40d731480 100644
+--- a/Ghidra/Features/Decompiler/src/decompile/cpp/slgh_compile.cc
+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/slgh_compile.cc
+@@ -2152,8 +2152,8 @@ string SleighCompile::checkSymbols(SymbolScope *scope)
+   ostringstream msg;
+   SymbolTree::const_iterator iter;
+   for(iter=scope->begin();iter!=scope->end();++iter) {
+    if ((*iter)->getType() != SleighSymbol::label_symbol) continue;
+     LabelSymbol *sym = (LabelSymbol *)*iter;
+-    if (sym->getType() != SleighSymbol::label_symbol) continue;
+     if (sym->getRefCount() == 0)
+       msg << "   Label <" << sym->getName() << "> was placed but not used" << endl;
+     else if (!sym->isPlaced())
+diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/slghsymbol.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/slghsymbol.cc
+index dbb8f9e51..85bd54261 100644
+--- a/Ghidra/Features/Decompiler/src/decompile/cpp/slghsymbol.cc
+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/slghsymbol.cc
+@@ -2565,7 +2565,7 @@ void ContextOp::restoreXml(const Element *el,SleighBase *trans)
+   const List &list(el->getChildren());
+   List::const_iterator iter;
+   iter = list.begin();
+-  patexp = (PatternValue *)PatternExpression::restoreExpression(*iter,trans);
+  patexp = PatternExpression::restoreExpression(*iter,trans);
+   patexp->layClaim();
+ }
+ 
+diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/type.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/type.cc
+index 316074389..91bf4bc77 100644
+--- a/Ghidra/Features/Decompiler/src/decompile/cpp/type.cc
+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/type.cc
+@@ -3233,8 +3233,8 @@ void TypeFactory::recalcPointerSubmeta(Datatype *base,sub_metatype sub)
+   top.submeta = sub;			// Search on the incorrect submeta
+   iter = tree.lower_bound(&top);
+   while(iter != tree.end()) {
+    if ((*iter)->getMetatype() != TYPE_PTR) break;
+     TypePointer *ptr = (TypePointer *)*iter;
+-    if (ptr->getMetatype() != TYPE_PTR) break;
+     if (ptr->ptrto != base) break;
+     ++iter;
+     if (ptr->submeta == sub) {
+diff --git a/Ghidra/Features/Decompiler/src/decompile/unittests/testfloatemu.cc b/Ghidra/Features/Decompiler/src/decompile/unittests/testfloatemu.cc
+index ab99382a3..67d92c573 100644
+--- a/Ghidra/Features/Decompiler/src/decompile/unittests/testfloatemu.cc
+++ b/Ghidra/Features/Decompiler/src/decompile/unittests/testfloatemu.cc
+@@ -338,7 +338,7 @@ TEST(float_opTrunc_to_int) {
+ 
+     for(float f:float_test_values) {
+         // avoid undefined behavior
+-        if((int64_t)f > std::numeric_limits<int>::max() || (int64_t)f < std::numeric_limits<int>::min())
+        if(f > std::numeric_limits<int>::max() || f < std::numeric_limits<int>::min() || std::isnan(f))
+             continue;
+         uintb true_result = ((uintb)(int32_t)f) & 0xffffffff;
+         uintb encoding = format.getEncoding(f);
+-- 
+2.38.1
+
@@ -0,0 +1,38 @@
+From 0891ecb91231978ef912c3215925bcdea6f14ce7 Mon Sep 17 00:00:00 2001
+From: Alex Cameron <asc@tetsuo.sh>
+Date: Wed, 3 Aug 2022 20:01:18 +1000
+Subject: [PATCH 4/4] Use `stroull` instead of `stroul` to parse address
+ offsets
+
+---
+ Ghidra/Features/Decompiler/src/decompile/cpp/space.cc | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/space.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/space.cc
+index 40a3e3bfe..ff6f282ca 100644
+--- a/Ghidra/Features/Decompiler/src/decompile/cpp/space.cc
+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/space.cc
+@@ -16,6 +16,8 @@
+ #include "space.hh"
+ #include "translate.hh"
+ 
+#include <climits>
+
+ AttributeId ATTRIB_BASE = AttributeId("base",89);
+ AttributeId ATTRIB_DEADCODEDELAY = AttributeId("deadcodedelay",90);
+ AttributeId ATTRIB_DELAY = AttributeId("delay", 91);
+@@ -268,7 +270,10 @@ uintb AddrSpace::read(const string &s,int4 &size) const
+     }
+   }
+   catch(LowlevelError &err) {	// Name doesn't exist
+-    offset = strtoul(s.c_str(),&tmpdata,0);
+    offset = strtoull(s.c_str(),&tmpdata,0);
+    if (offset == ULLONG_MAX) {
+      throw LowlevelError("Offset outside of valid range");
+    }
+     offset = addressToByte(offset,wordsize);
+     enddata = (const char *) tmpdata;
+     if (enddata - s.c_str() == s.size()) { // If no size or offset override
+-- 
+2.38.1
+
@@ -1,40 +1,67 @@
+#
+# Copyright (c) 2022-present, Trail of Bits, Inc.
+# All rights reserved.
+#
+# This source code is licensed in accordance with the terms specified in
+# the LICENSE file found in the root directory of this source tree.
+#
+
 # ---- Setup Ghidra Source code ----
+include_guard(GLOBAL)

 # Set up Ghidra repo human-readable version settings
-set(sleigh_GHIDRA_RELEASE_TYPE "stable" CACHE
-  STRING "Ghidra release type to use. 'HEAD' is used for active development purposes."
+set(sleigh_RELEASE_TYPE "stable" CACHE
+  STRING "Release type to use. 'HEAD' is used for active development purposes."
 )
+
 # This is just helper for CMake UIs. CMake does not enforce that the value matches one of those listed.
-set_property(CACHE sleigh_GHIDRA_RELEASE_TYPE PROPERTY STRINGS "stable" "HEAD")
+set_property(CACHE sleigh_RELEASE_TYPE PROPERTY STRINGS "stable" "HEAD")

 # **** Setup pinned git info ****

+find_package(Git REQUIRED)
+
 # Ghidra pinned stable version commit
-set(ghidra_version "10.1.2")
-set(ghidra_git_tag "63bb30ac8bee0e3ff34c9812d751edcfdc70dbe4")
+set(ghidra_version "10.2")
+set(ghidra_git_tag "Ghidra_${ghidra_version}_build")
+set(ghidra_shallow TRUE)
+
+set(sleigh_ADDITIONAL_PATCHES "" CACHE STRING
+  "The accepted patch format is git patch files, to be applied via git am. The format of the list is a CMake semicolon separated list.")
+
 # pinned stable patches list
 set(ghidra_patches
-  PATCH_COMMAND git am --ignore-space-change --ignore-whitespace --no-gpg-sign
-  "${CMAKE_CURRENT_SOURCE_DIR}/patches/stable/0001-Fix-arg-parsing-in-sleigh-C-test-runner.patch"
+  PATCH_COMMAND "${GIT_EXECUTABLE}" am --ignore-space-change --ignore-whitespace --no-gpg-sign
+  "${CMAKE_CURRENT_LIST_DIR}/patches/stable/0001-Small-improvements-to-C-decompiler-testing-from-CLI.patch"
+  "${CMAKE_CURRENT_LIST_DIR}/patches/stable/0002-Add-include-guards-to-decompiler-C-headers.patch"
+  "${CMAKE_CURRENT_LIST_DIR}/patches/stable/0003-Fix-UBSAN-errors-in-decompiler.patch"
+  "${CMAKE_CURRENT_LIST_DIR}/patches/stable/0004-Use-stroull-instead-of-stroul-to-parse-address-offse.patch"
 )

 # Ghidra pinned commits used for pinning last known working HEAD commit
-if("${sleigh_GHIDRA_RELEASE_TYPE}" STREQUAL HEAD)
+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 "10.2")
+  set(ghidra_head_version "10.3")
  set(ghidra_version "${ghidra_head_version}")
-  set(ghidra_head_git_tag "3eb03b1608b24aaae1cd1d5c86a5df36270ac54d")
+  set(ghidra_head_git_tag "97097daa681d43ee3a57c10523c382ec7cfafa88")
  set(ghidra_git_tag "${ghidra_head_git_tag}")
+  set(ghidra_shallow FALSE)
  set(ghidra_patches
-    PATCH_COMMAND git am --ignore-space-change --ignore-whitespace --no-gpg-sign
-    "${CMAKE_CURRENT_SOURCE_DIR}/patches/stable/0001-Fix-arg-parsing-in-sleigh-C-test-runner.patch"
+    PATCH_COMMAND "${GIT_EXECUTABLE}" am --ignore-space-change --ignore-whitespace --no-gpg-sign
+    "${CMAKE_CURRENT_LIST_DIR}/patches/HEAD/0001-Small-improvements-to-C-decompiler-testing-from-CLI.patch"
+    "${CMAKE_CURRENT_LIST_DIR}/patches/HEAD/0002-Add-include-guards-to-decompiler-C-headers.patch"
+    "${CMAKE_CURRENT_LIST_DIR}/patches/HEAD/0003-Fix-UBSAN-errors-in-decompiler.patch"
+    "${CMAKE_CURRENT_LIST_DIR}/patches/HEAD/0004-Use-stroull-instead-of-stroul-to-parse-address-offse.patch"
  )
+  string(SUBSTRING "${ghidra_git_tag}" 0 7 ghidra_short_commit)
+else()
+  set(ghidra_short_commit "${ghidra_git_tag}")
 endif()

-string(SUBSTRING "${ghidra_git_tag}" 0 7 ghidra_short_commit)
+list(APPEND ghidra_patches ${sleigh_ADDITIONAL_PATCHES})

-message(STATUS "Using Ghidra version ${ghidra_version} at commit ${ghidra_short_commit}")
+message(STATUS "Using Ghidra version ${ghidra_version} at git ref ${ghidra_short_commit}")

 include(FetchContent)

@@ -46,6 +73,7 @@ FetchContent_Declare(GhidraSource
  GIT_REPOSITORY https://github.com/NationalSecurityAgency/ghidra
  GIT_TAG ${ghidra_git_tag}
  GIT_PROGRESS TRUE
+  GIT_SHALLOW ${ghidra_shallow}
  ${ghidra_patches}
 )
 FetchContent_MakeAvailable(GhidraSource)
@@ -54,6 +82,144 @@ message(STATUS "Ghidra source located at '${ghidrasource_SOURCE_DIR}'")

 # Sanity check on Ghidra source code checkout
 set(library_root "${ghidrasource_SOURCE_DIR}/Ghidra/Features/Decompiler/src/decompile/cpp")
+
 if(NOT EXISTS "${library_root}/sleigh.hh")
  message(FATAL_ERROR "The Ghidra source directory has not been initialized correctly. Could not find '${library_root}'")
 endif()
+
+# Source collection variables
+set(sleigh_core_source_list
+  "${library_root}/xml.cc"
+  "${library_root}/space.cc"
+  "${library_root}/float.cc"
+  "${library_root}/address.cc"
+  "${library_root}/pcoderaw.cc"
+  "${library_root}/translate.cc"
+  "${library_root}/opcodes.cc"
+  "${library_root}/globalcontext.cc"
+  "${library_root}/marshal.cc"
+)
+#if("${sleigh_RELEASE_TYPE}" STREQUAL "HEAD")
+#  list(APPEND sleigh_core_source_list
+#  )
+#endif()
+
+set(sleigh_deccore_source_list
+  "${library_root}/capability.cc"
+  "${library_root}/architecture.cc"
+  "${library_root}/options.cc"
+  "${library_root}/graph.cc"
+  "${library_root}/cover.cc"
+  "${library_root}/block.cc"
+  "${library_root}/cast.cc"
+  "${library_root}/typeop.cc"
+  "${library_root}/database.cc"
+  "${library_root}/cpool.cc"
+  "${library_root}/comment.cc"
+  "${library_root}/stringmanage.cc"
+  "${library_root}/fspec.cc"
+  "${library_root}/action.cc"
+  "${library_root}/loadimage.cc"
+  "${library_root}/grammar.cc"
+  "${library_root}/varnode.cc"
+  "${library_root}/op.cc"
+  "${library_root}/type.cc"
+  "${library_root}/variable.cc"
+  "${library_root}/varmap.cc"
+  "${library_root}/jumptable.cc"
+  "${library_root}/emulate.cc"
+  "${library_root}/emulateutil.cc"
+  "${library_root}/flow.cc"
+  "${library_root}/userop.cc"
+  "${library_root}/funcdata.cc"
+  "${library_root}/funcdata_block.cc"
+  "${library_root}/funcdata_op.cc"
+  "${library_root}/funcdata_varnode.cc"
+  "${library_root}/pcodeinject.cc"
+  "${library_root}/heritage.cc"
+  "${library_root}/prefersplit.cc"
+  "${library_root}/rangeutil.cc"
+  "${library_root}/ruleaction.cc"
+  "${library_root}/subflow.cc"
+  "${library_root}/blockaction.cc"
+  "${library_root}/merge.cc"
+  "${library_root}/double.cc"
+  "${library_root}/transform.cc"
+  "${library_root}/coreaction.cc"
+  "${library_root}/condexe.cc"
+  "${library_root}/override.cc"
+  "${library_root}/dynamic.cc"
+  "${library_root}/crc32.cc"
+  "${library_root}/prettyprint.cc"
+  "${library_root}/printlanguage.cc"
+  "${library_root}/printc.cc"
+  "${library_root}/printjava.cc"
+  "${library_root}/memstate.cc"
+  "${library_root}/opbehavior.cc"
+  "${library_root}/paramid.cc"
+  "${library_root}/unionresolve.cc"
+)
+#if("${sleigh_RELEASE_TYPE}" STREQUAL "HEAD")
+#  list(APPEND sleigh_deccore_source_list
+#  )
+#endif()
+
+set(sleigh_extra_source_list
+  "${library_root}/callgraph.cc"
+  "${library_root}/ifacedecomp.cc"
+  "${library_root}/ifaceterm.cc"
+  "${library_root}/inject_sleigh.cc"
+  "${library_root}/interface.cc"
+  "${library_root}/libdecomp.cc"
+  "${library_root}/loadimage_xml.cc"
+  "${library_root}/raw_arch.cc"
+  "${library_root}/rulecompile.cc"
+  "${library_root}/sleigh_arch.cc"
+  "${library_root}/testfunction.cc"
+  "${library_root}/unify.cc"
+  "${library_root}/xml_arch.cc"
+)
+
+set(sleigh_source_list
+  "${library_root}/sleigh.cc"
+  "${library_root}/pcodeparse.cc"
+  "${library_root}/pcodecompile.cc"
+  "${library_root}/sleighbase.cc"
+  "${library_root}/slghsymbol.cc"
+  "${library_root}/slghpatexpress.cc"
+  "${library_root}/slghpattern.cc"
+  "${library_root}/semantics.cc"
+  "${library_root}/context.cc"
+  "${library_root}/filemanage.cc"
+)
+
+set(sleigh_ghidra_source_list
+  "${library_root}/ghidra_arch.cc"
+  "${library_root}/inject_ghidra.cc"
+  "${library_root}/ghidra_translate.cc"
+  "${library_root}/loadimage_ghidra.cc"
+  "${library_root}/typegrp_ghidra.cc"
+  "${library_root}/database_ghidra.cc"
+  "${library_root}/ghidra_context.cc"
+  "${library_root}/cpool_ghidra.cc"
+  "${library_root}/ghidra_process.cc"
+  "${library_root}/comment_ghidra.cc"
+  "${library_root}/string_ghidra.cc"
+)
+
+set(sleigh_slacomp_source_list
+  "${library_root}/slgh_compile.cc"
+  "${library_root}/slghparse.cc"
+  "${library_root}/slghscan.cc"
+)
+
+# Include separate file to make it easier to find user-specified compile
+# options
+include("${CMAKE_CURRENT_LIST_DIR}/compile_options.cmake")
+
+# Sets 'spec_file_list' variable
+if(sleigh_RELEASE_IS_HEAD)
+  include("${CMAKE_CURRENT_LIST_DIR}/spec_files_HEAD.cmake")
+else()
+  include("${CMAKE_CURRENT_LIST_DIR}/spec_files_stable.cmake")
+endif()
@@ -5,8 +5,6 @@ set(spec_file_list
  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/68000/data/languages/68030.slaspec"
  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/68000/data/languages/68040.slaspec"
  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/68000/data/languages/coldfire.slaspec"
-  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/6805/data/languages/6805.slaspec"
-  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/6805/data/languages/6809.slaspec"
  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/8048/data/languages/8048.slaspec"
  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/8051/data/languages/80251.slaspec"
  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/8051/data/languages/80390.slaspec"
@@ -54,9 +52,14 @@ set(spec_file_list
  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/HCS08/data/languages/HC05.slaspec"
  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/HCS08/data/languages/HC08.slaspec"
  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/HCS08/data/languages/HCS08.slaspec"
+  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/HCS12/data/languages/HC12.slaspec"
  "${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/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"
+  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/MC6800/data/languages/H6309.slaspec"
  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/MCS96/data/languages/MCS96.slaspec"
  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/MIPS/data/languages/mips32R6be.slaspec"
  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/MIPS/data/languages/mips32R6le.slaspec"
@@ -81,6 +84,8 @@ set(spec_file_list
  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/PowerPC/data/languages/ppc_32_4xx_be.slaspec"
  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/PowerPC/data/languages/ppc_32_4xx_le.slaspec"
  "${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_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"
@@ -5,8 +5,6 @@ set(spec_file_list
  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/68000/data/languages/68030.slaspec"
  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/68000/data/languages/68040.slaspec"
  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/68000/data/languages/coldfire.slaspec"
-  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/6805/data/languages/6805.slaspec"
-  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/6805/data/languages/6809.slaspec"
  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/8048/data/languages/8048.slaspec"
  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/8051/data/languages/80251.slaspec"
  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/8051/data/languages/80390.slaspec"
@@ -54,9 +52,14 @@ set(spec_file_list
  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/HCS08/data/languages/HC05.slaspec"
  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/HCS08/data/languages/HC08.slaspec"
  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/HCS08/data/languages/HCS08.slaspec"
+  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/HCS12/data/languages/HC12.slaspec"
  "${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/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"
+  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/MC6800/data/languages/H6309.slaspec"
  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/MCS96/data/languages/MCS96.slaspec"
  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/MIPS/data/languages/mips32R6be.slaspec"
  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/MIPS/data/languages/mips32R6le.slaspec"
@@ -81,6 +84,8 @@ set(spec_file_list
  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/PowerPC/data/languages/ppc_32_4xx_be.slaspec"
  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/PowerPC/data/languages/ppc_32_4xx_le.slaspec"
  "${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_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"
@@ -9,7 +9,7 @@
 # Generate the build and install directories to use in the support helpers
 configure_file(
  "${CMAKE_CURRENT_LIST_DIR}/SpecFilePaths.h.in"
-  "${CMAKE_CURRENT_BINARY_DIR}/SpecFilePaths.h"
+  "${CMAKE_CURRENT_BINARY_DIR}/include/sleigh/SpecFilePaths.h"
  @ONLY
 )

@@ -22,8 +22,10 @@ configure_file(
 # the source code for watching a git repository.
 set(PRE_CONFIGURE_FILE "${CMAKE_CURRENT_LIST_DIR}/Version.cpp.in")
 set(POST_CONFIGURE_FILE "${CMAKE_CURRENT_BINARY_DIR}/Version.cpp")
+set(GIT_STATE_FILE "${CMAKE_CURRENT_BINARY_DIR}/git-state-sleigh")
+set(GIT_WORKING_DIR "${PROJECT_SOURCE_DIR}")
 set(GIT_FAIL_IF_NONZERO_EXIT OFF)
-include("${PROJECT_SOURCE_DIR}/cmake/git_watcher.cmake")
+include("../cmake/git_watcher.cmake")

 # Generate GHIDRA version helpers
 configure_file(
@@ -32,22 +34,65 @@ configure_file(
  @ONLY
 )

-set(sleigh_support_source_list
+add_library(sleigh_support
  Support.cpp
-  ${POST_CONFIGURE_FILE}
+  "${POST_CONFIGURE_FILE}"
  "${CMAKE_CURRENT_BINARY_DIR}/GhidraVersion.cpp"
 )
+add_library(sleigh::support ALIAS sleigh_support)

-add_library(support
-  ${sleigh_support_source_list}
+# Need to explicitly add this dependency because BYPRODUCTS doesn't work under
+# CMake 3.16 with GNU Makefiles
+add_dependencies(sleigh_support check_git)
+
+target_compile_features(sleigh_support PUBLIC cxx_std_17)
+set_target_properties(sleigh_support PROPERTIES
+  EXPORT_NAME support
+  OUTPUT_NAME slaSupport
+)
+target_include_directories(sleigh_support
+  ${warning_guard}
+  PUBLIC
+  "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
+)
+target_include_directories(sleigh_support
+  SYSTEM
+  PUBLIC
+  "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>"
 )

-add_library(sleigh::support ALIAS support)
+if(NOT CMAKE_SKIP_INSTALL_RULES)
+  if(PROJECT_IS_TOP_LEVEL)
+    set(CMAKE_INSTALL_INCLUDEDIR include/sleigh CACHE PATH "")
+  endif()

-target_link_libraries(support PUBLIC
-  sleigh::sleigh_settings
-)
-target_include_directories(support PRIVATE
-  "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>"
-  "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/support>"
-)
+  include(GNUInstallDirs)
+
+  install(
+    TARGETS sleigh_support
+    EXPORT sleighSupportTargets
+    RUNTIME #
+      COMPONENT sleigh_SupportRuntime
+    LIBRARY #
+      COMPONENT sleigh_SupportRuntime
+      NAMELINK_COMPONENT sleigh_SupportDevelopment
+    ARCHIVE #
+      COMPONENT sleigh_SupportDevelopment
+    INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+  )
+
+  install(
+    DIRECTORY
+      include/
+      "${CMAKE_CURRENT_BINARY_DIR}/include/"
+    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+    COMPONENT sleigh_SupportDevelopment
+  )
+
+  install(
+    EXPORT sleighSupportTargets
+    DESTINATION "${sleigh_INSTALL_CMAKEDIR}"
+    NAMESPACE sleigh::
+    COMPONENT sleigh_SupportDevelopment
+  )
+endif()
@@ -6,7 +6,7 @@
  the LICENSE file found in the root directory of this source tree.
 */

-#include "Version.h"
+#include "sleigh/Version.h"

 namespace sleigh {

@@ -15,7 +15,7 @@ std::string_view GetGhidraVersion(void) { return "@ghidra_version@"; }
 std::string_view GetGhidraCommitHash(void) { return "@ghidra_git_tag@"; }

 std::string_view GetGhidraReleaseType(void) {
-  return "@sleigh_GHIDRA_RELEASE_TYPE@";
+  return "@sleigh_RELEASE_TYPE@";
 }

 } // namespace sleigh
@@ -10,7 +10,9 @@

 namespace sleigh {

-static const char *kSleighSpecInstallDir = "@sleigh_SPEC_INSTALL_DIR@";
-static const char *kSleighSpecBuildDir = "@sleigh_SPEC_BUILD_DIR@";
+static const char *kSleighSpecInstallDir = "@sleigh_INSTALL_SPECDIR@";
+static const char *kSleighFullSpecInstallDir =
+    "@CMAKE_INSTALL_PREFIX@/@sleigh_INSTALL_SPECDIR@";
+static const char *kSleighSpecBuildDir = "@spec_files_build_dir@";

 } // namespace sleigh
@@ -6,9 +6,9 @@
  the LICENSE file found in the root directory of this source tree.
 */

-#include "SpecFilePaths.h"
+#include "sleigh/Support.h"

-#include "Support.h"
+#include "sleigh/SpecFilePaths.h"

 namespace sleigh {

@@ -18,7 +18,7 @@ std::optional<std::filesystem::path>
 FindSpecFileInSearchPath(std::string_view file_name,
                         std::filesystem::path search_path) {
  search_path.append("Ghidra").append("Processors");
-  // Check whether a SLEIGH installation exists at this path
+  // Check whether a Sleigh installation exists at this path
  if (!std::filesystem::is_directory(search_path)) {
    return {};
  }
@@ -46,7 +46,7 @@ FindSpecFileInSearchPath(std::string_view file_name,

 const std::vector<std::filesystem::path> gDefaultSearchPaths = {
    // Derived from the installation
-    kSleighSpecInstallDir,
+    kSleighFullSpecInstallDir,
    // Derived from the build
    kSleighSpecBuildDir,
    // Common install locations
@@ -31,7 +31,7 @@
  SOFTWARE.
 */

-#include "Version.h"
+#include "sleigh/Version.h"

 namespace sleigh {

@@ -0,0 +1,126 @@
+/*
+  Copyright (c) 2021-present, Trail of Bits, Inc.
+  All rights reserved.
+
+  This source code is licensed in accordance with the terms specified in
+  the LICENSE file found in the root directory of this source tree.
+*/
+
+#include <sleigh/libconfig.h>
+
+#pragma once
+#ifndef _MSC_VER
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated"
+#pragma GCC diagnostic ignored "-Wsign-compare"
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#endif
+#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>
+#include <sleigh/slghparse.hh>
+#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
+#endif
+
+#include <sleigh/Support.h>
+#include <sleigh/Version.h>
@@ -0,0 +1,53 @@
+#
+# Copyright (c) 2022-present, Trail of Bits, Inc.
+# All rights reserved.
+#
+# This source code is licensed in accordance with the terms specified in
+# the LICENSE file found in the root directory of this source tree.
+#
+
+#
+# Tests from ghidra repo
+#
+
+add_executable(sleigh_ghidra_test
+  ${sleigh_core_source_list}
+  ${sleigh_deccore_source_list}
+  ${sleigh_source_list}
+  ${sleigh_extra_source_list}
+
+  "${library_root}/test.cc"
+
+  "${library_root}/../unittests/testcirclerange.cc"
+  "${library_root}/../unittests/testfloatemu.cc"
+  "${library_root}/../unittests/testtypes.cc"
+  "${library_root}/../unittests/testmarshal.cc"
+)
+
+#if(sleigh_RELEASE_IS_HEAD)
+#  target_sources(sleigh_ghidra_test PRIVATE
+#  )
+#endif()
+
+target_compile_features(sleigh_ghidra_test PRIVATE cxx_std_11)
+target_include_directories(sleigh_ghidra_test PRIVATE "${library_root}")
+include(CheckIncludeFileCXX)
+check_include_file_cxx(termios.h HAVE_TERMIOS_H)
+if(HAVE_TERMIOS_H)
+  target_compile_definitions(sleigh_ghidra_test PRIVATE
+    __TERMINAL__
+  )
+endif()
+sleigh_add_optional_defines(sleigh_ghidra_test PRIVATE)
+
+add_test(
+  NAME sleigh_ghidra_unittest
+  COMMAND sleigh_ghidra_test -sleighpath "${PROJECT_BINARY_DIR}" unittests
+)
+
+add_test(
+  NAME sleigh_ghidra_datatest
+  COMMAND sleigh_ghidra_test -sleighpath "${PROJECT_BINARY_DIR}"
+    -path "${library_root}/../datatests"
+    datatests
+)
@@ -6,10 +6,10 @@
 # the LICENSE file found in the root directory of this source tree.
 #

-cmake_minimum_required(VERSION 3.15.0)
+cmake_minimum_required(VERSION 3.18)
 project("sleigh_find_package_test")

-find_package(sleigh REQUIRED)
+find_package(sleigh REQUIRED COMPONENTS Support)

 add_executable(sleigh_test
  src/main.cpp
@@ -18,4 +18,11 @@ add_executable(sleigh_test
 target_link_libraries(sleigh_test PRIVATE
  sleigh::sla
  sleigh::decomp
+  sleigh::support
+)
+
+include(CTest)
+add_test(
+  NAME smoketest
+  COMMAND sleigh_test
 )
@@ -1,9 +1,35 @@
 #
-# Copyright (c) 2021-present, Trail of Bits, Inc.
+# Copyright (c) 2022-present, Trail of Bits, Inc.
 # All rights reserved.
 #
 # This source code is licensed in accordance with the terms specified in
 # the LICENSE file found in the root directory of this source tree.
 #

-add_subdirectory(sleigh-lift)
+cmake_minimum_required(VERSION 3.18)
+
+include(../cmake/prelude.cmake)
+include(../src/setup-ghidra-source.cmake)
+
+project(sleigh_tools
+  VERSION "${ghidra_version}"
+  DESCRIPTION "Sleigh tools"
+  HOMEPAGE_URL "https://github.com/lifting-bits/sleigh"
+  LANGUAGES CXX
+)
+
+option(sleigh_BUILD_SPECCOMPILER "Build the sleigh spec compiler executable (\"sleigh\")" ON)
+option(sleigh_BUILD_DECOMPILER "Build the decompiler executable (\"decomp\")" ON)
+option(sleigh_BUILD_GHIDRA "Build the Ghidra executable (\"ghidra\")" ON)
+
+if(sleigh_BUILD_SPECCOMPILER)
+  add_subdirectory(spec-compiler)
+endif()
+
+if(sleigh_BUILD_DECOMPILER)
+  add_subdirectory(decompiler)
+endif()
+
+if(sleigh_BUILD_GHIDRA)
+  add_subdirectory(ghidra)
+endif()
@@ -0,0 +1,65 @@
+#
+# Copyright (c) 2022-present, Trail of Bits, Inc.
+# All rights reserved.
+#
+# This source code is licensed in accordance with the terms specified in
+# the LICENSE file found in the root directory of this source tree.
+#
+
+cmake_minimum_required(VERSION 3.18)
+
+include(../../cmake/prelude.cmake)
+include(../../src/setup-ghidra-source.cmake)
+
+project(sleigh_decompiler
+  VERSION "${ghidra_version}"
+  DESCRIPTION "Sleigh decompiler"
+  HOMEPAGE_URL "https://github.com/lifting-bits/sleigh"
+  LANGUAGES CXX
+)
+
+include(../../cmake/project-is-top-level.cmake)
+
+add_executable(sleigh_decompiler
+  ${sleigh_core_source_list}
+  ${sleigh_deccore_source_list}
+  ${sleigh_extra_source_list}
+  ${sleigh_source_list}
+
+  "${library_root}/consolemain.cc"
+)
+add_executable(sleigh::decompiler ALIAS sleigh_decompiler)
+
+target_compile_features(sleigh_decompiler PUBLIC cxx_std_11)
+target_include_directories(sleigh_decompiler PRIVATE "$<BUILD_INTERFACE:${library_root}>")
+include(CheckIncludeFileCXX)
+check_include_file_cxx(termios.h HAVE_TERMIOS_H)
+if(HAVE_TERMIOS_H)
+  target_compile_definitions(sleigh_decompiler PRIVATE
+    __TERMINAL__
+  )
+endif()
+target_compile_definitions(sleigh_decompiler PRIVATE
+  $<$<CONFIG:Debug>:CPUI_DEBUG>
+)
+sleigh_add_optional_defines(sleigh_decompiler PRIVATE)
+
+set_target_properties(sleigh_decompiler PROPERTIES
+  EXPORT_NAME decompiler
+  OUTPUT_NAME decomp
+  OUTPUT_NAME_DEBUG decomp_dbg
+)
+
+if(NOT CMAKE_SKIP_INSTALL_RULES)
+  include("GNUInstallDirs")
+
+  install(
+    TARGETS sleigh_decompiler
+    EXPORT sleighTargets
+    RUNTIME COMPONENT sleigh_Runtime
+  )
+
+  if(PROJECT_IS_TOP_LEVEL)
+    include(CPack)
+  endif()
+endif()
@@ -0,0 +1,61 @@
+#
+# Copyright (c) 2022-present, Trail of Bits, Inc.
+# All rights reserved.
+#
+# This source code is licensed in accordance with the terms specified in
+# the LICENSE file found in the root directory of this source tree.
+#
+
+cmake_minimum_required(VERSION 3.18)
+
+include(../../cmake/prelude.cmake)
+include(../../src/setup-ghidra-source.cmake)
+
+project(sleigh_ghidra
+  VERSION "${ghidra_version}"
+  DESCRIPTION "Sleigh ghidra service"
+  HOMEPAGE_URL "https://github.com/lifting-bits/sleigh"
+  LANGUAGES CXX
+)
+
+include(../../cmake/project-is-top-level.cmake)
+
+add_executable(sleigh_ghidra
+  ${sleigh_core_source_list}
+  ${sleigh_deccore_source_list}
+  ${sleigh_ghidra_source_list}
+
+  "$<$<CONFIG:Debug>:${library_root}/callgraph.cc>"
+  "$<$<CONFIG:Debug>:${library_root}/ifacedecomp.cc>"
+  "$<$<CONFIG:Debug>:${library_root}/ifaceterm.cc>"
+  "$<$<CONFIG:Debug>:${library_root}/interface.cc>"
+  "$<$<CONFIG:Debug>:${library_root}/testfunction.cc>"
+)
+add_executable(sleigh::ghidra ALIAS sleigh_ghidra)
+
+target_compile_features(sleigh_ghidra PUBLIC cxx_std_11)
+target_include_directories(sleigh_ghidra PRIVATE "$<BUILD_INTERFACE:${library_root}>")
+target_compile_definitions(sleigh_ghidra PRIVATE
+  $<$<CONFIG:Debug>:CPUI_DEBUG>
+)
+sleigh_add_optional_defines(sleigh_ghidra PRIVATE)
+
+set_target_properties(sleigh_ghidra PROPERTIES
+  EXPORT_NAME ghidra
+  OUTPUT_NAME ghidra
+  OUTPUT_NAME_DEBUG ghidra_dbg
+)
+
+if(NOT CMAKE_SKIP_INSTALL_RULES)
+  include("GNUInstallDirs")
+
+  install(
+    TARGETS sleigh_ghidra
+    EXPORT sleighTargets
+    RUNTIME COMPONENT sleigh_Runtime
+  )
+
+  if(PROJECT_IS_TOP_LEVEL)
+    include(CPack)
+  endif()
+endif()
@@ -1,51 +0,0 @@
-#
-# Copyright (c) 2021-present, Trail of Bits, Inc.
-# All rights reserved.
-#
-# This source code is licensed in accordance with the terms specified in
-# the LICENSE file found in the root directory of this source tree.
-#
-
-add_executable(sleigh-lift
-  src/main.cpp
-)
-add_executable(sleigh::sleigh-lift ALIAS sleigh-lift)
-
-if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-  if(MSVC)
-    target_compile_options(sleigh-lift PRIVATE
-      /W4
-      /WX
-    )
-  else()
-    target_compile_options(sleigh-lift PRIVATE
-      -Wall
-      -Werror
-      -Wextra
-    )
-  endif()
-endif()
-
-target_link_libraries(sleigh-lift PRIVATE
-  sleigh::sla
-  sleigh::decomp
-  sleigh::support
-)
-
-if(NOT CMAKE_SKIP_INSTALL_RULES)
-  install(
-    TARGETS
-      sleigh-lift
-
-    EXPORT
-      "sleigh"
-
-    DESTINATION
-      "${CMAKE_INSTALL_BINDIR}"
-
-    PERMISSIONS
-      OWNER_READ OWNER_WRITE OWNER_EXECUTE
-      GROUP_READ GROUP_EXECUTE
-      WORLD_READ WORLD_EXECUTE
-  )
-endif()
@@ -0,0 +1,51 @@
+#
+# Copyright (c) 2022-present, Trail of Bits, Inc.
+# All rights reserved.
+#
+# This source code is licensed in accordance with the terms specified in
+# the LICENSE file found in the root directory of this source tree.
+#
+
+cmake_minimum_required(VERSION 3.18)
+
+include(../../cmake/prelude.cmake)
+include(../../src/setup-ghidra-source.cmake)
+
+project(sleigh_sleigh
+  VERSION "${ghidra_version}"
+  DESCRIPTION "Sleigh spec compiler"
+  HOMEPAGE_URL "https://github.com/lifting-bits/sleigh"
+  LANGUAGES CXX
+)
+
+include(../../cmake/project-is-top-level.cmake)
+
+add_executable(sleigh_sleigh
+  ${sleigh_core_source_list}
+  ${sleigh_source_list}
+  ${sleigh_slacomp_source_list}
+)
+add_executable(sleigh::sleigh ALIAS sleigh_sleigh)
+
+target_compile_features(sleigh_sleigh PUBLIC cxx_std_11)
+target_include_directories(sleigh_sleigh PRIVATE "$<BUILD_INTERFACE:${library_root}>")
+sleigh_add_optional_defines(sleigh_sleigh PRIVATE)
+set_target_properties(sleigh_sleigh PROPERTIES
+  EXPORT_NAME sleigh
+  OUTPUT_NAME sleigh
+  OUTPUT_NAME_DEBUG sleigh_dbg
+)
+
+if(NOT CMAKE_SKIP_INSTALL_RULES)
+  include("GNUInstallDirs")
+
+  install(
+    TARGETS sleigh_sleigh
+    EXPORT sleighTargets
+    RUNTIME COMPONENT sleigh_Runtime
+  )
+
+  if(PROJECT_IS_TOP_LEVEL)
+    include(CPack)
+  endif()
+endif()
Author	SHA1	Message	Date
auto-updater[bot]	32ae1db007	Update Ghidra HEAD to commit 97097daa6 (#145 ) Bump Ghidra HEAD commit 97097daa6 Co-authored-by: pgoodman <pgoodman@users.noreply.github.com>	2022-11-14 12:00:58 +11:00
auto-updater[bot]	12a9904dfb	Update Ghidra HEAD to commit 69b07161b (#144 ) Bump Ghidra HEAD commit 69b07161b Co-authored-by: pgoodman <pgoodman@users.noreply.github.com>	2022-11-07 12:49:12 +11:00
Eric Kilmer	e9b920d618	More robust CI	2022-11-05 10:39:27 -04:00
Eric Kilmer	f38eee41a2	Update to Ghidra stable 10.2	2022-11-04 18:08:16 -04:00
Eric Kilmer	c888160f53	Add missing unittest file (#141 ) testmarshal.cc in HEAD	2022-11-03 10:26:57 -04:00
auto-updater[bot]	82c11bea62	Update Ghidra HEAD to commit 0bd1c24b9 (#138 ) Bump Ghidra HEAD commit 0bd1c24b9 Co-authored-by: pgoodman <pgoodman@users.noreply.github.com>	2022-10-31 09:32:39 -04:00
auto-updater[bot]	21280b4e09	Update Ghidra HEAD to commit 12854d131 (#137 ) Bump Ghidra HEAD commit 12854d131 Co-authored-by: pgoodman <pgoodman@users.noreply.github.com>	2022-10-24 10:14:59 -04:00
auto-updater[bot]	3b53dfd6f1	Update Ghidra HEAD to commit 480f1e3a8 (#136 ) Bump Ghidra HEAD commit 480f1e3a8 Co-authored-by: pgoodman <pgoodman@users.noreply.github.com>	2022-10-17 09:25:46 -04:00
Alex Cameron	49bb897151	sleigh-lift: Convert address size to bits when calculating bitmask (#135 )	2022-10-11 13:11:07 +11:00
auto-updater[bot]	3b1afba2dc	Update Ghidra HEAD to commit 35b58b310 (#134 ) Bump Ghidra HEAD commit 35b58b310 Co-authored-by: pgoodman <pgoodman@users.noreply.github.com>	2022-10-10 15:49:43 +11:00
auto-updater[bot]	1858fc7473	Update Ghidra HEAD to commit b88cf85d5 (#131 ) Bump Ghidra HEAD commit b88cf85d5 Co-authored-by: pgoodman <pgoodman@users.noreply.github.com>	2022-10-03 14:58:24 +11:00
Eric Kilmer	c08898c9ae	CI: Fix Linux Homebrew usage	2022-09-26 14:15:32 -04:00
auto-updater[bot]	8c78874c7e	Update Ghidra HEAD to commit 1cdb68b03 (#130 ) Bump Ghidra HEAD commit 1cdb68b03 Co-authored-by: pgoodman <pgoodman@users.noreply.github.com>	2022-09-26 12:04:37 +10:00
auto-updater[bot]	cdaf9f6cea	Update Ghidra HEAD to commit 975db1919 (#129 ) Bump Ghidra HEAD commit 975db1919 Co-authored-by: pgoodman <pgoodman@users.noreply.github.com>	2022-09-19 09:06:38 -04:00
auto-updater[bot]	8dc9ab544d	Update Ghidra HEAD to commit 6a2cd8055 (#128 ) Bump Ghidra HEAD commit 6a2cd8055 Co-authored-by: pgoodman <pgoodman@users.noreply.github.com>	2022-09-12 10:33:42 -04:00
auto-updater[bot]	db6dd1e40b	Update Ghidra HEAD to commit 5593df495 (#127 ) Bump Ghidra HEAD commit 5593df495 Co-authored-by: pgoodman <pgoodman@users.noreply.github.com>	2022-09-05 13:31:28 +10:00
2over12	9966017ca0	Add kSleighFullSpecInstallDir to gDefaultSearchPaths (#126 ) Allows FindSpecFile to succeed if the specfiles are still in the install prefix defined in CMake.	2022-08-29 11:34:50 -04:00
auto-updater[bot]	1c2f67ce48	Update Ghidra HEAD to commit 2536099c0 (#125 ) Bump Ghidra HEAD commit 2536099c0 Co-authored-by: pgoodman <pgoodman@users.noreply.github.com>	2022-08-29 11:52:48 +10:00
Eric Kilmer	74838a39ba	CMake refactor (#105 ) * Major CMake refactor * CI fixes * Fix CMake errors * Install graphviz on Windows * More consistent CMake build types * Fix compiler defines for Windows * Fix more bugs * Add standalone tool building support * Fix typo * Update README * Install sleighLift before trying to smoketest it * Test coverage preset The compiler option '-fkeep-inline-functions' originally included with the coverage build type causes errors with the message "undefined reference to 'vtable for OpAction'" for all OpAction subclasses. This StackOverflow answer might help in resolving this? https://stackoverflow.com/a/57504289 Build documentation by default with CI presets * Use COMPONENT for install commands This allows for someone to specify which components they want to install if they only want or need a subset * Support cross compiling with host system sleigh compiler * Various fixes found during review * Move "_WINDOWS" define to CMakeLists.txt file * Rename ToB 'tools' directory to 'extra-tools' * Separate projects for sleigh tools Library is still top-level CMakeLists.txt More options * CMake find_package(Git) * Fix bad merge for patch paths * Fix missing libconfig.h header install * Fix issues with installation of headers * More refactoring * Refactor sleighexample into its own project/directory * Refactor specfiles building into separate project/directory * Check for termios.h header and set define if found * Update READMEs * Better consistency with install rules * Build sleighLift as a standalone project with added source * More changes to CMake subprojects * Also add "Specs" component to sleigh installation config * Try to be better at bootstrapping subprojects (hopefully this doesn't bite us, but if it does, I'm happy to remove it and say "not supported") * Address some code review * Add project sleigh_tool for tool subdirectory Could make it easier to build just the tools * Add help text to name the tool executable name * Add license notice to CMake files * Fix/Remove too specific CPack packaging configuration * Consistent capitalization of Sleigh Co-authored-by: Alex Cameron <asc@tetsuo.sh>	2022-08-22 15:41:53 +10:00
auto-updater[bot]	72d364a90f	Update Ghidra HEAD to commit 03bd4b45d (#123 ) * Bump Ghidra HEAD commit 03bd4b45d * Remove merged Ghidra patch Co-authored-by: pgoodman <pgoodman@users.noreply.github.com> Co-authored-by: Alex Cameron <asc@tetsuo.sh>	2022-08-22 14:00:57 +10:00
auto-updater[bot]	755f9252f1	Update Ghidra HEAD to commit aad60ecdd (#122 ) Bump Ghidra HEAD commit aad60ecdd Co-authored-by: pgoodman <pgoodman@users.noreply.github.com>	2022-08-15 11:31:09 +10:00
auto-updater[bot]	0474bbdc17	Update Ghidra HEAD to commit cef30890e (#120 ) Bump Ghidra HEAD commit cef30890e Co-authored-by: pgoodman <pgoodman@users.noreply.github.com>	2022-08-08 09:17:23 -04:00
Alex Cameron	ff84f3c8de	Add address offset parsing patch (#119 ) * Fixes tests on Windows * Update README for full Windows support	2022-08-03 13:15:56 +00:00
Alex Cameron	2aa04f941e	Add UBSAN decompiler fixes to patches (#118 )	2022-08-02 09:26:34 -04:00
auto-updater[bot]	a057b409fa	Update Ghidra HEAD to commit 3aac7dae7 (#117 ) Bump Ghidra HEAD commit 3aac7dae7 Co-authored-by: pgoodman <pgoodman@users.noreply.github.com>	2022-08-01 08:35:50 -04:00
Eric Kilmer	b3e26db5c3	More complete patch for all files with missing include guard (#116 )	2022-07-29 15:35:44 -04:00
Eric Kilmer	01cf5e5240	Fix wrong CMake cache variable in CI (#115 ) Make real fixes to sleigh-lift	2022-07-29 14:33:12 -04:00
Eric Kilmer	8a0ad2de4a	Update to Ghidra stable 10.1.5 (#114 ) https://github.com/NationalSecurityAgency/ghidra/releases/tag/Ghidra_10.1.5_build	2022-07-29 10:22:45 -04:00
Eric Kilmer	e6cfbacd67	Update CMake minimum to 3.18 Errors with Ghidra repo FetchContent when using CMake less than this version. FetchContent runs the patch step before update and so we lose the patches, which can cause build errors. CMake 3.15 can still be used if you specify your own Ghidra repo on the command line.	2022-07-28 15:40:05 -04:00
Eric Kilmer	66a6b7c472	Update libsleigh single-header include list	2022-07-28 09:28:13 -04:00
ekilmer	70bbd6ce0b	Bump Ghidra HEAD commit 75ae8b3 Add new source file marshal.cc and header marshal.hh Big changes for supporting stable and HEAD Conditional compilation based on whether sleigh is HEAD version Expose CMake variable to determine if version is HEAD	2022-07-27 14:49:35 -04:00
Artem Dinaburg	5ee2f2c162	Fix SLEIGH rebuilds (#111 ) * Fix additional_patches cache variable type to default to empty string Co-authored-by: Eric Kilmer <eric.d.kilmer@gmail.com>	2022-07-21 13:20:20 -04:00
2over12	08b2fdbe4b	Allow external patches and expose more headers (#104 ) * fix gitwatcher for external inclusion Co-authored-by: Alex Cameron <asc@tetsuo.sh>	2022-07-20 16:05:40 +00:00
Eric Kilmer	60f5ab437c	Add missing headers (#107 ) * Update stable headers list * Add HEAD-only headers This should really be automated	2022-06-30 15:49:37 +10:00
auto-updater[bot]	b8609d4673	Update Ghidra HEAD to commit d2883bbb8 (#102 ) Bump Ghidra HEAD commit d2883bbb8 Co-authored-by: pgoodman <pgoodman@users.noreply.github.com>	2022-06-20 15:07:09 +10:00
auto-updater[bot]	52bb4a54d6	Update Ghidra HEAD to commit 849c6d195 (#101 ) Bump Ghidra HEAD commit 849c6d195 Co-authored-by: pgoodman <pgoodman@users.noreply.github.com>	2022-06-13 08:48:06 -04:00
dependabot[bot]	ed9eb2e521	build(deps): bump actions/setup-python from 3 to 4 (#100 ) Bumps [actions/setup-python](https://github.com/actions/setup-python) from 3 to 4. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-06-09 09:11:21 -04:00
auto-updater[bot]	c6cf5f3728	Update Ghidra HEAD to commit c6cb8a0d8 (#99 ) Bump Ghidra HEAD commit c6cb8a0d8 Co-authored-by: pgoodman <pgoodman@users.noreply.github.com>	2022-06-05 21:39:05 -04:00
Eric Kilmer	78c2acabdc	Update to Ghidra stable 10.1.4	2022-06-03 13:58:35 -04:00
auto-updater[bot]	4ebe036cff	Update Ghidra HEAD to commit 7a30cefeb (#98 ) Bump Ghidra HEAD commit 7a30cefeb Co-authored-by: pgoodman <pgoodman@users.noreply.github.com>	2022-05-30 23:15:58 +10:00
auto-updater[bot]	e1c8562ed7	Update Ghidra HEAD to commit f672ba46b (#96 ) Bump Ghidra HEAD commit f672ba46b Co-authored-by: pgoodman <pgoodman@users.noreply.github.com>	2022-05-23 12:43:52 +10:00
Eric Kilmer	c7419e7392	Windows support (#85 ) * CI: Enable Windows testing * Fix compilation error on Windows * Remove compiler warnings as errors * Move tests to the last step to upload Windows binaries * Add test for find_package testing in Windows Makes testing it easier for multi-config generators	2022-05-17 14:49:57 -04:00
auto-updater[bot]	7836647885	Bump Ghidra HEAD commit fafbaacd5 (#94 ) Co-authored-by: pgoodman <pgoodman@users.noreply.github.com>	2022-05-16 10:40:46 +10:00
auto-updater[bot]	7f25d7fdb8	Bump Ghidra HEAD commit f249abfac (#91 ) Co-authored-by: pgoodman <pgoodman@users.noreply.github.com>	2022-05-09 09:55:34 -04:00
auto-updater[bot]	15ec40ea1b	Bump Ghidra HEAD commit f9e7e2cfc (#90 ) Co-authored-by: pgoodman <pgoodman@users.noreply.github.com>	2022-05-02 10:51:32 +10:00
Eric Kilmer	e371046481	CI: Use default compiler on runner instead of clang	2022-04-22 10:48:19 -04:00
Eric Kilmer	e69a0323b7	Fix CMake message for selected Ghidra git reference	2022-04-22 10:43:17 -04:00
Eric Kilmer	cf4a096a7f	support: Simplify CMake source file listing for library	2022-04-22 10:43:17 -04:00
Eric Kilmer	a149784982	CI: Use default build generator and compiler We should test with default configurations because this is likely what people will be using when they test the project. GNU Makefiles generator is also useful to test because it is usually the simplest (read: least featured) generator and exposes a bug with the way we have set up our CMake target dependencies when generating Git version information.	2022-04-22 10:43:17 -04:00
Eric Kilmer	593ef2d5f3	CI: Don't fail-fast with matrix builds All of our builds are testing separate things and it would be nice to know if only one combination is troublesome or not. This is hard to determine if all other builds are canceled when one fails.	2022-04-22 10:43:17 -04:00
auto-updater[bot]	3703123e79	Update Ghidra HEAD to commit 9c04807c8 (#88 ) * Bump Ghidra HEAD commit 9c04807c8 * Add new source file Co-authored-by: ekilmer <ekilmer@users.noreply.github.com> Co-authored-by: Eric Kilmer <eric.d.kilmer@gmail.com>	2022-04-22 09:53:02 -04:00
Eric Kilmer	e8383e673b	Revert "Add new source file" This reverts commit `eb22b705d9`.	2022-04-22 09:02:14 -04:00
Eric Kilmer	eb22b705d9	Add new source file	2022-04-22 09:01:35 -04:00
Eric Kilmer	264204577d	Update to Ghidra stable 10.1.3 (#87 ) https://github.com/NationalSecurityAgency/ghidra/releases/tag/Ghidra_10.1.3_build * Synchronize spec files list with HEAD	2022-04-22 08:54:05 -04:00
auto-updater[bot]	521a606fa9	Bump Ghidra HEAD commit 0ab836add (#86 ) Co-authored-by: pgoodman <pgoodman@users.noreply.github.com>	2022-04-18 11:10:50 +10:00
auto-updater[bot]	13392ebf97	Bump Ghidra HEAD commit 4adddf061 (#84 ) Co-authored-by: pgoodman <pgoodman@users.noreply.github.com>	2022-04-11 11:32:20 +10:00
Alex Cameron	4662552d17	cmake: Build SLEIGH with C++11 (#83 ) * cmake: Build SLEIGH with C++11 * cmake: Expose compile flag as PUBLIC so that sleigh-lift inherits it * test: Link support in find_package test	2022-04-05 00:02:43 +10:00
auto-updater[bot]	e4558db017	Bump Ghidra HEAD commit 7080c10df (#82 ) Co-authored-by: pgoodman <pgoodman@users.noreply.github.com>	2022-04-04 14:17:17 +10:00
auto-updater[bot]	b15f26bac8	Bump Ghidra HEAD commit 883f5a687 (#80 ) Co-authored-by: pgoodman <pgoodman@users.noreply.github.com>	2022-03-27 20:25:31 -04:00
auto-updater[bot]	274058b4d9	Bump Ghidra HEAD commit b6181be1e (#79 ) Co-authored-by: ekilmer <ekilmer@users.noreply.github.com>	2022-03-23 09:29:52 -04:00
dependabot[bot]	b8e35dc652	build(deps): bump peter-evans/create-pull-request from 3 to 4 (#78 ) Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 3 to 4. - [Release notes](https://github.com/peter-evans/create-pull-request/releases) - [Commits](https://github.com/peter-evans/create-pull-request/compare/v3...v4) --- updated-dependencies: - dependency-name: peter-evans/create-pull-request dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-03-24 00:06:44 +11:00
dependabot[bot]	72c58bc7e3	build(deps): bump actions/cache from 2 to 3 (#76 ) Bumps [actions/cache](https://github.com/actions/cache) from 2 to 3. - [Release notes](https://github.com/actions/cache/releases) - [Commits](https://github.com/actions/cache/compare/v2...v3) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-03-22 09:49:30 -04:00
auto-updater[bot]	96b58968a7	Bump Ghidra HEAD commit 2d7c8d505 (#75 ) Co-authored-by: pgoodman <pgoodman@users.noreply.github.com>	2022-03-21 12:15:34 +11:00
auto-updater[bot]	f152f04095	Bump Ghidra HEAD commit 4200ae567 (#74 ) Co-authored-by: pgoodman <pgoodman@users.noreply.github.com>	2022-03-14 11:36:04 +11:00
Eric Kilmer	759fe7ff76	Bump package version v10.1.2-2 (#73 )	2022-03-11 11:34:16 -05:00
Eric Kilmer	3ba6dd5a3e	Support minimum macOS 10.15 in CI artifacts (#72 )	2022-03-11 10:41:55 -05:00
Eric Kilmer	dbc3dbd15f	Let user specify path to sleigh compiler in CMake module (#69 ) This allows user to specify an arbitrary sleigh compiler. Almost always it's going to be the sleigh::sleigh_opt target, but in the case of cross-compiling, that won't work because the host won't be able to run it.	2022-03-11 09:27:41 -05:00
auto-updater[bot]	893c97711f	Bump Ghidra HEAD commit ee268dea0 (#71 ) Co-authored-by: pgoodman <pgoodman@users.noreply.github.com>	2022-03-07 12:43:48 +11:00
dependabot[bot]	a66b0abf26	build(deps): bump actions/upload-artifact from 2.3.1 to 3 (#70 ) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 2.3.1 to 3. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v2.3.1...v3) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-03-04 09:20:39 -05:00
Eric Kilmer	f8f4b7e550	Update apt in CI before installing dependencies	2022-03-04 08:54:36 -05:00
dependabot[bot]	a3dd5d5ca1	build(deps): bump actions/checkout from 2.4.0 to 3 (#68 ) Bumps [actions/checkout](https://github.com/actions/checkout) from 2.4.0 to 3. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v2.4.0...v3) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-03-02 16:53:42 +11:00
dependabot[bot]	d4e2eb5aa2	build(deps): bump actions/setup-python from 2 to 3 (#67 ) Bumps [actions/setup-python](https://github.com/actions/setup-python) from 2 to 3. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/v2...v3) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-03-01 17:42:12 +11:00
Eric Kilmer	cb86cb0c22	Add data tests (#62 ) * Add sleigh datatests tests as CTest target * Fix Ghidra test runner not reporting failed tests in exit code	2022-02-28 15:47:36 -05:00
Eric Kilmer	f395ce311a	Shallow clone for stable builds (#65 ) Saves a little bit of time	2022-02-28 15:29:30 -05:00
Eric Kilmer	8dfe626001	Remove cmake_path and lower minimum required CMake version (#64 ) New minimum is CMake 3.15	2022-02-28 14:56:46 -05:00
auto-updater[bot]	901efbb17e	Bump Ghidra HEAD commit 3e245c6f8 (#66 )	2022-02-20 21:17:52 -05:00
auto-updater[bot]	c44e6ad2ab	Bump Ghidra HEAD commit 1a1d06b74 (#63 ) Co-authored-by: pgoodman <pgoodman@users.noreply.github.com>	2022-02-14 11:29:57 +11:00
Eric Kilmer	6ed111cc3b	Only upload stable assets to release page	2022-02-08 10:15:43 -05:00