Update Ghidra HEAD to commit 52aed0a72 (#431)

auto-updater[bot] · github-actions[bot] · ekilmer · web-flow · commit 13e0c6b8ff03 · 2026-06-29T21:51:56.000-04:00
* Bump Ghidra HEAD commit 52aed0a72 Changed files: ``` M Ghidra/Features/Decompiler/src/decompile/cpp/Doxyfile M Ghidra/Features/Decompiler/src/decompile/cpp/action.cc 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/blockaction.cc M Ghidra/Features/Decompiler/src/decompile/cpp/consolemain.cc M Ghidra/Features/Decompiler/src/decompile/cpp/coreaction.cc 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/docmain.hh M Ghidra/Features/Decompiler/src/decompile/cpp/flow.cc 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/ghidra_process.cc M Ghidra/Features/Decompiler/src/decompile/cpp/ghidra_process.hh M Ghidra/Features/Decompiler/src/decompile/cpp/ifacedecomp.cc M Ghidra/Features/Decompiler/src/decompile/cpp/ifaceterm.cc M Ghidra/Features/Decompiler/src/decompile/cpp/jumptable.cc M Ghidra/Features/Decompiler/src/decompile/cpp/jumptable.hh 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/pcodecompile.cc M Ghidra/Features/Decompiler/src/decompile/cpp/pcodecompile.hh M Ghidra/Features/Decompiler/src/decompile/cpp/printc.hh M Ghidra/Features/Decompiler/src/decompile/cpp/printlanguage.hh M Ghidra/Features/Decompiler/src/decompile/cpp/semantics.cc M Ghidra/Features/Decompiler/src/decompile/cpp/semantics.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/slgh_compile.hh M Ghidra/Features/Decompiler/src/decompile/cpp/slghsymbol.hh M Ghidra/Features/Decompiler/src/decompile/cpp/subflow.cc M Ghidra/Features/Decompiler/src/decompile/cpp/testfunction.cc M Ghidra/Features/Decompiler/src/decompile/cpp/translate.cc M Ghidra/Features/Decompiler/src/decompile/cpp/type.cc 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/unionresolve.cc M Ghidra/Processors/68000/data/languages/68000.sinc M Ghidra/Processors/PowerPC/data/languages/ppc_32_e500mc_be.cspec M Ghidra/Processors/PowerPC/data/languages/ppc_32_e500mc_le.cspec M Ghidra/Processors/RISCV/data/languages/riscv.rv32m.sinc M Ghidra/Processors/RISCV/data/languages/riscv.rv64m.sinc M Ghidra/Processors/Sparc/data/languages/SparcV9.sinc M Ghidra/Processors/V850/certification.manifest D Ghidra/Processors/V850/data/languages/Helpers/Conditions.sinc D Ghidra/Processors/V850/data/languages/Helpers/Extras.sinc D Ghidra/Processors/V850/data/languages/Helpers/Macros.sinc D Ghidra/Processors/V850/data/languages/Helpers/Register.sinc D Ghidra/Processors/V850/data/languages/Helpers/Tokens.sinc D Ghidra/Processors/V850/data/languages/Helpers/Variables.sinc D Ghidra/Processors/V850/data/languages/Instructions/Arithmetic.sinc D Ghidra/Processors/V850/data/languages/Instructions/Float.sinc D Ghidra/Processors/V850/data/languages/Instructions/Load_Store.sinc D Ghidra/Processors/V850/data/languages/Instructions/Logic.sinc D Ghidra/Processors/V850/data/languages/Instructions/Special.sinc A Ghidra/Processors/V850/data/languages/V850.dwarf M Ghidra/Processors/V850/data/languages/V850.ldefs M Ghidra/Processors/V850/data/languages/V850.opinion M Ghidra/Processors/V850/data/languages/V850.pspec A Ghidra/Processors/V850/data/languages/V850.sinc M Ghidra/Processors/V850/data/languages/V850.slaspec A Ghidra/Processors/V850/data/languages/V850_instructions.sinc A Ghidra/Processors/V850/data/languages/V850e3.pspec A Ghidra/Processors/V850/data/languages/V850e3.sinc A Ghidra/Processors/V850/data/languages/V850e3.slaspec M Ghidra/Processors/V850/data/manuals/v850.idx M Ghidra/Processors/x86/data/languages/ia.sinc ``` Commit details: ``` [Commit 1/16] Hash: bab81cb679ca810fcb3279fb87b6c205d754dcf1 Date: 2026-06-08 17:36:39 +0000 Message: GP-941: Correct SparcV9 register operand display to be consistent Files changed: M Ghidra/Processors/Sparc/data/languages/SparcV9.sinc [Commit 2/16] Hash: db3782947177bd6a65d732db896f99a59c12c49b Date: 2024-06-26 15:25:49 -0700 Message: decomp_dbg: fix left/right arrow keyboard input decomp_dbg: use keyboard up/down arrow to control history Files changed: M Ghidra/Features/Decompiler/src/decompile/cpp/ifaceterm.cc [Commit 3/16] Hash: 3c7e4d1503335db589064a08aa633e8bf19faed2 Date: 2023-10-27 16:09:32 +0000 Message: Properly iterate through resolvemap when remove resolve ranges Files changed: M Ghidra/Features/Decompiler/src/decompile/cpp/database.cc [Commit 4/16] Hash: 376ac1a0a04bfbc0871238b1f019fd0d4353375f Date: 2026-06-23 17:36:03 +0000 Message: GP-6995 SLEIGH decode checks Files changed: M Ghidra/Features/Decompiler/src/decompile/cpp/slghsymbol.hh M Ghidra/Features/Decompiler/src/decompile/cpp/translate.cc [Commit 5/16] Hash: 12806006b5e03fe1583eceeee37494fccb9144de Date: 2023-03-05 11:33:25 +0100 Message: Add custom printRaw implementation for TypeOps with ambiguous printRaw This adds a `printRaw` implementation to 13 TypeOps, similar in implementation to `TypeOpIntSright::printRaw`. Files changed: M Ghidra/Features/Decompiler/src/decompile/cpp/typeop.cc M Ghidra/Features/Decompiler/src/decompile/cpp/typeop.hh [Commit 6/16] Hash: 05c8a9c312db0c3b6c3fcd89dc86cca7f0490e76 Date: 2026-06-22 16:57:08 +0000 Message: GP-6985 Send back consistent function symbol or hole Files changed: M Ghidra/Features/Decompiler/src/decompile/cpp/action.cc M Ghidra/Features/Decompiler/src/decompile/cpp/architecture.hh M Ghidra/Features/Decompiler/src/decompile/cpp/blockaction.cc M Ghidra/Features/Decompiler/src/decompile/cpp/database.cc 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/ghidra_process.cc M Ghidra/Features/Decompiler/src/decompile/cpp/ghidra_process.hh M Ghidra/Features/Decompiler/src/decompile/cpp/sleigh_arch.cc M Ghidra/Features/Decompiler/src/decompile/cpp/sleigh_arch.hh [Commit 7/16] Hash: 6f5fa3192c92996a81955d2183712c62b9e7d477 Date: 2025-01-15 15:21:19 +0000 Message: GP-2907: Added v850e3 language variant instructions Files changed: M Ghidra/Processors/V850/certification.manifest D Ghidra/Processors/V850/data/languages/Helpers/Conditions.sinc D Ghidra/Processors/V850/data/languages/Helpers/Extras.sinc D Ghidra/Processors/V850/data/languages/Helpers/Macros.sinc D Ghidra/Processors/V850/data/languages/Helpers/Register.sinc D Ghidra/Processors/V850/data/languages/Helpers/Tokens.sinc D Ghidra/Processors/V850/data/languages/Helpers/Variables.sinc D Ghidra/Processors/V850/data/languages/Instructions/Arithmetic.sinc D Ghidra/Processors/V850/data/languages/Instructions/Float.sinc D Ghidra/Processors/V850/data/languages/Instructions/Load_Store.sinc D Ghidra/Processors/V850/data/languages/Instructions/Logic.sinc D Ghidra/Processors/V850/data/languages/Instructions/Special.sinc A Ghidra/Processors/V850/data/languages/V850.dwarf M Ghidra/Processors/V850/data/languages/V850.ldefs M Ghidra/Processors/V850/data/languages/V850.opinion M Ghidra/Processors/V850/data/languages/V850.pspec A Ghidra/Processors/V850/data/languages/V850.sinc M Ghidra/Processors/V850/data/languages/V850.slaspec A Ghidra/Processors/V850/data/languages/V850_instructions.sinc A Ghidra/Processors/V850/data/languages/V850e3.pspec A Ghidra/Processors/V850/data/languages/V850e3.sinc A Ghidra/Processors/V850/data/languages/V850e3.slaspec M Ghidra/Processors/V850/data/manuals/v850.idx [Commit 8/16] Hash: 891826dbc951afe823f07d26447728a6eb259f82 Date: 2025-12-23 23:06:20 +0100 Message: 68000: movem.w always uses 2 increments Details: movem exists in 2 symmetrical variants, register to memory (save to stack) and memory to register (pull from stack). Per 68000 manual, when in word mode, increment (respectively decrement) is 2, and 4 in long mode. For word mode, the various registers masks are handled by m2rfw0, r2mbw0, and r2mfw0. This patch corrects the pointer increment for r2mbw0 to 2, aligning it to m2rfw0 and r2mfw0. Files changed: M Ghidra/Processors/68000/data/languages/68000.sinc [Commit 9/16] Hash: 86f4daefc594b5df331e2a538150aa678ca6c0d5 Date: 2026-06-18 00:18:15 +0000 Message: Handle TYPE_CODE in isPtrsubMatching Files changed: M Ghidra/Features/Decompiler/src/decompile/cpp/type.cc [Commit 10/16] Hash: 7cfdb503153c1cd1f5dbbb235e0e0847d63088cc Date: 2026-02-18 23:47:44 +0100 Message: Do not apply rule ptrsubundo for pointers targeting ARM Thumb functions Details: In ARM Thumb, function pointers are used with an offset. For example, let's consider this C program: static void fn(void) {} __attribute__((noinline, optimize("O0"))) static void call_function(void (*callback)(void)) { callback(); } void call_fn_through_reference(void) { call_function(fn); } Function call_fn_through_reference actually gives the address fn + 1 in the first parameter of call_function, when this code is compiled in ARM Thumb mode. In such a situation, Ghidra's decompiler produced: void call_fn_through_reference(void) { call_function((void *)0x10189); return; } The rules which were applied included both: - rule constantptr, which converted the constant 0x10189 to (#0x0 -> #0x10188) + #0x1 (opcodes PTRSUB and INT_ADD) ; - rule ptrsubundo, which converted this expression to (#0x0 + #0x10188) + #0x1 (later simplified to #0x10189). The second rule cancelled the first one. In this case, rule ptrsubundo should not be applied as the expression involving PTRSUB targets a valid location. Nevertheless, TypePointer::isPtrsubMatching(off=0x10188, extra=1, multiplier=0) returned false. This is due to the fact that even though the size of symbol fn was adjusted to be 2 (in method DecompileCallback::encodeFunction in Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/DecompileCallback.java ), the actual type is "pointer to a TypeCode which size is 1", so extra >= subType->getSize() and the method returned false. Fix TypePointer::isPtrsubMatching to return true when a pointer to some code is encountered with extra >= 0. This makes Ghidra's decompiler now produce: void call_fn_through_reference(void) { call_function(fn + 1); return; } Fixes: NationalSecurityAgency/ghidra#8471 Fixes: 34adcff8308d ("GP-4782 Refactor RulePtrsubUndo") Files changed: M Ghidra/Features/Decompiler/src/decompile/cpp/type.cc [Commit 11/16] Hash: ff4f0ed1f6a866ce0bea86b921d67ce656e3cc8d Date: 2026-06-12 15:22:23 +0000 Message: GP-6946 Refactor JumpTable thunk check Files changed: M Ghidra/Features/Decompiler/src/decompile/cpp/jumptable.cc M Ghidra/Features/Decompiler/src/decompile/cpp/jumptable.hh [Commit 12/16] Hash: e465f9b3d620b47ad367065fc1f0e4329ffa492a Date: 2026-06-15 17:59:24 +0000 Message: GP-6967 Add getScopeDelimiter Files changed: M Ghidra/Features/Decompiler/src/decompile/cpp/Doxyfile 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/consolemain.cc M Ghidra/Features/Decompiler/src/decompile/cpp/coreaction.cc 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/docmain.hh M Ghidra/Features/Decompiler/src/decompile/cpp/ifacedecomp.cc M Ghidra/Features/Decompiler/src/decompile/cpp/pcodecompile.cc M Ghidra/Features/Decompiler/src/decompile/cpp/pcodecompile.hh M Ghidra/Features/Decompiler/src/decompile/cpp/printc.hh M Ghidra/Features/Decompiler/src/decompile/cpp/printlanguage.hh M Ghidra/Features/Decompiler/src/decompile/cpp/semantics.cc M Ghidra/Features/Decompiler/src/decompile/cpp/semantics.hh M Ghidra/Features/Decompiler/src/decompile/cpp/slgh_compile.hh M Ghidra/Features/Decompiler/src/decompile/cpp/subflow.cc M Ghidra/Features/Decompiler/src/decompile/cpp/testfunction.cc M Ghidra/Features/Decompiler/src/decompile/cpp/unionresolve.cc [Commit 13/16] Hash: 8cdec9bbf6334fb12a163408f8404c1e3d907e3b Date: 2026-06-15 20:08:40 +0000 Message: GP-6989 e500mc stack offset adjustment Files changed: M Ghidra/Processors/PowerPC/data/languages/ppc_32_e500mc_be.cspec M Ghidra/Processors/PowerPC/data/languages/ppc_32_e500mc_le.cspec [Commit 14/16] Hash: edb05a43b9991fba471eb79433aea01f7e1142c7 Date: 2024-05-15 16:17:17 +0930 Message: riscv: handle divideby0 Files changed: M Ghidra/Processors/RISCV/data/languages/riscv.rv32m.sinc M Ghidra/Processors/RISCV/data/languages/riscv.rv64m.sinc [Commit 15/16] Hash: 48f4c0b040456b99c3de84685657bed1d4a0f390 Date: 2026-06-11 20:53:01 +0000 Message: GP-6957 Relative branch to next instruction is more flexible Files changed: M Ghidra/Features/Decompiler/src/decompile/cpp/flow.cc M Ghidra/Features/Decompiler/src/decompile/cpp/op.cc M Ghidra/Features/Decompiler/src/decompile/cpp/op.hh [Commit 16/16] Hash: 4f1b1bdefffffbdf4feeadfbc0f32f8da39f33a4 Date: 2026-06-08 18:57:31 +0000 Message: GP-6937: Fixed x86 Xmmreg2 accessing EVEX registers in non-EVEX Files changed: M Ghidra/Processors/x86/data/languages/ia.sinc ``` * Rebase HEAD UBSAN patch onto Ghidra 52aed0a72 Upstream refactored semantics.cc/semantics.hh, so the context lines in 0001-Fix-UBSAN-errors-in-decompiler.patch no longer matched and git am rejected it. Regenerate the patch against the new source; ConstTpl still initializes select in the constructors that left it uninitialized. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Eric Kilmer <eric.kilmer@trailofbits.com> Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
diff --git a/src/patches/HEAD/0001-Fix-UBSAN-errors-in-decompiler.patch b/src/patches/HEAD/0001-Fix-UBSAN-errors-in-decompiler.patch
@@ -1,4 +1,4 @@
-From 98769d3cd2f417a52559bf68700e2f9f3e7a0e4f Mon Sep 17 00:00:00 2001
+From b51cd30957ce9e5dafae0497a13a0e3a0cec8bc0 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/7] Fix UBSAN errors in decompiler
@@ -13,10 +13,10 @@ Co-authored-by: Alex Cameron <asc@tetsuo.sh>
  5 files changed, 16 insertions(+), 10 deletions(-)
 
 diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/pcodecompile.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/pcodecompile.cc
-index a67a3de849..37ba4930e6 100644
+index de3ec1af20..0274060de1 100644
 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/pcodecompile.cc
 +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/pcodecompile.cc
-@@ -618,8 +618,10 @@ vector<OpTpl *> *PcodeCompile::assignBitRange(VarnodeTpl *vn,uint4 bitoffset,uin
+@@ -772,8 +772,10 @@ vector<OpTpl *> *PcodeCompile::assignBitRange(VarnodeTpl *vn,uint4 bitoffset,uin
    uint4 smallsize = (numbits+7)/8; // Size of input (output of rhs)
    bool shiftneeded = (bitoffset != 0);
    bool zextneeded = true;
@@ -29,7 +29,7 @@ index a67a3de849..37ba4930e6 100644
  
    if (vn->getSize().getType()==ConstTpl::real) {
      // If we know the size of the bitranged varnode, we can
-@@ -723,9 +725,6 @@ ExprTree *PcodeCompile::createBitRange(SpecificSymbol *sym,uint4 bitoffset,uint4
+@@ -884,9 +886,6 @@ ExprTree *PcodeCompile::createBitRange(SpecificSymbol *sym,uint4 bitoffset,uint4
      }
    }
  
@@ -39,7 +39,7 @@ index a67a3de849..37ba4930e6 100644
    if (truncneeded && ((bitoffset % 8)==0)) {
      truncshift = bitoffset/8;
      bitoffset = 0;
-@@ -748,8 +747,13 @@ ExprTree *PcodeCompile::createBitRange(SpecificSymbol *sym,uint4 bitoffset,uint4
+@@ -909,8 +908,13 @@ ExprTree *PcodeCompile::createBitRange(SpecificSymbol *sym,uint4 bitoffset,uint4
      appendOp(CPUI_INT_RIGHT,res,bitoffset,4);
    if (truncneeded)
      appendOp(CPUI_SUBPIECE,res,truncshift,4);
@@ -56,18 +56,18 @@ index a67a3de849..37ba4930e6 100644
    return res;
  }
 diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/semantics.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/semantics.cc
-index 18e2ff8ba1..3bfe29f2ef 100644
+index c729073918..9ec58e18d3 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)
+@@ -23,6 +23,7 @@ ConstTpl::ConstTpl(const_type tp)
  
- {				// Constructor for relative jump constants and uniques
+ {
    type = tp;
 +  select = v_space;
  }
  
- ConstTpl::ConstTpl(const_type tp,uintb val)
-@@ -56,6 +57,7 @@ ConstTpl::ConstTpl(AddrSpace *sid)
+ /// \param tp is constant type: either \b real or \b j_relative
+@@ -67,6 +68,7 @@ ConstTpl::ConstTpl(AddrSpace *sid)
  {
    type = spaceid;
    value.spaceid = sid;
@@ -76,23 +76,23 @@ index 18e2ff8ba1..3bfe29f2ef 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 b53b18797d..b2f043e32d 100644
+index b878b840e6..12df5e548c 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 {
-   uintb value_real;
-   v_field select;		// Which part of handle to use as constant
+@@ -83,7 +83,7 @@ class ConstTpl {
+   uintb value_real;		///< An immediate constant value or other constant offset a ConstTpl represents
+   v_field select;		///< Assuming ConstTpl is a \b handle, the part of the \b handle to use as constant
  public:
--  ConstTpl(void) { type = real; value_real = 0; }
-+  ConstTpl(void) { type = real; value_real = 0; select = v_space; }
+-  ConstTpl(void) { type = real; value_real = 0; }	///< Construct a zero constant
++  ConstTpl(void) { type = real; value_real = 0; select = v_space; }	///< Construct a zero constant
    ConstTpl(const ConstTpl &op2) {
-     type=op2.type; value=op2.value; value_real=op2.value_real; select=op2.select; }
-   ConstTpl(const_type tp,uintb val);
+     type=op2.type; value=op2.value; value_real=op2.value_real; select=op2.select; }	///< Copy constructor
+   ConstTpl(const_type tp,uintb val);					///< Constructor for real constants or relative offsets
 diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/slgh_compile.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/slgh_compile.cc
-index 75bebffcb0..bf5e7ce681 100644
+index 9c57c9e44d..aa9bce0433 100644
 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/slgh_compile.cc
 +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/slgh_compile.cc
-@@ -2323,8 +2323,8 @@ string SleighCompile::checkSymbols(SymbolScope *scope)
+@@ -2337,8 +2337,8 @@ string SleighCompile::checkSymbols(SymbolScope *scope)
    ostringstream msg;
    SymbolTree::const_iterator iter;
    for(iter=scope->begin();iter!=scope->end();++iter) {
@@ -116,5 +116,5 @@ index 2571f55f1a..fe40e22b1b 100644
          uintb true_result = ((uintb)(int32_t)f) & 0xffffffff;
          uintb encoding = format.getEncoding(f);
 -- 
-2.51.1
+2.54.0
 
diff --git a/src/setup-ghidra-source.cmake b/src/setup-ghidra-source.cmake
@@ -55,7 +55,7 @@ if("${sleigh_RELEASE_TYPE}" STREQUAL "HEAD")
   # TODO: CMake only likes numeric characters in the version string....
   set(ghidra_head_version "12.2")
   set(ghidra_version "${ghidra_head_version}")
-  set(ghidra_head_git_tag "f9e13846b20c223334d37cfe75bf36fbe9e4dce7")
+  set(ghidra_head_git_tag "52aed0a729013fde5dda297888322ab184c3f8ff")
   set(ghidra_git_tag "${ghidra_head_git_tag}")
   set(ghidra_shallow FALSE)
   set(ghidra_patches
diff --git a/src/spec_files_HEAD.cmake b/src/spec_files_HEAD.cmake
@@ -139,6 +139,7 @@ set(spec_file_list
   "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/Toy/data/languages/toy_wsz_be.slaspec"
   "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/Toy/data/languages/toy_wsz_le.slaspec"
   "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/V850/data/languages/V850.slaspec"
+  "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/V850/data/languages/V850e3.slaspec"
   "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/Xtensa/data/languages/xtensa_be.slaspec"
   "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/Xtensa/data/languages/xtensa_le.slaspec"
   "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/Z80/data/languages/z180.slaspec"
