Update Ghidra HEAD to commit acb07dd53 (#168)

* Bump Ghidra HEAD commit acb07dd53

Changed files:

```
M	Ghidra/Features/Decompiler/src/decompile/cpp/coreaction.cc
M	Ghidra/Features/Decompiler/src/decompile/cpp/funcdata.hh
M	Ghidra/Features/Decompiler/src/decompile/cpp/funcdata_varnode.cc
M	Ghidra/Features/Decompiler/src/decompile/cpp/merge.cc
M	Ghidra/Features/Decompiler/src/decompile/cpp/merge.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/type.cc
M	Ghidra/Features/Decompiler/src/decompile/cpp/type.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/varnode.cc
A	Ghidra/Features/Decompiler/src/decompile/datatests/piecestruct.xml
M	Ghidra/Processors/ARM/data/languages/ARMTHUMBinstructions.sinc
M	Ghidra/Processors/RISCV/data/languages/riscv.ldefs
M	Ghidra/Processors/RISCV/data/languages/riscv.rv32i.sinc
```

Regenerate RemUsing patch

---------
Co-authored-by: Alex Cameron <asc@tetsuo.sh>

.github/workflows/main.yml

@@ -61,8 +61,8 @@ jobs:
       shell: cmake -P {0}
       run: |
         string(TIMESTAMP current_date "%Y-%m-%d-%H;%M;%S" UTC)
-        file(APPEND "$ENV{GITHUB_ENV}" "CACHE_KEY=build_${{ matrix.os }}_type-${{ matrix.build_type }}-${{ matrix.release }}")
-        file(APPEND "$ENV{GITHUB_ENV}" "CACHE_TIMESTAMP=${current_date}")
+        file(APPEND "$ENV{GITHUB_ENV}" "CACHE_KEY=build_${{ matrix.os }}_type-${{ matrix.build_type }}-${{ matrix.release }}\n")
+        file(APPEND "$ENV{GITHUB_ENV}" "CACHE_TIMESTAMP=${current_date}\n")
 
     - name: Update the cache (ccache)
       uses: actions/cache@v3
@@ -188,7 +188,7 @@ jobs:
         path: ${{ env.DEB_PACKAGE_PATH }}
 
     - name: Release DEB package artifact (RelWithDebInfo only)
-      uses: softprops/action-gh-release@v0.1.14
+      uses: softprops/action-gh-release@v0.1.15
       if: matrix.build_type == 'RelWithDebInfo' && runner.os == 'Linux' && startsWith(github.ref, 'refs/tags/') && matrix.release == 'stable'
       with:
         files: ${{ env.DEB_PACKAGE_PATH }}
@@ -201,7 +201,7 @@ jobs:
         name: ${{ env.RPM_PACKAGE_NAME }}
         path: ${{ env.RPM_PACKAGE_PATH }}
     - name: Release RPM package artifact (RelWithDebInfo only)
-      uses: softprops/action-gh-release@v0.1.14
+      uses: softprops/action-gh-release@v0.1.15
       if: matrix.build_type == 'RelWithDebInfo' && runner.os == 'Linux' && startsWith(github.ref, 'refs/tags/') && matrix.release == 'stable'
       with:
         files: ${{ env.RPM_PACKAGE_PATH }}
@@ -215,7 +215,7 @@ jobs:
         path: ${{ env.TGZ_PACKAGE_PATH }}
 
     - name: Release TGZ package artifact (RelWithDebInfo only)
-      uses: softprops/action-gh-release@v0.1.14
+      uses: softprops/action-gh-release@v0.1.15
       if: matrix.build_type == 'RelWithDebInfo' && startsWith(github.ref, 'refs/tags/') && matrix.release == 'stable'
       with:
         files: ${{ env.TGZ_PACKAGE_PATH }}

.github/workflows/update_head.yml

@@ -23,7 +23,7 @@ jobs:
       id: head_update
       run: |
         # Sets some outputs. See next step
-        python3.7 scripts/update_ghidra_head.py --ci
+        python3 scripts/update_ghidra_head.py --ci
 
     # Need this to run further Actions on the newly created PR
     # See here for more details https://github.com/peter-evans/create-pull-request/blob/28fa4848947e0faa7fa50647691d01477589d5e9/docs/concepts-guidelines.md#authenticating-with-github-app-generated-tokens
@@ -39,7 +39,16 @@ jobs:
       uses: peter-evans/create-pull-request@v4
       with:
         title: Update Ghidra HEAD to commit ${{ steps.head_update.outputs.short_sha }}
-        commit-message: Bump Ghidra HEAD commit ${{ steps.head_update.outputs.short_sha }}
+        commit-message: |
+          Bump Ghidra HEAD commit ${{ steps.head_update.outputs.short_sha }}
+
+          Changed files:
+
+          ${{ steps.head_update.outputs.changed_files }}
+        body: |
+          Changed files:
+
+          ${{ steps.head_update.outputs.changed_files }}
         branch: cron/update-ghidra-${{ steps.head_update.outputs.short_sha }}
         delete-branch: true
         token: ${{ steps.generate-token.outputs.token }}

CMakePresets.json

@@ -37,7 +37,8 @@
       "cacheVariables": {
         "CMAKE_CXX_EXTENSIONS": "OFF",
         "CMAKE_CXX_STANDARD": "11",
-        "CMAKE_CXX_STANDARD_REQUIRED": "ON"
+        "CMAKE_CXX_STANDARD_REQUIRED": "ON",
+        "CMAKE_POSITION_INDEPENDENT_CODE": "ON"
       }
     },
     {

scripts/update_ghidra_head.py

@@ -1,18 +1,26 @@
 """Script to update CMake files for latest Ghidra Sleigh changes"""
-import pathlib
 import re
 import shutil
 import subprocess
 import sys
 import tempfile
-from typing import AnyStr, Union
+from pathlib import Path
+from typing import AnyStr, Union, List
 
-PROJECT_ROOT = pathlib.Path(__file__).parent.parent.resolve()
+PROJECT_ROOT = Path(__file__).parent.parent.resolve()
 HEAD_SPEC_FILE = PROJECT_ROOT / "src" / "spec_files_HEAD.cmake"
 assert HEAD_SPEC_FILE.exists()
 SETUP_GHIDRA_FILE = PROJECT_ROOT / "src" / "setup-ghidra-source.cmake"
 assert SETUP_GHIDRA_FILE.exists()
 
+# Paths in Ghidra repo that affect this repo. Used with git diff
+SLEIGH_PATHS: List[str] = [
+    # Source code and tests
+    "Ghidra/Features/Decompiler/src/decompile",
+    # Sleigh files
+    "Ghidra/Processors",
+]
+
 GIT_EXE = shutil.which("git")
 assert GIT_EXE is not None
 
@@ -21,21 +29,18 @@ def msg(s: str) -> None:
     print(f"[!] {s}")
 
 
-PathString = Union[AnyStr, pathlib.Path]
+PathString = Union[AnyStr, Path]
 
 
-def clone_ghidra_git(dir: PathString) -> None:
+def clone_ghidra_git(clone_dir: PathString) -> None:
     """Clone the Ghidra git dir at specified directory"""
-    # Shallow clone
     assert GIT_EXE is not None
     subprocess.run(
         [
             GIT_EXE,
             "clone",
             "https://github.com/NationalSecurityAgency/ghidra",
-            "--depth",
-            "1",
-            dir,
+            clone_dir,
         ],
         stdout=sys.stdout,
         stderr=sys.stderr,
@@ -43,36 +48,90 @@ def clone_ghidra_git(dir: PathString) -> None:
     )
 
 
-def update_head_commit(latest_commit: str):
+def git_get_changed_files(
+    repo: Path, old_commit: str, new_commit: str, paths: List[str], ci: bool
+) -> List[str]:
+    """Get list of changed files from old_commit to new_commit at the specified paths"""
+    assert GIT_EXE is not None
+    changed_files = (
+        subprocess.run(
+            [
+                GIT_EXE,
+                "diff",
+                "--name-status",
+                f"{old_commit}...{new_commit}",
+                "--",
+                *paths,
+            ],
+            cwd=repo,
+            capture_output=True,
+            check=True,
+        )
+        .stdout.decode()
+        .strip()
+        .splitlines()
+    )
+    num_changed = len(changed_files)
+    if num_changed > 0:
+        msg(f"Found {num_changed} changed sleigh files:")
+        print("\n".join(changed_files))
+        if ci:
+            with open(os.environ["GITHUB_OUTPUT"], "a") as gh_out:
+                gh_out.write("changed_files<<EOF\n")
+                gh_out.write("```\n")
+                gh_out.write("\n".join(changed_files))
+                gh_out.write("\n```\n")
+                gh_out.write("EOF\n")
+    return changed_files
+
+
+def is_sleigh_updated(
+    ghidra_repo: Path, old_commit: str, new_commit: str, ci: bool
+) -> bool:
+    """Check if files we're interested in have been touched at all"""
+    changed_files = git_get_changed_files(
+        ghidra_repo, old_commit, new_commit, SLEIGH_PATHS, ci
+    )
+    return len(changed_files) > 0
+
+
+def update_head_commit(
+    setup_file: Path, ghidra_repo_dir: PathString, latest_commit: str, ci: bool
+) -> bool:
     """Edit the Ghidra script to point to the latest commit"""
     head_commit_line = r"set\(ghidra_head_git_tag \"([0-9A-Fa-f]+)\"\)"
     updated = False
 
     fd, abspath = tempfile.mkstemp()
     with open(fd, "w") as w:
-        with open(SETUP_GHIDRA_FILE, "r") as r:
+        with setup_file.open("r") as r:
             for line in r:
                 match = re.search(head_commit_line, line)
                 if match is not None:
                     current_commit = match.group(1)
                     if current_commit != latest_commit:
                         msg(f"Found new commit: {latest_commit}")
-                        line = re.sub(
-                            head_commit_line,
-                            f'set(ghidra_head_git_tag "{latest_commit}")',
-                            line,
-                        )
-                        updated = True
+                        if is_sleigh_updated(
+                            ghidra_repo_dir, current_commit, latest_commit, ci
+                        ):
+                            line = re.sub(
+                                head_commit_line,
+                                f'set(ghidra_head_git_tag "{latest_commit}")',
+                                line,
+                            )
+                            updated = True
+                        else:
+                            msg("No sleigh files updated")
                 w.write(line)
 
     # Make the swap with the new content
-    shutil.copymode(SETUP_GHIDRA_FILE, abspath)
-    os.remove(SETUP_GHIDRA_FILE)
-    shutil.move(abspath, SETUP_GHIDRA_FILE)
+    shutil.copymode(setup_file, abspath)
+    os.remove(setup_file)
+    shutil.move(abspath, setup_file)
     return updated
 
 
-def update_head_version_file(ghidra_root_dir: PathString) -> None:
+def update_head_version_file(setup_file: Path, ghidra_root_dir: PathString) -> None:
     """Edit the Ghidra script to point to the latest version"""
     cmake_head_version_line = (
         r"set\(ghidra_head_version \"([0-9]+(\.[0-9]+)?(\.[0-9]+)?)\"\)"
@@ -86,7 +145,7 @@ def update_head_version_file(ghidra_root_dir: PathString) -> None:
         assert match is not None
         source_version = match.group(1)
 
-    with SETUP_GHIDRA_FILE.open("r") as f:
+    with setup_file.open("r") as f:
         content = f.read()
         match = re.search(cmake_head_version_line, content)
         assert match is not None
@@ -99,7 +158,7 @@ def update_head_version_file(ghidra_root_dir: PathString) -> None:
     msg(f"Found new version: {source_version}")
     fd, abspath = tempfile.mkstemp()
     with open(fd, "w") as w:
-        with SETUP_GHIDRA_FILE.open("r") as r:
+        with setup_file.open("r") as r:
             for line in r:
                 match = re.search(cmake_head_version_line, line)
                 if match is not None:
@@ -111,9 +170,9 @@ def update_head_version_file(ghidra_root_dir: PathString) -> None:
                 w.write(line)
 
     # Make the swap with the new content
-    shutil.copymode(SETUP_GHIDRA_FILE, abspath)
-    os.remove(SETUP_GHIDRA_FILE)
-    shutil.move(abspath, SETUP_GHIDRA_FILE)
+    shutil.copymode(setup_file, abspath)
+    os.remove(setup_file)
+    shutil.move(abspath, setup_file)
 
 
 def update_spec_files(ghidra_repo_dir: PathString, cmake_file: PathString):
@@ -122,9 +181,7 @@ def update_spec_files(ghidra_repo_dir: PathString, cmake_file: PathString):
     for dirpath, _, fnames in os.walk(ghidra_repo_dir / "Ghidra" / "Processors"):
         for file in fnames:
             if file.endswith(".slaspec"):
-                spec_files.append(
-                    (pathlib.Path(dirpath) / file).relative_to(ghidra_repo_dir)
-                )
+                spec_files.append((Path(dirpath) / file).relative_to(ghidra_repo_dir))
     assert len(spec_files) > 0
     spec_files.sort()
 
@@ -152,22 +209,27 @@ def get_latest_commit(ghidra_repo_dir: PathString) -> str:
     )
 
 
-def update_head(ghidra_repo_dir: PathString, ci: bool) -> bool:
+def update_head(
+    setup_file: Path, spec_file: Path, ghidra_repo_dir: PathString, ci: bool
+) -> bool:
     """Update to latest head and make changes to the CMake files"""
     tmpdirname = None
     if ghidra_repo_dir is None:
         tmpdirname = tempfile.TemporaryDirectory()
-        ghidra_repo_dir = pathlib.Path(tmpdirname.name) / "ghidra"
+        ghidra_repo_dir = Path(tmpdirname.name) / "ghidra"
         clone_ghidra_git(ghidra_repo_dir)
 
     latest_commit = get_latest_commit(ghidra_repo_dir)
-    did_update_commit = update_head_commit(latest_commit)
+    did_update_commit = update_head_commit(
+        setup_file, ghidra_repo_dir, latest_commit, ci
+    )
     if did_update_commit:
         if ci:
-            print(f"::set-output name=short_sha::{latest_commit[:9]}")
-            print("::set-output name=did_update::true")
-        update_spec_files(ghidra_repo_dir, HEAD_SPEC_FILE)
-        update_head_version_file(ghidra_repo_dir)
+            with open(os.environ["GITHUB_OUTPUT"], "a") as gh_out:
+                gh_out.write(f"short_sha={latest_commit[:9]}\n")
+                gh_out.write("did_update=true\n")
+        update_spec_files(ghidra_repo_dir, spec_file)
+        update_head_version_file(setup_file, ghidra_repo_dir)
     else:
         msg(f"Already at the latest commit: {latest_commit}")
 
@@ -186,7 +248,7 @@ if __name__ == "__main__":
     def dir_path(string):
         if string is None:
             return string
-        string = pathlib.Path(string).expanduser().resolve()
+        string = Path(string).expanduser().resolve()
         if string.is_dir():
             return string
         else:
@@ -207,5 +269,12 @@ if __name__ == "__main__":
     )
     args = parser.parse_args()
 
-    if not update_head(args.ghidra_repo, args.ci):
+    if args.ci:
+        assert (
+            "GITHUB_OUTPUT" in os.environ
+        ), "CI needs `GITHUB_OUTPUT` environment variable set to a file location"
+
+    if not update_head(SETUP_GHIDRA_FILE, HEAD_SPEC_FILE, args.ghidra_repo, args.ci):
         msg("No update required")
+    else:
+        msg("Update required!")

src/patches/HEAD/0001-Add-include-guards-to-decompiler-C-headers.patch

@@ -1,7 +1,7 @@
-From 44c439d879c18c2873d5605821132957680a4405 Mon Sep 17 00:00:00 2001
+From 0ca6d7c5c7f927a37482962df4399031581cf8af Mon Sep 17 00:00:00 2001
 From: Eric Kilmer <eric.d.kilmer@gmail.com>
 Date: Thu, 28 Jul 2022 09:20:03 -0400
-Subject: [PATCH] Add include guards to decompiler C++ headers
+Subject: [PATCH 1/7] Add include guards to decompiler C++ headers
 
 ---
  Ghidra/Features/Decompiler/src/decompile/cpp/bfd_arch.hh    | 5 +++++
@@ -92,7 +92,7 @@ index 2245840a0..490abf901 100644
  
 +#endif
 diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/slgh_compile.hh b/Ghidra/Features/Decompiler/src/decompile/cpp/slgh_compile.hh
-index e7ab19185..8fd9ba2fd 100644
+index 91e12244b..2b18e10fc 100644
 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/slgh_compile.hh
 +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/slgh_compile.hh
 @@ -16,6 +16,9 @@
@@ -105,7 +105,7 @@ index e7ab19185..8fd9ba2fd 100644
  #include "sleighbase.hh"
  #include "pcodecompile.hh"
  #include "filemanage.hh"
-@@ -446,3 +449,5 @@ class SleighCompile : public SleighBase {
+@@ -450,3 +453,5 @@ class SleighCompile : public SleighBase {
  
  extern SleighCompile *slgh;		///< A global reference to the SLEIGH compiler accessible to the parse functions
  extern int yydebug;			///< Debug state for the SLEIGH parse functions
@@ -133,5 +133,5 @@ index d395fb8a3..6371148b0 100644
 +
 +#endif
 -- 
-2.37.1
+2.40.0
 

src/patches/HEAD/0001-Small-improvements-to-C-decompiler-testing-from-CLI.patch

@@ -1,165 +0,0 @@
-From 031d9830abe8517540389672fd22dc479e46d696 Mon Sep 17 00:00:00 2001
-From: Eric Kilmer <eric.d.kilmer@gmail.com>
-Date: Sun, 13 Feb 2022 12:59:42 -0500
-Subject: [PATCH] Small improvements to C++ decompiler testing from CLI
-
-* Fixes argument parsing to accept more than one option for specifying
-  paths.
-
-* Return a non-zero exit code (clamped to max value 255, even if more
-  than 255 tests fail) indicating number of failed tests. This is
-  helpful when running in a script (like in CI) to detect failures
-  instead of detecting failures through manual visual inspection of
-  output text.
----
- .../Decompiler/src/decompile/cpp/test.cc      | 42 ++++++++++++++-----
- .../Decompiler/src/decompile/cpp/test.hh      |  2 +-
- .../src/decompile/cpp/testfunction.cc         |  3 +-
- .../src/decompile/cpp/testfunction.hh         |  2 +-
- 4 files changed, 36 insertions(+), 13 deletions(-)
-
-diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/test.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/test.cc
-index e81f2564a..ebc049c29 100644
---- a/Ghidra/Features/Decompiler/src/decompile/cpp/test.cc
-+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/test.cc
-@@ -14,6 +14,9 @@
-  * limitations under the License.
-  */
- #include "test.hh"
-+
-+#include <algorithm>
-+
- #include "libdecomp.hh"
- 
- vector<UnitTest *> UnitTest::tests;
-@@ -21,7 +24,8 @@ vector<UnitTest *> UnitTest::tests;
- /// Run all the tests unless a non-empty set of names is passed in.
- /// In which case, only the named tests in the set are run.
- /// \param testNames is the set of names
--void UnitTest::run(set<string> &testNames)
-+/// \return number of failed tests
-+int UnitTest::run(set<string> &testNames)
- 
- {
-   int total = 0;
-@@ -42,6 +46,7 @@ void UnitTest::run(set<string> &testNames)
-   }
-   std::cerr << "==============================" << std::endl;
-   std::cerr << passed << "/" << total << " tests passed." << std::endl;
-+  return total - passed;
- }
- 
- /// Create list of the absolute path of all tests to be run
-@@ -85,7 +90,7 @@ int main(int argc, char **argv) {
-   set<string> dataTestNames;
-   string dirname("../datatests");
-   string sleighdirname("../../../../../../..");
--  if (argc > 0) {
-+  while (argc > 0) {
-     string command(argv[0]);
-     if (command == "-path") {
-       dirname = argv[1];
-@@ -109,30 +114,47 @@ int main(int argc, char **argv) {
-       argv += 1;
-       argc -= 1;
-     }
--  }
--  if (argc > 0) {
--    string command(argv[0]);
--    if (command == "unittests") {
-+    else if (command == "unittests") {
-       runUnitTests = true;
-       runDataTests = false;	// Run only unit tests
-       unitTestNames.insert(argv + 1,argv + argc);
-+      break;
-     }
-     else if (command == "datatests") {
-       runUnitTests = false;	// Run only data-tests
-       runDataTests = true;
-       dataTestNames.insert(argv + 1,argv + argc);
-+      break;
-     }
-     else {
--      cout << "USAGE: ghidra_test [-path <datatestdir>] [[unittests|datatests] [testname1 testname2 ...]]" << endl;
-+      cout << "USAGE: ghidra_test [-usesleighenv] [-sleighpath <sleighdir>] [-path <datatestdir>] [[unittests|datatests] [testname1 testname2 ...]]" << endl;
-+      return -1;
-     }
-   }
-   startDecompilerLibrary(sleighdirname.c_str());
--  if (runUnitTests)
--    UnitTest::run(unitTestNames);
-+
-+  // Keep track of failed tests as return code to indicate failures, clamped at
-+  // max 255 value
-+  int failedTests = 0;
-+  if (runUnitTests) {
-+    int errors = UnitTest::run(unitTestNames);
-+    // Clamp at 255 max return code
-+    failedTests = std::min(
-+        failedTests +
-+            (errors < 0 ? 255 : std::min(errors, 255)),
-+        255);
-+  }
-   if (runDataTests) {
-     vector<string> testFiles;
-     gatherDataTests(dirname,dataTestNames,testFiles);
-     cout << endl << endl;
--    FunctionTestCollection::runTestFiles(testFiles,cout);
-+    int errors = FunctionTestCollection::runTestFiles(testFiles,cout);
-+    // Clamp at 255 max return code
-+    failedTests = std::min(
-+        failedTests +
-+          (errors < 0 ? 255 : std::min(errors, 255)),
-+        255);
-   }
-+
-+  return failedTests;
- }
-diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/test.hh b/Ghidra/Features/Decompiler/src/decompile/cpp/test.hh
-index 8b762c5b1..a138f511d 100644
---- a/Ghidra/Features/Decompiler/src/decompile/cpp/test.hh
-+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/test.hh
-@@ -54,7 +54,7 @@ struct UnitTest {
-     tests.push_back(this);
-   }
- 
--  static void run(std::set<std::string> &testNames);	///< Run all the instantiated tests
-+  static int run(std::set<std::string> &testNames);	///< Run all the instantiated tests
- };
- 
- 
-diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/testfunction.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/testfunction.cc
-index 66f8d3fa2..c136a964b 100644
---- a/Ghidra/Features/Decompiler/src/decompile/cpp/testfunction.cc
-+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/testfunction.cc
-@@ -304,7 +304,7 @@ void FunctionTestCollection::runTests(list<string> &lateStream)
- /// Run through all XML files in the given list, processing each in turn.
- /// \param testFiles is the given list of test files
- /// \param s is the output stream to print results to
--void FunctionTestCollection::runTestFiles(const vector<string> &testFiles,ostream &s)
-+int FunctionTestCollection::runTestFiles(const vector<string> &testFiles,ostream &s)
- 
- {
-   int4 totalTestsApplied = 0;
-@@ -344,4 +344,5 @@ void FunctionTestCollection::runTestFiles(const vector<string> &testFiles,ostrea
-       if (iter == failures.end()) break;
-     }
-   }
-+  return totalTestsApplied - totalTestsSucceeded;
- }
-diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/testfunction.hh b/Ghidra/Features/Decompiler/src/decompile/cpp/testfunction.hh
-index 52125b401..46abd6bce 100644
---- a/Ghidra/Features/Decompiler/src/decompile/cpp/testfunction.hh
-+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/testfunction.hh
-@@ -91,7 +91,7 @@ class FunctionTestCollection {
-   void restoreXml(DocumentStorage &store,const Element *el);	///< Load tests from a \<decompilertest> tag.
-   void restoreXmlOldForm(DocumentStorage &store,const Element *el);	///< Load tests from \<binaryimage> tag.
-   void runTests(list<string> &lateStream);	///< Run the script and perform the tests
--  static void runTestFiles(const vector<string> &testFiles,ostream &s);	///< Run tests for each listed file
-+  static int runTestFiles(const vector<string> &testFiles,ostream &s);	///< Run tests for each listed file
- };
- 
- #endif
--- 
-2.35.1
-

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

@@ -1,7 +1,7 @@
-From f62b1e5483a99efe3ae6598291ec010ecee749d4 Mon Sep 17 00:00:00 2001
+From 1f00ab9f7c53b6611fc1cf16455bb6069c0c0b69 Mon Sep 17 00:00:00 2001
 From: Alex Cameron <asc@tetsuo.sh>
 Date: Mon, 7 Feb 2022 02:02:03 +1100
-Subject: [PATCH] Fix UBSAN errors in decompiler
+Subject: [PATCH 2/7] Fix UBSAN errors in decompiler
 
 ---
  .../Decompiler/src/decompile/cpp/address.cc    |  4 ++--
@@ -20,7 +20,7 @@ Subject: [PATCH] Fix UBSAN errors in decompiler
  13 files changed, 59 insertions(+), 23 deletions(-)
 
 diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/address.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/address.cc
-index 1cb02c5b2..3a60d1322 100644
+index 26694b558..395fee432 100644
 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/address.cc
 +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/address.cc
 @@ -685,7 +685,7 @@ uintb sign_extend(uintb in,int4 sizein,int4 sizeout)
@@ -42,10 +42,10 @@ index 1cb02c5b2..3a60d1322 100644
    mask <<= 1;
    val &= (~mask);
 diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/fspec.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/fspec.cc
-index 0526ed04c..e79fd041e 100644
+index 0f8c95d60..95ab4b0ee 100644
 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/fspec.cc
 +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/fspec.cc
-@@ -2633,8 +2633,12 @@ void ProtoModelMerged::decode(Decoder &decoder)
+@@ -2659,8 +2659,12 @@ void ProtoModelMerged::decode(Decoder &decoder)
      modellist.push_back(mymodel);
    }
    decoder.closeElement(elemId);
@@ -61,7 +61,7 @@ index 0526ed04c..e79fd041e 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 e6b282ac7..f6a35728f 100644
+index 0a641091b..70acfad8f 100644
 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/funcdata_varnode.cc
 +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/funcdata_varnode.cc
 @@ -501,7 +501,13 @@ void Funcdata::setHighLevel(void)
@@ -80,10 +80,10 @@ index e6b282ac7..f6a35728f 100644
    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 b4f8a3f8e..068393416 100644
+index 4c0749590..24551ed11 100644
 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/op.cc
 +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/op.cc
-@@ -667,7 +667,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();
@@ -159,7 +159,7 @@ index 49128f7e6..133da8178 100644
    return res;
  }
 diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/ruleaction.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/ruleaction.cc
-index b5bdb4700..ef741545c 100644
+index 9068f2a81..216f2f45f 100644
 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/ruleaction.cc
 +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/ruleaction.cc
 @@ -974,7 +974,12 @@ int4 RulePullsubIndirect::applyOp(PcodeOp *op,Funcdata &data)
@@ -176,7 +176,7 @@ index b5bdb4700..ef741545c 100644
    consume = ~consume;
    if ((consume & indir->getIn(0)->getConsume())!=0) return 0;
  
-@@ -6785,8 +6790,9 @@ int4 RulePtrsubCharConstant::applyOp(PcodeOp *op,Funcdata &data)
+@@ -6738,8 +6743,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;
@@ -188,7 +188,7 @@ index b5bdb4700..ef741545c 100644
    Varnode *vn1 = op->getIn(1);
    if (!vn1->isConstant()) return 0;
    Varnode *outvn = op->getOut();
-@@ -7822,7 +7828,11 @@ int4 RuleSubvarSubpiece::applyOp(PcodeOp *op,Funcdata &data)
+@@ -8469,7 +8475,11 @@ int4 RuleSubvarSubpiece::applyOp(PcodeOp *op,Funcdata &data)
    Varnode *outvn = op->getOut();
    int4 flowsize = outvn->getSize();
    uintb mask = calc_mask( flowsize );
@@ -202,7 +202,7 @@ index b5bdb4700..ef741545c 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 f8c1580a8..8ae5ff293 100644
+index ecebc0970..1c9ab7560 100644
 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/semantics.cc
 +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/semantics.cc
 @@ -20,6 +20,7 @@ ConstTpl::ConstTpl(const_type tp)
@@ -222,10 +222,10 @@ index f8c1580a8..8ae5ff293 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 dccf0437d..f7f598667 100644
+index 3b836244c..1fbd169c9 100644
 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/semantics.hh
 +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/semantics.hh
-@@ -46,7 +46,7 @@ private:
+@@ -46,7 +46,7 @@ class ConstTpl {
    static void printHandleSelector(ostream &s,v_field val);
    static v_field readHandleSelector(const string &name);
  public:
@@ -235,10 +235,10 @@ index dccf0437d..f7f598667 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 3ec58b9d0..55fcfd7c8 100644
+index b92a3de3b..ac9a70c93 100644
 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/slgh_compile.cc
 +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/slgh_compile.cc
-@@ -2150,8 +2150,8 @@ string SleighCompile::checkSymbols(SymbolScope *scope)
+@@ -2157,8 +2157,8 @@ string SleighCompile::checkSymbols(SymbolScope *scope)
    ostringstream msg;
    SymbolTree::const_iterator iter;
    for(iter=scope->begin();iter!=scope->end();++iter) {
@@ -249,10 +249,10 @@ index 3ec58b9d0..55fcfd7c8 100644
        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 5f4a8fe32..50bc33b8b 100644
+index 8516dbf10..352a0ae99 100644
 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/slghsymbol.cc
 +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/slghsymbol.cc
-@@ -2499,7 +2499,7 @@ void ContextOp::restoreXml(const Element *el,SleighBase *trans)
+@@ -2566,7 +2566,7 @@ void ContextOp::restoreXml(const Element *el,SleighBase *trans)
    const List &list(el->getChildren());
    List::const_iterator iter;
    iter = list.begin();
@@ -262,10 +262,10 @@ index 5f4a8fe32..50bc33b8b 100644
  }
  
 diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/type.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/type.cc
-index b8dbcd55b..b2d0c1bb6 100644
+index 9fc48aa7d..8b75afb6d 100644
 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/type.cc
 +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/type.cc
-@@ -3073,8 +3073,8 @@ void TypeFactory::recalcPointerSubmeta(Datatype *base,sub_metatype sub)
+@@ -3233,8 +3233,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()) {
@@ -276,10 +276,10 @@ index b8dbcd55b..b2d0c1bb6 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 ab99382a3..67d92c573 100644
+index f88b4d000..3b16ed13c 100644
 --- a/Ghidra/Features/Decompiler/src/decompile/unittests/testfloatemu.cc
 +++ b/Ghidra/Features/Decompiler/src/decompile/unittests/testfloatemu.cc
-@@ -338,7 +338,7 @@ TEST(float_opTrunc_to_int) {
+@@ -343,7 +343,7 @@ TEST(float_opTrunc_to_int) {
  
      for(float f:float_test_values) {
          // avoid undefined behavior
@@ -289,5 +289,5 @@ index ab99382a3..67d92c573 100644
          uintb true_result = ((uintb)(int32_t)f) & 0xffffffff;
          uintb encoding = format.getEncoding(f);
 -- 
-2.32.1 (Apple Git-133)
+2.40.0
 

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

@@ -1,14 +1,15 @@
-From 773dda85b84a03c8795e27f1df87e6024bdb208a Mon Sep 17 00:00:00 2001
+From ad4a5782300ff499c1633da6923669545b78a2cc Mon Sep 17 00:00:00 2001
 From: Alex Cameron <asc@tetsuo.sh>
 Date: Wed, 3 Aug 2022 20:01:18 +1000
-Subject: [PATCH] Use `stroull` instead of `stroul` to parse address offsets
+Subject: [PATCH 3/7] Use `stroull` instead of `stroul` to parse address
+ offsets
 
 ---
  Ghidra/Features/Decompiler/src/decompile/cpp/space.cc | 7 ++++++-
  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 c51e58560..c5cc7541d 100644
+index b511f8919..4ae8f18a6 100644
 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/space.cc
 +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/space.cc
 @@ -16,6 +16,8 @@
@@ -20,7 +21,7 @@ index c51e58560..c5cc7541d 100644
  AttributeId ATTRIB_BASE = AttributeId("base",89);
  AttributeId ATTRIB_DEADCODEDELAY = AttributeId("deadcodedelay",90);
  AttributeId ATTRIB_DELAY = AttributeId("delay", 91);
-@@ -268,7 +270,10 @@ uintb AddrSpace::read(const string &s,int4 &size) const
+@@ -288,7 +290,10 @@ uintb AddrSpace::read(const string &s,int4 &size) const
      }
    }
    catch(LowlevelError &err) {	// Name doesn't exist
@@ -33,5 +34,5 @@ index c51e58560..c5cc7541d 100644
      enddata = (const char *) tmpdata;
      if (enddata - s.c_str() == s.size()) { // If no size or offset override
 -- 
-2.32.1 (Apple Git-133)
+2.40.0
 

src/patches/HEAD/0006-3-4-decompiler-Manually-fix-std-namespace-in-generat.patch

@@ -0,0 +1,51 @@
+From 24a158c4514567a0cc253f0c0a4b7a9f5df7384d Mon Sep 17 00:00:00 2001
+From: Eric Kilmer <eric.d.kilmer@gmail.com>
+Date: Wed, 15 Mar 2023 23:04:28 -0400
+Subject: [PATCH 6/7] (3/4) decompiler: Manually fix std namespace in generated
+ file
+
+We must manually fix the symbols from std namespace because the
+automated tool does not know how to parse yacc/bison files.
+---
+ .../Decompiler/src/decompile/cpp/slghparse.y       | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/slghparse.y b/Ghidra/Features/Decompiler/src/decompile/cpp/slghparse.y
+index 0e2172f79..039963cd5 100644
+--- a/Ghidra/Features/Decompiler/src/decompile/cpp/slghparse.y
++++ b/Ghidra/Features/Decompiler/src/decompile/cpp/slghparse.y
+@@ -32,24 +32,24 @@ using namespace std;
+   char ch;
+   uintb *i;
+   intb *big;
+-  string *str;
+-  vector<string> *strlist;
+-  vector<intb> *biglist;
+-  vector<ExprTree *> *param;
++  std::string *str;
++  std::vector<std::string> *strlist;
++  std::vector<intb> *biglist;
++  std::vector<ExprTree *> *param;
+   SpaceQuality *spacequal;
+   FieldQuality *fieldqual;
+   StarQuality *starqual;
+   VarnodeTpl *varnode;
+   ExprTree *tree;
+-  vector<OpTpl *> *stmt;
++  std::vector<OpTpl *> *stmt;
+   ConstructTpl *sem;
+   SectionVector *sectionstart;
+   Constructor *construct;
+   PatternEquation *pateq;
+   PatternExpression *patexp;
+ 
+-  vector<SleighSymbol *> *symlist;
+-  vector<ContextChange *> *contop;
++  std::vector<SleighSymbol *> *symlist;
++  std::vector<ContextChange *> *contop;
+   SleighSymbol *anysym;
+   SpaceSymbol *spacesym;
+   SectionSymbol *sectionsym;
+-- 
+2.40.0
+

src/patches/HEAD/0007-4-4-decompiler-Manually-fix-missed-std-variable-usag.patch

@@ -0,0 +1,29 @@
+From ed427a72a0d2f70565752902f274a748835afa1a Mon Sep 17 00:00:00 2001
+From: Eric Kilmer <eric.d.kilmer@gmail.com>
+Date: Wed, 15 Mar 2023 23:10:22 -0400
+Subject: [PATCH 7/7] (4/4) decompiler: Manually fix missed std variable usage
+
+Unfortunately, the heuristics in remusing are unable to automatically
+fix this case of variables from the C++ standard library.
+
+This was fixed by resolving the error(s) produced by the compiler.
+---
+ Ghidra/Features/Decompiler/src/decompile/cpp/ghidra_process.hh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/ghidra_process.hh b/Ghidra/Features/Decompiler/src/decompile/cpp/ghidra_process.hh
+index 64fd45e35..428319a65 100644
+--- a/Ghidra/Features/Decompiler/src/decompile/cpp/ghidra_process.hh
++++ b/Ghidra/Features/Decompiler/src/decompile/cpp/ghidra_process.hh
+@@ -79,7 +79,7 @@ class GhidraCommand {
+   virtual void loadParameters(void);	///< Read parameters directing command execution
+   virtual void sendResult(void);	///< Send results of the command (if any) back to the Ghidra client
+ public:
+-  GhidraCommand(void) : sin(cin),sout(cout) {
++  GhidraCommand(void) : sin(std::cin),sout(std::cout) {
+     ghidra = (ArchitectureGhidra *)0; 
+   }					///< Construct given i/o streams
+   virtual ~GhidraCommand(void) {}	///< Destructor
+-- 
+2.40.0
+

src/patches/stable/0001-Small-improvements-to-C-decompiler-testing-from-CLI.patch

@@ -1,7 +1,7 @@
-From 3100df1ece29160185e1bc9602a3b4c299914965 Mon Sep 17 00:00:00 2001
+From 2ade75baba3f2945d5b53e5c1eedb53ebe10f61b Mon Sep 17 00:00:00 2001
 From: Eric Kilmer <eric.d.kilmer@gmail.com>
 Date: Sun, 13 Feb 2022 12:59:42 -0500
-Subject: [PATCH 1/4] Small improvements to C++ decompiler testing from CLI
+Subject: [PATCH 1/8] Small improvements to C++ decompiler testing from CLI
 
 * Fixes argument parsing to accept more than one option for specifying
   paths.
@@ -161,5 +161,5 @@ index 52125b401..46abd6bce 100644
  
  #endif
 -- 
-2.38.1
+2.40.0
 

src/patches/stable/0002-Add-include-guards-to-decompiler-C-headers.patch

@@ -1,7 +1,7 @@
-From 5189064a0b81b74b5844b461f2f2b4d1a398ab59 Mon Sep 17 00:00:00 2001
+From 9f82d92228afeaac6e8482a1e842fea9d195e750 Mon Sep 17 00:00:00 2001
 From: Eric Kilmer <eric.d.kilmer@gmail.com>
 Date: Thu, 28 Jul 2022 09:20:03 -0400
-Subject: [PATCH 2/4] Add include guards to decompiler C++ headers
+Subject: [PATCH 2/8] Add include guards to decompiler C++ headers
 
 ---
  Ghidra/Features/Decompiler/src/decompile/cpp/bfd_arch.hh    | 5 +++++
@@ -133,5 +133,5 @@ index d395fb8a3..6371148b0 100644
 +
 +#endif
 -- 
-2.38.1
+2.40.0
 

src/patches/stable/0003-Fix-UBSAN-errors-in-decompiler.patch

@@ -1,7 +1,7 @@
-From 42dd4d97396e7769bbbaca78c7a546835d72d974 Mon Sep 17 00:00:00 2001
+From 4fa4b34e64c277f699a0c4d9cda1a2de739b9130 Mon Sep 17 00:00:00 2001
 From: Alex Cameron <asc@tetsuo.sh>
 Date: Mon, 7 Feb 2022 02:02:03 +1100
-Subject: [PATCH 3/4] Fix UBSAN errors in decompiler
+Subject: [PATCH 3/8] Fix UBSAN errors in decompiler
 
 ---
  .../Decompiler/src/decompile/cpp/address.cc    |  4 ++--
@@ -42,10 +42,10 @@ index b3758ddd1..0b3bf04c8 100644
    mask <<= 1;
    val &= (~mask);
 diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/fspec.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/fspec.cc
-index 19ed41c63..d1bd842d8 100644
+index c52d92c80..937b57157 100644
 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/fspec.cc
 +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/fspec.cc
-@@ -2656,8 +2656,12 @@ void ProtoModelMerged::decode(Decoder &decoder)
+@@ -2649,8 +2649,12 @@ void ProtoModelMerged::decode(Decoder &decoder)
      modellist.push_back(mymodel);
    }
    decoder.closeElement(elemId);
@@ -61,7 +61,7 @@ index 19ed41c63..d1bd842d8 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 2b26961f0..117518e24 100644
+index 63784131d..ff8bb6a23 100644
 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/funcdata_varnode.cc
 +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/funcdata_varnode.cc
 @@ -501,7 +501,13 @@ void Funcdata::setHighLevel(void)
@@ -159,7 +159,7 @@ index 49128f7e6..133da8178 100644
    return res;
  }
 diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/ruleaction.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/ruleaction.cc
-index 9701f642b..7e8030ae8 100644
+index 973a7a31d..3955b836b 100644
 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/ruleaction.cc
 +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/ruleaction.cc
 @@ -974,7 +974,12 @@ int4 RulePullsubIndirect::applyOp(PcodeOp *op,Funcdata &data)
@@ -176,7 +176,7 @@ index 9701f642b..7e8030ae8 100644
    consume = ~consume;
    if ((consume & indir->getIn(0)->getConsume())!=0) return 0;
  
-@@ -6788,8 +6793,9 @@ int4 RulePtrsubCharConstant::applyOp(PcodeOp *op,Funcdata &data)
+@@ -6805,8 +6810,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;
@@ -188,7 +188,7 @@ index 9701f642b..7e8030ae8 100644
    Varnode *vn1 = op->getIn(1);
    if (!vn1->isConstant()) return 0;
    Varnode *outvn = op->getOut();
-@@ -8272,7 +8278,11 @@ int4 RuleSubvarSubpiece::applyOp(PcodeOp *op,Funcdata &data)
+@@ -8289,7 +8295,11 @@ int4 RuleSubvarSubpiece::applyOp(PcodeOp *op,Funcdata &data)
    Varnode *outvn = op->getOut();
    int4 flowsize = outvn->getSize();
    uintb mask = calc_mask( flowsize );
@@ -262,7 +262,7 @@ index dbb8f9e51..85bd54261 100644
  }
  
 diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/type.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/type.cc
-index 316074389..91bf4bc77 100644
+index 8d5dc17ed..f50e07f84 100644
 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/type.cc
 +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/type.cc
 @@ -3233,8 +3233,8 @@ void TypeFactory::recalcPointerSubmeta(Datatype *base,sub_metatype sub)
@@ -289,5 +289,5 @@ index ab99382a3..67d92c573 100644
          uintb true_result = ((uintb)(int32_t)f) & 0xffffffff;
          uintb encoding = format.getEncoding(f);
 -- 
-2.38.1
+2.40.0
 

src/patches/stable/0004-Use-stroull-instead-of-stroul-to-parse-address-offse.patch

@@ -1,7 +1,7 @@
-From 0891ecb91231978ef912c3215925bcdea6f14ce7 Mon Sep 17 00:00:00 2001
+From a5f1be9df17f10db97dbd12243b001591d8b64d9 Mon Sep 17 00:00:00 2001
 From: Alex Cameron <asc@tetsuo.sh>
 Date: Wed, 3 Aug 2022 20:01:18 +1000
-Subject: [PATCH 4/4] Use `stroull` instead of `stroul` to parse address
+Subject: [PATCH 4/8] Use `stroull` instead of `stroul` to parse address
  offsets
 
 ---
@@ -34,5 +34,5 @@ index 40a3e3bfe..ff6f282ca 100644
      enddata = (const char *) tmpdata;
      if (enddata - s.c_str() == s.size()) { // If no size or offset override
 -- 
-2.38.1
+2.40.0
 

src/patches/stable/0007-3-4-decompiler-Manually-fix-std-namespace-in-generat.patch

@@ -0,0 +1,51 @@
+From 893e32017fb08c773bfedafe790667db3a39cf62 Mon Sep 17 00:00:00 2001
+From: Eric Kilmer <eric.d.kilmer@gmail.com>
+Date: Sun, 19 Mar 2023 15:46:26 -0400
+Subject: [PATCH 7/8] (3/4) decompiler: Manually fix std namespace in generated
+ file
+
+We must manually fix the symbols from std namespace because the
+automated tool does not know how to parse yacc/bison files.
+---
+ .../Decompiler/src/decompile/cpp/slghparse.y       | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/slghparse.y b/Ghidra/Features/Decompiler/src/decompile/cpp/slghparse.y
+index 0e2172f79..039963cd5 100644
+--- a/Ghidra/Features/Decompiler/src/decompile/cpp/slghparse.y
++++ b/Ghidra/Features/Decompiler/src/decompile/cpp/slghparse.y
+@@ -32,24 +32,24 @@ using namespace std;
+   char ch;
+   uintb *i;
+   intb *big;
+-  string *str;
+-  vector<string> *strlist;
+-  vector<intb> *biglist;
+-  vector<ExprTree *> *param;
++  std::string *str;
++  std::vector<std::string> *strlist;
++  std::vector<intb> *biglist;
++  std::vector<ExprTree *> *param;
+   SpaceQuality *spacequal;
+   FieldQuality *fieldqual;
+   StarQuality *starqual;
+   VarnodeTpl *varnode;
+   ExprTree *tree;
+-  vector<OpTpl *> *stmt;
++  std::vector<OpTpl *> *stmt;
+   ConstructTpl *sem;
+   SectionVector *sectionstart;
+   Constructor *construct;
+   PatternEquation *pateq;
+   PatternExpression *patexp;
+ 
+-  vector<SleighSymbol *> *symlist;
+-  vector<ContextChange *> *contop;
++  std::vector<SleighSymbol *> *symlist;
++  std::vector<ContextChange *> *contop;
+   SleighSymbol *anysym;
+   SpaceSymbol *spacesym;
+   SectionSymbol *sectionsym;
+-- 
+2.40.0
+

src/patches/stable/0008-4-4-decompiler-Manually-fix-missed-std-variable-usag.patch

@@ -0,0 +1,29 @@
+From 92dd6f2579323dba0b5438c245f342507d27ec01 Mon Sep 17 00:00:00 2001
+From: Eric Kilmer <eric.d.kilmer@gmail.com>
+Date: Sun, 19 Mar 2023 15:47:28 -0400
+Subject: [PATCH 8/8] (4/4) decompiler: Manually fix missed std variable usage
+
+Unfortunately, the heuristics in remusing are unable to automatically
+fix this case of variables from the C++ standard library.
+
+This was fixed by resolving the error(s) produced by the compiler.
+---
+ Ghidra/Features/Decompiler/src/decompile/cpp/ghidra_process.hh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/ghidra_process.hh b/Ghidra/Features/Decompiler/src/decompile/cpp/ghidra_process.hh
+index 64fd45e35..428319a65 100644
+--- a/Ghidra/Features/Decompiler/src/decompile/cpp/ghidra_process.hh
++++ b/Ghidra/Features/Decompiler/src/decompile/cpp/ghidra_process.hh
+@@ -79,7 +79,7 @@ class GhidraCommand {
+   virtual void loadParameters(void);	///< Read parameters directing command execution
+   virtual void sendResult(void);	///< Send results of the command (if any) back to the Ghidra client
+ public:
+-  GhidraCommand(void) : sin(cin),sout(cout) {
++  GhidraCommand(void) : sin(std::cin),sout(std::cout) {
+     ghidra = (ArchitectureGhidra *)0; 
+   }					///< Construct given i/o streams
+   virtual ~GhidraCommand(void) {}	///< Destructor
+-- 
+2.40.0
+

src/setup-ghidra-source.cmake

@@ -22,20 +22,30 @@ set_property(CACHE sleigh_RELEASE_TYPE PROPERTY STRINGS "stable" "HEAD")
 find_package(Git REQUIRED)
 
 # Ghidra pinned stable version commit
-set(ghidra_version "10.2.1")
+set(ghidra_version "10.2.3")
 set(ghidra_git_tag "Ghidra_${ghidra_version}_build")
 set(ghidra_shallow TRUE)
 
 set(sleigh_ADDITIONAL_PATCHES "" CACHE STRING
   "The accepted patch format is git patch files, to be applied via git am. The format of the list is a CMake semicolon separated list.")
 
+# See this thread for more details https://github.community/t/github-actions-bot-email-address/17204/5
+set(ghidra_patch_user "github-actions[bot]")
+set(ghidra_patch_email "41898282+github-actions[bot]@users.noreply.github.com")
+
 # pinned stable patches list
 set(ghidra_patches
-  PATCH_COMMAND "${GIT_EXECUTABLE}" am --ignore-space-change --ignore-whitespace --no-gpg-sign
+  PATCH_COMMAND "${GIT_EXECUTABLE}" config user.name "${ghidra_patch_user}" &&
+  "${GIT_EXECUTABLE}" config user.email "${ghidra_patch_email}" &&
+  "${GIT_EXECUTABLE}" am --ignore-space-change --ignore-whitespace --no-gpg-sign
   "${CMAKE_CURRENT_LIST_DIR}/patches/stable/0001-Small-improvements-to-C-decompiler-testing-from-CLI.patch"
   "${CMAKE_CURRENT_LIST_DIR}/patches/stable/0002-Add-include-guards-to-decompiler-C-headers.patch"
   "${CMAKE_CURRENT_LIST_DIR}/patches/stable/0003-Fix-UBSAN-errors-in-decompiler.patch"
   "${CMAKE_CURRENT_LIST_DIR}/patches/stable/0004-Use-stroull-instead-of-stroul-to-parse-address-offse.patch"
+  "${CMAKE_CURRENT_LIST_DIR}/patches/stable/0005-1-4-decompiler-Add-using-namespace-std-to-all-.cc.patch"
+  "${CMAKE_CURRENT_LIST_DIR}/patches/stable/0006-2-4-decompiler-Remusing-automated-std-namespace-fix.patch"
+  "${CMAKE_CURRENT_LIST_DIR}/patches/stable/0007-3-4-decompiler-Manually-fix-std-namespace-in-generat.patch"
+  "${CMAKE_CURRENT_LIST_DIR}/patches/stable/0008-4-4-decompiler-Manually-fix-missed-std-variable-usag.patch"
 )
 
 # Ghidra pinned commits used for pinning last known working HEAD commit
@@ -44,15 +54,20 @@ if("${sleigh_RELEASE_TYPE}" STREQUAL "HEAD")
   # TODO: CMake only likes numeric characters in the version string....
   set(ghidra_head_version "10.3")
   set(ghidra_version "${ghidra_head_version}")
-  set(ghidra_head_git_tag "97097daa681d43ee3a57c10523c382ec7cfafa88")
+  set(ghidra_head_git_tag "acb07dd535a9ff10d230e989cc45523482e76fa9")
   set(ghidra_git_tag "${ghidra_head_git_tag}")
   set(ghidra_shallow FALSE)
   set(ghidra_patches
-    PATCH_COMMAND "${GIT_EXECUTABLE}" am --ignore-space-change --ignore-whitespace --no-gpg-sign
-    "${CMAKE_CURRENT_LIST_DIR}/patches/HEAD/0001-Small-improvements-to-C-decompiler-testing-from-CLI.patch"
-    "${CMAKE_CURRENT_LIST_DIR}/patches/HEAD/0002-Add-include-guards-to-decompiler-C-headers.patch"
-    "${CMAKE_CURRENT_LIST_DIR}/patches/HEAD/0003-Fix-UBSAN-errors-in-decompiler.patch"
-    "${CMAKE_CURRENT_LIST_DIR}/patches/HEAD/0004-Use-stroull-instead-of-stroul-to-parse-address-offse.patch"
+    PATCH_COMMAND "${GIT_EXECUTABLE}" config user.name "${ghidra_patch_user}" &&
+    "${GIT_EXECUTABLE}" config user.email "${ghidra_patch_email}" &&
+    "${GIT_EXECUTABLE}" am --ignore-space-change --ignore-whitespace --no-gpg-sign
+    "${CMAKE_CURRENT_LIST_DIR}/patches/HEAD/0001-Add-include-guards-to-decompiler-C-headers.patch"
+    "${CMAKE_CURRENT_LIST_DIR}/patches/HEAD/0002-Fix-UBSAN-errors-in-decompiler.patch"
+    "${CMAKE_CURRENT_LIST_DIR}/patches/HEAD/0003-Use-stroull-instead-of-stroul-to-parse-address-offse.patch"
+    "${CMAKE_CURRENT_LIST_DIR}/patches/HEAD/0004-1-4-decompiler-Add-using-namespace-std-to-all-.cc-fi.patch"
+    "${CMAKE_CURRENT_LIST_DIR}/patches/HEAD/0005-2-4-decompiler-Automated-std-namespace-fix-with-remu.patch"
+    "${CMAKE_CURRENT_LIST_DIR}/patches/HEAD/0006-3-4-decompiler-Manually-fix-std-namespace-in-generat.patch"
+    "${CMAKE_CURRENT_LIST_DIR}/patches/HEAD/0007-4-4-decompiler-Manually-fix-missed-std-variable-usag.patch"
   )
   string(SUBSTRING "${ghidra_git_tag}" 0 7 ghidra_short_commit)
 else()

support/CMakeLists.txt

@@ -59,6 +59,8 @@ target_include_directories(sleigh_support
   SYSTEM
   PUBLIC
   "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>"
+  # For libconfig.h
+  "$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>"
 )
 
 if(NOT CMAKE_SKIP_INSTALL_RULES)

tests/CMakeLists.txt

@@ -24,10 +24,11 @@ add_executable(sleigh_ghidra_test
   "${library_root}/../unittests/testmarshal.cc"
 )
 
-#if(sleigh_RELEASE_IS_HEAD)
-#  target_sources(sleigh_ghidra_test PRIVATE
-#  )
-#endif()
+if(sleigh_RELEASE_IS_HEAD)
+  target_sources(sleigh_ghidra_test PRIVATE
+    "${library_root}/../unittests/testfuncproto.cc"
+  )
+endif()
 
 target_compile_features(sleigh_ghidra_test PRIVATE cxx_std_11)
 target_include_directories(sleigh_ghidra_test PRIVATE "${library_root}")
@@ -51,3 +52,29 @@ add_test(
     -path "${library_root}/../datatests"
     datatests
 )
+
+
+#
+# Test for removal of using namespace std patches
+#
+if(sleigh_BUILD_SUPPORT)
+  add_executable(sleigh_namespace_std_test
+    no_using_namespace_std.cpp
+  )
+  target_link_libraries(sleigh_namespace_std_test
+    PRIVATE
+    sleigh::sla
+    sleigh::decomp
+    sleigh::support
+  )
+  if(WIN32)
+    # Ensure no issue with /permissive- and std::byte colliding deeply in the
+    # sleigh headers when compiling against Windows headers
+    target_compile_features(sleigh_namespace_std_test PRIVATE cxx_std_20)
+  endif()
+  # Really only testing that it compiles
+  add_test(
+    NAME sleigh_namespace_std_test
+    COMMAND sleigh_namespace_std_test
+  )
+endif()

tests/no_using_namespace_std.cpp

@@ -0,0 +1,13 @@
+struct vector {};
+struct set {};
+struct unordered_map {};
+struct string {};
+
+#include <sleigh/libsleigh.hh>
+
+int main() {
+  vector v;
+  set s;
+  unordered_map m;
+  string str;
+}