github/ghidra
1
1
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-01-07 21:24:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-6133_OffsetPointerNestedField'

Browse Source 
into patch (Closes #8630)
This commit is contained in:
Ryan Kurtz
2025-12-10 12:27:43 -05:00
parent 68f57a0e7c 0e658ae5b6
commit 727964763f
1 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Ghidra/Features/Decompiler/src/decompile/cpp/ruleaction.cc
View File

@@ -6691,17 +6691,39 @@ int4 RuleStructOffset0::applyOp(PcodeOp *op,Funcdata &data)
Datatype *ct = ptrVn->getTypeReadFacing(op);
if (ct->getMetatype() != TYPE_PTR) return 0;
Datatype *baseType = ((TypePointer *)ct)->getPtrTo();
int8 offset = 0;
int8 offset;
if (ct->isFormalPointerRel() && ((TypePointerRel *)ct)->evaluateThruParent(0)) {
TypePointerRel *ptRel = (TypePointerRel *)ct;
baseType = ptRel->getParent();
if (baseType->getMetatype() != TYPE_STRUCT)
return 0;
int8 iOff = ptRel->getByteOffset();
if (iOff >= baseType->getSize())
offset = ptRel->getByteOffset();
if (offset >= baseType->getSize())
return 0;
offset = iOff;
if (baseType->getSize() < movesize)
return 0; // Moving something bigger than entire structure
int8 newoff;
Datatype *subType = baseType->getSubType(offset,&newoff); // Get field at pointer's offset
if (subType==(Datatype *)0) return 0;
if (subType->getSize() < movesize) return 0; // Subtype is too small to handle LOAD/STORE
newoff = AddrSpace::byteToAddress(newoff, ptRel->getWordSize());
offset = -newoff & calc_mask(ptrVn->getSize());
// Create pointer up to parent
PcodeOp *newop = data.newOpBefore(op,CPUI_PTRSUB,ptrVn,data.newConstant(ptrVn->getSize(),offset));
if (ptrVn->getType()->needsResolution())
data.inheritResolution(ptrVn->getType(),newop, 0, op, 1);
newop->setStopTypePropagation();
if (newoff != 0) {
// Add newoff in to get back to zero total offset
PcodeOp *addop = data.newOpBefore(op,CPUI_INT_ADD,newop->getOut(),data.newConstant(ptrVn->getSize(),newoff));
data.opSetInput(op,addop->getOut(),1);
}
else {
data.opSetInput(op,newop->getOut(),1);
}
return 1;
}
offset = 0;
if (baseType->getMetatype() == TYPE_STRUCT) {
if (baseType->getSize() < movesize)
return 0; // Moving something bigger than entire structure