Use ghidra-native-0.4.0

radareorg · Aug 16, 2023 · 7a681cb · 7a681cb
1 parent a8675dd
commit 7a681cb
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 3 deletions.
diff --git a/Makefile.acr b/Makefile.acr
@@ -1,7 +1,7 @@
 include config.mk
 DESTDIR?=
 
-GHIDRA_NATIVE_COMMIT=0.3.3
+GHIDRA_NATIVE_COMMIT=0.4.0
 
 PUGIXML=third-party/pugixml/Makefile
 

diff --git a/meson.build b/meson.build
@@ -3,7 +3,7 @@ project(
   ['c', 'cpp'],
 license : 'LGPL3',
 meson_version : '>=0.50.1',
-version : '5.8.8',
+version : '5.8.9',
 default_options : ['c_std=c11', 'cpp_std=c++11']
 )
 

diff --git a/preconfigure.bat b/preconfigure.bat
@@ -3,7 +3,7 @@ set PATH=%CD%\radare2\bin;%PATH%
 set VSARCH=x64
 
 git submodule update --init
-set GNV=0.3.3
+set GNV=0.4.0
 
 python -m wget https://github.com/radareorg/ghidra-native/releases/download/%GNV%/ghidra-native-%GNV%.zip
 

diff --git a/src/CodeXMLParse.cpp b/src/CodeXMLParse.cpp
@@ -165,8 +165,10 @@ void AnnotateColor(ANNOTATOR_PARAMS) {
 		type = R_SYNTAX_HIGHLIGHT_TYPE_GLOBAL_VARIABLE;
 		break;
 	case Emit::syntax_highlight::no_color:
+#if 1
 	case Emit::syntax_highlight::error_color:
 	case Emit::syntax_highlight::special_color:
+#endif
 	default:
 		return;
 	}

diff --git a/src/R2Scope.cpp b/src/R2Scope.cpp
@@ -117,6 +117,7 @@ FunctionSymbol *R2Scope::registerFunction(RAnalFunction *fcn) const {
 				if (flag->space && flag->space->name && !strcmp(flag->space->name, R_FLAGS_FS_SECTIONS)) {
 					continue;
 				}
+				// if (!strcmp(flag->name, fcn->name) && flag->realname && *flag->realname)
 				if (R_STR_ISNOTEMPTY (flag->realname)) {
 					fcn_name = flag->realname;
 					break;