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

TypePointerRel adjustments

Browse source
This commit is contained in:
caheckman 2021-11-24 15:22:17 -05:00
parent 6cc2eae322
commit 64534bc774
7 changed files with 98 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Ghidra/Features/Decompiler/src/decompile/cpp/ruleaction.cc
View file

@ -5977,6 +5977,13 @@ void AddTreeState::calcSubtype(void)
}
extra = AddrSpace::byteToAddress(extra, ct->getWordSize()); // Convert back to address units
offset = (nonmultsum - extra) & ptrmask;
if (pRelType != (TypePointerRel *)0 && offset == pRelType->getPointerOffset()) {
// offset falls within basic ptrto
if (!pRelType->evaluateThruParent(0)) { // If we are not representing offset 0 through parent
valid = false; // Use basic (alternate) form
return;
}
}
isSubtype = true;
}
else if (baseType->getMetatype() == TYPE_ARRAY) {
@ -6331,7 +6338,7 @@ int4 RuleStructOffset0::applyOp(PcodeOp *op,Funcdata &data)
if (ct->getMetatype() != TYPE_PTR) return 0;
Datatype *baseType = ((TypePointer *)ct)->getPtrTo();
uintb offset = 0;
if (ct->isFormalPointerRel()) {
if (ct->isFormalPointerRel() && ((TypePointerRel *)ct)->evaluateThruParent(0)) {
TypePointerRel *ptRel = (TypePointerRel *)ct;
baseType = ptRel->getParent();
if (baseType->getMetatype() != TYPE_STRUCT)