Update Ghidra HEAD to commit 84332ef95 (#174)

* Bump Ghidra HEAD commit 84332ef95

Changed files:

```
M	Ghidra/Features/Decompiler/src/decompile/cpp/sleighexample.cc
```

* cmake: Remove Sleigh example patch

---------

Co-authored-by: pgoodman <pgoodman@users.noreply.github.com>
Co-authored-by: Alex Cameron <asc@tetsuo.sh>
This commit is contained in:
auto-updater[bot]
2023-04-18 17:43:43 +10:00
committed by GitHub
parent 262f8d8421
commit e1562dd87f
2 changed files with 1 additions and 44 deletions
@@ -1,42 +0,0 @@
From 166e7aa2c37f51e48fb945e9b519b4997bbd4a57 Mon Sep 17 00:00:00 2001
From: Eric Kilmer <eric.d.kilmer@gmail.com>
Date: Mon, 10 Apr 2023 10:07:36 -0400
Subject: [PATCH 3/3] Fix C++ sleighexample compilation
---
.../Decompiler/src/decompile/cpp/sleighexample.cc | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/sleighexample.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/sleighexample.cc
index 87a4d7980..f356825c9 100644
--- a/Ghidra/Features/Decompiler/src/decompile/cpp/sleighexample.cc
+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/sleighexample.cc
@@ -22,6 +22,11 @@
#include "emulate.hh"
#include <iostream>
+using std::cerr;
+using std::cout;
+
+namespace ghidra {
+
// These are the bytes for an example x86 binary
// These bytes are loaded at address 0x80483b4
static uint1 myprog[] = {
@@ -283,9 +288,13 @@ static void doEmulation(Translate &trans,LoadImage &loader)
} while(!emulater.getHalt());
}
+} // End namespace ghidra
+
int main(int argc,char **argv)
{
+ using namespace ghidra;
+
if (argc != 2) {
cerr << "USAGE: " << argv[0] << " disassemble" << endl;
cerr << " " << argv[0] << " pcode" << endl;
--
2.40.0
+1 -2
View File
@@ -54,7 +54,7 @@ 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 "85cc8ee883aad9c3bede7e62a0ffb75a1238989c")
set(ghidra_head_git_tag "84332ef95c3bb3e28c0d969affbf0c63ec9f4cc3")
set(ghidra_git_tag "${ghidra_head_git_tag}")
set(ghidra_shallow FALSE)
set(ghidra_patches
@@ -63,7 +63,6 @@ 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/0003-Fix-C-sleighexample-compilation.patch"
)
string(SUBSTRING "${ghidra_git_tag}" 0 7 ghidra_short_commit)
else()