Rework and regenerate patches

Only modified ruleaction.cc in 0001-Fix-UBSAN-errors-in-decompiler.patch

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

@@ -1,21 +1,21 @@
-From 76289be82722d1a076bb9718507ce57748b40543 Mon Sep 17 00:00:00 2001
+From 5b07c4118a9c6fe8f9d240419aaf5b8ce49becdf Mon Sep 17 00:00:00 2001
 From: Eric Kilmer <[email protected]>
 Date: Mon, 12 Aug 2024 12:02:35 -0400
-Subject: [PATCH 1/6] Fix UBSAN errors in decompiler
+Subject: [PATCH 1/5] Fix UBSAN errors in decompiler
 
 Co-authored-by: Alex Cameron <[email protected]>
 ---
  .../Decompiler/src/decompile/cpp/fspec.cc      |  8 ++++++--
  .../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 d78b78731c..caf4b24d15 100644
@@ -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 bfca3d6ee5..5819bcd732 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 bfca3d6ee5..5819bcd732 100644
    consume = ~consume;
    if ((consume & indir->getIn(0)->getConsume())!=0) return 0;
 
-@@ -7028,8 +7033,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 bfca3d6ee5..5819bcd732 100644
    Varnode *vn1 = op->getIn(1);
    if (!vn1->isConstant()) return 0;
    Varnode *outvn = op->getOut();
-@@ -8833,7 +8839,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 59dcc55949..5944db5905 100644
+index fd0ab26fb4..7f654c220b 100644
 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/type.cc
 +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/type.cc
-@@ -3658,8 +3658,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()) {

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

@@ -1,7 +1,7 @@
-From 2e4706231191395dac90b764ce29c55de29ca2ce Mon Sep 17 00:00:00 2001
+From 4da4a99471f73c3962b8c9d89d9a593896366a58 Mon Sep 17 00:00:00 2001
 From: Alex Cameron <[email protected]>
 Date: Wed, 3 Aug 2022 20:01:18 +1000
-Subject: [PATCH 2/6] Use `stroull` instead of `stroul` to parse address
+Subject: [PATCH 2/5] Use `stroull` instead of `stroul` to parse address
  offsets
 
 ---

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

@@ -1,7 +1,7 @@
-From d7f7be313580a6e0eef101848a3c86e3a3db4029 Mon Sep 17 00:00:00 2001
+From d2b0eaec8477ddaf7a1a971e45a6ebf8dceb57da Mon Sep 17 00:00:00 2001
 From: Eric Kilmer <[email protected]>
 Date: Tue, 29 Oct 2024 15:30:57 -0400
-Subject: [PATCH 4/6] Use string resize instead of reserve
+Subject: [PATCH 3/5] Use string resize instead of reserve
 
 assign will fix up the size to hold all of what's copied
 ---

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

@@ -1,7 +1,7 @@
-From a76b69021f34973973487362cb5f25f7644880b8 Mon Sep 17 00:00:00 2001
+From fc506c1da2adc3fb249d7721f3c4a16c3c319056 Mon Sep 17 00:00:00 2001
 From: Eric Kilmer <[email protected]>
 Date: Tue, 29 Oct 2024 17:51:09 -0400
-Subject: [PATCH 5/6] Ignore floating point test due to compilation differences
+Subject: [PATCH 4/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.

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

@@ -1,7 +1,7 @@
-From ce0148e9dd6d4a9ba92ee44fb50be1f01b7a8858 Mon Sep 17 00:00:00 2001
+From 59254803a80df713860817b05fdc4c4487dd984f Mon Sep 17 00:00:00 2001
 From: Eric Kilmer <[email protected]>
 Date: Wed, 30 Oct 2024 14:26:57 -0400
-Subject: [PATCH 6/6] Allow positive or negative NAN in decompiler floating
+Subject: [PATCH 5/5] Allow positive or negative NAN in decompiler floating
  point test
 
 At least on Apple Silicon, this test reports positive NAN.

src/setup-ghidra-source.cmake

@@ -61,9 +61,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/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/0006-Allow-positive-or-negative-NAN-in-decompiler-floatin.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"
   )
   string(SUBSTRING "${ghidra_git_tag}" 0 7 ghidra_short_commit)
 else()