Update stable to Ghidra v10.4 (#211 )

Update Ghidra HEAD to commit 54e0ab1a3 (#210 )
Bump Ghidra HEAD commit 54e0ab1a3 Changed files: ``` M Ghidra/Features/Decompiler/src/decompile/cpp/architecture.cc M Ghidra/Features/Decompiler/src/decompile/cpp/architecture.hh M Ghidra/Features/Decompiler/src/decompile/cpp/block.hh M Ghidra/Features/Decompiler/src/decompile/cpp/coreaction.cc M Ghidra/Features/Decompiler/src/decompile/cpp/double.cc M Ghidra/Features/Decompiler/src/decompile/cpp/fspec.cc M Ghidra/Features/Decompiler/src/decompile/cpp/fspec.hh M Ghidra/Features/Decompiler/src/decompile/cpp/ghidra_arch.cc M Ghidra/Features/Decompiler/src/decompile/cpp/ghidra_arch.hh M Ghidra/Features/Decompiler/src/decompile/cpp/grammar.cc M Ghidra/Features/Decompiler/src/decompile/cpp/grammar.y M Ghidra/Features/Decompiler/src/decompile/cpp/options.cc M Ghidra/Features/Decompiler/src/decompile/cpp/options.hh M Ghidra/Features/Decompiler/src/decompile/cpp/ruleaction.cc M Ghidra/Features/Decompiler/src/decompile/cpp/sleigh_arch.cc M Ghidra/Features/Decompiler/src/decompile/cpp/sleigh_arch.hh M Ghidra/Features/Decompiler/src/decompile/cpp/type.cc M Ghidra/Features/Decompiler/src/decompile/cpp/type.hh M Ghidra/Features/Decompiler/src/decompile/cpp/typeop.cc M Ghidra/Features/Decompiler/src/decompile/cpp/unionresolve.cc M Ghidra/Features/Decompiler/src/decompile/cpp/varmap.cc M Ghidra/Features/Decompiler/src/decompile/datatests/impliedfield.xml A Ghidra/Features/Decompiler/src/decompile/datatests/longdouble.xml M Ghidra/Features/Decompiler/src/decompile/datatests/nestedoffset.xml M Ghidra/Features/Decompiler/src/decompile/datatests/offsetarray.xml M Ghidra/Features/Decompiler/src/decompile/datatests/packstructaccess.xml M Ghidra/Processors/x86/data/languages/x86gcc.cspec ``` Co-authored-by: pgoodman <pgoodman@users.noreply.github.com>
2026-06-21 13:56:12 +00:00 · 2023-10-04 12:18:22 -04:00 · 2023-10-02 16:59:57 +11:00 · 2023-09-25 12:04:27 +10:00
5 changed files with 2 additions and 180 deletions
@@ -1 +0,0 @@
-use flake
@@ -4,5 +4,3 @@ build
 # FetchContent Ghidra source directories
 /src/ghidra*
 cmake_fc_*
-
-.direnv/
@@ -1,95 +0,0 @@
-{
-  "nodes": {
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1681202837,
-        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1682291304,
-        "narHash": "sha256-VkufTQNEclnZ0HnSXxmXC2Qvtj6/3/8SyZfRyL4AllI=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "b2d51541a37678ad4e870f75326b6e68daf3b3c7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1680945546,
-        "narHash": "sha256-8FuaH5t/aVi/pR1XxnF0qi4WwMYC+YxlfdsA0V+TEuQ=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "d9f759f2ea8d265d974a6e1259bd510ac5844c5d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs",
-        "treefmt-nix": "treefmt-nix"
-      }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "treefmt-nix": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_2"
-      },
-      "locked": {
-        "lastModified": 1681486253,
-        "narHash": "sha256-EjiQZvXQH9tUPCyLC6lQpfGnoq4+kI9v59bDJWPicYo=",
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "rev": "b25d1a3c2c7554d0462ab1dfddf2f13128638b90",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "type": "github"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}
@@ -1,80 +0,0 @@
-{
-  inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs";
-    flake-utils.url = "github:numtide/flake-utils";
-    treefmt-nix.url = "github:numtide/treefmt-nix";
-  };
-  outputs = {
-    self,
-    nixpkgs,
-    flake-utils,
-    treefmt-nix,
-  }:
-    {
-      overlays.default = final: prev: {
-        ghidra = with final;
-          applyPatches {
-            src = fetchFromGitHub {
-              owner = "NationalSecurityAgency";
-              repo = "ghidra";
-              rev = "refs/tags/Ghidra_10.3.3_build";
-              sha256 = "sha256-KDSiZ/JwAqX6Obg9UD8ZQut01l/eMXbioJy//GluXn0=";
-            };
-            patches = [
-              ./src/patches/stable/0001-Fix-UBSAN-errors-in-decompiler.patch
-              ./src/patches/stable/0002-Use-stroull-instead-of-stroul-to-parse-address-offse.patch
-            ];
-          };
-
-        sleigh = with final;
-          stdenv.mkDerivation {
-            name = "sleigh";
-            src = ./.;
-            nativeBuildInputs = [
-              cmake
-              ninja
-              git
-            ];
-            buildInputs = [
-              ghidra
-            ];
-            cmakeFlags = [
-              "-DFETCHCONTENT_SOURCE_DIR_GHIDRASOURCE=${ghidra}"
-            ];
-          };
-        sleigh-debug = with final;
-          final.sleigh.overrideAttrs (o: {
-            dontStrip = true;
-            enableDebugging = true;
-            separateDebugInfo = true;
-          });
-        sleigh-asan = with final;
-          final.sleigh-debug.overrideAttrs (o: {
-            cmakeFlags = o.cmakeFlags ++ ["-DCMAKE_C_FLAGS=-fsanitize=address" "-DCMAKE_CXX_FLAGS=-fsanitize=address"];
-          });
-      };
-    }
-    // flake-utils.lib.eachDefaultSystem (
-      system: let
-        pkgs = import nixpkgs {
-          inherit system;
-          overlays = [self.overlays.default];
-        };
-      in {
-        packages.default = pkgs.sleigh;
-        devShells.default = pkgs.mkShell {
-          packages = with pkgs; [
-            sleigh-asan
-            clang-tools
-          ];
-        };
-        formatter = treefmt-nix.lib.mkWrapper pkgs {
-          projectRootFile = ".git/config";
-          programs = {
-            alejandra.enable = true;
-            clang-format.enable = true;
-          };
-        };
-      }
-    );
-}
@@ -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 "10.3.3")
+set(ghidra_version "10.4")
 set(ghidra_git_tag "Ghidra_${ghidra_version}_build")
 set(ghidra_shallow TRUE)

@@ -48,7 +48,7 @@ if("${sleigh_RELEASE_TYPE}" STREQUAL "HEAD")
  # TODO: CMake only likes numeric characters in the version string....
  set(ghidra_head_version "10.5")
  set(ghidra_version "${ghidra_head_version}")
-  set(ghidra_head_git_tag "4561e8335d3b62329c4afdf5a91bc6ce113b7002")
+  set(ghidra_head_git_tag "54e0ab1a3897dad020275d6395acfe0c56c3994d")
  set(ghidra_git_tag "${ghidra_head_git_tag}")
  set(ghidra_shallow FALSE)
  set(ghidra_patches