yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-05 02:39:44 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/patch'

Browse source 
Conflicts:
	Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/PcodeDataTypeManager.java
This commit is contained in:
Ryan Kurtz 2019-12-10 12:29:41 -05:00
commit b8f07b8351
9 changed files with 53 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Ghidra/Framework/SoftwareModeling/data/languages/language_common.rxg
View file

@ -212,6 +212,9 @@
<optional>
<attribute name="dynamic"/>
</optional>
<optional>
<attribute name="incidentalcopy"/>
</optional>
<interleave>
<zeroOrMore>
<element name="input"><ref name="inject_parameter_type"/></element>

20
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/PcodeDataTypeManager.java
View file

@ -120,9 +120,12 @@ public class PcodeDataTypeManager {
}
/**
* Find a data type with the given name.
* @param nm name of data type
* @return may return null if no data type exists with the given name
* Find a base/built-in data-type with the given name and/or id. If an id is provided and
* a corresponding data-type exists, this data-type is returned. Otherwise the first
* built-in data-type with a matching name is returned
* @param nm name of data-type
* @param idstr is an optional string containing a data-type id number
* @return the data-type object or null if no matching data-type exists
*/
public DataType findBaseType(String nm, String idstr) {
long id = 0;
@ -242,8 +245,13 @@ public class PcodeDataTypeManager {
}
/**
* @param type to be converted
* @return either a typeref tag giving the name, or a full type tag
* Generate an XML tag describing the given data-type. Most data-types produce a <type> tag,
* fully describing the data-type. Where possible a <typeref> tag is produced, which just gives
* the name of the data-type, deferring a full description of the data-type. For certain simple or
* nameless data-types, a <type> tag is emitted giving a full description.
* @param type is the data-type to be converted
* @param size is the size in bytes of the specific instance of the data-type
* @return a StringBuilder containing the XML tag
*/
public StringBuilder buildTypeRef(DataType type, int size) {
if (type != null && type.getDataTypeManager() != progDataTypes) {
@ -424,7 +432,7 @@ public class PcodeDataTypeManager {
resBuf.append(">\n");
for (long key : keys) {
resBuf.append("<val");
SpecXmlUtils.encodeStringAttribute(resBuf, "name", enumDt.getName(key));
SpecXmlUtils.xmlEscapeAttribute(resBuf, "name", enumDt.getName(key));
SpecXmlUtils.encodeSignedIntegerAttribute(resBuf, "value", key);
resBuf.append("/>");
}