Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-02-18 08:30:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed corner case causing "Deleting op with descendants"

Browse Source
This commit is contained in:
caheckman 2020-01-30 12:07:46 -05:00
parent ccd5030574
commit ef8400ee42
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Ghidra/Features/Decompiler/src/decompile/cpp/funcdata_block.cc
View File

@ -93,6 +93,7 @@ void Funcdata::pushMultiequals(BlockBasic *bb)
warningHeader("push_multiequal on block with multiple outputs");
outblock = (BlockBasic *) bb->getOut(0); // Take first output block. If this is a
// donothing block, it is the only output block
int4 outblock_ind = bb->getOutRevIndex(0);
for(iter=bb->beginOp();iter!=bb->endOp();++iter) {
origop = *iter;
if (origop->code() != CPUI_MULTIEQUAL) continue;
@ -103,12 +104,22 @@ void Funcdata::pushMultiequals(BlockBasic *bb)
for(citer=origvn->beginDescend();citer!=origvn->endDescend();++citer) {
PcodeOp *op = *citer;
if ((op->code()==CPUI_MULTIEQUAL)&&(op->getParent()==outblock)) {
if ((origvn->getAddr() == op->getOut()->getAddr())&&origvn->isAddrTied())
bool deadEdge = true; // Check for reference to origvn NOT thru the dead edge
for(int4 i=0;i<op->numInput();++i) {
if (i == outblock_ind) continue; // Not going thru dead edge
if (op->getIn(i) == origvn) { // Reference to origvn
deadEdge = false;
break;
}
}
if (deadEdge) {
if ((origvn->getAddr() == op->getOut()->getAddr())&&origvn->isAddrTied())
// If origvn is addrtied and feeds into a MULTIEQUAL at same address in outblock
// Then any use of origvn beyond outblock that did not go thru this MULTIEQUAL must have
// propagated through some other register. So we make the new MULTIEQUAL write to a unique register
neednewunique = true;
continue;
neednewunique = true;
continue;
}
}
needreplace = true;
break;
@ -141,7 +152,6 @@ void Funcdata::pushMultiequals(BlockBasic *bb)
// Replace obsolete origvn with replacevn
int4 i;
int4 outblock_ind = bb->getOutRevIndex(0);
list<PcodeOp *>::iterator titer = origvn->descend.begin();
while(titer != origvn->descend.end()) {
PcodeOp *op = *titer++;