svf-lib 1.0.1034 → 1.0.1037

package/SVF-osx/include/CFL/CFLGrammar.txt

@@ -1,11 +1,19 @@
 Start:  
    V
 Productions:
+   F -> Addr;
+   F -> Addr ( Copy ) *;
+   F -> Addr ( Store V Load ) *;
    F -> ( Copy ) *;
    F -> ( Store V Load ) *;
+   Fbar -> Addrbar;
+   Fbar -> Addrbar ( Copybar ) *;
+   Fbar -> Addrbar ( Loadbar V Storebar ) *;
    Fbar -> ( Copybar ) *;
    Fbar -> ( Loadbar V Storebar ) *;
    V -> Fbar V F;
    V -> Gepbar_i V Gep_i;
    V -> Addrbar Addr;
-   V -> epsilon;
+   V -> epsilon;
+
+   

package/SVF-osx/include/CFL/CFLGrammarDev.txt

@@ -0,0 +1,16 @@
+Start:  
+   V
+Productions:
+   F -> ( Copy ) *;
+   F -> ( Store V Load ) *;
+   Fbar -> ( Copybar ) *;
+   Fbar -> ( Loadbar Vbar Storebar ) *;
+   V -> Fbar V F;
+   V -> Gepbar_i V Gep_i;
+   V -> Addrbar Addr;
+   V -> epsilon;
+   Vbar -> Fbar Vbar Fbar;
+   Vbar -> Gepbar_i Vbar Gep_i;
+   Vbar -> Addrbar Addr;
+   Vbar -> epsilon;
+   

package/SVF-osx/include/CFL/CFLGraphBuilder.h

@@ -39,7 +39,19 @@ namespace SVF
 
 class CFLGraphBuilder
 {
+private:
+    typedef CFLGrammar::Kind Kind;
+    typedef CFLGrammar::Symbol Symbol;
+    Map<std::string, Kind> label2KindMap;
+    Map<Kind, std::string> kind2LabelMap;
+    Map<CFLGrammar::Kind,  Set<CFLGrammar::Attribute>> kind2AttrsMap;
+    bool externMap;
+    Symbol current;
+
 public:
+    /// add attribute to kind2Attribute Map
+    void addAttribute(CFLGrammar::Kind kind, CFLGrammar::Attribute attribute);
+
     /// Build graph by copying nodes and edges from any graph inherited from GenericGraph
     template<class N, class E>
     void build(GenericGraph<N,E>* graph, CFLGraph* cflGraph)
@@ -61,11 +73,22 @@ public:
 
     /// Build Bidirectional graph by copying nodes and edges from any graph inherited from GenericGraph
     template<class N, class E>
-    CFLGraph* buildBigraph(GenericGraph<N,E>* graph)
+    CFLGraph* buildBigraph(GenericGraph<N,E>* graph, Kind startKind)
     {
-        CFLGraph *cflGraph = new CFLGraph();
+        CFLGraph *cflGraph = new CFLGraph(startKind);
         Map<std::string, SVF::CFLGraph::Symbol> ConstMap =  {{"Addr",0}, {"Copy", 1},{"Store", 2},{"Load", 3},{"Gep_i", 4},{"Vgep", 5},{"Addrbar",6}, {"Copybar", 7},{"Storebar", 8},{"Loadbar", 9},{"Gepbar_i", 10},{"Vgepbar", 11}};
-        cflGraph->setMap(ConstMap);
+        externMap = true;
+        for(auto pairV : ConstMap)
+        {
+            if(label2KindMap.find(pairV.first) == label2KindMap.end())
+            {
+                label2KindMap.insert(pairV);
+            }
+            if(kind2LabelMap.find(pairV.second) == kind2LabelMap.end())
+            {
+                kind2LabelMap.insert(make_pair(pairV.second, pairV.first));
+            }
+        }
         for(auto it = graph->begin(); it!= graph->end(); it++)
         {
             CFLNode* node = new CFLNode((*it).first);
@@ -82,23 +105,23 @@ public:
                 if(NormalGepCGEdge::classof(edge))
                 {
                     NormalGepCGEdge *nGepEdge = SVFUtil::dyn_cast<NormalGepCGEdge>(edge);
-                    CFLGrammar::Attribute offset =  nGepEdge->getConstantFieldIdx();
-                    cflGraph->addAttribute(edgeLabel, offset);
-                    edgeLabel = CFLGrammar::getAttributedKind(offset, edgeLabel);
+                    CFLGrammar::Attribute attr =  nGepEdge->getConstantFieldIdx();
+                    addAttribute(edgeLabel, attr);
+                    edgeLabel = CFLGrammar::getAttributedKind(attr, edgeLabel);
                     cflGraph->addCFLEdge(cflGraph->getGNode(edge->getSrcID()), cflGraph->getGNode(edge->getDstID()), edgeLabel);
-                    std::string key = cflGraph->sym2LabelMap[edge->getEdgeKind()];
+                    std::string key = kind2LabelMap[edge->getEdgeKind()];
                     key.pop_back();
                     key.pop_back();    // _i standsfor attribute variable should place at last
                     key.append("bar_i");   // for example Gep_i should be Gepbar_i, not Gep_ibar
-                    cflGraph->addCFLEdge(cflGraph->getGNode(edge->getDstID()), cflGraph->getGNode(edge->getSrcID()), CFLGrammar::getAttributedKind(offset, cflGraph->label2SymMap[key]));
-                    cflGraph->addAttribute(cflGraph->label2SymMap[key], offset);
+                    cflGraph->addCFLEdge(cflGraph->getGNode(edge->getDstID()), cflGraph->getGNode(edge->getSrcID()), CFLGrammar::getAttributedKind(attr, label2KindMap[key]));
+                    addAttribute(label2KindMap[key], attr);
                 }
                 else
                 {
                     cflGraph->addCFLEdge(cflGraph->getGNode(edge->getSrcID()), cflGraph->getGNode(edge->getDstID()), edgeLabel);
-                    std::string key = cflGraph->sym2LabelMap[edge->getEdgeKind()];
+                    std::string key = kind2LabelMap[edge->getEdgeKind()];
                     key.append("bar");
-                    cflGraph->addCFLEdge(cflGraph->getGNode(edge->getDstID()), cflGraph->getGNode(edge->getSrcID()), cflGraph->label2SymMap[key]);
+                    cflGraph->addCFLEdge(cflGraph->getGNode(edge->getDstID()), cflGraph->getGNode(edge->getSrcID()), label2KindMap[key]);
                 }
             }
         }
@@ -109,6 +132,23 @@ public:
 
     /// Build graph from Dot
     CFLGraph *buildFromDot(std::string filename, GrammarBase *grammar);
+
+    Map<std::string, Kind>& getLabel2KindMap()
+    {
+        return this->label2KindMap;
+    }
+
+    Map<Kind, std::string>& getKind2LabelMap()
+    {
+        return this->kind2LabelMap;
+    }
+
+    Map<CFLGrammar::Kind,  Set<CFLGrammar::Attribute>>& getKind2AttrsMap()
+    {
+        return this->kind2AttrsMap;
+    }
+
+
 };
 }// SVF
 

package/SVF-osx/include/CFL/CFLSolver.h

@@ -50,6 +50,8 @@ public:
 
     ~CFLSolver()
     {
+        delete graph;
+        delete grammar;
     }
 
     /// Start solving

package/SVF-osx/include/Graphs/CFLGraph.h

@@ -77,16 +77,13 @@ class CFLGraph: public GenericCFLGraphTy
 {
 public:
     typedef CFLGrammar::Symbol Symbol;
+    typedef CFLGrammar::Kind Kind;
     typedef GenericNode<CFLNode,CFLEdge>::GEdgeSetTy CFLEdgeSet;
-    Map<std::string, Symbol> label2SymMap;
-    Map<Symbol, std::string> sym2LabelMap;
-    Symbol startSymbol;
-    Map<CFLGrammar::Kind,  Set<CFLGrammar::Attribute>> kind2AttrMap;
-    bool externMap;
-    Symbol current;
-
-    CFLGraph()
+    Kind startKind;
+
+    CFLGraph(Kind kind)
     {
+        startKind = kind;
     }
     ~CFLGraph() override = default;
 
@@ -100,27 +97,6 @@ public:
 
     void view();
 
-    void setMap(Map<std::string, Symbol> &labelMap);
-    /// Set label2Sym from External
-    void setMap(GrammarBase *grammar);
-
-    /// add attribute to kind2Attribute Map
-    void addAttribute(CFLGrammar::Kind kind, CFLGrammar::Attribute attribute)
-    {
-        if(kind2AttrMap.find(kind) == kind2AttrMap.end())
-        {
-            Set<CFLGrammar::Attribute> attrs {attribute};
-            kind2AttrMap.insert(make_pair(kind, attrs));
-        }
-        else
-        {
-            if(kind2AttrMap[kind].find(attribute) == kind2AttrMap[kind].end())
-            {
-                kind2AttrMap[kind].insert(attribute);
-            }
-        }
-    }
-
 private:
     CFLEdgeSet cflEdgeSet;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-lib",
-  "version": "1.0.1034",
+  "version": "1.0.1037",
   "description": "SVF's npm support",
   "main": "index.js",
   "scripts": {