From ef12c208291db224a0d5ca9d4d36fcd75f8e4d9a Mon Sep 17 00:00:00 2001
From: caheckman <48068198+caheckman@users.noreply.github.com>
Date: Thu, 4 Jul 2019 12:53:36 -0400
Subject: [PATCH] Fix for "Unknown function tag: scope" error
---
.../ghidra/program/model/pcode/HighFunction.java | 6 ++++++
.../Processors/x86/data/languages/x86-64-gcc.cspec | 6 +++++-
.../Processors/x86/data/languages/x86-64-win.cspec | 12 ++++++++++--
3 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/HighFunction.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/HighFunction.java
index 8624851227..ffdcc8f2f2 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/HighFunction.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/HighFunction.java
@@ -298,6 +298,12 @@ public class HighFunction extends PcodeSyntaxTree {
// Do nothing with override at the moment
parser.discardSubTree();
}
+ else if (subel.getName().equals("scope")) {
+ // This must be a subscope of the local scope
+ // Currently this can only hold static variables of the function
+ // which ghidra already knows about
+ parser.discardSubTree();
+ }
else {
throw new PcodeXMLException("Unknown tag in function: " + subel.getName());
}
diff --git a/Ghidra/Processors/x86/data/languages/x86-64-gcc.cspec b/Ghidra/Processors/x86/data/languages/x86-64-gcc.cspec
index e55ae77a5f..2191210a34 100644
--- a/Ghidra/Processors/x86/data/languages/x86-64-gcc.cspec
+++ b/Ghidra/Processors/x86/data/languages/x86-64-gcc.cspec
@@ -132,7 +132,7 @@
-