From e2ac45f48db8a6b8c3a9b26c96151dcc545b9e60 Mon Sep 17 00:00:00 2001 From: Mikhail Kocharmin Date: Thu, 4 Apr 2024 20:15:56 +0300 Subject: [PATCH] codestyle issues --- .../CFGraph/DataFlow/backward_data_flow.h | 3 +- .../_src/CFGraph/DataFlow/data_flow_impl.h | 3 +- .../_src/Transformations/dead_code.cpp | 34 +++++++++++-------- 3 files changed, 23 insertions(+), 17 deletions(-) diff --git a/sapfor/experts/Sapfor_2017/_src/CFGraph/DataFlow/backward_data_flow.h b/sapfor/experts/Sapfor_2017/_src/CFGraph/DataFlow/backward_data_flow.h index 7f81751..556af90 100644 --- a/sapfor/experts/Sapfor_2017/_src/CFGraph/DataFlow/backward_data_flow.h +++ b/sapfor/experts/Sapfor_2017/_src/CFGraph/DataFlow/backward_data_flow.h @@ -10,7 +10,8 @@ #include "../IR.h" template -class BackwardDataFlowAnalysis : public DataFlowAnalysis { +class BackwardDataFlowAnalysis : public DataFlowAnalysis +{ std::vector reorderSequence(const std::vector& blocks, const std::set back_edge_sources); public: diff --git a/sapfor/experts/Sapfor_2017/_src/CFGraph/DataFlow/data_flow_impl.h b/sapfor/experts/Sapfor_2017/_src/CFGraph/DataFlow/data_flow_impl.h index f45b2d7..db33e73 100644 --- a/sapfor/experts/Sapfor_2017/_src/CFGraph/DataFlow/data_flow_impl.h +++ b/sapfor/experts/Sapfor_2017/_src/CFGraph/DataFlow/data_flow_impl.h @@ -70,7 +70,8 @@ void DataFlowAnalysisNode::doStep() /* definitions for DataFlowAnalysis class */ template -void DataFlowAnalysis::analyze() { +void DataFlowAnalysis::analyze() +{ auto curr = 0; auto stop = nodes.size(); diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/dead_code.cpp b/sapfor/experts/Sapfor_2017/_src/Transformations/dead_code.cpp index 089ca88..6f724b5 100644 --- a/sapfor/experts/Sapfor_2017/_src/Transformations/dead_code.cpp +++ b/sapfor/experts/Sapfor_2017/_src/Transformations/dead_code.cpp @@ -135,7 +135,8 @@ static void buildUseDef(SAPFOR::BasicBlock* block, set& use, } -class DeadCodeAnalysisNode : public DataFlowAnalysisNode>> { +class DeadCodeAnalysisNode : public DataFlowAnalysisNode>> +{ private: vector useful; bool useful_block = false; @@ -198,28 +199,28 @@ public: return updated; } - map> getIn() { + map> getIn() + { return getBlock()->getLiveOut(); } - map> getOut() { + map> getOut() + { return getBlock()->getLiveIn(); } - bool addIn(const map>& data) { - bool inserted = getBlock()->addLiveOut(data); - - return inserted; + bool addIn(const map>& data) + { + return getBlock()->addLiveOut(data); } - bool addOut(const map>& data) { + bool addOut(const map>& data) + { return getBlock()->addLiveIn(data); } - bool updateState() { - if(getBlock()->getInstructions()[0]->getInstruction()->getOperator()->lineNumber() == 58) - int b = 51; - + bool updateState() + { bool updated = false; if (!useful_block) @@ -231,7 +232,8 @@ public: return updated; } - bool forwardData(const map>& data) { + bool forwardData(const map>& data) + { bool inserted = false; SAPFOR::BasicBlock* bb= getBlock(); @@ -315,12 +317,14 @@ public: const vector& getResult() { return useful; } }; -class DeadCodeAnalysis : public BackwardDataFlowAnalysis { +class DeadCodeAnalysis : public BackwardDataFlowAnalysis +{ protected: vector& formal_parameters; const map& funcByName; - DeadCodeAnalysisNode* createNode(SAPFOR::BasicBlock* block) override { + DeadCodeAnalysisNode* createNode(SAPFOR::BasicBlock* block) override + { return new DeadCodeAnalysisNode(block, formal_parameters, funcByName); } public: