svf-tools 1.0.317 → 1.0.321

package/lib/MemoryModel/SVFIR.cpp

@@ -57,6 +57,7 @@ AddrPE* SVFIR::addAddrPE(NodeID src, NodeID dst)
     else
     {
         AddrPE* addrPE = new AddrPE(srcNode, dstNode);
+        addToStmt2TypeMap(addrPE);
         addEdge(srcNode,dstNode, addrPE);
         return addrPE;
     }
@@ -74,24 +75,49 @@ CopyPE* SVFIR::addCopyPE(NodeID src, NodeID dst)
     else
     {
         CopyPE* copyPE = new CopyPE(srcNode, dstNode);
+        addToStmt2TypeMap(copyPE);
         addEdge(srcNode,dstNode, copyPE);
         return copyPE;
     }
 }
 
+/*!
+ * Add Phi statement 
+ */
+PhiPE* SVFIR::addPhiNode(NodeID res, NodeID opnd)
+{
+    SVFVar* opNode = getGNode(opnd);
+    SVFVar* resNode = getGNode(res);
+    PHINodeMap::iterator it = phiNodeMap.find(resNode);
+    if(it == phiNodeMap.end()){
+        PhiPE* phi = new PhiPE(resNode, {opNode});
+        addToStmt2TypeMap(phi);
+        addEdge(opNode, resNode, phi);
+        phiNodeMap[resNode] = phi;
+        return phi;
+    }
+    else{
+        it->second->addOpVar(opNode);
+        return it->second;
+    }
+}
+
 /*!
  * Add Compare edge
  */
-CmpPE* SVFIR::addCmpPE(NodeID src, NodeID dst)
+CmpPE* SVFIR::addCmpPE(NodeID op1, NodeID op2, NodeID dst, u32_t opcode)
 {
-    SVFVar* srcNode = getGNode(src);
+    SVFVar* op1Node = getGNode(op1);
+    SVFVar* op2Node = getGNode(op2);
     SVFVar* dstNode = getGNode(dst);
-    if(SVFStmt* edge = hasNonlabeledEdge(srcNode,dstNode, SVFStmt::Cmp))
+    if(SVFStmt* edge = hasLabeledEdge(op1Node, dstNode, SVFStmt::Cmp, op2Node))
         return SVFUtil::cast<CmpPE>(edge);
     else
     {
-        CmpPE* cmp = new CmpPE(srcNode, dstNode);
-        addEdge(srcNode,dstNode, cmp);
+        std::vector<SVFVar*> opnds = {op1Node, op2Node};
+        CmpPE* cmp = new CmpPE(dstNode, opnds, opcode);
+        addToStmt2TypeMap(cmp);
+        addEdge(op1Node, dstNode, cmp);
         return cmp;
     }
 }
@@ -100,16 +126,19 @@ CmpPE* SVFIR::addCmpPE(NodeID src, NodeID dst)
 /*!
  * Add Compare edge
  */
-BinaryOPPE* SVFIR::addBinaryOPPE(NodeID src, NodeID dst)
+BinaryOPPE* SVFIR::addBinaryOPPE(NodeID op1, NodeID op2, NodeID dst, u32_t opcode)
 {
-    SVFVar* srcNode = getGNode(src);
+    SVFVar* op1Node = getGNode(op1);
+    SVFVar* op2Node = getGNode(op2);
     SVFVar* dstNode = getGNode(dst);
-    if(SVFStmt* edge = hasNonlabeledEdge(srcNode,dstNode, SVFStmt::BinaryOp))
+    if(SVFStmt* edge = hasLabeledEdge(op1Node, dstNode, SVFStmt::BinaryOp, op2Node))
         return SVFUtil::cast<BinaryOPPE>(edge);
     else
     {
-        BinaryOPPE* binaryOP = new BinaryOPPE(srcNode, dstNode);
-        addEdge(srcNode,dstNode, binaryOP);
+        std::vector<SVFVar*> opnds = {op1Node, op2Node};
+        BinaryOPPE* binaryOP = new BinaryOPPE(dstNode, opnds, opcode);
+        addToStmt2TypeMap(binaryOP);
+        addEdge(op1Node,dstNode, binaryOP);
         return binaryOP;
     }
 }
@@ -117,7 +146,7 @@ BinaryOPPE* SVFIR::addBinaryOPPE(NodeID src, NodeID dst)
 /*!
  * Add Unary edge
  */
-UnaryOPPE* SVFIR::addUnaryOPPE(NodeID src, NodeID dst)
+UnaryOPPE* SVFIR::addUnaryOPPE(NodeID src, NodeID dst, u32_t opcode)
 {
     SVFVar* srcNode = getGNode(src);
     SVFVar* dstNode = getGNode(dst);
@@ -125,12 +154,31 @@ UnaryOPPE* SVFIR::addUnaryOPPE(NodeID src, NodeID dst)
         return SVFUtil::cast<UnaryOPPE>(edge);
     else
     {
-        UnaryOPPE* unaryOP = new UnaryOPPE(srcNode, dstNode);
+        UnaryOPPE* unaryOP = new UnaryOPPE(srcNode, dstNode, opcode);
+        addToStmt2TypeMap(unaryOP);
         addEdge(srcNode,dstNode, unaryOP);
         return unaryOP;
     }
 }
 
+/*
+* Add BranchStmt
+*/
+BranchStmt* SVFIR::addBranchStmt(NodeID br, NodeID cond, std::vector<const ICFGNode*> succs)
+{
+    SVFVar* brNode = getGNode(br);
+    SVFVar* condNode = getGNode(cond);
+    if(SVFStmt* edge = hasNonlabeledEdge(condNode,brNode, SVFStmt::Branch))
+        return SVFUtil::cast<BranchStmt>(edge);
+    else
+    {
+        BranchStmt* branch = new BranchStmt(brNode, condNode, succs);
+        addToStmt2TypeMap(branch);
+        addEdge(condNode,brNode, branch);
+        return branch;
+    }
+}
+
 /*!
  * Add Load edge
  */
@@ -143,6 +191,7 @@ LoadPE* SVFIR::addLoadPE(NodeID src, NodeID dst)
     else
     {
         LoadPE* loadPE = new LoadPE(srcNode, dstNode);
+        addToStmt2TypeMap(loadPE);
         addEdge(srcNode,dstNode, loadPE);
         return loadPE;
     }
@@ -161,6 +210,7 @@ StorePE* SVFIR::addStorePE(NodeID src, NodeID dst, const IntraBlockNode* curVal)
     else
     {
         StorePE* storePE = new StorePE(srcNode, dstNode, curVal);
+        addToStmt2TypeMap(storePE);
         addEdge(srcNode,dstNode, storePE);
         return storePE;
     }
@@ -178,6 +228,7 @@ CallPE* SVFIR::addCallPE(NodeID src, NodeID dst, const CallBlockNode* cs)
     else
     {
         CallPE* callPE = new CallPE(srcNode, dstNode, cs);
+        addToStmt2TypeMap(callPE);
         addEdge(srcNode,dstNode, callPE);
         return callPE;
     }
@@ -195,6 +246,7 @@ RetPE* SVFIR::addRetPE(NodeID src, NodeID dst, const CallBlockNode* cs)
     else
     {
         RetPE* retPE = new RetPE(srcNode, dstNode, cs);
+        addToStmt2TypeMap(retPE);
         addEdge(srcNode,dstNode, retPE);
         return retPE;
     }
@@ -223,6 +275,7 @@ TDForkPE* SVFIR::addThreadForkPE(NodeID src, NodeID dst, const CallBlockNode* cs
     else
     {
         TDForkPE* forkPE = new TDForkPE(srcNode, dstNode, cs);
+        addToStmt2TypeMap(forkPE);
         addEdge(srcNode,dstNode, forkPE);
         return forkPE;
     }
@@ -240,6 +293,7 @@ TDJoinPE* SVFIR::addThreadJoinPE(NodeID src, NodeID dst, const CallBlockNode* cs
     else
     {
         TDJoinPE* joinPE = new TDJoinPE(srcNode, dstNode, cs);
+        addToStmt2TypeMap(joinPE);
         addEdge(srcNode,dstNode, joinPE);
         return joinPE;
     }
@@ -280,6 +334,7 @@ NormalGepPE* SVFIR::addNormalGepPE(NodeID src, NodeID dst, const LocationSet& ls
     else
     {
         NormalGepPE* gepPE = new NormalGepPE(baseNode, dstNode, ls+baseLS);
+        addToStmt2TypeMap(gepPE);
         addEdge(baseNode, dstNode, gepPE);
         return gepPE;
     }
@@ -299,6 +354,7 @@ VariantGepPE* SVFIR::addVariantGepPE(NodeID src, NodeID dst)
     else
     {
         VariantGepPE* gepPE = new VariantGepPE(baseNode, dstNode);
+        addToStmt2TypeMap(gepPE);
         addEdge(baseNode, dstNode, gepPE);
         return gepPE;
     }

package/lib/MemoryModel/SVFStatements.cpp

@@ -37,8 +37,9 @@ using namespace SVFUtil;
 
 u64_t SVFStmt::callEdgeLabelCounter = 0;
 u64_t SVFStmt::storeEdgeLabelCounter = 0;
+u64_t SVFStmt::multiOpndLabelCounter = 0;  
 SVFStmt::Inst2LabelMap SVFStmt::inst2LabelMap;
-
+SVFStmt::Var2LabelMap SVFStmt::var2LabelMap;
 /*!
  * SVFStmt constructor
  */
@@ -86,10 +87,21 @@ const std::string CopyPE::toString() const{
     return rawstr.str();
 }
 
+const std::string PhiPE::toString() const{
+    std::string str;
+    raw_string_ostream rawstr(str);
+    rawstr << "PhiPE: [" << getResID() << "<--(" << getOpVarID(0) << "," << getOpVarID(1) << ")]\t";
+    if (Options::PAGDotGraphShorter) {
+        rawstr << "\n";
+    }
+    rawstr << value2String(getValue());
+    return rawstr.str();
+}
+
 const std::string CmpPE::toString() const{
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "CmpPE: [" << getDstID() << "<--" << getSrcID() << "]\t";
+    rawstr << "CmpPE: [" << getResID() << "<--(" << getOpVarID(0) << "," << getOpVarID(1) << ")]\t";
     if (Options::PAGDotGraphShorter) {
         rawstr << "\n";
     }
@@ -100,7 +112,7 @@ const std::string CmpPE::toString() const{
 const std::string BinaryOPPE::toString() const{
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "BinaryOPPE: [" << getDstID() << "<--" << getSrcID() << "]\t";
+    rawstr << "BinaryOPPE: [" << getResID() << "<--(" << getOpVarID(0) << "," << getOpVarID(1) << ")]\t";
     if (Options::PAGDotGraphShorter) {
         rawstr << "\n";
     }
@@ -111,7 +123,7 @@ const std::string BinaryOPPE::toString() const{
 const std::string UnaryOPPE::toString() const{
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "UnaryOPPE: [" << getDstID() << "<--" << getSrcID() << "]\t";
+    rawstr << "UnaryOPPE: [" << getResID() << "<--" << getOpVarID() << "]\t";
     if (Options::PAGDotGraphShorter) {
         rawstr << "\n";
     }
@@ -119,6 +131,21 @@ const std::string UnaryOPPE::toString() const{
     return rawstr.str();
 }
 
+const std::string BranchStmt::toString() const {
+    std::string str;
+    raw_string_ostream rawstr(str);
+    if(isConditional())
+        rawstr << "BranchStmt: [" <<  getCondition()->toString() << "]\t";
+    else
+        rawstr << "BranchStmt: [" <<  " Unconditional branch" << "]\t";
+    if (Options::PAGDotGraphShorter) {
+        rawstr << "\n";
+    }
+    rawstr << value2String(getValue());
+    return rawstr.str();
+}
+
+
 const std::string LoadPE::toString() const{
     std::string str;
     raw_string_ostream rawstr(str);
@@ -217,3 +244,37 @@ const std::string TDJoinPE::toString() const{
     rawstr << value2String(getValue());
     return rawstr.str();
 }
+
+
+NodeID MultiOpndStmt::getOpVarID(u32_t pos) const
+{
+    return getOpVar(pos)->getId();
+}
+
+NodeID MultiOpndStmt::getResID() const
+{
+    return getRes()->getId();
+}
+
+NodeID UnaryOPPE::getOpVarID() const{
+    return getOpVar()->getId();
+}
+NodeID UnaryOPPE::getResID() const{
+    return getRes()->getId();
+}
+
+
+/// The branch is unconditional if cond is a null value
+bool BranchStmt::isUnconditional() const {
+    return cond->getId() == SymbolTableInfo::SymbolInfo()->nullPtrSymID();
+}
+/// The branch is conditional if cond is not a null value
+bool BranchStmt::isConditional() const{
+    return cond->getId() != SymbolTableInfo::SymbolInfo()->nullPtrSymID();;
+}
+/// Return the condition 
+const SVFVar* BranchStmt::getCondition() const 
+{
+    //assert(isConditional() && "this is a unconditional branch"); 
+    return cond;
+}