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

Adjust propagation of booleans

Browse source
This commit is contained in:
caheckman 2020-02-10 10:30:38 -05:00
parent 1c95e274ff
commit 37cc39eaa3
1 changed files with 5 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4185,14 +4185,6 @@ bool ActionInferTypes::propagateGoodEdge(PcodeOp *op,int4 inslot,int4 outslot,Va
break; break;
case CPUI_COPY: case CPUI_COPY:
if ((inslot!=-1)&&(outslot!=-1)) return false; // Must propagate input <-> output if ((inslot!=-1)&&(outslot!=-1)) return false; // Must propagate input <-> output
if (metain == TYPE_BOOL) {
if (inslot != -1) return false;
Varnode *othervn = op->getIn(outslot);
if (!othervn->isConstant()) return false;
uintb val = othervn->getOffset();
if (val > 1)
return false;
}
break; break;
case CPUI_MULTIEQUAL: case CPUI_MULTIEQUAL:
if ((inslot!=-1)&&(outslot!=-1)) return false; // Must propagate input <-> output if ((inslot!=-1)&&(outslot!=-1)) return false; // Must propagate input <-> output
@ -4200,24 +4192,15 @@ bool ActionInferTypes::propagateGoodEdge(PcodeOp *op,int4 inslot,int4 outslot,Va
case CPUI_INT_LESS: case CPUI_INT_LESS:
case CPUI_INT_LESSEQUAL: case CPUI_INT_LESSEQUAL:
if ((inslot==-1)||(outslot==-1)) return false; // Must propagate input <-> input if ((inslot==-1)||(outslot==-1)) return false; // Must propagate input <-> input
if (metain == TYPE_BOOL) return false;
break; break;
case CPUI_INT_EQUAL: case CPUI_INT_EQUAL:
case CPUI_INT_NOTEQUAL: case CPUI_INT_NOTEQUAL:
if ((inslot==-1)||(outslot==-1)) return false; // Must propagate input <-> input if ((inslot==-1)||(outslot==-1)) return false; // Must propagate input <-> input
if (metain == TYPE_BOOL) { // Only propagate bool to 0 or 1 const
Varnode *othervn = op->getIn(outslot);
if (!othervn->isConstant()) return false;
uintb val = othervn->getOffset();
if (val > 1)
return false;
}
break; break;
case CPUI_LOAD: case CPUI_LOAD:
case CPUI_STORE: case CPUI_STORE:
if ((inslot==0)||(outslot==0)) return false; // Don't propagate along this edge if ((inslot==0)||(outslot==0)) return false; // Don't propagate along this edge
if (invn->isSpacebase()) return false; if (invn->isSpacebase()) return false;
if (metain == TYPE_BOOL) return false;
break; break;
case CPUI_PTRADD: case CPUI_PTRADD:
if ((inslot==2)||(outslot==2)) return false; // Don't propagate along this edge if ((inslot==2)||(outslot==2)) return false; // Don't propagate along this edge
@ -4275,10 +4258,14 @@ bool ActionInferTypes::propagateTypeEdge(TypeFactory *typegrp,PcodeOp *op,int4 i
if (outvn->isAnnotation()) return false; if (outvn->isAnnotation()) return false;
if (outvn->isTypeLock()) return false; // Can't propagate through typelock if (outvn->isTypeLock()) return false; // Can't propagate through typelock
invn = (inslot==-1) ? op->getOut() : op->getIn(inslot); invn = (inslot==-1) ? op->getOut() : op->getIn(inslot);
Datatype *alttype = invn->getTempType();
if (!propagateGoodEdge(op,inslot,outslot,invn)) if (!propagateGoodEdge(op,inslot,outslot,invn))
return false; return false;
Datatype *alttype = invn->getTempType();
if (alttype->getMetatype() == TYPE_BOOL) { // Only propagate boolean
if (outvn->getNZMask() > 1) // If we know output can only take boolean values
return false;
}
switch(op->code()) { switch(op->code()) {
case CPUI_INDIRECT: case CPUI_INDIRECT:
case CPUI_COPY: case CPUI_COPY: