yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-04 18:29:37 +02:00
Code Issues Releases Wiki Activity

Fix for "Unknown function tag: scope" error

Browse source
This commit is contained in:
caheckman 2019-07-04 12:53:36 -04:00
parent a3ea66e4db
commit ef12c20829
3 changed files with 21 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/HighFunction.java
View file

@ -298,6 +298,12 @@ public class HighFunction extends PcodeSyntaxTree {
// Do nothing with override at the moment // Do nothing with override at the moment
parser.discardSubTree(); 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 { else {
throw new PcodeXMLException("Unknown tag in function: " + subel.getName()); throw new PcodeXMLException("Unknown tag in function: " + subel.getName());
} }

6
Ghidra/Processors/x86/data/languages/x86-64-gcc.cspec
View file

@ -132,7 +132,7 @@
<addr offset="40" space="stack"/> <addr offset="40" space="stack"/>
</pentry> </pentry>
</input> </input>
<output killedbycall="true"> <output>
<pentry minsize="4" maxsize="8" metatype="float"> <pentry minsize="4" maxsize="8" metatype="float">
<register name="XMM0_Qa"/> <register name="XMM0_Qa"/>
</pentry> </pentry>
@ -153,6 +153,10 @@
<register name="R15"/> <register name="R15"/>
<register name="DF"/> <register name="DF"/>
</unaffected> </unaffected>
<killedbycall>
<register name="RAX"/>
<register name="XMM0"/>
</killedbycall>
<localrange> <localrange>
<range space="stack" first="0xfffffffffff0bdc1" last="0xffffffffffffffff"/> <range space="stack" first="0xfffffffffff0bdc1" last="0xffffffffffffffff"/>
<range space="stack" first="8" last="39"/> <range space="stack" first="8" last="39"/>

12
Ghidra/Processors/x86/data/languages/x86-64-win.cspec
View file

@ -64,7 +64,7 @@
<addr offset="40" space="stack"/> <addr offset="40" space="stack"/>
</pentry> </pentry>
</input> </input>
<output killedbycall="true"> <output>
<pentry minsize="4" maxsize="8" metatype="float"> <pentry minsize="4" maxsize="8" metatype="float">
<register name="XMM0_Qa"/> <register name="XMM0_Qa"/>
</pentry> </pentry>
@ -85,6 +85,10 @@
<register name="R15"/> <register name="R15"/>
<register name="DF"/> <register name="DF"/>
</unaffected> </unaffected>
<killedbycall>
<register name="RAX"/>
<register name="XMM0"/>
</killedbycall>
<localrange> <localrange>
<range space="stack" first="0xfffffffffff0bdc1" last="0xffffffffffffffff"/> <range space="stack" first="0xfffffffffff0bdc1" last="0xffffffffffffffff"/>
<range space="stack" first="8" last="39"/> <range space="stack" first="8" last="39"/>
@ -121,7 +125,7 @@
<addr offset="40" space="stack"/> <addr offset="40" space="stack"/>
</pentry> </pentry>
</input> </input>
<output killedbycall="true"> <output>
<pentry minsize="4" maxsize="8" metatype="float"> <pentry minsize="4" maxsize="8" metatype="float">
<register name="XMM0_Qa"/> <register name="XMM0_Qa"/>
</pentry> </pentry>
@ -142,6 +146,10 @@
<register name="R15"/> <register name="R15"/>
<register name="DF"/> <register name="DF"/>
</unaffected> </unaffected>
<killedbycall>
<register name="RAX"/>
<register name="XMM0"/>
</killedbycall>
<localrange> <localrange>
<range space="stack" first="0xfffffffffff0bdc1" last="0xffffffffffffffff"/> <range space="stack" first="0xfffffffffff0bdc1" last="0xffffffffffffffff"/>
<range space="stack" first="8" last="39"/> <range space="stack" first="8" last="39"/>