mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2025-10-05 02:39:44 +02:00
Merge remote-tracking branch 'origin/caheckman_recentBranches'
This commit is contained in:
ghidravore
commit
875eed4c3b
60 changed files with 2939 additions and 1043 deletions
|
|
@ -318,12 +318,43 @@ public class PcodeDataTypeManager {
|
|||
throw new IllegalArgumentException("Unsupported character size");
|
||||
}
|
||||
|
||||
private String buildTypeInternal(DataType type, int size) { // Build all of type except name attribute
|
||||
if (type instanceof TypeDef) {
|
||||
type = ((TypeDef) type).getBaseDataType();
|
||||
private void appendOpaqueString(StringBuilder resBuf, DataType type, int size) {
|
||||
SpecXmlUtils.encodeStringAttribute(resBuf, "metatype", "struct");
|
||||
SpecXmlUtils.encodeSignedIntegerAttribute(resBuf, "size", size);
|
||||
SpecXmlUtils.encodeBooleanAttribute(resBuf, "opaquestring", true);
|
||||
SpecXmlUtils.encodeBooleanAttribute(resBuf, "varlength", true);
|
||||
resBuf.append(">\n");
|
||||
resBuf.append("<field name=\"unknown_data1\"");
|
||||
SpecXmlUtils.encodeSignedIntegerAttribute(resBuf, "offset", 0);
|
||||
resBuf.append("> <typeref name=\"byte\"/></field>\n");
|
||||
size -= 1;
|
||||
resBuf.append("<field name=\"opaque_data\"");
|
||||
SpecXmlUtils.encodeSignedIntegerAttribute(resBuf, "offset", 1);
|
||||
resBuf.append("> <type");
|
||||
SpecXmlUtils.encodeStringAttribute(resBuf, "name", "");
|
||||
SpecXmlUtils.encodeStringAttribute(resBuf, "metatype", "array");
|
||||
SpecXmlUtils.encodeSignedIntegerAttribute(resBuf, "size", size);
|
||||
SpecXmlUtils.encodeSignedIntegerAttribute(resBuf, "arraysize", size);
|
||||
resBuf.append("><typeref name=\"byte\"/></type>");
|
||||
resBuf.append("</field>\n");
|
||||
}
|
||||
|
||||
private String buildTypeInternal(DataType origType, int size) { // Build all of type except name attribute
|
||||
DataType type;
|
||||
if (origType instanceof TypeDef) {
|
||||
type = ((TypeDef) origType).getBaseDataType();
|
||||
}
|
||||
else {
|
||||
type = origType;
|
||||
}
|
||||
StringBuilder resBuf = new StringBuilder();
|
||||
if (type instanceof Pointer) {
|
||||
if (origType == type) {
|
||||
SpecXmlUtils.encodeStringAttribute(resBuf, "name", "");
|
||||
}
|
||||
else {
|
||||
appendNameIdAttributes(resBuf, origType);
|
||||
}
|
||||
SpecXmlUtils.encodeStringAttribute(resBuf, "metatype", "ptr");
|
||||
int ptrLen = type.getLength();
|
||||
if (ptrLen <= 0) {
|
||||
|
|
@ -344,26 +375,35 @@ public class PcodeDataTypeManager {
|
|||
if (ptrto == null) {
|
||||
ptrtoTypeRef = buildTypeRef(DefaultDataType.dataType, 1);
|
||||
}
|
||||
else if ((ptrto instanceof StringDataType) ||
|
||||
(type instanceof TerminatedStringDataType)) { // Convert pointer to string
|
||||
ptrtoTypeRef = getCharTypeRef(dataOrganization.getCharSize()); // to pointer to char
|
||||
}
|
||||
else if (ptrto instanceof StringUTF8DataType) { // Convert pointer to string
|
||||
// TODO: Need to ensure that UTF8 decoding applies
|
||||
ptrtoTypeRef = getCharTypeRef(1); // to pointer to char
|
||||
else if (ptrto instanceof AbstractStringDataType) {
|
||||
if ((ptrto instanceof StringDataType) ||
|
||||
(type instanceof TerminatedStringDataType)) { // Convert pointer to string
|
||||
ptrtoTypeRef = getCharTypeRef(dataOrganization.getCharSize()); // to pointer to char
|
||||
}
|
||||
else if (ptrto instanceof StringUTF8DataType) { // Convert pointer to string
|
||||
// TODO: Need to ensure that UTF8 decoding applies
|
||||
ptrtoTypeRef = getCharTypeRef(1); // to pointer to char
|
||||
}
|
||||
else if ((ptrto instanceof UnicodeDataType) ||
|
||||
(ptrto instanceof TerminatedUnicodeDataType)) {
|
||||
ptrtoTypeRef = getCharTypeRef(2);
|
||||
}
|
||||
else if ((ptrto instanceof Unicode32DataType) ||
|
||||
(ptrto instanceof TerminatedUnicode32DataType)) {
|
||||
ptrtoTypeRef = getCharTypeRef(4);
|
||||
}
|
||||
else {
|
||||
ptrtoTypeRef = new StringBuilder();
|
||||
ptrtoTypeRef.append("<type");
|
||||
appendNameIdAttributes(ptrtoTypeRef, ptrto);
|
||||
appendOpaqueString(ptrtoTypeRef, ptrto, 16384);
|
||||
ptrtoTypeRef.append("</type>\n");
|
||||
}
|
||||
}
|
||||
else if (ptrto instanceof FunctionDefinition) {
|
||||
// FunctionDefinition may have size of -1, do not translate to undefined
|
||||
ptrtoTypeRef = buildTypeRef(ptrto, ptrto.getLength());
|
||||
}
|
||||
else if ((ptrto instanceof UnicodeDataType) ||
|
||||
(ptrto instanceof TerminatedUnicodeDataType)) {
|
||||
ptrtoTypeRef = getCharTypeRef(2);
|
||||
}
|
||||
else if ((ptrto instanceof Unicode32DataType) ||
|
||||
(ptrto instanceof TerminatedUnicode32DataType)) {
|
||||
ptrtoTypeRef = getCharTypeRef(4);
|
||||
}
|
||||
else if (ptrto.getLength() < 0 && !(ptrto instanceof FunctionDefinition)) {
|
||||
ptrtoTypeRef = buildTypeRef(Undefined1DataType.dataType, 1);
|
||||
}
|
||||
|
|
@ -373,6 +413,12 @@ public class PcodeDataTypeManager {
|
|||
resBuf.append(ptrtoTypeRef);
|
||||
}
|
||||
else if (type instanceof Array) {
|
||||
if (origType == type) {
|
||||
SpecXmlUtils.encodeStringAttribute(resBuf, "name", "");
|
||||
}
|
||||
else {
|
||||
appendNameIdAttributes(resBuf, origType);
|
||||
}
|
||||
int sz = type.getLength();
|
||||
if (sz == 0) {
|
||||
sz = size;
|
||||
|
|
@ -386,6 +432,7 @@ public class PcodeDataTypeManager {
|
|||
buildTypeRef(((Array) type).getDataType(), ((Array) type).getElementLength()));
|
||||
}
|
||||
else if (type instanceof Structure) {
|
||||
appendNameIdAttributes(resBuf, origType);
|
||||
// if size is 0, insert an Undefined4 component
|
||||
//
|
||||
int sz = type.getLength();
|
||||
|
|
@ -417,6 +464,7 @@ public class PcodeDataTypeManager {
|
|||
// TODO: trailing flexible array component not yet supported
|
||||
}
|
||||
else if (type instanceof Enum) {
|
||||
appendNameIdAttributes(resBuf, origType);
|
||||
Enum enumDt = (Enum) type;
|
||||
long[] keys = enumDt.getValues();
|
||||
String metatype = "uint";
|
||||
|
|
@ -438,6 +486,7 @@ public class PcodeDataTypeManager {
|
|||
}
|
||||
}
|
||||
else if (type instanceof CharDataType) {
|
||||
appendNameIdAttributes(resBuf, origType);
|
||||
boolean signed = ((CharDataType) type).isSigned();
|
||||
int sz = type.getLength();
|
||||
if (sz <= 0) {
|
||||
|
|
@ -455,44 +504,57 @@ public class PcodeDataTypeManager {
|
|||
}
|
||||
else if (type instanceof WideCharDataType || type instanceof WideChar16DataType ||
|
||||
type instanceof WideChar32DataType) {
|
||||
appendNameIdAttributes(resBuf, origType);
|
||||
SpecXmlUtils.encodeStringAttribute(resBuf, "metatype", "int");
|
||||
SpecXmlUtils.encodeSignedIntegerAttribute(resBuf, "size", type.getLength());
|
||||
SpecXmlUtils.encodeBooleanAttribute(resBuf, "utf", true);
|
||||
resBuf.append('>');
|
||||
}
|
||||
else if ((type instanceof StringDataType) || (type instanceof TerminatedStringDataType)) {
|
||||
SpecXmlUtils.encodeStringAttribute(resBuf, "metatype", "array");
|
||||
SpecXmlUtils.encodeSignedIntegerAttribute(resBuf, "size", size);
|
||||
SpecXmlUtils.encodeSignedIntegerAttribute(resBuf, "arraysize", size);
|
||||
resBuf.append('>');
|
||||
resBuf.append(getCharTypeRef(dataOrganization.getCharSize()));
|
||||
}
|
||||
else if (type instanceof StringUTF8DataType) {
|
||||
SpecXmlUtils.encodeStringAttribute(resBuf, "metatype", "array");
|
||||
SpecXmlUtils.encodeSignedIntegerAttribute(resBuf, "size", size);
|
||||
SpecXmlUtils.encodeSignedIntegerAttribute(resBuf, "arraysize", size);
|
||||
resBuf.append('>');
|
||||
resBuf.append(getCharTypeRef(1)); // TODO: Need to ensure that UTF8 decoding applies
|
||||
}
|
||||
else if ((type instanceof UnicodeDataType) || (type instanceof TerminatedUnicodeDataType)) {
|
||||
SpecXmlUtils.encodeStringAttribute(resBuf, "metatype", "array");
|
||||
SpecXmlUtils.encodeSignedIntegerAttribute(resBuf, "size", size);
|
||||
SpecXmlUtils.encodeSignedIntegerAttribute(resBuf, "arraysize", size / 2);
|
||||
resBuf.append('>');
|
||||
resBuf.append(getCharTypeRef(2));
|
||||
}
|
||||
else if ((type instanceof Unicode32DataType) ||
|
||||
(type instanceof TerminatedUnicode32DataType)) {
|
||||
SpecXmlUtils.encodeStringAttribute(resBuf, "metatype", "array");
|
||||
SpecXmlUtils.encodeSignedIntegerAttribute(resBuf, "size", size);
|
||||
SpecXmlUtils.encodeSignedIntegerAttribute(resBuf, "arraysize", size / 4);
|
||||
resBuf.append('>');
|
||||
resBuf.append(getCharTypeRef(4));
|
||||
else if (type instanceof AbstractStringDataType) {
|
||||
if ((type instanceof StringDataType) || (type instanceof TerminatedStringDataType)) {
|
||||
SpecXmlUtils.encodeStringAttribute(resBuf, "name", "");
|
||||
SpecXmlUtils.encodeStringAttribute(resBuf, "metatype", "array");
|
||||
SpecXmlUtils.encodeSignedIntegerAttribute(resBuf, "size", size);
|
||||
SpecXmlUtils.encodeSignedIntegerAttribute(resBuf, "arraysize", size);
|
||||
resBuf.append('>');
|
||||
resBuf.append(getCharTypeRef(dataOrganization.getCharSize()));
|
||||
}
|
||||
else if (type instanceof StringUTF8DataType) {
|
||||
SpecXmlUtils.encodeStringAttribute(resBuf, "name", "");
|
||||
SpecXmlUtils.encodeStringAttribute(resBuf, "metatype", "array");
|
||||
SpecXmlUtils.encodeSignedIntegerAttribute(resBuf, "size", size);
|
||||
SpecXmlUtils.encodeSignedIntegerAttribute(resBuf, "arraysize", size);
|
||||
resBuf.append('>');
|
||||
resBuf.append(getCharTypeRef(1)); // TODO: Need to ensure that UTF8 decoding applies
|
||||
}
|
||||
else if ((type instanceof UnicodeDataType) ||
|
||||
(type instanceof TerminatedUnicodeDataType)) {
|
||||
SpecXmlUtils.encodeStringAttribute(resBuf, "name", "");
|
||||
SpecXmlUtils.encodeStringAttribute(resBuf, "metatype", "array");
|
||||
SpecXmlUtils.encodeSignedIntegerAttribute(resBuf, "size", size);
|
||||
SpecXmlUtils.encodeSignedIntegerAttribute(resBuf, "arraysize", size / 2);
|
||||
resBuf.append('>');
|
||||
resBuf.append(getCharTypeRef(2));
|
||||
}
|
||||
else if ((type instanceof Unicode32DataType) ||
|
||||
(type instanceof TerminatedUnicode32DataType)) {
|
||||
SpecXmlUtils.encodeStringAttribute(resBuf, "name", "");
|
||||
SpecXmlUtils.encodeStringAttribute(resBuf, "metatype", "array");
|
||||
SpecXmlUtils.encodeSignedIntegerAttribute(resBuf, "size", size);
|
||||
SpecXmlUtils.encodeSignedIntegerAttribute(resBuf, "arraysize", size / 4);
|
||||
resBuf.append('>');
|
||||
resBuf.append(getCharTypeRef(4));
|
||||
}
|
||||
else {
|
||||
appendNameIdAttributes(resBuf, type);
|
||||
appendOpaqueString(resBuf, type, size);
|
||||
}
|
||||
}
|
||||
else if (type instanceof FunctionDefinition) {
|
||||
if (size <= 0) {
|
||||
size = 1;
|
||||
}
|
||||
appendNameIdAttributes(resBuf, origType);
|
||||
SpecXmlUtils.encodeStringAttribute(resBuf, "metatype", "code");
|
||||
SpecXmlUtils.encodeSignedIntegerAttribute(resBuf, "size", 1); // Force size of 1
|
||||
resBuf.append('>');
|
||||
|
|
@ -502,6 +564,7 @@ public class PcodeDataTypeManager {
|
|||
fproto.buildPrototypeXML(resBuf, this);
|
||||
}
|
||||
else if (type instanceof BooleanDataType) {
|
||||
appendNameIdAttributes(resBuf, origType);
|
||||
SpecXmlUtils.encodeStringAttribute(resBuf, "metatype", "bool");
|
||||
SpecXmlUtils.encodeSignedIntegerAttribute(resBuf, "size", type.getLength());
|
||||
resBuf.append('>');
|
||||
|
|
@ -512,11 +575,13 @@ public class PcodeDataTypeManager {
|
|||
if (sz <= 0) {
|
||||
sz = size;
|
||||
}
|
||||
appendNameIdAttributes(resBuf, origType);
|
||||
SpecXmlUtils.encodeStringAttribute(resBuf, "metatype", signed ? "int" : "uint");
|
||||
SpecXmlUtils.encodeSignedIntegerAttribute(resBuf, "size", sz);
|
||||
resBuf.append('>');
|
||||
}
|
||||
else if (type instanceof AbstractFloatDataType) {
|
||||
appendNameIdAttributes(resBuf, origType);
|
||||
SpecXmlUtils.encodeStringAttribute(resBuf, "metatype", "float");
|
||||
SpecXmlUtils.encodeSignedIntegerAttribute(resBuf, "size", type.getLength());
|
||||
resBuf.append('>');
|
||||
|
|
@ -526,22 +591,36 @@ public class PcodeDataTypeManager {
|
|||
if (sz <= 0) {
|
||||
sz = size;
|
||||
}
|
||||
appendNameIdAttributes(resBuf, origType);
|
||||
if (sz < 16) {
|
||||
SpecXmlUtils.encodeStringAttribute(resBuf, "metatype", "unknown");
|
||||
SpecXmlUtils.encodeSignedIntegerAttribute(resBuf, "size", sz);
|
||||
resBuf.append('>');
|
||||
}
|
||||
else {
|
||||
SpecXmlUtils.encodeStringAttribute(resBuf, "metatype", "array");
|
||||
// Build an "opaque" structure with no fields
|
||||
SpecXmlUtils.encodeStringAttribute(resBuf, "metatype", "struct");
|
||||
SpecXmlUtils.encodeSignedIntegerAttribute(resBuf, "size", sz);
|
||||
SpecXmlUtils.encodeSignedIntegerAttribute(resBuf, "arraysize", sz);
|
||||
resBuf.append('>');
|
||||
resBuf.append(buildTypeRef(new ByteDataType(), 1));
|
||||
}
|
||||
}
|
||||
return resBuf.toString();
|
||||
}
|
||||
|
||||
private void appendNameIdAttributes(StringBuilder resBuf, DataType type) {
|
||||
if (type instanceof BuiltIn) {
|
||||
SpecXmlUtils.xmlEscapeAttribute(resBuf, "name",
|
||||
((BuiltIn) type).getDecompilerDisplayName(displayLanguage));
|
||||
}
|
||||
else {
|
||||
SpecXmlUtils.xmlEscapeAttribute(resBuf, "name", type.getName());
|
||||
long id = progDataTypes.getID(type);
|
||||
if (id > 0) {
|
||||
SpecXmlUtils.encodeUnsignedIntegerAttribute(resBuf, "id", id);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Build an XML document string representing the type information for a data type
|
||||
*
|
||||
|
|
@ -559,23 +638,6 @@ public class PcodeDataTypeManager {
|
|||
return resBuf.append("<void/>");
|
||||
}
|
||||
resBuf.append("<type");
|
||||
if ((type instanceof Pointer) || (type instanceof Array) ||
|
||||
(!(type instanceof FunctionDefinition) && type.getLength() <= 0)) {
|
||||
SpecXmlUtils.encodeStringAttribute(resBuf, "name", "");
|
||||
}
|
||||
else {
|
||||
if (type instanceof BuiltIn) {
|
||||
SpecXmlUtils.xmlEscapeAttribute(resBuf, "name",
|
||||
((BuiltIn) type).getDecompilerDisplayName(displayLanguage));
|
||||
}
|
||||
else {
|
||||
SpecXmlUtils.xmlEscapeAttribute(resBuf, "name", type.getName());
|
||||
long id = progDataTypes.getID(type);
|
||||
if (id > 0) {
|
||||
SpecXmlUtils.encodeUnsignedIntegerAttribute(resBuf, "id", id);
|
||||
}
|
||||
}
|
||||
}
|
||||
resBuf.append(buildTypeInternal(type, size));
|
||||
resBuf.append("</type>");
|
||||
return resBuf;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue