Merge branch 'dev' into stable

.builds/freebsd.yml

@@ -16,6 +16,7 @@ sources:
     - https://github.com/rizinorg/rizin#stable
     - https://github.com/rizinorg/rz-ghidra
     - https://github.com/rizinorg/rizin-testbins
+hottub_trigger: '.*'
 tasks:
     - rizinbuild: |
         cd rizin

.builds/openbsd.yml

@@ -14,6 +14,7 @@ sources:
     - https://github.com/rizinorg/rizin#stable
     - https://github.com/rizinorg/rz-ghidra
     - https://github.com/rizinorg/rizin-testbins
+hottub_trigger: '.*'
 tasks:
     - rizinbuild: |
         cd rizin

.github/workflows/ci.yml

@@ -28,7 +28,7 @@ jobs:
     name: ${{ matrix.name }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Checkout submodules
         run: |
             git submodule init
@@ -40,10 +40,10 @@ jobs:
   windows:
     runs-on: windows-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
           submodules: recursive
-    - uses: actions/setup-python@v2
+    - uses: actions/setup-python@v4
     - name: Preparing msvc toolchain
       uses: ilammy/msvc-dev-cmd@v1
       with:
@@ -52,14 +52,14 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         pip install meson ninja PyYAML
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
           repository: rizinorg/rizin
           path: rizin
           ref: stable
     - name: Extract rizin version
       shell: pwsh
-      run: echo "##[set-output name=branch;]$( python sys\\version.py )"
+      run: echo "branch=$(python sys/version.py)" >> $Env:GITHUB_OUTPUT
       id: extract_version
       working-directory: rizin
     - name: Build with meson + ninja

.github/workflows/codeql-analysis.yml

@@ -11,15 +11,15 @@ on:
 jobs:
   analyze:
     name: Analyze
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
         language: ['cpp']
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         # We must fetch at least the immediate parents so that if this is
         # a pull request then we can checkout the head.
@@ -30,14 +30,14 @@ jobs:
           git submodule init
           git submodule update
 
-    - uses: actions/setup-python@v1
+    - uses: actions/setup-python@v4
       with:
-        python-version: 3.8.x
+        python-version: 3.10.x
 
     - name: apt dependencies
       run: |
           sudo apt-get --assume-yes update
-          sudo apt-get --assume-yes install ninja-build libgraphviz-dev bison flex qt5-default
+          sudo apt-get --assume-yes install ninja-build libgraphviz-dev bison flex qtbase5-dev cmake
 
     - name: py dependencies
       run: |
@@ -53,7 +53,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
 
@@ -64,4 +64,4 @@ jobs:
         make
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2

.github/workflows/coverity-scan.yml

@@ -5,14 +5,14 @@ on:
 
 jobs:
   latest:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
         with:
           submodules: true
-      - uses: actions/setup-python@v1
+      - uses: actions/setup-python@v4
         with:
-          python-version: 3.7.x
+          python-version: 3.10.x
 
       - name: Download Coverity Build Tool
         run: |
@@ -28,7 +28,7 @@ jobs:
           sudo chmod -R go-w /usr/share
 
       - name: apt dependencies
-        run: sudo apt-get install ninja-build libgraphviz-dev bison flex qt5-default
+        run: sudo apt-get install ninja-build libgraphviz-dev bison flex qtbase5-dev qt5-qmake cmake
 
       - name: py dependencies
         run: |

.github/workflows/dist.yml

@@ -9,7 +9,7 @@ jobs:
     if: startsWith(github.ref, 'refs/tags/deploy-test-') || startsWith(github.ref, 'refs/tags/v')
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Checkout submodules
         run: |
             git submodule init
@@ -35,10 +35,10 @@ jobs:
       tarball
     ]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Extract version
       id: extract_version
-      run: echo ::set-output name=version::${GITHUB_REF/refs\/tags\//}
+      run: echo "version=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_OUTPUT
     - name: Create Release
       id: create_release
       uses: actions/create-release@v1
@@ -49,7 +49,7 @@ jobs:
           release_name: Release ${{ steps.extract_version.outputs.version }}
           draft: true
           prerelease: false
-    - uses: actions/download-artifact@v2
+    - uses: actions/download-artifact@v3
     - name: Display structure of downloaded files
       run: ls -R
     - name: Upload rz-ghidra src tarball

.github/workflows/linter.yml

@@ -6,9 +6,9 @@ on:
 
 jobs:
   licenses:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: REUSE Compliance Check
-      uses: fsfe/reuse-action@v1.1
+      uses: fsfe/reuse-action@v1

.travis.yml

@@ -10,24 +10,19 @@ jobs:
   include:
     - os: linux
       name: X86_64
-      dist: focal
+      dist: jammy
     - os: linux
       name: S390X
       arch: s390x
-      dist: focal
+      dist: jammy
     - os: linux
       name: PPC64
       arch: ppc64le
-      dist: focal
+      dist: jammy
     - os: linux
       name: ARM64
       arch: arm64
-      dist: focal
-  allow_failures:
-    - os: linux
-      name: S390X
-      arch: s390x
-      dist: focal
+      dist: jammy
 
 addons:
   apt:

CMakeLists.txt

@@ -55,7 +55,10 @@ set(CORE_SOURCE
 		src/RizinPrintC.cpp
 		src/RzCoreMutex.h
 		src/RzCoreMutex.cpp
-		src/rz_ghidra.h)
+		src/PrettyXmlEncode.h
+		src/PrettyXmlEncode.cpp
+		src/rz_ghidra.h
+		src/rz_ghidra_internal.h)
 
 if(BUILD_SLEIGH_PLUGIN)
 set(ASM_SOURCE

ghidra/CMakeLists.txt

@@ -5,6 +5,7 @@
 # Base of everything
 set(SOURCE_BASE_CXX
 		# xml.cc				// generated by yacc task
+		marshal.cc
 		space.cc
 		float.cc
 		address.cc
@@ -46,6 +47,7 @@ set(SOURCE_DECOMPILER_CXX
 	funcdata.cc
 	funcdata_block.cc
 	funcdata_varnode.cc
+	unionresolve.cc
 	funcdata_op.cc
 	pcodeinject.cc
 	heritage.cc

src/CodeXMLParse.cpp

@@ -139,32 +139,47 @@ void AnnotateCommentOffset(ANNOTATOR_PARAMS)
 void AnnotateColor(ANNOTATOR_PARAMS)
 {
 	pugi::xml_attribute attr = node.attribute("color");
-	if (attr.empty())
+	if(attr.empty())
 		return;
 
-	std::string color = attr.as_string();
-	if (color == "")
+	int color = attr.as_int(-1);
+	if(color < 0)
 		return;
 
 	RSyntaxHighlightType type;
-	if (color == "keyword")
-		type = RZ_SYNTAX_HIGHLIGHT_TYPE_KEYWORD;
-	else if (color == "comment")
-		type = RZ_SYNTAX_HIGHLIGHT_TYPE_COMMENT;
-	else if (color == "type")
-		type = RZ_SYNTAX_HIGHLIGHT_TYPE_DATATYPE;
-	else if (color == "funcname")
-		type = RZ_SYNTAX_HIGHLIGHT_TYPE_FUNCTION_NAME;
-	else if (color == "param")
-		type = RZ_SYNTAX_HIGHLIGHT_TYPE_FUNCTION_PARAMETER;
-	else if (color == "var")
-		type = RZ_SYNTAX_HIGHLIGHT_TYPE_LOCAL_VARIABLE;
-	else if (color == "const")
-		type = RZ_SYNTAX_HIGHLIGHT_TYPE_CONSTANT_VARIABLE;
-	else if (color == "global")
-		type = RZ_SYNTAX_HIGHLIGHT_TYPE_GLOBAL_VARIABLE;
-	else
-		return;
+	switch(color)
+	{
+		case Emit::syntax_highlight::keyword_color:
+			type = RZ_SYNTAX_HIGHLIGHT_TYPE_KEYWORD;
+			break;
+		case Emit::syntax_highlight::comment_color:
+			type = RZ_SYNTAX_HIGHLIGHT_TYPE_COMMENT;
+			break;
+		case Emit::syntax_highlight::type_color:
+			type = RZ_SYNTAX_HIGHLIGHT_TYPE_DATATYPE;
+			break;
+		case Emit::syntax_highlight::funcname_color:
+			type = RZ_SYNTAX_HIGHLIGHT_TYPE_FUNCTION_NAME;
+			break;
+		case Emit::syntax_highlight::var_color:
+			type = RZ_SYNTAX_HIGHLIGHT_TYPE_LOCAL_VARIABLE;
+			break;
+		case Emit::syntax_highlight::const_color:
+			type = RZ_SYNTAX_HIGHLIGHT_TYPE_CONSTANT_VARIABLE;
+			break;
+		case Emit::syntax_highlight::param_color:
+			type = RZ_SYNTAX_HIGHLIGHT_TYPE_FUNCTION_PARAMETER;
+			break;
+		case Emit::syntax_highlight::global_color:
+			type = RZ_SYNTAX_HIGHLIGHT_TYPE_GLOBAL_VARIABLE;
+			break;
+		case Emit::syntax_highlight::no_color:
+		case Emit::syntax_highlight::error_color:
+		case Emit::syntax_highlight::special_color:
+		default:
+			return;
+	}
+
 	RzCodeAnnotation annotation = {};
 	annotation.type = RZ_CODE_ANNOTATION_TYPE_SYNTAX_HIGHLIGHT;
 	annotation.syntax_highlight.type = type;

src/PrettyXmlEncode.cpp

@@ -0,0 +1,37 @@
+// SPDX-FileCopyrightText: 2023 Florian Märkl <info@florianmaerkl.de>
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+#include "PrettyXmlEncode.h"
+
+void PrettyXmlEncode::indent()
+{
+	for(int i = 0; i < depth; i++)
+		outStream << "  ";
+}
+
+void PrettyXmlEncode::openElement(const ElementId &elemId)
+{
+	if(elementTagIsOpen)
+		outStream << ">\n";
+	else
+		elementTagIsOpen = true;
+	indent();
+	depth++;
+	outStream << '<' << elemId.getName();
+}
+
+void PrettyXmlEncode::closeElement(const ElementId &elemId)
+{
+	depth--;
+	if(elementTagIsOpen)
+	{
+		outStream << "/>\n";
+		elementTagIsOpen = false;
+	}
+	else
+	{
+		indent();
+		outStream << "</" << elemId.getName() << ">\n";
+	}
+}
+

src/PrettyXmlEncode.h

@@ -0,0 +1,21 @@
+// SPDX-FileCopyrightText: 2023 Florian Märkl <info@florianmaerkl.de>
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+#ifndef PRETTY_XML_ENCODE_H
+#define PRETTY_XML_ENCODE_H
+
+#include <marshal.hh>
+
+class PrettyXmlEncode: public XmlEncode
+{
+	private:
+		int depth = 0;
+		void indent();
+
+	public:
+		PrettyXmlEncode(std::ostream &s) : XmlEncode(s) {}
+		void openElement(const ElementId &elemId) override;
+		void closeElement(const ElementId &elemId) override;
+};
+
+#endif

src/RizinArchitecture.cpp

@@ -37,7 +37,7 @@ std::string FilenameFromCore(RzCore *core)
 }
 
 RizinArchitecture::RizinArchitecture(RzCore *core, const std::string &sleigh_id)
-	: SleighArchitecture(FilenameFromCore(core), sleigh_id.empty() ? SleighIdFromCore(core) : sleigh_id, &cout),
+	: SleighArchitecture(FilenameFromCore(core), sleigh_id.empty() ? SleighIdFromCore(core) : sleigh_id, &std::cout),
 	coreMutex(core)
 {
 }

src/RizinCommentDatabase.h

@@ -29,8 +29,8 @@ class RizinCommentDatabase : public CommentDatabase
 		CommentSet::const_iterator beginComment(const Address &fad) const override;
 		CommentSet::const_iterator endComment(const Address &fad) const override;
 
-		void saveXml(ostream &s) const override { cache.saveXml(s); }
-		void restoreXml(const Element *el, const AddrSpaceManager *trans) override { throw LowlevelError("commentdb::restoreXml unimplemented"); }
+		void encode(Encoder &encoder) const override { cache.encode(encoder); }
+		void decode(Decoder &decoder) override { throw LowlevelError("CommentDatabaseGhidra::decode unimplemented"); }
 };
 
 #endif //RZ_GHIDRA_RizinCOMMENTDATABASE_H