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

GT-3401_emteere Interim fix for multiple return types where one type is

Browse source 
tagged as a pointer.
This commit is contained in:
emteere 2019-08-02 11:29:10 -04:00
parent 0a517e6864
commit c814e5bfbf
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Ghidra/Features/Base/src/main/java/ghidra/program/util/SymbolicPropogator.java
View file

@ -2037,7 +2037,7 @@ public class SymbolicPropogator {
} }
// only want returns that can fit in a pointer! // only want returns that can fit in a pointer!
returnLoc = conv.getReturnLocation(Undefined.getUndefinedDataType(pointerSize), program); returnLoc = conv.getReturnLocation(new PointerDataType(Undefined.DEFAULT,pointerSize), program);
return returnLoc; return returnLoc;
} }

12
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/ParamEntry.java
View file

@ -323,9 +323,15 @@ public class ParamEntry {
size = SpecXmlUtils.decodeInt(entry.getValue()); size = SpecXmlUtils.decodeInt(entry.getValue());
else if (name.equals("metatype")) { // Not implemented at the moment else if (name.equals("metatype")) { // Not implemented at the moment
String meta = entry.getValue(); String meta = entry.getValue();
// TODO: Currently only supporting "float" and "unknown" metatypes // TODO: Currently only supporting "float", "ptr", and "unknown" metatypes
if ((meta != null)&&(meta.equals("float"))) if ((meta != null)) {
type = TYPE_FLOAT; if (meta.equals("float")) {
type = TYPE_FLOAT;
}
else if (meta.equals("ptr")) {
type = TYPE_PTR;
}
}
} }
else if (name.equals("group")) // Override the group else if (name.equals("group")) // Override the group
group = SpecXmlUtils.decodeInt(entry.getValue()); group = SpecXmlUtils.decodeInt(entry.getValue());