diff --git a/patches/HEAD/0003-Add-include-guards-to-decompiler-C-headers.patch b/patches/HEAD/0002-Add-include-guards-to-decompiler-C-headers.patch similarity index 100% rename from patches/HEAD/0003-Add-include-guards-to-decompiler-C-headers.patch rename to patches/HEAD/0002-Add-include-guards-to-decompiler-C-headers.patch diff --git a/patches/HEAD/0002-Initialize-ID-lookup-tables-to-fix-sleighexample.patch b/patches/HEAD/0002-Initialize-ID-lookup-tables-to-fix-sleighexample.patch deleted file mode 100644 index 24fdd07..0000000 --- a/patches/HEAD/0002-Initialize-ID-lookup-tables-to-fix-sleighexample.patch +++ /dev/null @@ -1,26 +0,0 @@ -From ae78cca16d5d34d61912cbe6d9cb2f959cc36d21 Mon Sep 17 00:00:00 2001 -From: Eric Kilmer -Date: Wed, 27 Jul 2022 11:53:41 -0400 -Subject: [PATCH] Initialize ID lookup tables to fix sleighexample - ---- - Ghidra/Features/Decompiler/src/decompile/cpp/sleighexample.cc | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/sleighexample.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/sleighexample.cc -index 3a61418e6..87a4d7980 100644 ---- a/Ghidra/Features/Decompiler/src/decompile/cpp/sleighexample.cc -+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/sleighexample.cc -@@ -294,6 +294,9 @@ int main(int argc,char **argv) - } - string action(argv[1]); - -+ AttributeId::initialize(); -+ ElementId::initialize(); -+ - // Set up the loadimage - MyLoadImage loader(0x80483b4,myprog,408); - // loader->open(); --- -2.37.1 - diff --git a/patches/HEAD/0004-Fix-UBSAN-errors-in-decompiler.patch b/patches/HEAD/0003-Fix-UBSAN-errors-in-decompiler.patch similarity index 100% rename from patches/HEAD/0004-Fix-UBSAN-errors-in-decompiler.patch rename to patches/HEAD/0003-Fix-UBSAN-errors-in-decompiler.patch diff --git a/patches/HEAD/0005-Use-stroull-instead-of-stroul-to-parse-address-offse.patch b/patches/HEAD/0004-Use-stroull-instead-of-stroul-to-parse-address-offse.patch similarity index 100% rename from patches/HEAD/0005-Use-stroull-instead-of-stroul-to-parse-address-offse.patch rename to patches/HEAD/0004-Use-stroull-instead-of-stroul-to-parse-address-offse.patch diff --git a/src/setup-ghidra-source.cmake b/src/setup-ghidra-source.cmake index 21d5a9f..fcf16d3 100644 --- a/src/setup-ghidra-source.cmake +++ b/src/setup-ghidra-source.cmake @@ -30,16 +30,15 @@ if("${sleigh_RELEASE_TYPE}" STREQUAL "HEAD") # TODO: CMake only likes numeric characters in the version string.... set(ghidra_head_version "10.2") set(ghidra_version "${ghidra_head_version}") - set(ghidra_head_git_tag "aad60ecdd319f4db6e5cbafc0516db218e56988b") + set(ghidra_head_git_tag "03bd4b45d00c2bdd46632b01408de2544d87287c") 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/HEAD/0001-Small-improvements-to-C-decompiler-testing-from-CLI.patch" - "${CMAKE_CURRENT_SOURCE_DIR}/patches/HEAD/0002-Initialize-ID-lookup-tables-to-fix-sleighexample.patch" - "${CMAKE_CURRENT_SOURCE_DIR}/patches/HEAD/0003-Add-include-guards-to-decompiler-C-headers.patch" - "${CMAKE_CURRENT_SOURCE_DIR}/patches/HEAD/0004-Fix-UBSAN-errors-in-decompiler.patch" - "${CMAKE_CURRENT_SOURCE_DIR}/patches/HEAD/0005-Use-stroull-instead-of-stroul-to-parse-address-offse.patch" + "${CMAKE_CURRENT_SOURCE_DIR}/patches/HEAD/0002-Add-include-guards-to-decompiler-C-headers.patch" + "${CMAKE_CURRENT_SOURCE_DIR}/patches/HEAD/0003-Fix-UBSAN-errors-in-decompiler.patch" + "${CMAKE_CURRENT_SOURCE_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()