Alexander_KS/SAPFOR
4
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added CFG_withUnreachable option

Browse Source
This commit is contained in:
ALEXks
2026-02-14 10:05:25 +03:00
committed by Oleg Nikitin
parent aa7f9cfa4f
commit 78aa84f8e5
4 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/CFGraph/CFGraph.cpp
View File

@@ -1162,6 +1162,7 @@ map<FuncInfo*, vector<BBlock*>> buildCFG(const map<string, CommonBlock*>& common
if (SgFile::switchToFile(oldFile) == -1) if (SgFile::switchToFile(oldFile) == -1)
printInternalError(convertFileName(__FILE__).c_str(), __LINE__); printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
if (!settings.withUnreachable)
for (auto& [func, blocks] : result) for (auto& [func, blocks] : result)
removedUnreachableBlocks(blocks); removedUnreachableBlocks(blocks);

6
src/CFGraph/CFGraph.h
View File

@@ -112,7 +112,8 @@ namespace SAPFOR
CFG_withDVM = 5, CFG_withDVM = 5,
CFG_withCallsInBlocks = 6, CFG_withCallsInBlocks = 6,
CFG_withCallFrom = 7, CFG_withCallFrom = 7,
CFG_withDominators = 8 }; CFG_withDominators = 8,
CFG_withUnreachable = 9 };
bool atLeastOneIterInLoop = false; bool atLeastOneIterInLoop = false;
bool withRD = false; bool withRD = false;
@@ -122,6 +123,7 @@ namespace SAPFOR
bool withCallsInBlocks = false; // separate each F_CALL to own BasicBlock bool withCallsInBlocks = false; // separate each F_CALL to own BasicBlock
bool withCallFrom = false; bool withCallFrom = false;
bool withDominators = false; bool withDominators = false;
bool withUnreachable = false;
explicit CFG_Settings(const std::set<setting> &settings = { CFG_withRD, CFG_withCallFrom, CFG_withDominators }) explicit CFG_Settings(const std::set<setting> &settings = { CFG_withRD, CFG_withCallFrom, CFG_withDominators })
{ {
@@ -143,6 +145,8 @@ namespace SAPFOR
withCallFrom = true; withCallFrom = true;
else if (set == CFG_withDominators) else if (set == CFG_withDominators)
withDominators = true; withDominators = true;
else if (set == CFG_withUnreachable)
withUnreachable = true;
else else
printInternalError(convertFileName(__FILE__).c_str(), __LINE__); printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
} }

3
src/DirectiveProcessing/shadow.cpp
View File

@@ -1673,7 +1673,8 @@ void GroupShadow(const map<string, vector<FuncInfo*>>& allFuncs,
SgStatement* func = currF->funcPointer->GetOriginal(); SgStatement* func = currF->funcPointer->GetOriginal();
const auto settings = CFG_Settings({ CFG_Settings::CFG_atLeastOneIterInLoop, CFG_Settings::CFG_withSPF, CFG_Settings::CFG_withCallsInBlocks }); const auto settings = CFG_Settings({ CFG_Settings::CFG_atLeastOneIterInLoop, CFG_Settings::CFG_withSPF,
CFG_Settings::CFG_withCallsInBlocks, CFG_Settings::CFG_withUnreachable });
auto cfg = buildCFGforCurrentFunc(func, settings, commonBlocks, allFuncs); auto cfg = buildCFGforCurrentFunc(func, settings, commonBlocks, allFuncs);
if (cfg.size() != 1) if (cfg.size() != 1)
printInternalError(convertFileName(__FILE__).c_str(), __LINE__); printInternalError(convertFileName(__FILE__).c_str(), __LINE__);

2
src/Utils/version.h
View File

@@ -1,3 +1,3 @@
#pragma once #pragma once
#define VERSION_SPF "2462" #define VERSION_SPF "2463"