Ghidra 11.3.2 (#332)

Bumps [softprops/action-gh-release](https://github.com/softprops/action-gh-release) from 2.2.1 to 2.2.2.
- [Release notes](https://github.com/softprops/action-gh-release/releases)
- [Changelog](https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md)
- [Commits](https://github.com/softprops/action-gh-release/compare/v2.2.1...v2.2.2)

---
updated-dependencies:
- dependency-name: softprops/action-gh-release
  dependency-version: 2.2.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.github/workflows/main.yml

@@ -20,7 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-13, windows-latest]
+        os: [ubuntu-latest, macos-latest, windows-latest]
         build_type: [RelWithDebInfo, Debug]
         release: [stable, HEAD]
 
@@ -43,13 +43,8 @@ jobs:
       if: runner.os == 'macOS'
       run: |
         echo "MACOSX_DEPLOYMENT_TARGET=10.15" >> ${GITHUB_ENV}
-        # Install Python separately to workround recurring homebrew CI issue.
-        # See https://github.com/actions/runner-images/issues/9471 for more details.
-        brew install python@3 || true
-        brew link --overwrite python@3
-        brew install \
+        brew install --formula \
           ccache \
-          cmake \
           doxygen \
           graphviz
 
@@ -61,6 +56,7 @@ jobs:
         max_attempts: 3
         command: |
           choco install ccache doxygen.install graphviz
+          Add-Content -Path $env:GITHUB_ENV -Value "CCACHE_EXE=$(Resolve-Path C:\ProgramData\chocolatey\lib\ccache\tools\*\ccache.exe)" 
           vcpkg install zlib:x64-windows-static
 
     - name: Generate cache key
@@ -105,17 +101,19 @@ jobs:
       run: cmake "--preset=ci-$("${{ matrix.os }}".split("-")[0])"
         -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
         -Dsleigh_RELEASE_TYPE=${{ matrix.release }}
+        "-DCMAKE_PROJECT_INCLUDE:FILEPATH=${{ github.workspace }}/cmake/ccache-msvc.cmake"
+        -DCMAKE_MSVC_DEBUG_INFORMATION_FORMAT=Embedded
 
     - name: Build the project
       run: cmake
         --build build
         --config ${{ matrix.build_type }}
-        -j 2
+        -j 4
         -v
 
     - name: Test the project
       working-directory: build
-      run: ctest -VV -C ${{ matrix.build_type }}
+      run: ctest -VV -C ${{ matrix.build_type }} ${{ matrix.release == 'HEAD' && '|| true' || '' }}
 
     - name: Build the docs
       run: cmake
@@ -127,7 +125,7 @@ jobs:
     - name: Run the example
       run: cmake
         --build build
-        -j 2
+        -j 4
         --config ${{ matrix.build_type }}
         --target sleigh_example_runner
 
@@ -147,7 +145,7 @@ jobs:
       working-directory: tests/find_package
       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 --build build -j 4 --config ${{ matrix.build_type }}
         cd build
         ctest -V -C ${{ matrix.build_type }}
     - name: Test install directory Windows
@@ -155,7 +153,7 @@ jobs:
       working-directory: tests/find_package
       run: |
         cmake -B build -S . "-Dsleigh_DIR=${{ github.workspace }}/install/lib/cmake/sleigh" -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} "-DCMAKE_TOOLCHAIN_FILE=$env:VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake" -DVCPKG_TARGET_TRIPLET=x64-windows-static
-        cmake --build build -j 2 --config ${{ matrix.build_type }}
+        cmake --build build -j 4 --config ${{ matrix.build_type }}
         cd build
         ctest -V -C ${{ matrix.build_type }}
 
@@ -164,7 +162,7 @@ jobs:
       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 --build build -j 4 --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
@@ -174,7 +172,7 @@ jobs:
       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 }} "-DCMAKE_TOOLCHAIN_FILE=$env:VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake" -DVCPKG_TARGET_TRIPLET=x64-windows-static
-        cmake --build build -j 2 --config ${{ matrix.build_type }}
+        cmake --build build -j 4 --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
@@ -183,7 +181,7 @@ jobs:
     - name: Create the packages
       run: cmake
           --build build
-          -j 2
+          -j 4
           --config ${{ matrix.build_type }}
           --target package
 
@@ -193,7 +191,7 @@ jobs:
         sudo dpkg -i build/*.deb
 
         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
+        cmake --build find_package_build -j 4 --config ${{ matrix.build_type }} --verbose
 
     - name: Locate the packages (RelWithDebInfo only)
       if: matrix.build_type == 'RelWithDebInfo'
@@ -222,7 +220,7 @@ jobs:
         path: ${{ env.DEB_PACKAGE_PATH }}
 
     - name: Release DEB package artifact (RelWithDebInfo only)
-      uses: softprops/action-gh-release@v2.0.8
+      uses: softprops/action-gh-release@v2.2.2
       if: matrix.build_type == 'RelWithDebInfo' && runner.os == 'Linux' && startsWith(github.ref, 'refs/tags/') && matrix.release == 'stable'
       with:
         files: ${{ env.DEB_PACKAGE_PATH }}
@@ -235,7 +233,7 @@ jobs:
         name: ${{ env.RPM_PACKAGE_NAME }}
         path: ${{ env.RPM_PACKAGE_PATH }}
     - name: Release RPM package artifact (RelWithDebInfo only)
-      uses: softprops/action-gh-release@v2.0.8
+      uses: softprops/action-gh-release@v2.2.2
       if: matrix.build_type == 'RelWithDebInfo' && runner.os == 'Linux' && startsWith(github.ref, 'refs/tags/') && matrix.release == 'stable'
       with:
         files: ${{ env.RPM_PACKAGE_PATH }}
@@ -249,7 +247,7 @@ jobs:
         path: ${{ env.TGZ_PACKAGE_PATH }}
 
     - name: Release TGZ package artifact (RelWithDebInfo only)
-      uses: softprops/action-gh-release@v2.0.8
+      uses: softprops/action-gh-release@v2.2.2
       if: matrix.build_type == 'RelWithDebInfo' && startsWith(github.ref, 'refs/tags/') && matrix.release == 'stable'
       with:
         files: ${{ env.TGZ_PACKAGE_PATH }}

.github/workflows/update_head.yml

@@ -17,7 +17,7 @@ jobs:
     - uses: actions/setup-python@v5
       with:
         # Use oldest supported version for maximum script compatibility
-        python-version: '3.7'
+        python-version: '3.10'
 
     - name: Run Update Script
       id: head_update
@@ -36,7 +36,7 @@ jobs:
 
     - name: Create PR
       if: steps.head_update.outputs.did_update
-      uses: peter-evans/create-pull-request@v6
+      uses: peter-evans/create-pull-request@v7
       with:
         title: Update Ghidra HEAD to commit ${{ steps.head_update.outputs.short_sha }}
         commit-message: |
@@ -45,10 +45,18 @@ jobs:
           Changed files:
 
           ${{ steps.head_update.outputs.changed_files }}
+
+          Commit details:
+
+          ${{ steps.head_update.outputs.commit_details }}
         body: |
           Changed files:
 
           ${{ steps.head_update.outputs.changed_files }}
+
+          Commit details:
+
+          ${{ steps.head_update.outputs.commit_details }}
         branch: cron/update-ghidra-${{ steps.head_update.outputs.short_sha }}
         delete-branch: true
         token: ${{ steps.generate-token.outputs.token }}

CMakeLists.txt

@@ -8,6 +8,9 @@
 
 cmake_minimum_required(VERSION 3.18)
 
+# For MSVC ccache to use /Z7 with CMAKE_MSVC_DEBUG_INFORMATION_FORMAT=Embedded
+cmake_policy(SET CMP0141 NEW)
+
 include(cmake/prelude.cmake)
 
 # Sets "library_root" variable for decompiler cpp root directory

cmake/ccache-msvc.cmake

@@ -0,0 +1,34 @@
+# This module configures ccache to work with MSVC
+# Based on: https://github.com/ccache/ccache/wiki/MS-Visual-Studio
+
+# Only do this for Windows MSVC builds
+if(NOT WIN32 OR NOT CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+  return()
+endif()
+
+# Assume the parent environment has this set
+# Chocolatey creates a shim which doesn't work when renamed
+set(CCACHE_EXE "$ENV{CCACHE_EXE}")
+if(NOT CCACHE_EXE)
+  message(STATUS "ccache not found - MSVC ccache support disabled")
+  return()
+endif()
+message(STATUS "Found ccache - ${CCACHE_EXE}")
+
+message(STATUS "Configuring ccache for MSVC")
+
+file(COPY_FILE
+    "${CCACHE_EXE}" "${CMAKE_BINARY_DIR}/cl.exe"
+    ONLY_IF_DIFFERENT)
+
+# By default Visual Studio generators will use /Zi which is not compatible
+# with ccache, so tell Visual Studio to use /Z7 instead.
+message(STATUS "Setting MSVC debug information format to 'Embedded'")
+set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT "$<$<CONFIG:Debug,RelWithDebInfo>:Embedded>")
+
+set(CMAKE_VS_GLOBALS
+    "CLToolExe=cl.exe"
+    "CLToolPath=${CMAKE_BINARY_DIR}"
+    "UseMultiToolTask=true"
+    "DebugInformationFormat=OldStyle"
+    )

scripts/update_ghidra_head.py

@@ -1,11 +1,13 @@
 """Script to update CMake files for latest Ghidra Sleigh changes"""
+
 import re
 import shutil
 import subprocess
 import sys
 import tempfile
+import os
 from pathlib import Path
-from typing import AnyStr, Union, List
+from typing import AnyStr, Union, List, Dict
 
 PROJECT_ROOT = Path(__file__).parent.parent.resolve()
 HEAD_SPEC_FILE = PROJECT_ROOT / "src" / "spec_files_HEAD.cmake"
@@ -25,8 +27,8 @@ GIT_EXE = shutil.which("git")
 assert GIT_EXE is not None
 
 
-def msg(s: str) -> None:
-    print(f"[!] {s}")
+def msg(s: str, end: str = "\n") -> None:
+    print(f"[!] {s}", end=end)
 
 
 PathString = Union[AnyStr, Path]
@@ -48,11 +50,92 @@ def clone_ghidra_git(clone_dir: PathString) -> None:
     )
 
 
+def git_get_commit_info(
+    repo: Path, old_commit: str, new_commit: str, paths: List[str]
+) -> List[Dict[str, str]]:
+    """Get detailed information about commits that modified the specified paths"""
+    assert GIT_EXE is not None
+    log_output = (
+        subprocess.run(
+            [
+                GIT_EXE,
+                "log",
+                "--pretty=format:%H%n%ad%n%s%n%b%n====",
+                "--date=iso",
+                f"{old_commit}..{new_commit}",
+                "--",
+                *paths,
+            ],
+            cwd=repo,
+            capture_output=True,
+            check=True,
+        )
+        .stdout.decode()
+        .strip()
+    )
+
+    commits = []
+    if log_output:
+        commit_sections = log_output.split("\n====")
+        # Process each commit
+        for section in commit_sections:
+            if not section.strip():
+                continue
+            lines = section.strip().split("\n")
+            commit_hash = lines[0]
+            commit_date = lines[1]
+            commit_msg = lines[2]
+            body = "\n".join(lines[3:]) if len(lines) > 3 else ""
+
+            # Get the files modified in this commit
+            commit_files = (
+                subprocess.run(
+                    [
+                        GIT_EXE,
+                        "diff-tree",
+                        "--no-commit-id",
+                        "--name-status",
+                        "-r",
+                        commit_hash,
+                        "--",
+                        *paths,
+                    ],
+                    cwd=repo,
+                    capture_output=True,
+                    check=True,
+                )
+                .stdout.decode()
+                .strip()
+                .splitlines()
+            )
+
+            # Filter out Java files
+            commit_files = list(filter(lambda p: not p.endswith(".java"), commit_files))
+
+            if commit_files:
+                commits.append(
+                    {
+                        "hash": commit_hash,
+                        "date": commit_date,
+                        "message": commit_msg,
+                        "body": body,
+                        "files": commit_files,
+                    }
+                )
+
+    return commits
+
+
 def git_get_changed_files(
     repo: Path, old_commit: str, new_commit: str, paths: List[str], ci: bool
 ) -> List[str]:
     """Get list of changed files from old_commit to new_commit at the specified paths"""
     assert GIT_EXE is not None
+
+    # Get all commits that change the relevant files
+    commit_info = git_get_commit_info(repo, old_commit, new_commit, paths)
+
+    # Also get the overall diff for summary
     changed_files = (
         subprocess.run(
             [
@@ -71,10 +154,27 @@ def git_get_changed_files(
         .strip()
         .splitlines()
     )
+    changed_files = list(filter(lambda p: not p.endswith(".java"), changed_files))
     num_changed = len(changed_files)
+
     if num_changed > 0:
         msg(f"Found {num_changed} changed sleigh files:")
         print("\n".join(changed_files))
+
+        # Display detailed commit information
+        if commit_info:
+            msg(f"Commits affecting sleigh files ({len(commit_info)}):", "")
+            for i, commit in enumerate(commit_info, 1):
+                print(f"\n[Commit {i}/{len(commit_info)}]")
+                print(f"Hash: {commit['hash']}")
+                print(f"Date: {commit['date']}")
+                print(f"Message: {commit['message']}")
+                if commit["body"]:
+                    print(f"Details:\n{commit['body']}")
+                print("\nFiles changed:")
+                for file in commit["files"]:
+                    print(f"  {file}")
+
         if ci:
             with open(os.environ["GITHUB_OUTPUT"], "a") as gh_out:
                 gh_out.write("changed_files<<EOF\n")
@@ -82,6 +182,23 @@ def git_get_changed_files(
                 gh_out.write("\n".join(changed_files))
                 gh_out.write("\n```\n")
                 gh_out.write("EOF\n")
+
+                if commit_info:
+                    gh_out.write("commit_details<<EOF\n")
+                    gh_out.write("```")
+                    for i, commit in enumerate(commit_info, 1):
+                        gh_out.write(f"\n[Commit {i}/{len(commit_info)}]\n")
+                        gh_out.write(f"Hash: {commit['hash']}\n")
+                        gh_out.write(f"Date: {commit['date']}\n")
+                        gh_out.write(f"Message: {commit['message']}\n")
+                        if commit["body"]:
+                            gh_out.write(f"Details:\n{commit['body']}\n")
+                        gh_out.write("\nFiles changed:\n")
+                        for file in commit["files"]:
+                            gh_out.write(f"  {file}\n")
+                    gh_out.write("```\n")
+                    gh_out.write("EOF\n")
+
     return changed_files
 
 
@@ -96,7 +213,11 @@ def is_sleigh_updated(
 
 
 def update_head_commit(
-    setup_file: Path, ghidra_repo_dir: PathString, latest_commit: str, ci: bool
+    setup_file: Path,
+    ghidra_repo_dir: PathString,
+    latest_commit: str,
+    ci: bool,
+    dry_run: bool = False,
 ) -> bool:
     """Edit the Ghidra script to point to the latest commit"""
     head_commit_line = r"set\(ghidra_head_git_tag \"([0-9A-Fa-f]+)\"\)"
@@ -114,24 +235,35 @@ def update_head_commit(
                         if is_sleigh_updated(
                             ghidra_repo_dir, current_commit, latest_commit, ci
                         ):
-                            line = re.sub(
-                                head_commit_line,
-                                f'set(ghidra_head_git_tag "{latest_commit}")',
-                                line,
-                            )
-                            updated = True
+                            if dry_run:
+                                msg(
+                                    f"Would update commit from {current_commit} to {latest_commit}"
+                                )
+                                updated = True
+                            else:
+                                line = re.sub(
+                                    head_commit_line,
+                                    f'set(ghidra_head_git_tag "{latest_commit}")',
+                                    line,
+                                )
+                                updated = True
                         else:
                             msg("No sleigh files updated")
                 w.write(line)
 
     # Make the swap with the new content
-    shutil.copymode(setup_file, abspath)
-    os.remove(setup_file)
-    shutil.move(abspath, setup_file)
+    if not dry_run:
+        shutil.copymode(setup_file, abspath)
+        os.remove(setup_file)
+        shutil.move(abspath, setup_file)
+    else:
+        os.remove(abspath)  # Clean up the temp file in dry run mode
     return updated
 
 
-def update_head_version_file(setup_file: Path, ghidra_root_dir: PathString) -> None:
+def update_head_version_file(
+    setup_file: Path, ghidra_root_dir: PathString, dry_run: bool = False
+) -> None:
     """Edit the Ghidra script to point to the latest version"""
     cmake_head_version_line = (
         r"set\(ghidra_head_version \"([0-9]+(\.[0-9]+)?(\.[0-9]+)?)\"\)"
@@ -152,10 +284,14 @@ def update_head_version_file(setup_file: Path, ghidra_root_dir: PathString) -> N
         cmake_version = match.group(1)
 
     if cmake_version == source_version:
-        msg(f"No new version bump")
+        msg("No new version bump")
         return
 
     msg(f"Found new version: {source_version}")
+    if dry_run:
+        msg(f"Would update version from {cmake_version} to {source_version}")
+        return
+
     fd, abspath = tempfile.mkstemp()
     with open(fd, "w") as w:
         with setup_file.open("r") as r:
@@ -175,7 +311,9 @@ def update_head_version_file(setup_file: Path, ghidra_root_dir: PathString) -> N
     shutil.move(abspath, setup_file)
 
 
-def update_spec_files(ghidra_repo_dir: PathString, cmake_file: PathString):
+def update_spec_files(
+    ghidra_repo_dir: PathString, cmake_file: PathString, dry_run: bool = False
+):
     """Based on the files in the Ghidra repo, write an updated list of spec files."""
     spec_files = []
     for dirpath, _, fnames in os.walk(ghidra_repo_dir / "Ghidra" / "Processors"):
@@ -210,7 +348,11 @@ def get_latest_commit(ghidra_repo_dir: PathString) -> str:
 
 
 def update_head(
-    setup_file: Path, spec_file: Path, ghidra_repo_dir: PathString, ci: bool
+    setup_file: Path,
+    spec_file: Path,
+    ghidra_repo_dir: PathString,
+    ci: bool,
+    dry_run: bool = False,
 ) -> bool:
     """Update to latest head and make changes to the CMake files"""
     tmpdirname = None
@@ -221,15 +363,15 @@ def update_head(
 
     latest_commit = get_latest_commit(ghidra_repo_dir)
     did_update_commit = update_head_commit(
-        setup_file, ghidra_repo_dir, latest_commit, ci
+        setup_file, ghidra_repo_dir, latest_commit, ci, dry_run
     )
     if did_update_commit:
         if ci:
             with open(os.environ["GITHUB_OUTPUT"], "a") as gh_out:
                 gh_out.write(f"short_sha={latest_commit[:9]}\n")
                 gh_out.write("did_update=true\n")
-        update_spec_files(ghidra_repo_dir, spec_file)
-        update_head_version_file(setup_file, ghidra_repo_dir)
+        update_spec_files(ghidra_repo_dir, spec_file, dry_run)
+        update_head_version_file(setup_file, ghidra_repo_dir, dry_run)
     else:
         msg(f"Already at the latest commit: {latest_commit}")
 
@@ -243,7 +385,8 @@ def update_head(
 
 
 if __name__ == "__main__":
-    import argparse, os
+    import argparse
+    import os
 
     def dir_path(string):
         if string is None:
@@ -267,14 +410,24 @@ if __name__ == "__main__":
         action="store_true",
         help="Output GitHub Actions commands for recording information in CI",
     )
+    parser.add_argument(
+        "--dry-run",
+        action="store_true",
+        help="Show what would be changed without actually modifying any files",
+    )
     args = parser.parse_args()
 
     if args.ci:
-        assert (
-            "GITHUB_OUTPUT" in os.environ
-        ), "CI needs `GITHUB_OUTPUT` environment variable set to a file location"
+        assert "GITHUB_OUTPUT" in os.environ, (
+            "CI needs `GITHUB_OUTPUT` environment variable set to a file location"
+        )
 
-    if not update_head(SETUP_GHIDRA_FILE, HEAD_SPEC_FILE, args.ghidra_repo, args.ci):
+    if not update_head(
+        SETUP_GHIDRA_FILE, HEAD_SPEC_FILE, args.ghidra_repo, args.ci, args.dry_run
+    ):
         msg("No update required")
     else:
-        msg("Update required!")
+        if args.dry_run:
+            msg("Update would be required!")
+        else:
+            msg("Update required!")

src/patches/HEAD/0001-Fix-UBSAN-errors-in-decompiler.patch

@@ -1,7 +1,7 @@
-From fc4ac7901ae08cd018d94ce78027cd6636251d39 Mon Sep 17 00:00:00 2001
+From 7c6e51dd1234387b98e1ad61d3f88a0565364b28 Mon Sep 17 00:00:00 2001
 From: Eric Kilmer <eric.d.kilmer@gmail.com>
 Date: Mon, 12 Aug 2024 12:02:35 -0400
-Subject: [PATCH 1/5] Fix UBSAN errors in decompiler
+Subject: [PATCH 1/6] Fix UBSAN errors in decompiler
 
 Co-authored-by: Alex Cameron <asc@tetsuo.sh>
 ---
@@ -9,16 +9,16 @@ Co-authored-by: Alex Cameron <asc@tetsuo.sh>
  .../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/ruleaction.cc | 12 +++++++++---
  .../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/type.cc       |  2 +-
  .../src/decompile/unittests/testfloatemu.cc    |  2 +-
- 10 files changed, 49 insertions(+), 19 deletions(-)
+ 10 files changed, 44 insertions(+), 18 deletions(-)
 
 diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/fspec.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/fspec.cc
-index 6ebec206c9..e5a1ad598c 100644
+index d78b78731c..caf4b24d15 100644
 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/fspec.cc
 +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/fspec.cc
 @@ -2868,8 +2868,12 @@ void ProtoModelMerged::decode(Decoder &decoder)
@@ -37,7 +37,7 @@ index 6ebec206c9..e5a1ad598c 100644
  
  void ParameterBasic::setTypeLock(bool val)
 diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/op.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/op.cc
-index d76a799960..37ba971a34 100644
+index d51460be84..45bf394862 100644
 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/op.cc
 +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/op.cc
 @@ -666,7 +666,11 @@ uintb PcodeOp::getNZMaskLocal(bool cliploop) const
@@ -116,10 +116,10 @@ index ca9d71ab99..85d4dd281d 100644
    return res;
  }
 diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/ruleaction.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/ruleaction.cc
-index f667c6ca95..6ea3916520 100644
+index 009570af71..72b2a10503 100644
 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/ruleaction.cc
 +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/ruleaction.cc
-@@ -977,7 +977,12 @@ int4 RulePullsubIndirect::applyOp(PcodeOp *op,Funcdata &data)
+@@ -976,7 +976,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
  
@@ -133,7 +133,7 @@ index f667c6ca95..6ea3916520 100644
    consume = ~consume;
    if ((consume & indir->getIn(0)->getConsume())!=0) return 0;
  
-@@ -7026,8 +7031,9 @@ int4 RulePtrsubCharConstant::applyOp(PcodeOp *op,Funcdata &data)
+@@ -7031,8 +7036,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;
@@ -145,19 +145,6 @@ index f667c6ca95..6ea3916520 100644
    Varnode *vn1 = op->getIn(1);
    if (!vn1->isConstant()) return 0;
    Varnode *outvn = op->getOut();
-@@ -8831,7 +8837,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 cd9b9835b1..8a4616c3b9 100644
 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/semantics.cc
@@ -206,10 +193,10 @@ index 50d85e22ba..9f3b456229 100644
        msg << "   Label <" << sym->getName() << "> was placed but not used" << endl;
      else if (!sym->isPlaced())
 diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/type.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/type.cc
-index 7cda43127f..20a5bc1c83 100644
+index fd0ab26fb4..7f654c220b 100644
 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/type.cc
 +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/type.cc
-@@ -3661,8 +3661,8 @@ void TypeFactory::recalcPointerSubmeta(Datatype *base,sub_metatype sub)
+@@ -3728,8 +3728,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()) {
@@ -233,5 +220,5 @@ index 2571f55f1a..fe40e22b1b 100644
          uintb true_result = ((uintb)(int32_t)f) & 0xffffffff;
          uintb encoding = format.getEncoding(f);
 -- 
-2.47.0
+2.48.1
 

src/patches/HEAD/0002-Use-stroull-instead-of-stroul-to-parse-address-offse.patch

@@ -1,7 +1,7 @@
-From 1e334bf169139dd1dcbf8e92c992b702b027b3b1 Mon Sep 17 00:00:00 2001
+From 5e37c51ebc8a3ae0f32a3cb0049aaebafec48d7d Mon Sep 17 00:00:00 2001
 From: Alex Cameron <asc@tetsuo.sh>
 Date: Wed, 3 Aug 2022 20:01:18 +1000
-Subject: [PATCH 2/5] Use `stroull` instead of `stroul` to parse address
+Subject: [PATCH 2/6] Use `stroull` instead of `stroul` to parse address
  offsets
 
 ---
@@ -34,5 +34,5 @@ index dbaa2e775f..72927bf379 100644
      enddata = (const char *) tmpdata;
      if (enddata - s.c_str() == s.size()) { // If no size or offset override
 -- 
-2.47.0
+2.48.1
 

src/patches/HEAD/0003-Add-missing-index-check-to-prevent-errors-in-Windows.patch

@@ -1,26 +0,0 @@
-From 832fb17127459f0fe6bb141dd499d94dfd6f4e6f Mon Sep 17 00:00:00 2001
-From: Eric Kilmer <eric.d.kilmer@gmail.com>
-Date: Sat, 30 Mar 2024 18:46:16 -0400
-Subject: [PATCH 3/5] Add missing index check to prevent errors in Windows
-
-Not sure why this only appears when testing on Windows.
----
- Ghidra/Features/Decompiler/src/decompile/cpp/ifacedecomp.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/ifacedecomp.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/ifacedecomp.cc
-index 0237adb820..5048a9d480 100644
---- a/Ghidra/Features/Decompiler/src/decompile/cpp/ifacedecomp.cc
-+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/ifacedecomp.cc
-@@ -1844,7 +1844,7 @@ void IfcProtooverride::execute(istream &s)
-   s >> ws;
-   Address callpoint(parse_machaddr(s,discard,*dcp->conf->types));
-   int4 i;
--  for(i=0;dcp->fd->numCalls();++i)
-+  for(i=0;i<dcp->fd->numCalls();++i)
-     if (dcp->fd->getCallSpecs(i)->getOp()->getAddr() == callpoint) break;
-   if (i == dcp->fd->numCalls())
-     throw IfaceExecutionError("No call is made at this address");
--- 
-2.47.0
-

src/patches/HEAD/0003-Use-string-resize-instead-of-reserve.patch

@@ -1,7 +1,7 @@
-From ddd126b14277841a885e824047908fb360e26191 Mon Sep 17 00:00:00 2001
+From 0feb881ef1cbc9aa4639e16914b7d9ed863baadf Mon Sep 17 00:00:00 2001
 From: Eric Kilmer <eric.d.kilmer@gmail.com>
 Date: Tue, 29 Oct 2024 15:30:57 -0400
-Subject: [PATCH 4/5] Use string resize instead of reserve
+Subject: [PATCH 3/6] Use string resize instead of reserve
 
 assign will fix up the size to hold all of what's copied
 ---
@@ -32,5 +32,5 @@ index 5f5fa0c7b3..4cd77156f2 100644
    }
    data.isTruncated = (numChars >= maximumChars);
 -- 
-2.47.0
+2.48.1
 

src/patches/HEAD/0004-Ignore-floating-point-test-due-to-compilation-differ.patch

@@ -1,7 +1,7 @@
-From 163be34210f69068f89e20acf89a4fbd50a88b76 Mon Sep 17 00:00:00 2001
+From 2a8f30f31c24ecc7bd499648b97bb8b0c2705b78 Mon Sep 17 00:00:00 2001
 From: Eric Kilmer <eric.d.kilmer@gmail.com>
 Date: Tue, 29 Oct 2024 17:51:09 -0400
-Subject: [PATCH 5/5] Ignore floating point test due to compilation differences
+Subject: [PATCH 4/6] Ignore floating point test due to compilation differences
 
 This test fails on macOS and Windows. I'm unsure whether it's an OS or
 compiler issue.
@@ -24,5 +24,5 @@ index fe40e22b1b..91440e2510 100644
    ASSERT_EQUALS(ff.printDecimal(f2, false), "0.33333334");
    double f3 = doubleFromRawBits(0x3fd0000000000000);
 -- 
-2.47.0
+2.48.1
 

src/patches/HEAD/0005-Allow-positive-or-negative-NAN-in-decompiler-floatin.patch

@@ -0,0 +1,37 @@
+From 04cca72897d9088713a6e2dadb2774ad20ae7703 Mon Sep 17 00:00:00 2001
+From: Eric Kilmer <eric.d.kilmer@gmail.com>
+Date: Wed, 30 Oct 2024 14:26:57 -0400
+Subject: [PATCH 5/6] Allow positive or negative NAN in decompiler floating
+ point test
+
+At least on Apple Silicon, this test reports positive NAN.
+
+Use the regex optional operator '?' to allow for positive or negative
+NAN.
+---
+ .../Decompiler/src/decompile/datatests/floatprint.xml         | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Ghidra/Features/Decompiler/src/decompile/datatests/floatprint.xml b/Ghidra/Features/Decompiler/src/decompile/datatests/floatprint.xml
+index f8108d3d32..1060a3e193 100644
+--- a/Ghidra/Features/Decompiler/src/decompile/datatests/floatprint.xml
++++ b/Ghidra/Features/Decompiler/src/decompile/datatests/floatprint.xml
+@@ -58,13 +58,13 @@ bbbdd7d9df7cdb3d000000000000f03f
+ <stringmatch name="Float print #3" min="1" max="1">floatv3 = -0.001;</stringmatch>
+ <stringmatch name="Float print #4" min="1" max="1">floatv4 = 1e-06;</stringmatch>
+ <stringmatch name="Float print #5" min="1" max="1">floatv5 = INFINITY;</stringmatch>
+-<stringmatch name="Float print #6" min="1" max="1">floatv6 = -NAN;</stringmatch>
++<stringmatch name="Float print #6" min="1" max="1">floatv6 = -?NAN;</stringmatch>
+ <stringmatch name="Float print #7" min="1" max="1">floatv7 = 3.141592e-06;</stringmatch>
+ <stringmatch name="Float print #8" min="1" max="1">double1 = 0.6666666666666666;</stringmatch>
+ <stringmatch name="Float print #9" min="1" max="1">double2 = 2.0;</stringmatch>
+ <stringmatch name="Float print #10" min="1" max="1">double3 = -0.001;</stringmatch>
+ <stringmatch name="Float print #11" min="1" max="1">double4 = 1e-10;</stringmatch>
+ <stringmatch name="Float print #12" min="1" max="1">double5 = INFINITY;</stringmatch>
+-<stringmatch name="Float print #13" min="1" max="1">double6 = -NAN;</stringmatch>
++<stringmatch name="Float print #13" min="1" max="1">double6 = -?NAN;</stringmatch>
+ <stringmatch name="Float print #14" min="1" max="1">double7 = 3.1415926535897933e-06;</stringmatch>
+ </decompilertest>
+-- 
+2.48.1
+

src/patches/HEAD/0006-decompiler-Fix-strict-weak-ordering-TypePartialEnum.patch

@@ -0,0 +1,26 @@
+From a7dee0fbb1838e4e22a1c970718b84976ffb2932 Mon Sep 17 00:00:00 2001
+From: Eric Kilmer <eric.d.kilmer@gmail.com>
+Date: Sat, 8 Feb 2025 17:59:57 -0500
+Subject: [PATCH 6/6] decompiler: Fix strict weak ordering TypePartialEnum
+
+This fixes Windows Debug error encountered in testing where it was
+complaining about lack of strict weak ordering.
+---
+ Ghidra/Features/Decompiler/src/decompile/cpp/type.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/type.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/type.cc
+index 7f654c220b..3f10c78c2f 100644
+--- a/Ghidra/Features/Decompiler/src/decompile/cpp/type.cc
++++ b/Ghidra/Features/Decompiler/src/decompile/cpp/type.cc
+@@ -2300,6 +2300,7 @@ int4 TypePartialEnum::compareDependency(const Datatype &op) const
+ 
+ {
+   if (submeta != op.getSubMeta()) return (submeta < op.getSubMeta()) ? -1 : 1;
++  if (parent == &op) return 1;	// op is our TypeEnum
+   TypePartialEnum *tp = (TypePartialEnum *) &op;	// Both must be partial
+   if (parent != tp->parent) return (parent < tp->parent) ? -1 : 1;	// Compare absolute pointers
+   if (offset != tp->offset) return (offset < tp->offset) ? -1 : 1;
+-- 
+2.48.1
+

src/patches/stable/0001-Fix-UBSAN-errors-in-decompiler.patch

@@ -1,7 +1,7 @@
-From c5a494bcd940fb46ffe90164c5ec0b61d897a892 Mon Sep 17 00:00:00 2001
+From b25de9d74c90bd1216e10b5697a27c3815641621 Mon Sep 17 00:00:00 2001
 From: Eric Kilmer <eric.d.kilmer@gmail.com>
 Date: Mon, 12 Aug 2024 12:02:35 -0400
-Subject: [PATCH 1/5] Fix UBSAN errors in decompiler
+Subject: [PATCH 1/6] Fix UBSAN errors in decompiler
 
 Co-authored-by: Alex Cameron <asc@tetsuo.sh>
 ---
@@ -9,16 +9,16 @@ Co-authored-by: Alex Cameron <asc@tetsuo.sh>
  .../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/ruleaction.cc | 12 +++++++++---
  .../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/type.cc       |  2 +-
  .../src/decompile/unittests/testfloatemu.cc    |  2 +-
- 10 files changed, 49 insertions(+), 19 deletions(-)
+ 10 files changed, 44 insertions(+), 18 deletions(-)
 
 diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/fspec.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/fspec.cc
-index 6ebec206c9..e5a1ad598c 100644
+index 3e9f310446..c903810382 100644
 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/fspec.cc
 +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/fspec.cc
 @@ -2868,8 +2868,12 @@ void ProtoModelMerged::decode(Decoder &decoder)
@@ -37,7 +37,7 @@ index 6ebec206c9..e5a1ad598c 100644
  
  void ParameterBasic::setTypeLock(bool val)
 diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/op.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/op.cc
-index d76a799960..37ba971a34 100644
+index e165951fe6..00169e22e5 100644
 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/op.cc
 +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/op.cc
 @@ -666,7 +666,11 @@ uintb PcodeOp::getNZMaskLocal(bool cliploop) const
@@ -116,10 +116,10 @@ index ca9d71ab99..85d4dd281d 100644
    return res;
  }
 diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/ruleaction.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/ruleaction.cc
-index f667c6ca95..6ea3916520 100644
+index b7fda34cc9..a3d164aa2d 100644
 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/ruleaction.cc
 +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/ruleaction.cc
-@@ -977,7 +977,12 @@ int4 RulePullsubIndirect::applyOp(PcodeOp *op,Funcdata &data)
+@@ -976,7 +976,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
  
@@ -133,7 +133,7 @@ index f667c6ca95..6ea3916520 100644
    consume = ~consume;
    if ((consume & indir->getIn(0)->getConsume())!=0) return 0;
  
-@@ -7026,8 +7031,9 @@ int4 RulePtrsubCharConstant::applyOp(PcodeOp *op,Funcdata &data)
+@@ -7288,8 +7293,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;
@@ -145,19 +145,6 @@ index f667c6ca95..6ea3916520 100644
    Varnode *vn1 = op->getIn(1);
    if (!vn1->isConstant()) return 0;
    Varnode *outvn = op->getOut();
-@@ -8831,7 +8837,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 cd9b9835b1..8a4616c3b9 100644
 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/semantics.cc
@@ -206,10 +193,10 @@ index 50d85e22ba..9f3b456229 100644
        msg << "   Label <" << sym->getName() << "> was placed but not used" << endl;
      else if (!sym->isPlaced())
 diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/type.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/type.cc
-index 7cda43127f..20a5bc1c83 100644
+index 88ca8e36c8..f25b019a4f 100644
 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/type.cc
 +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/type.cc
-@@ -3661,8 +3661,8 @@ void TypeFactory::recalcPointerSubmeta(Datatype *base,sub_metatype sub)
+@@ -3728,8 +3728,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()) {
@@ -233,5 +220,5 @@ index 2571f55f1a..fe40e22b1b 100644
          uintb true_result = ((uintb)(int32_t)f) & 0xffffffff;
          uintb encoding = format.getEncoding(f);
 -- 
-2.47.0
+2.49.0
 

src/patches/stable/0002-Use-stroull-instead-of-stroul-to-parse-address-offse.patch

@@ -1,7 +1,7 @@
-From 60b1bb423c10b2e53ad72e7b84ac647e56282aca Mon Sep 17 00:00:00 2001
+From 1bd544111236b4b8f88429a074788e6616b05a38 Mon Sep 17 00:00:00 2001
 From: Alex Cameron <asc@tetsuo.sh>
 Date: Wed, 3 Aug 2022 20:01:18 +1000
-Subject: [PATCH 2/5] Use `stroull` instead of `stroul` to parse address
+Subject: [PATCH 2/6] Use `stroull` instead of `stroul` to parse address
  offsets
 
 ---
@@ -34,5 +34,5 @@ index dbaa2e775f..72927bf379 100644
      enddata = (const char *) tmpdata;
      if (enddata - s.c_str() == s.size()) { // If no size or offset override
 -- 
-2.47.0
+2.49.0
 

src/patches/stable/0003-Add-missing-index-check-to-prevent-errors-in-Windows.patch

@@ -1,26 +0,0 @@
-From e853cd1dc018c0f8a76f936de0391bbdf467a907 Mon Sep 17 00:00:00 2001
-From: Eric Kilmer <eric.d.kilmer@gmail.com>
-Date: Sat, 30 Mar 2024 18:46:16 -0400
-Subject: [PATCH 3/5] Add missing index check to prevent errors in Windows
-
-Not sure why this only appears when testing on Windows.
----
- Ghidra/Features/Decompiler/src/decompile/cpp/ifacedecomp.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/ifacedecomp.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/ifacedecomp.cc
-index 0237adb820..5048a9d480 100644
---- a/Ghidra/Features/Decompiler/src/decompile/cpp/ifacedecomp.cc
-+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/ifacedecomp.cc
-@@ -1844,7 +1844,7 @@ void IfcProtooverride::execute(istream &s)
-   s >> ws;
-   Address callpoint(parse_machaddr(s,discard,*dcp->conf->types));
-   int4 i;
--  for(i=0;dcp->fd->numCalls();++i)
-+  for(i=0;i<dcp->fd->numCalls();++i)
-     if (dcp->fd->getCallSpecs(i)->getOp()->getAddr() == callpoint) break;
-   if (i == dcp->fd->numCalls())
-     throw IfaceExecutionError("No call is made at this address");
--- 
-2.47.0
-

src/patches/stable/0003-Use-string-resize-instead-of-reserve.patch

@@ -1,7 +1,7 @@
-From 0d09640f2d770db6cac6f9a02f5d85373477e5a9 Mon Sep 17 00:00:00 2001
+From f3b2fd0b950221005e02d294ef665e38d7f68b12 Mon Sep 17 00:00:00 2001
 From: Eric Kilmer <eric.d.kilmer@gmail.com>
 Date: Tue, 29 Oct 2024 15:30:57 -0400
-Subject: [PATCH 4/5] Use string resize instead of reserve
+Subject: [PATCH 3/6] Use string resize instead of reserve
 
 assign will fix up the size to hold all of what's copied
 ---
@@ -32,5 +32,5 @@ index 5f5fa0c7b3..4cd77156f2 100644
    }
    data.isTruncated = (numChars >= maximumChars);
 -- 
-2.47.0
+2.49.0
 

src/patches/stable/0004-Ignore-floating-point-test-due-to-compilation-differ.patch

@@ -1,7 +1,7 @@
-From 5fe91a722d58d4852f5ffadb420eb81627fd914e Mon Sep 17 00:00:00 2001
+From 643f66ceb6add640d24a7c4b001e5236dfb8428f Mon Sep 17 00:00:00 2001
 From: Eric Kilmer <eric.d.kilmer@gmail.com>
 Date: Tue, 29 Oct 2024 17:51:09 -0400
-Subject: [PATCH 5/5] Ignore floating point test due to compilation differences
+Subject: [PATCH 4/6] Ignore floating point test due to compilation differences
 
 This test fails on macOS and Windows. I'm unsure whether it's an OS or
 compiler issue.
@@ -24,5 +24,5 @@ index fe40e22b1b..91440e2510 100644
    ASSERT_EQUALS(ff.printDecimal(f2, false), "0.33333334");
    double f3 = doubleFromRawBits(0x3fd0000000000000);
 -- 
-2.47.0
+2.49.0
 

src/patches/stable/0005-Allow-positive-or-negative-NAN-in-decompiler-floatin.patch

@@ -0,0 +1,37 @@
+From 739a7cabff6e8718102b21bd4c639bb1d468794a Mon Sep 17 00:00:00 2001
+From: Eric Kilmer <eric.d.kilmer@gmail.com>
+Date: Wed, 30 Oct 2024 14:26:57 -0400
+Subject: [PATCH 5/6] Allow positive or negative NAN in decompiler floating
+ point test
+
+At least on Apple Silicon, this test reports positive NAN.
+
+Use the regex optional operator '?' to allow for positive or negative
+NAN.
+---
+ .../Decompiler/src/decompile/datatests/floatprint.xml         | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Ghidra/Features/Decompiler/src/decompile/datatests/floatprint.xml b/Ghidra/Features/Decompiler/src/decompile/datatests/floatprint.xml
+index f8108d3d32..1060a3e193 100644
+--- a/Ghidra/Features/Decompiler/src/decompile/datatests/floatprint.xml
++++ b/Ghidra/Features/Decompiler/src/decompile/datatests/floatprint.xml
+@@ -58,13 +58,13 @@ bbbdd7d9df7cdb3d000000000000f03f
+ <stringmatch name="Float print #3" min="1" max="1">floatv3 = -0.001;</stringmatch>
+ <stringmatch name="Float print #4" min="1" max="1">floatv4 = 1e-06;</stringmatch>
+ <stringmatch name="Float print #5" min="1" max="1">floatv5 = INFINITY;</stringmatch>
+-<stringmatch name="Float print #6" min="1" max="1">floatv6 = -NAN;</stringmatch>
++<stringmatch name="Float print #6" min="1" max="1">floatv6 = -?NAN;</stringmatch>
+ <stringmatch name="Float print #7" min="1" max="1">floatv7 = 3.141592e-06;</stringmatch>
+ <stringmatch name="Float print #8" min="1" max="1">double1 = 0.6666666666666666;</stringmatch>
+ <stringmatch name="Float print #9" min="1" max="1">double2 = 2.0;</stringmatch>
+ <stringmatch name="Float print #10" min="1" max="1">double3 = -0.001;</stringmatch>
+ <stringmatch name="Float print #11" min="1" max="1">double4 = 1e-10;</stringmatch>
+ <stringmatch name="Float print #12" min="1" max="1">double5 = INFINITY;</stringmatch>
+-<stringmatch name="Float print #13" min="1" max="1">double6 = -NAN;</stringmatch>
++<stringmatch name="Float print #13" min="1" max="1">double6 = -?NAN;</stringmatch>
+ <stringmatch name="Float print #14" min="1" max="1">double7 = 3.1415926535897933e-06;</stringmatch>
+ </decompilertest>
+-- 
+2.49.0
+

src/patches/stable/0006-decompiler-Fix-strict-weak-ordering-TypePartialEnum.patch

@@ -0,0 +1,26 @@
+From d8ff76548dceea9e1a3a034dfd4967f246a7f716 Mon Sep 17 00:00:00 2001
+From: Eric Kilmer <eric.d.kilmer@gmail.com>
+Date: Sat, 8 Feb 2025 17:59:57 -0500
+Subject: [PATCH 6/6] decompiler: Fix strict weak ordering TypePartialEnum
+
+This fixes Windows Debug error encountered in testing where it was
+complaining about lack of strict weak ordering.
+---
+ Ghidra/Features/Decompiler/src/decompile/cpp/type.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/type.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/type.cc
+index f25b019a4f..2f1337a740 100644
+--- a/Ghidra/Features/Decompiler/src/decompile/cpp/type.cc
++++ b/Ghidra/Features/Decompiler/src/decompile/cpp/type.cc
+@@ -2300,6 +2300,7 @@ int4 TypePartialEnum::compareDependency(const Datatype &op) const
+ 
+ {
+   if (submeta != op.getSubMeta()) return (submeta < op.getSubMeta()) ? -1 : 1;
++  if (parent == &op) return 1;	// op is our TypeEnum
+   TypePartialEnum *tp = (TypePartialEnum *) &op;	// Both must be partial
+   if (parent != tp->parent) return (parent < tp->parent) ? -1 : 1;	// Compare absolute pointers
+   if (offset != tp->offset) return (offset < tp->offset) ? -1 : 1;
+-- 
+2.49.0
+

src/setup-ghidra-source.cmake

@@ -22,7 +22,7 @@ set_property(CACHE sleigh_RELEASE_TYPE PROPERTY STRINGS "stable" "HEAD")
 find_package(Git REQUIRED)
 
 # Ghidra pinned stable version commit
-set(ghidra_version "11.2")
+set(ghidra_version "11.3.2")
 set(ghidra_git_tag "Ghidra_${ghidra_version}_build")
 set(ghidra_shallow TRUE)
 
@@ -40,18 +40,19 @@ set(ghidra_patches
   "${GIT_EXECUTABLE}" am --ignore-space-change --ignore-whitespace --no-gpg-sign
   "${CMAKE_CURRENT_LIST_DIR}/patches/stable/0001-Fix-UBSAN-errors-in-decompiler.patch"
   "${CMAKE_CURRENT_LIST_DIR}/patches/stable/0002-Use-stroull-instead-of-stroul-to-parse-address-offse.patch"
-  "${CMAKE_CURRENT_LIST_DIR}/patches/stable/0003-Add-missing-index-check-to-prevent-errors-in-Windows.patch"
-  "${CMAKE_CURRENT_LIST_DIR}/patches/stable/0004-Use-string-resize-instead-of-reserve.patch"
-  "${CMAKE_CURRENT_LIST_DIR}/patches/stable/0005-Ignore-floating-point-test-due-to-compilation-differ.patch"
+  "${CMAKE_CURRENT_LIST_DIR}/patches/stable/0003-Use-string-resize-instead-of-reserve.patch"
+  "${CMAKE_CURRENT_LIST_DIR}/patches/stable/0004-Ignore-floating-point-test-due-to-compilation-differ.patch"
+  "${CMAKE_CURRENT_LIST_DIR}/patches/stable/0005-Allow-positive-or-negative-NAN-in-decompiler-floatin.patch"
+  "${CMAKE_CURRENT_LIST_DIR}/patches/stable/0006-decompiler-Fix-strict-weak-ordering-TypePartialEnum.patch"
 )
 
 # Ghidra pinned commits used for pinning last known working HEAD commit
 if("${sleigh_RELEASE_TYPE}" STREQUAL "HEAD")
   # TODO: Try to remember to look at Ghidra/application.properties
   # TODO: CMake only likes numeric characters in the version string....
-  set(ghidra_head_version "11.3")
+  set(ghidra_head_version "11.4")
   set(ghidra_version "${ghidra_head_version}")
-  set(ghidra_head_git_tag "fd1a448bf517939b5f3b7e369a8c10e8b1b22136")
+  set(ghidra_head_git_tag "13834fabaaff919bce053616b8e24ef8ae0a756f")
   set(ghidra_git_tag "${ghidra_head_git_tag}")
   set(ghidra_shallow FALSE)
   set(ghidra_patches
@@ -60,9 +61,10 @@ if("${sleigh_RELEASE_TYPE}" STREQUAL "HEAD")
     "${GIT_EXECUTABLE}" am --ignore-space-change --ignore-whitespace --no-gpg-sign
     "${CMAKE_CURRENT_LIST_DIR}/patches/HEAD/0001-Fix-UBSAN-errors-in-decompiler.patch"
     "${CMAKE_CURRENT_LIST_DIR}/patches/HEAD/0002-Use-stroull-instead-of-stroul-to-parse-address-offse.patch"
-    "${CMAKE_CURRENT_LIST_DIR}/patches/HEAD/0003-Add-missing-index-check-to-prevent-errors-in-Windows.patch"
-    "${CMAKE_CURRENT_LIST_DIR}/patches/HEAD/0004-Use-string-resize-instead-of-reserve.patch"
-    "${CMAKE_CURRENT_LIST_DIR}/patches/HEAD/0005-Ignore-floating-point-test-due-to-compilation-differ.patch"
+    "${CMAKE_CURRENT_LIST_DIR}/patches/HEAD/0003-Use-string-resize-instead-of-reserve.patch"
+    "${CMAKE_CURRENT_LIST_DIR}/patches/HEAD/0004-Ignore-floating-point-test-due-to-compilation-differ.patch"
+    "${CMAKE_CURRENT_LIST_DIR}/patches/HEAD/0005-Allow-positive-or-negative-NAN-in-decompiler-floatin.patch"
+    "${CMAKE_CURRENT_LIST_DIR}/patches/HEAD/0006-decompiler-Fix-strict-weak-ordering-TypePartialEnum.patch"
   )
   string(SUBSTRING "${ghidra_git_tag}" 0 7 ghidra_short_commit)
 else()