Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-11-24 21:21:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-4899_DoNothingSwitchTarget' into

Browse Source 
patch (Closes #6819)
This commit is contained in:
Ryan Kurtz 2024-10-01 08:44:55 -04:00
commit 1c0396d590
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Ghidra/Features/Decompiler/src/decompile/cpp/block.cc
View File

@ -2574,9 +2574,16 @@ bool BlockBasic::isDoNothing(void) const
if (sizeIn() == 0) return false; // A block that does nothing but
// is a starting block, may need to be a
// placeholder for global(persistent) vars
if ((sizeIn()==1)&&(getIn(0)->isSwitchOut())) {
if (getOut(0)->sizeIn() > 1)
return false; // Don't remove switch targets
for(int4 i=0;i<sizeIn();++i) {
const FlowBlock *switchbl = getIn(i);
if (!switchbl->isSwitchOut()) continue;
if (switchbl->sizeOut() > 1) {
// This block is a switch target
if (getOut(0)->sizeIn() > 1) { // Multiple edges coming together
// Switch edge may still be propagating a unique value
return false; // Don't remove it
}
}
}
PcodeOp *lastop = lastOp();
if ((lastop != (PcodeOp *)0)&&(lastop->code()==CPUI_BRANCHIND))