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

Adjustments to get rid of some compiler warnings

Browse source
This commit is contained in:
caheckman 2021-10-08 16:51:12 -04:00
parent 22769f2234
commit 41d0be6b95
31 changed files with 317 additions and 326 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Ghidra/Features/Decompiler/src/decompile/cpp/block.cc
View file

@ -890,18 +890,18 @@ void BlockGraph::identifyInternal(BlockGraph *ident,const vector<FlowBlock *> &n
ident->selfIdentify();
}
/// \param flags is the set of boolean properties
void BlockGraph::clearEdgeFlags(uint4 flags)
/// \param fl is the set of boolean properties
void BlockGraph::clearEdgeFlags(uint4 fl)
{
flags = ~flags;
fl = ~fl;
int4 size = list.size();
for(int4 i=0;i<size;++i) {
FlowBlock *bl = list[i];
for(int4 j=0;j<size;++j) {
FlowBlock *bl = list[j];
for(int4 i=0;i<bl->intothis.size();++i)
bl->intothis[i].label &= flags;
bl->intothis[i].label &= fl;
for(int4 i=0;i<bl->outofthis.size();++i)
bl->outofthis[i].label &= flags;
bl->outofthis[i].label &= fl;
}
}
@ -3350,8 +3350,8 @@ void BlockSwitch::finalizePrinting(Funcdata &data) const
CaseOrder &curcase( caseblocks[i] );
if (jump->numIndicesByBlock(curcase.basicblock) > 0) {
if (curcase.depth == 0) { // Only set label on chain roots
int4 index = jump->getIndexByBlock(curcase.basicblock,0);
curcase.label = jump->getLabelByIndex(index);
int4 ind = jump->getIndexByBlock(curcase.basicblock,0);
curcase.label = jump->getLabelByIndex(ind);
int4 j = curcase.chain;
int4 depthcount = 1;
while(j != -1) {