Ghidra 11.2 (#296 )

Update Ghidra HEAD to commit fd1a448bf (#290 )
Changed files: ``` M Ghidra/Features/Decompiler/src/decompile/cpp/Makefile 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.cc M Ghidra/Features/Decompiler/src/decompile/cpp/block.hh A Ghidra/Features/Decompiler/src/decompile/cpp/constseq.cc A Ghidra/Features/Decompiler/src/decompile/cpp/constseq.hh M Ghidra/Features/Decompiler/src/decompile/cpp/coreaction.cc M Ghidra/Features/Decompiler/src/decompile/cpp/coreaction.hh M Ghidra/Features/Decompiler/src/decompile/cpp/database.cc M Ghidra/Features/Decompiler/src/decompile/cpp/database.hh M Ghidra/Features/Decompiler/src/decompile/cpp/double.cc M Ghidra/Features/Decompiler/src/decompile/cpp/double.hh M Ghidra/Features/Decompiler/src/decompile/cpp/float.cc M Ghidra/Features/Decompiler/src/decompile/cpp/float.hh M Ghidra/Features/Decompiler/src/decompile/cpp/flow.cc M Ghidra/Features/Decompiler/src/decompile/cpp/fspec.cc M Ghidra/Features/Decompiler/src/decompile/cpp/funcdata.cc M Ghidra/Features/Decompiler/src/decompile/cpp/funcdata.hh M Ghidra/Features/Decompiler/src/decompile/cpp/funcdata_block.cc M Ghidra/Features/Decompiler/src/decompile/cpp/funcdata_varnode.cc M Ghidra/Features/Decompiler/src/decompile/cpp/ghidra_arch.cc M Ghidra/Features/Decompiler/src/decompile/cpp/jumptable.cc M Ghidra/Features/Decompiler/src/decompile/cpp/merge.cc M Ghidra/Features/Decompiler/src/decompile/cpp/op.cc M Ghidra/Features/Decompiler/src/decompile/cpp/op.hh M Ghidra/Features/Decompiler/src/decompile/cpp/printc.cc M Ghidra/Features/Decompiler/src/decompile/cpp/printc.hh M Ghidra/Features/Decompiler/src/decompile/cpp/ruleaction.cc M Ghidra/Features/Decompiler/src/decompile/cpp/ruleaction.hh 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/sleighbase.cc M Ghidra/Features/Decompiler/src/decompile/cpp/space.cc M Ghidra/Features/Decompiler/src/decompile/cpp/stringmanage.cc M Ghidra/Features/Decompiler/src/decompile/cpp/stringmanage.hh M Ghidra/Features/Decompiler/src/decompile/cpp/subflow.cc M Ghidra/Features/Decompiler/src/decompile/cpp/subflow.hh M Ghidra/Features/Decompiler/src/decompile/cpp/testfunction.cc M Ghidra/Features/Decompiler/src/decompile/cpp/transform.cc M Ghidra/Features/Decompiler/src/decompile/cpp/transform.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/typeop.hh M Ghidra/Features/Decompiler/src/decompile/cpp/userop.cc M Ghidra/Features/Decompiler/src/decompile/cpp/userop.hh M Ghidra/Features/Decompiler/src/decompile/cpp/variable.cc M Ghidra/Features/Decompiler/src/decompile/cpp/variable.hh M Ghidra/Features/Decompiler/src/decompile/cpp/varmap.cc M Ghidra/Features/Decompiler/src/decompile/cpp/varmap.hh A Ghidra/Features/Decompiler/src/decompile/datatests/doublemove.xml A Ghidra/Features/Decompiler/src/decompile/datatests/floatcast.xml A Ghidra/Features/Decompiler/src/decompile/datatests/floatconv.xml M Ghidra/Features/Decompiler/src/decompile/datatests/floatprint.xml A Ghidra/Features/Decompiler/src/decompile/datatests/heapstring.xml A Ghidra/Features/Decompiler/src/decompile/datatests/orcompare.xml A Ghidra/Features/Decompiler/src/decompile/datatests/stackstring.xml M Ghidra/Features/Decompiler/src/decompile/unittests/testfloatemu.cc M Ghidra/Processors/68000/data/languages/68000.sinc M Ghidra/Processors/8051/certification.manifest A Ghidra/Processors/8051/data/languages/8051.opinion M Ghidra/Processors/AARCH64/data/languages/AARCH64_win.cspec M Ghidra/Processors/AARCH64/src/main/java/ghidra/app/util/bin/format/elf/relocation/AARCH64_ElfRelocationHandler.java M Ghidra/Processors/ARM/data/languages/ARM.dwarf M Ghidra/Processors/ARM/data/languages/ARMneon.dwarf M Ghidra/Processors/ARM/data/languages/ARMneon.sinc M Ghidra/Processors/ARM/data/languages/ARMv8.sinc M Ghidra/Processors/ARM/src/main/java/ghidra/app/util/bin/format/elf/relocation/ARM_ElfRelocationHandler.java M Ghidra/Processors/Atmel/ghidra_scripts/CreateAVR8GDTArchiveScript.java M Ghidra/Processors/Atmel/src/main/java/ghidra/app/util/bin/format/elf/relocation/AVR32_ElfRelocationHandler.java M Ghidra/Processors/Atmel/src/main/java/ghidra/app/util/bin/format/elf/relocation/AVR8_ElfRelocationHandler.java M Ghidra/Processors/Loongarch/src/main/java/ghidra/app/util/bin/format/elf/relocation/Loongarch_ElfRelocationHandler.java A Ghidra/Processors/M16C/Module.manifest A Ghidra/Processors/M16C/build.gradle A Ghidra/Processors/M16C/certification.manifest A Ghidra/Processors/M16C/data/languages/M16C_60.cspec A Ghidra/Processors/M16C/data/languages/M16C_60.ldefs A Ghidra/Processors/M16C/data/languages/M16C_60.pspec A Ghidra/Processors/M16C/data/languages/M16C_60.slaspec A Ghidra/Processors/M16C/data/languages/M16C_80.cspec A Ghidra/Processors/M16C/data/languages/M16C_80.ldefs A Ghidra/Processors/M16C/data/languages/M16C_80.pspec A Ghidra/Processors/M16C/data/languages/M16C_80.slaspec A Ghidra/Processors/M16C/data/manuals/M16C_60.idx A Ghidra/Processors/M16C/data/manuals/M16C_80.idx M Ghidra/Processors/MIPS/data/languages/MIPS.opinion M Ghidra/Processors/MIPS/src/main/java/ghidra/app/util/bin/format/elf/relocation/MIPS_ElfRelocationHandler.java M Ghidra/Processors/PIC/data/languages/pic16.ldefs M Ghidra/Processors/PIC/data/languages/pic16.pspec M Ghidra/Processors/PIC/data/languages/pic16.sinc M Ghidra/Processors/PIC/data/languages/pic16_instructions.sinc M Ghidra/Processors/PIC/data/languages/pic16f.pspec M Ghidra/Processors/PIC/src/main/java/ghidra/app/plugin/core/analysis/Pic16Analyzer.java M Ghidra/Processors/PIC/src/main/java/ghidra/app/util/bin/format/elf/relocation/PIC30_ElfRelocationHandler.java M Ghidra/Processors/PowerPC/data/languages/SPE_APU.sinc M Ghidra/Processors/PowerPC/data/languages/evx.sinc M Ghidra/Processors/PowerPC/data/languages/ppc.ldefs M Ghidra/Processors/PowerPC/data/languages/ppc_32.pspec M Ghidra/Processors/PowerPC/data/languages/ppc_32_mpc8270.pspec M Ghidra/Processors/PowerPC/data/languages/ppc_64.pspec M Ghidra/Processors/PowerPC/src/main/java/ghidra/app/util/bin/format/elf/relocation/PowerPC64_ElfRelocationHandler.java M Ghidra/Processors/PowerPC/src/main/java/ghidra/app/util/bin/format/elf/relocation/PowerPC_ElfRelocationHandler.java M Ghidra/Processors/RISCV/src/main/java/ghidra/app/util/bin/format/elf/relocation/RISCV_ElfRelocationHandler.java M Ghidra/Processors/Sparc/certification.manifest M Ghidra/Processors/Sparc/data/languages/SparcV9.ldefs M Ghidra/Processors/Sparc/data/languages/SparcV9.sinc M Ghidra/Processors/Sparc/data/languages/SparcV9_32.cspec M Ghidra/Processors/Sparc/data/languages/SparcV9_64.cspec M Ghidra/Processors/Sparc/data/patterns/SPARC_patterns.xml M Ghidra/Processors/Sparc/src/main/java/ghidra/app/plugin/core/analysis/SparcAnalyzer.java A Ghidra/Processors/Sparc/src/main/java/ghidra/app/plugin/core/analysis/SparcEarlyAddressAnalyzer.java A Ghidra/Processors/Sparc/src/main/java/ghidra/app/util/bin/format/elf/relocation/SPARC64_ElfRelocationHandler.java M Ghidra/Processors/Sparc/src/main/java/ghidra/app/util/bin/format/elf/relocation/SPARC_ElfRelocationHandler.java M Ghidra/Processors/Sparc/src/main/java/ghidra/app/util/bin/format/elf/relocation/SPARC_ElfRelocationType.java M Ghidra/Processors/SuperH4/src/main/java/ghidra/app/util/bin/format/elf/relocation/SH_ElfRelocationHandler.java M Ghidra/Processors/TI_MSP430/src/main/java/ghidra/app/util/bin/format/elf/relocation/MSP430X_ElfRelocationHandler.java M Ghidra/Processors/TI_MSP430/src/main/java/ghidra/app/util/bin/format/elf/relocation/MSP430_ElfRelocationHandler.java M Ghidra/Processors/Xtensa/src/main/java/ghidra/app/util/bin/format/elf/relocation/Xtensa_ElfRelocationHandler.java D Ghidra/Processors/eBPF/src/main/java/ghidra/app/plugin/core/analysis/eBPFAnalyzer.java A Ghidra/Processors/eBPF/src/main/java/ghidra/app/plugin/core/analysis/eBPFHelperDataTypes.java A Ghidra/Processors/eBPF/src/main/java/ghidra/app/plugin/core/analysis/eBPFSyscallAnalyzer.java M Ghidra/Processors/eBPF/src/main/java/ghidra/app/util/bin/format/elf/relocation/eBPF_ElfRelocationHandler.java M Ghidra/Processors/tricore/src/main/java/ghidra/app/util/bin/format/elf/relocation/Tricore_ElfRelocationHandler.java M Ghidra/Processors/x86/data/languages/avx.sinc M Ghidra/Processors/x86/data/languages/avx2.sinc M Ghidra/Processors/x86/data/languages/ia.sinc M Ghidra/Processors/x86/data/languages/lockable.sinc M Ghidra/Processors/x86/data/languages/x86-64.pspec M Ghidra/Processors/x86/data/languages/x86.ldefs M Ghidra/Processors/x86/data/languages/x86.pspec M Ghidra/Processors/x86/src/main/java/ghidra/app/util/bin/format/elf/relocation/X86_32_ElfRelocationHandler.java M Ghidra/Processors/x86/src/main/java/ghidra/app/util/bin/format/elf/relocation/X86_64_ElfRelocationContext.java M Ghidra/Processors/x86/src/main/java/ghidra/app/util/bin/format/elf/relocation/X86_64_ElfRelocationHandler.java ``` * Ignore double floating point test due to errors on mac and Windows * Reformat patches --------- Co-authored-by: Eric Kilmer <eric.d.kilmer@gmail.com>
2026-06-21 13:56:12 +00:00 · 2024-10-29 22:35:41 -04:00 · 2024-10-29 22:08:21 -04:00 · 2024-10-29 21:30:43 -04:00 · 2024-10-29 18:54:43 -04:00 · 2024-07-19 08:44:46 -04:00
22 changed files with 278 additions and 178 deletions
@@ -20,7 +20,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ubuntu-latest, macos-13, windows-latest]
        build_type: [RelWithDebInfo, Debug]
        release: [stable, HEAD]

@@ -43,6 +43,10 @@ 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 \
          ccache \
          cmake \
@@ -218,7 +222,7 @@ jobs:
        path: ${{ env.DEB_PACKAGE_PATH }}

    - name: Release DEB package artifact (RelWithDebInfo only)
-      uses: softprops/action-gh-release@v2.0.4
+      uses: softprops/action-gh-release@v2.0.8
      if: matrix.build_type == 'RelWithDebInfo' && runner.os == 'Linux' && startsWith(github.ref, 'refs/tags/') && matrix.release == 'stable'
      with:
        files: ${{ env.DEB_PACKAGE_PATH }}
@@ -231,7 +235,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.4
+      uses: softprops/action-gh-release@v2.0.8
      if: matrix.build_type == 'RelWithDebInfo' && runner.os == 'Linux' && startsWith(github.ref, 'refs/tags/') && matrix.release == 'stable'
      with:
        files: ${{ env.RPM_PACKAGE_PATH }}
@@ -245,7 +249,7 @@ jobs:
        path: ${{ env.TGZ_PACKAGE_PATH }}

    - name: Release TGZ package artifact (RelWithDebInfo only)
-      uses: softprops/action-gh-release@v2.0.4
+      uses: softprops/action-gh-release@v2.0.8
      if: matrix.build_type == 'RelWithDebInfo' && startsWith(github.ref, 'refs/tags/') && matrix.release == 'stable'
      with:
        files: ${{ env.TGZ_PACKAGE_PATH }}
@@ -139,13 +139,15 @@ set(public_include_header_list
  "${library_root}/modelrules.hh"
  "${library_root}/signature.hh"
  "${library_root}/signature_ghidra.hh"
+  "${library_root}/compression.hh"
+  "${library_root}/multiprecision.hh"
+  "${library_root}/slaformat.hh"
+  "${library_root}/constseq.hh"
 )
-if(sleigh_RELEASE_IS_HEAD)
-  list(APPEND public_include_header_list
-    "${library_root}/compression.hh"
-    "${library_root}/slaformat.hh"
-  )
-endif()
+#if(sleigh_RELEASE_IS_HEAD)
+#  list(APPEND public_include_header_list
+#  )
+#endif()
 # Create custom target so that IDEs know these files are part of the sources
 add_custom_target(sleigh_all_headers SOURCES ${public_include_header_list})
 set(public_headers_dir ${CMAKE_CURRENT_BINARY_DIR}/include)
@@ -161,9 +163,7 @@ endforeach()
 configure_file(cmake/libconfig.h.in "${public_headers_dir}/sleigh/libconfig.h")

 # External Dependencies
-if(sleigh_RELEASE_IS_HEAD)
-  find_package(ZLIB REQUIRED)
-endif()
+find_package(ZLIB REQUIRED)

 #
 # sla
@@ -197,9 +197,7 @@ set_target_properties(sleigh_sla PROPERTIES
  OUTPUT_NAME_DEBUG sla_dbg
 )

-if(sleigh_RELEASE_IS_HEAD)
-  target_link_libraries(sleigh_sla PUBLIC ZLIB::ZLIB)
-endif()
+target_link_libraries(sleigh_sla PUBLIC ZLIB::ZLIB)

 #
 # decomp
@@ -228,9 +226,7 @@ set_target_properties(sleigh_decomp PROPERTIES
  OUTPUT_NAME_DEBUG decomp_dbg
 )

-if(sleigh_RELEASE_IS_HEAD)
-  target_link_libraries(sleigh_decomp PUBLIC ZLIB::ZLIB)
-endif()
+target_link_libraries(sleigh_decomp PUBLIC ZLIB::ZLIB)

 # 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
@@ -17,10 +17,9 @@

 # Extra version details. Either 'stable' or 'HEAD'
 set(sleigh_RELEASE_IS_HEAD "@sleigh_RELEASE_IS_HEAD@")
-if(sleigh_RELEASE_IS_HEAD)
-  include(CMakeFindDependencyMacro)
-  find_dependency(ZLIB)
-endif()
+
+include(CMakeFindDependencyMacro)
+find_dependency(ZLIB)

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

@@ -265,14 +265,9 @@ int main(int argc, char *argv[]) {
  ghidra::ContextInternal ctx;
  ghidra::Sleigh engine(&load_image, &ctx);
  ghidra::DocumentStorage storage;
-#ifdef sleigh_RELEASE_IS_HEAD
  std::istringstream sla("<sleigh>" + sla_file_path->string() + "</sleigh>");
  ghidra::Element *root =
      storage.parseDocument(sla)->getRoot();
-#else
-  ghidra::Element *root =
-      storage.openDocument(sla_file_path->string())->getRoot();
-#endif
  storage.registerTag(root);
  std::optional<std::filesystem::path> pspec_file_path;
  if (args->pspec_file_name) {
@@ -1,11 +1,11 @@
-From 6c36965500d26d5a35dfbc91725956ae1d51e394 Mon Sep 17 00:00:00 2001
-From: Alex Cameron <asc@tetsuo.sh>
-Date: Mon, 5 Jun 2023 16:45:04 +1200
+From fc4ac7901ae08cd018d94ce78027cd6636251d39 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

+Co-authored-by: Alex Cameron <asc@tetsuo.sh>
 ---
 .../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 +++++++++++-------
@@ -15,13 +15,13 @@ Subject: [PATCH 1/5] Fix UBSAN errors in decompiler
 .../src/decompile/cpp/slgh_compile.cc          |  2 +-
 .../Decompiler/src/decompile/cpp/type.cc       |  2 +-
 .../src/decompile/unittests/testfloatemu.cc    |  2 +-
- 11 files changed, 56 insertions(+), 20 deletions(-)
+ 10 files changed, 49 insertions(+), 19 deletions(-)

 diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/fspec.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/fspec.cc
-index dc96f0c19..3482cf17c 100644
+index 6ebec206c9..e5a1ad598c 100644
 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/fspec.cc
 +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/fspec.cc
-@@ -2727,8 +2727,12 @@ void ProtoModelMerged::decode(Decoder &decoder)
+@@ -2868,8 +2868,12 @@ void ProtoModelMerged::decode(Decoder &decoder)
     modellist.push_back(mymodel);
   }
   decoder.closeElement(elemId);
@@ -36,27 +36,8 @@ index dc96f0c19..3482cf17c 100644
 }
 
 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 fc094ee96..1f7e53ebe 100644
--- a/Ghidra/Features/Decompiler/src/decompile/cpp/funcdata_varnode.cc
-+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/funcdata_varnode.cc
-@@ -503,7 +503,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 921335173..46cdc39f3 100644
+index d76a799960..37ba971a34 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
@@ -73,7 +54,7 @@ index 921335173..46cdc39f3 100644
     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 aebcfd910..6c47e6eb1 100644
+index aebcfd9103..6c47e6eb15 100644
 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/opbehavior.cc
 +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/opbehavior.cc
@@ -746,7 +746,13 @@ uintb OpBehaviorPiece::evaluateBinary(int4 sizeout,int4 sizein,uintb in1,uintb i
@@ -92,7 +73,7 @@ index aebcfd910..6c47e6eb1 100644
 }
 
 diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/pcodecompile.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/pcodecompile.cc
-index ca9d71ab9..85d4dd281 100644
+index ca9d71ab99..85d4dd281d 100644
 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/pcodecompile.cc
 +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/pcodecompile.cc
@@ -621,8 +621,10 @@ vector<OpTpl *> *PcodeCompile::assignBitRange(VarnodeTpl *vn,uint4 bitoffset,uin
@@ -135,10 +116,10 @@ index ca9d71ab9..85d4dd281 100644
   return res;
 }
 diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/ruleaction.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/ruleaction.cc
-index 3703c8ef5..ac6e21c00 100644
+index f667c6ca95..6ea3916520 100644
 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/ruleaction.cc
 +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/ruleaction.cc
-@@ -976,7 +976,12 @@ int4 RulePullsubIndirect::applyOp(PcodeOp *op,Funcdata &data)
+@@ -977,7 +977,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
 
@@ -152,7 +133,7 @@ index 3703c8ef5..ac6e21c00 100644
   consume = ~consume;
   if ((consume & indir->getIn(0)->getConsume())!=0) return 0;
 
-@@ -6803,8 +6808,9 @@ int4 RulePtrsubCharConstant::applyOp(PcodeOp *op,Funcdata &data)
+@@ -7026,8 +7031,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;
@@ -164,7 +145,7 @@ index 3703c8ef5..ac6e21c00 100644
   Varnode *vn1 = op->getIn(1);
   if (!vn1->isConstant()) return 0;
   Varnode *outvn = op->getOut();
-@@ -8616,7 +8622,11 @@ int4 RuleSubvarSubpiece::applyOp(PcodeOp *op,Funcdata &data)
+@@ -8831,7 +8837,11 @@ int4 RuleSubvarSubpiece::applyOp(PcodeOp *op,Funcdata &data)
   Varnode *outvn = op->getOut();
   int4 flowsize = outvn->getSize();
   uintb mask = calc_mask( flowsize );
@@ -178,7 +159,7 @@ index 3703c8ef5..ac6e21c00 100644
   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 cd9b9835b..8a4616c3b 100644
+index cd9b9835b1..8a4616c3b9 100644
 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/semantics.cc
 +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/semantics.cc
@@ -22,6 +22,7 @@ ConstTpl::ConstTpl(const_type tp)
@@ -198,7 +179,7 @@ index cd9b9835b..8a4616c3b 100644
 
 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 e0b069959..9117a45c7 100644
+index e0b069959d..9117a45c75 100644
 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/semantics.hh
 +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/semantics.hh
@@ -47,7 +47,7 @@ class ConstTpl {
@@ -211,7 +192,7 @@ index e0b069959..9117a45c7 100644
     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 c060053bf..c9004023c 100644
+index 50d85e22ba..9f3b456229 100644
 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/slgh_compile.cc
 +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/slgh_compile.cc
@@ -2164,8 +2164,8 @@ string SleighCompile::checkSymbols(SymbolScope *scope)
@@ -225,10 +206,10 @@ index c060053bf..c9004023c 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 e6292e138..bd31b7470 100644
+index 7cda43127f..20a5bc1c83 100644
 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/type.cc
 +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/type.cc
-@@ -3561,8 +3561,8 @@ void TypeFactory::recalcPointerSubmeta(Datatype *base,sub_metatype sub)
+@@ -3661,8 +3661,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()) {
@@ -239,10 +220,10 @@ index e6292e138..bd31b7470 100644
     ++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 c35bde877..061e53677 100644
+index 2571f55f1a..fe40e22b1b 100644
 --- a/Ghidra/Features/Decompiler/src/decompile/unittests/testfloatemu.cc
 +++ b/Ghidra/Features/Decompiler/src/decompile/unittests/testfloatemu.cc
-@@ -346,7 +346,7 @@ TEST(float_opTrunc_to_int) {
+@@ -375,7 +375,7 @@ TEST(float_opTrunc_to_int) {
 
     for(float f:float_test_values) {
         // avoid undefined behavior
@@ -252,5 +233,5 @@ index c35bde877..061e53677 100644
         uintb true_result = ((uintb)(int32_t)f) & 0xffffffff;
         uintb encoding = format.getEncoding(f);
 -- 
-2.44.0
+2.47.0

@@ -1,4 +1,4 @@
-From 290b06621c7a8c32c1470d16dbd8740876d57640 Mon Sep 17 00:00:00 2001
+From 1e334bf169139dd1dcbf8e92c992b702b027b3b1 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
@@ -9,7 +9,7 @@ Subject: [PATCH 2/5] Use `stroull` instead of `stroul` to parse address
 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 bda09fc94..d077ee375 100644
+index dbaa2e775f..72927bf379 100644
 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/space.cc
 +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/space.cc
@@ -16,6 +16,8 @@
@@ -21,7 +21,7 @@ index bda09fc94..d077ee375 100644
 namespace ghidra {
 
 AttributeId ATTRIB_BASE = AttributeId("base",89);
-@@ -274,7 +276,10 @@ uintb AddrSpace::read(const string &s,int4 &size) const
+@@ -277,7 +279,10 @@ uintb AddrSpace::read(const string &s,int4 &size) const
     }
   }
   catch(LowlevelError &err) {	// Name doesn't exist
@@ -34,5 +34,5 @@ index bda09fc94..d077ee375 100644
     enddata = (const char *) tmpdata;
     if (enddata - s.c_str() == s.size()) { // If no size or offset override
 -- 
-2.44.0
+2.47.0

@@ -1,7 +1,7 @@
-From a7fc8b440ab58cb377460e11c7449488ff5abc96 Mon Sep 17 00:00:00 2001
+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 5/5] Add missing index check to prevent errors in Windows
+Subject: [PATCH 3/5] Add missing index check to prevent errors in Windows

 Not sure why this only appears when testing on Windows.
 ---
@@ -9,10 +9,10 @@ Not sure why this only appears when testing on Windows.
 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 ac94d261c..a76ad389b 100644
+index 0237adb820..5048a9d480 100644
 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/ifacedecomp.cc
 +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/ifacedecomp.cc
-@@ -1842,7 +1842,7 @@ void IfcProtooverride::execute(istream &s)
+@@ -1844,7 +1844,7 @@ void IfcProtooverride::execute(istream &s)
   s >> ws;
   Address callpoint(parse_machaddr(s,discard,*dcp->conf->types));
   int4 i;
@@ -22,5 +22,5 @@ index ac94d261c..a76ad389b 100644
   if (i == dcp->fd->numCalls())
     throw IfaceExecutionError("No call is made at this address");
 -- 
-2.44.0
+2.47.0

@@ -0,0 +1,36 @@
+From 0d09640f2d770db6cac6f9a02f5d85373477e5a9 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
+
+assign will fix up the size to hold all of what's copied
+---
+ Ghidra/Features/Decompiler/src/decompile/cpp/stringmanage.cc | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/stringmanage.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/stringmanage.cc
+index 5f5fa0c7b3..4cd77156f2 100644
+--- a/Ghidra/Features/Decompiler/src/decompile/cpp/stringmanage.cc
+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/stringmanage.cc
+@@ -67,7 +67,6 @@ void StringManager::assignStringData(StringData &data,const uint1 *buf,int4 size
+ 
+ {
+   if (charsize == 1 && numChars < maximumChars) {
+-    data.byteData.reserve(size);
+     data.byteData.assign(buf,buf+size);
+   }
+   else {
+@@ -77,9 +76,9 @@ void StringManager::assignStringData(StringData &data,const uint1 *buf,int4 size
+       return;
+     string resString = s.str();
+     int4 newSize = resString.size();
+-    data.byteData.reserve(newSize + 1);
+     const uint1 *ptr = (const uint1 *)resString.c_str();
+     data.byteData.assign(ptr,ptr+newSize);
+    data.byteData.resize(newSize + 1, 0);
+     data.byteData[newSize] = 0;		// Make sure there is a null terminator
+   }
+   data.isTruncated = (numChars >= maximumChars);
+-- 
+2.47.0
+
@@ -0,0 +1,28 @@
+From 5fe91a722d58d4852f5ffadb420eb81627fd914e 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
+
+This test fails on macOS and Windows. I'm unsure whether it's an OS or
+compiler issue.
+---
+ .../Decompiler/src/decompile/unittests/testfloatemu.cc         | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/Ghidra/Features/Decompiler/src/decompile/unittests/testfloatemu.cc b/Ghidra/Features/Decompiler/src/decompile/unittests/testfloatemu.cc
+index fe40e22b1b..91440e2510 100644
+--- a/Ghidra/Features/Decompiler/src/decompile/unittests/testfloatemu.cc
+++ b/Ghidra/Features/Decompiler/src/decompile/unittests/testfloatemu.cc
+@@ -184,7 +184,8 @@ TEST(double_decimal_precision) {
+   double f0 = doubleFromRawBits(0x3fc5555555555555);
+   ASSERT_EQUALS(ff.printDecimal(f0, false), "0.16666666666666666");
+   double f1 = doubleFromRawBits(0x7fefffffffffffff);
+-  ASSERT_EQUALS(ff.printDecimal(f1, false), "1.79769313486232e+308");
+  // Windows and Mac print                      1.7976931348623157e+308
+  // ASSERT_EQUALS(ff.printDecimal(f1, false), "1.79769313486232e+308");
+   double f2 = doubleFromRawBits(0x3fd555555c7dda4b);
+   ASSERT_EQUALS(ff.printDecimal(f2, false), "0.33333334");
+   double f3 = doubleFromRawBits(0x3fd0000000000000);
+-- 
+2.47.0
+
@@ -1,12 +1,11 @@
-From 0e437cb96249306d17f26ff6614871ecd9b37359 Mon Sep 17 00:00:00 2001
-From: "github-actions[bot]"
- <41898282+github-actions[bot]@users.noreply.github.com>
-Date: Wed, 2 Aug 2023 23:19:42 +1000
-Subject: [PATCH 1/2] Fix UBSAN errors in decompiler
+From c5a494bcd940fb46ffe90164c5ec0b61d897a892 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

+Co-authored-by: Alex Cameron <asc@tetsuo.sh>
 ---
 .../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 +++++++++++-------
@@ -14,16 +13,15 @@ Subject: [PATCH 1/2] Fix UBSAN errors in decompiler
 .../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 +-
- 12 files changed, 57 insertions(+), 21 deletions(-)
+ 10 files changed, 49 insertions(+), 19 deletions(-)

 diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/fspec.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/fspec.cc
-index 8380d3cd..a18d5007 100644
+index 6ebec206c9..e5a1ad598c 100644
 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/fspec.cc
 +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/fspec.cc
-@@ -2661,8 +2661,12 @@ void ProtoModelMerged::decode(Decoder &decoder)
+@@ -2868,8 +2868,12 @@ void ProtoModelMerged::decode(Decoder &decoder)
     modellist.push_back(mymodel);
   }
   decoder.closeElement(elemId);
@@ -38,30 +36,11 @@ index 8380d3cd..a18d5007 100644
 }
 
 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 f7781707..283d81c3 100644
--- a/Ghidra/Features/Decompiler/src/decompile/cpp/funcdata_varnode.cc
-+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/funcdata_varnode.cc
-@@ -503,7 +503,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 0e3decc8..403ec35a 100644
+index d76a799960..37ba971a34 100644
 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/op.cc
 +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/op.cc
-@@ -672,7 +672,11 @@ uintb PcodeOp::getNZMaskLocal(bool cliploop) const
+@@ -666,7 +666,11 @@ uintb PcodeOp::getNZMaskLocal(bool cliploop) const
     break;
   case CPUI_PIECE:
     resmask = getIn(0)->getNZMask();
@@ -75,10 +54,10 @@ index 0e3decc8..403ec35a 100644
     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 fcd75cc7..ed0e005a 100644
+index aebcfd9103..6c47e6eb15 100644
 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/opbehavior.cc
 +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/opbehavior.cc
-@@ -750,7 +750,13 @@ uintb OpBehaviorPiece::evaluateBinary(int4 sizeout,int4 sizein,uintb in1,uintb i
+@@ -746,7 +746,13 @@ uintb OpBehaviorPiece::evaluateBinary(int4 sizeout,int4 sizein,uintb in1,uintb i
 uintb OpBehaviorSubpiece::evaluateBinary(int4 sizeout,int4 sizein,uintb in1,uintb in2) const
 
 {
@@ -94,7 +73,7 @@ index fcd75cc7..ed0e005a 100644
 }
 
 diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/pcodecompile.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/pcodecompile.cc
-index ca9d71ab..85d4dd28 100644
+index ca9d71ab99..85d4dd281d 100644
 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/pcodecompile.cc
 +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/pcodecompile.cc
@@ -621,8 +621,10 @@ vector<OpTpl *> *PcodeCompile::assignBitRange(VarnodeTpl *vn,uint4 bitoffset,uin
@@ -137,10 +116,10 @@ index ca9d71ab..85d4dd28 100644
   return res;
 }
 diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/ruleaction.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/ruleaction.cc
-index 4851365d..d069d1c9 100644
+index f667c6ca95..6ea3916520 100644
 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/ruleaction.cc
 +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/ruleaction.cc
-@@ -976,7 +976,12 @@ int4 RulePullsubIndirect::applyOp(PcodeOp *op,Funcdata &data)
+@@ -977,7 +977,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
 
@@ -154,7 +133,7 @@ index 4851365d..d069d1c9 100644
   consume = ~consume;
   if ((consume & indir->getIn(0)->getConsume())!=0) return 0;
 
-@@ -6782,8 +6787,9 @@ int4 RulePtrsubCharConstant::applyOp(PcodeOp *op,Funcdata &data)
+@@ -7026,8 +7031,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;
@@ -166,7 +145,7 @@ index 4851365d..d069d1c9 100644
   Varnode *vn1 = op->getIn(1);
   if (!vn1->isConstant()) return 0;
   Varnode *outvn = op->getOut();
-@@ -8593,7 +8599,11 @@ int4 RuleSubvarSubpiece::applyOp(PcodeOp *op,Funcdata &data)
+@@ -8831,7 +8837,11 @@ int4 RuleSubvarSubpiece::applyOp(PcodeOp *op,Funcdata &data)
   Varnode *outvn = op->getOut();
   int4 flowsize = outvn->getSize();
   uintb mask = calc_mask( flowsize );
@@ -180,7 +159,7 @@ index 4851365d..d069d1c9 100644
   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 2e3531ea..42482be7 100644
+index cd9b9835b1..8a4616c3b9 100644
 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/semantics.cc
 +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/semantics.cc
@@ -22,6 +22,7 @@ ConstTpl::ConstTpl(const_type tp)
@@ -200,12 +179,12 @@ index 2e3531ea..42482be7 100644
 
 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 8e283dca..652600c1 100644
+index e0b069959d..9117a45c75 100644
 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/semantics.hh
 +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/semantics.hh
-@@ -48,7 +48,7 @@ private:
-   static void printHandleSelector(ostream &s,v_field val);
-   static v_field readHandleSelector(const string &name);
+@@ -47,7 +47,7 @@ class ConstTpl {
+   uintb value_real;
+   v_field select;		// Which part of handle to use as constant
 public:
 -  ConstTpl(void) { type = real; value_real = 0; }
 +  ConstTpl(void) { type = real; value_real = 0; select = v_space; }
@@ -213,10 +192,10 @@ index 8e283dca..652600c1 100644
     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 b40f7438..3c37958d 100644
+index 50d85e22ba..9f3b456229 100644
 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/slgh_compile.cc
 +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/slgh_compile.cc
-@@ -2163,8 +2163,8 @@ string SleighCompile::checkSymbols(SymbolScope *scope)
+@@ -2164,8 +2164,8 @@ string SleighCompile::checkSymbols(SymbolScope *scope)
   ostringstream msg;
   SymbolTree::const_iterator iter;
   for(iter=scope->begin();iter!=scope->end();++iter) {
@@ -226,24 +205,11 @@ index b40f7438..3c37958d 100644
     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 b308e1b7..af2982ae 100644
--- a/Ghidra/Features/Decompiler/src/decompile/cpp/slghsymbol.cc
-+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/slghsymbol.cc
-@@ -2569,7 +2569,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 30faf0b6..e76a0619 100644
+index 7cda43127f..20a5bc1c83 100644
 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/type.cc
 +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/type.cc
-@@ -3359,8 +3359,8 @@ void TypeFactory::recalcPointerSubmeta(Datatype *base,sub_metatype sub)
+@@ -3661,8 +3661,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()) {
@@ -254,10 +220,10 @@ index 30faf0b6..e76a0619 100644
     ++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 c35bde87..061e5367 100644
+index 2571f55f1a..fe40e22b1b 100644
 --- a/Ghidra/Features/Decompiler/src/decompile/unittests/testfloatemu.cc
 +++ b/Ghidra/Features/Decompiler/src/decompile/unittests/testfloatemu.cc
-@@ -346,7 +346,7 @@ TEST(float_opTrunc_to_int) {
+@@ -375,7 +375,7 @@ TEST(float_opTrunc_to_int) {
 
     for(float f:float_test_values) {
         // avoid undefined behavior
@@ -267,5 +233,5 @@ index c35bde87..061e5367 100644
         uintb true_result = ((uintb)(int32_t)f) & 0xffffffff;
         uintb encoding = format.getEncoding(f);
 -- 
-2.39.2 (Apple Git-143)
+2.47.0

@@ -1,8 +1,7 @@
-From 95f230f46bdb95aa4aab7f5d320691f87107fb36 Mon Sep 17 00:00:00 2001
-From: "github-actions[bot]"
- <41898282+github-actions[bot]@users.noreply.github.com>
-Date: Wed, 2 Aug 2023 23:20:14 +1000
-Subject: [PATCH 2/2] Use `stroull` instead of `stroul` to parse address
+From 60b1bb423c10b2e53ad72e7b84ac647e56282aca 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
 offsets

 ---
@@ -10,7 +9,7 @@ Subject: [PATCH 2/2] Use `stroull` instead of `stroul` to parse address
 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 bf4e1dc9..594b4583 100644
+index dbaa2e775f..72927bf379 100644
 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/space.cc
 +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/space.cc
@@ -16,6 +16,8 @@
@@ -22,7 +21,7 @@ index bf4e1dc9..594b4583 100644
 namespace ghidra {
 
 AttributeId ATTRIB_BASE = AttributeId("base",89);
-@@ -290,7 +292,10 @@ uintb AddrSpace::read(const string &s,int4 &size) const
+@@ -277,7 +279,10 @@ uintb AddrSpace::read(const string &s,int4 &size) const
     }
   }
   catch(LowlevelError &err) {	// Name doesn't exist
@@ -35,5 +34,5 @@ index bf4e1dc9..594b4583 100644
     enddata = (const char *) tmpdata;
     if (enddata - s.c_str() == s.size()) { // If no size or offset override
 -- 
-2.39.2 (Apple Git-143)
+2.47.0

@@ -0,0 +1,26 @@
+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
+
@@ -0,0 +1,36 @@
+From ddd126b14277841a885e824047908fb360e26191 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
+
+assign will fix up the size to hold all of what's copied
+---
+ Ghidra/Features/Decompiler/src/decompile/cpp/stringmanage.cc | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/stringmanage.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/stringmanage.cc
+index 5f5fa0c7b3..4cd77156f2 100644
+--- a/Ghidra/Features/Decompiler/src/decompile/cpp/stringmanage.cc
+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/stringmanage.cc
+@@ -67,7 +67,6 @@ void StringManager::assignStringData(StringData &data,const uint1 *buf,int4 size
+ 
+ {
+   if (charsize == 1 && numChars < maximumChars) {
+-    data.byteData.reserve(size);
+     data.byteData.assign(buf,buf+size);
+   }
+   else {
+@@ -77,9 +76,9 @@ void StringManager::assignStringData(StringData &data,const uint1 *buf,int4 size
+       return;
+     string resString = s.str();
+     int4 newSize = resString.size();
+-    data.byteData.reserve(newSize + 1);
+     const uint1 *ptr = (const uint1 *)resString.c_str();
+     data.byteData.assign(ptr,ptr+newSize);
+    data.byteData.resize(newSize + 1, 0);
+     data.byteData[newSize] = 0;		// Make sure there is a null terminator
+   }
+   data.isTruncated = (numChars >= maximumChars);
+-- 
+2.47.0
+
@@ -0,0 +1,28 @@
+From 163be34210f69068f89e20acf89a4fbd50a88b76 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
+
+This test fails on macOS and Windows. I'm unsure whether it's an OS or
+compiler issue.
+---
+ .../Decompiler/src/decompile/unittests/testfloatemu.cc         | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/Ghidra/Features/Decompiler/src/decompile/unittests/testfloatemu.cc b/Ghidra/Features/Decompiler/src/decompile/unittests/testfloatemu.cc
+index fe40e22b1b..91440e2510 100644
+--- a/Ghidra/Features/Decompiler/src/decompile/unittests/testfloatemu.cc
+++ b/Ghidra/Features/Decompiler/src/decompile/unittests/testfloatemu.cc
+@@ -184,7 +184,8 @@ TEST(double_decimal_precision) {
+   double f0 = doubleFromRawBits(0x3fc5555555555555);
+   ASSERT_EQUALS(ff.printDecimal(f0, false), "0.16666666666666666");
+   double f1 = doubleFromRawBits(0x7fefffffffffffff);
+-  ASSERT_EQUALS(ff.printDecimal(f1, false), "1.79769313486232e+308");
+  // Windows and Mac print                      1.7976931348623157e+308
+  // ASSERT_EQUALS(ff.printDecimal(f1, false), "1.79769313486232e+308");
+   double f2 = doubleFromRawBits(0x3fd555555c7dda4b);
+   ASSERT_EQUALS(ff.printDecimal(f2, false), "0.33333334");
+   double f3 = doubleFromRawBits(0x3fd0000000000000);
+-- 
+2.47.0
+
@@ -22,7 +22,7 @@ set_property(CACHE sleigh_RELEASE_TYPE PROPERTY STRINGS "stable" "HEAD")
 find_package(Git REQUIRED)

 # Ghidra pinned stable version commit
-set(ghidra_version "11.0.3")
+set(ghidra_version "11.2")
 set(ghidra_git_tag "Ghidra_${ghidra_version}_build")
 set(ghidra_shallow TRUE)

@@ -40,15 +40,18 @@ 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"
 )

 # 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.1")
+  set(ghidra_head_version "11.3")
  set(ghidra_version "${ghidra_head_version}")
-  set(ghidra_head_git_tag "cae9190c13709fbd889edbe8f46d28c99df0a588")
+  set(ghidra_head_git_tag "fd1a448bf517939b5f3b7e369a8c10e8b1b22136")
  set(ghidra_git_tag "${ghidra_head_git_tag}")
  set(ghidra_shallow FALSE)
  set(ghidra_patches
@@ -57,7 +60,9 @@ 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/0005-Add-missing-index-check-to-prevent-errors-in-Windows.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"
  )
  string(SUBSTRING "${ghidra_git_tag}" 0 7 ghidra_short_commit)
 else()
@@ -165,11 +170,13 @@ set(sleigh_deccore_source_list
  "${library_root}/unionresolve.cc"
  "${library_root}/modelrules.cc"
  "${library_root}/signature.cc"
+  "${library_root}/multiprecision.cc"
+  "${library_root}/constseq.cc"
 )
-# if("${sleigh_RELEASE_TYPE}" STREQUAL "HEAD")
-#   list(APPEND sleigh_deccore_source_list
-#   )
-# endif()
+#if("${sleigh_RELEASE_TYPE}" STREQUAL "HEAD")
+#  list(APPEND sleigh_deccore_source_list
+#  )
+#endif()

 set(sleigh_extra_source_list
  "${library_root}/callgraph.cc"
@@ -198,13 +205,13 @@ set(sleigh_source_list
  "${library_root}/semantics.cc"
  "${library_root}/context.cc"
  "${library_root}/filemanage.cc"
+  "${library_root}/slaformat.cc"
+  "${library_root}/compression.cc"
 )
-if("${sleigh_RELEASE_TYPE}" STREQUAL "HEAD")
-  list(APPEND sleigh_source_list
-    "${library_root}/slaformat.cc"
-    "${library_root}/compression.cc"
-  )
-endif()
+# if("${sleigh_RELEASE_TYPE}" STREQUAL "HEAD")
+#   list(APPEND sleigh_source_list
+#   )
+# endif()

 set(sleigh_ghidra_source_list
  "${library_root}/ghidra_arch.cc"
@@ -63,6 +63,8 @@ set(spec_file_list
  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/Loongarch/data/languages/loongarch32_f64.slaspec"
  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/Loongarch/data/languages/loongarch64_f32.slaspec"
  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/Loongarch/data/languages/loongarch64_f64.slaspec"
+  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/M16C/data/languages/M16C_60.slaspec"
+  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/M16C/data/languages/M16C_80.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"
@@ -63,6 +63,8 @@ set(spec_file_list
  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/Loongarch/data/languages/loongarch32_f64.slaspec"
  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/Loongarch/data/languages/loongarch64_f32.slaspec"
  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/Loongarch/data/languages/loongarch64_f64.slaspec"
+  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/M16C/data/languages/M16C_60.slaspec"
+  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/M16C/data/languages/M16C_80.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"
@@ -124,6 +124,9 @@ namespace ghidra {
 #include <ghidra/modelrules.hh>
 #include <ghidra/signature.hh>
 #include <ghidra/signature_ghidra.hh>
+#include <ghidra/compression.hh>
+#include <ghidra/multiprecision.hh>
+#include <ghidra/slaformat.hh>

 // #ifdef sleigh_RELEASE_IS_HEAD
 // #endif
@@ -42,9 +42,7 @@ if(HAVE_TERMIOS_H)
 endif()
 sleigh_add_optional_defines(sleigh_ghidra_test PRIVATE)

-if(sleigh_RELEASE_IS_HEAD)
-  target_link_libraries(sleigh_ghidra_test PRIVATE ZLIB::ZLIB)
-endif()
+target_link_libraries(sleigh_ghidra_test PRIVATE ZLIB::ZLIB)

 add_test(
  NAME sleigh_ghidra_unittest
@@ -50,10 +50,8 @@ set_target_properties(sleigh_decompiler PROPERTIES
  OUTPUT_NAME_DEBUG decomp_dbg
 )

-if(sleigh_RELEASE_IS_HEAD)
-  find_package(ZLIB REQUIRED)
-  target_link_libraries(sleigh_decompiler PRIVATE ZLIB::ZLIB)
-endif()
+find_package(ZLIB REQUIRED)
+target_link_libraries(sleigh_decompiler PRIVATE ZLIB::ZLIB)

 if(NOT CMAKE_SKIP_INSTALL_RULES)
  include("GNUInstallDirs")
@@ -46,10 +46,8 @@ set_target_properties(sleigh_ghidra PROPERTIES
  OUTPUT_NAME_DEBUG ghidra_dbg
 )

-if(sleigh_RELEASE_IS_HEAD)
-  find_package(ZLIB REQUIRED)
-  target_link_libraries(sleigh_ghidra PRIVATE ZLIB::ZLIB)
-endif()
+find_package(ZLIB REQUIRED)
+target_link_libraries(sleigh_ghidra PRIVATE ZLIB::ZLIB)

 if(NOT CMAKE_SKIP_INSTALL_RULES)
  include("GNUInstallDirs")
@@ -36,10 +36,8 @@ set_target_properties(sleigh_sleigh PROPERTIES
  OUTPUT_NAME_DEBUG sleigh_dbg
 )

-if(sleigh_RELEASE_IS_HEAD)
-  find_package(ZLIB REQUIRED)
-  target_link_libraries(sleigh_sleigh PRIVATE ZLIB::ZLIB)
-endif()
+find_package(ZLIB REQUIRED)
+target_link_libraries(sleigh_sleigh PRIVATE ZLIB::ZLIB)

 if(NOT CMAKE_SKIP_INSTALL_RULES)
  include("GNUInstallDirs")