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

GP-3739 Make sure output of partial PIECE operations are marked explicit

Browse source
This commit is contained in:
caheckman 2023-08-11 21:40:18 +00:00
parent 960fc2d06f
commit 027c3e2295
1 changed files with 8 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Ghidra/Features/Decompiler/src/decompile/cpp/coreaction.cc
View file

@ -2922,20 +2922,9 @@ int4 ActionMarkExplicit::baseExplicit(Varnode *vn,int4 maxref)
Varnode *rootVn = PieceNode::findRoot(vn); Varnode *rootVn = PieceNode::findRoot(vn);
if (vn == rootVn) return -1; if (vn == rootVn) return -1;
if (rootVn->getDef()->isPartialRoot()) { if (rootVn->getDef()->isPartialRoot()) {
// Getting PIECEd into a structured thing. Unless vn is a leaf, it should be implicit // Varnode is getting PIECEd into a structure. All such PIECE operations should be explicit.
if (def->code() != CPUI_PIECE) return -1; // Internal PIECE operations will be hidden.
if (vn->loneDescend() == (PcodeOp *)0) return -1; return -1;
Varnode *vn0 = def->getIn(0);
Varnode *vn1 = def->getIn(1);
Address addr = vn->getAddr();
if (!addr.getSpace()->isBigEndian())
addr = addr + vn1->getSize();
if (addr != vn0->getAddr()) return -1;
addr = vn->getAddr();
if (addr.getSpace()->isBigEndian())
addr = addr + vn0->getSize();
if (addr != vn1->getAddr()) return -1;
// If we reach here vn is a non-leaf in a CONCAT tree and should be implicit
} }
} }
else { else {
@ -2947,12 +2936,13 @@ int4 ActionMarkExplicit::baseExplicit(Varnode *vn,int4 maxref)
// or a dynamic mapping causing the bit to be set. In either case, it should probably be explicit // or a dynamic mapping causing the bit to be set. In either case, it should probably be explicit
return -1; return -1;
} }
else if (vn->isProtoPartial() && def->code() != CPUI_PIECE) { else if (vn->isProtoPartial()) {
// Varnode is part of structure. Write to structure should be an explicit statement // Varnode is getting PIECEd into a structure. All such PIECE operations should be explicit.
// Internal PIECE operations will be hidden.
return -1; return -1;
} }
else if (def->code() == CPUI_PIECE && def->getIn(0)->isProtoPartial() && !vn->isProtoPartial()) { else if (def->code() == CPUI_PIECE && def->getIn(0)->isProtoPartial()) {
// The base of PIECE operations building a structure // The base of PIECE operations building a structure should be explicit.
return -1; return -1;
} }
if (vn->hasNoDescend()) return -1; // Must have at least one descendant if (vn->hasNoDescend()) return -1; // Must have at least one descendant