svf-lib 1.0.1255 → 1.0.1256

package/SVF-linux/include/CFL/CFLAlias.h

@@ -54,12 +54,10 @@ public:
     /// Print grammar and graph
     virtual void finalize();
 
-    /// Start Analysis here (main part of pointer analysis).
-    virtual void analyze();
+    /// Solving CFL Reachability
+    virtual void solve();
 
-    virtual void countSumEdges();
-
-    /// Interface exposed to users of our pointer analysis, given Value infos
+    /// Interface exposed to users of our Alias analysis, given Value infos
     virtual AliasResult alias(const Value* v1, const Value* v2)
     {
         NodeID n1 = svfir->getValueNode(v1);
@@ -67,7 +65,7 @@ public:
         return alias(n1,n2);
     }
 
-    /// Interface exposed to users of our pointer analysis, given PAGNodeID
+    /// Interface exposed to users of our Alias analysis, given PAGNodeID
     virtual AliasResult alias(NodeID node1, NodeID node2)
     {
         if(graph->hasEdge(graph->getGNode(node1), graph->getGNode(node2), graph->startKind))

package/SVF-linux/include/CFL/CFLBase.h

@@ -21,7 +21,7 @@
 //===----------------------------------------------------------------------===//
 
 /*
- * CFLAlias.h
+ * CFLBase.h
  *
  *  Created on: Oct 12, 2022
  *      Author: Pei Xu
@@ -45,6 +45,7 @@ namespace SVF
 
 class CFLStat;
 
+/// CFL Client Base Class
 class CFLBase : public BVDataPTAImpl
 {
 
@@ -57,53 +58,51 @@ public:
     virtual ~CFLBase()
     {
         delete solver;
+        delete grammarBase;
     }
 
-    /// Initialize the grammar, graph, solver
-    virtual void initialize() = 0;
+    /// Build Grammar from text file
+    virtual void buildCFLGrammar();
 
-    /// Print grammar and graph
-    virtual void finalize() = 0;
+    /// Build CFLGraph based on Option
+    virtual void buildCFLGraph();
 
-    /// Start Analysis here (main part of pointer analysis).
-    virtual void analyze() = 0;
+    /// Normalize grammar
+    virtual void normalizeCFLGrammar();
 
     /// Get CFL graph
-    CFLGraph* getCFLGraph()
-    {
-        return graph;
-    }
+    CFLGraph* getCFLGraph();
+
+    /// Count the num of Nonterminal Edges
+    virtual void countSumEdges();
+
+    /// Solving CFL Reachability
+    virtual void solve();
 
-    virtual void countSumEdges() = 0;
+    /// Perform analyze (main part of CFLR Analysis)
+    virtual void analyze();
 
     /// Statistics
     //@{
-    static u32_t numOfProcessedAddr;   /// Number of processed Addr edge
-    static u32_t numOfProcessedCopy;   /// Number of processed Copy edge
-    static u32_t numOfProcessedGep;    /// Number of processed Gep edge
-    static u32_t numOfProcessedLoad;   /// Number of processed Load edge
-    static u32_t numOfProcessedStore;  /// Number of processed Store edge
-    static u32_t numOfSfrs;
-    static u32_t numOfFieldExpand;
-
-    static u32_t numOfSCCDetection;
-    static double timeOfSCCDetection;
-    static double timeOfSCCMerges;
-    static double timeOfCollapse;
-    static u32_t AveragePointsToSetSize;
-    static u32_t MaxPointsToSetSize;
-    static double timeOfProcessCopyGep;
-    static double timeOfProcessLoadStore;
-    static double timeOfUpdateCallGraph;
-    static double timeOfSolving;
-    static double numOfSumEdges;
+    // Grammar
+    static double timeOfBuildCFLGrammar;            // Time of building grammarBase from text file
+    static double timeOfNormalizeGrammar;           // Time of normalizing grammarBase to CFLGrammar
+    // Graph
+    static double timeOfBuildCFLGraph;              // Time of building CFLGraph
+    static double numOfTerminalEdges;               // Number of terminal labeled edges
+    static double numOfTemporaryNonterminalEdges;   // Number of temporary (ie. X0, X1..) nonterminal labeled edges
+    static double numOfNonterminalEdges;            // Number of nonterminal labeled edges
+    static double numOfStartEdges;                  // Number of start nonterminal labeled edges
+    // Solver
+    static double timeOfSolving;                    // time of solving CFL Reachability
     //@}
 
 protected:
     SVFIR* svfir;
     CFLGraph* graph;
+    GrammarBase* grammarBase;
     CFLGrammar* grammar;
-    CFLSolver *solver;
+    CFLSolver* solver;
 };
 
 } // End namespace SVF

package/SVF-linux/include/CFL/CFLStat.h

@@ -53,17 +53,6 @@ private:
     CFLBase* pta;
 
 public:
-    static const char* CollapseTime;
-
-    static u32_t _MaxPtsSize;
-    static u32_t _NumOfCycles;
-    static u32_t _NumOfPWCCycles;
-    static u32_t _NumOfNodesInCycles;
-    static u32_t _MaxNumOfNodesInSCC;
-    u32_t _NumOfNullPtr;
-    u32_t _NumOfConstantPtr;
-    u32_t _NumOfBlackholePtr;
-
     /// CFL Stat
     u32_t _NumofCFLGraphNode;
 
@@ -76,15 +65,13 @@ public:
 
     virtual void performStat();
 
-    void collectCycleInfo(ConstraintGraph* consCG);
-
     void collectCFLInfo(CFLGraph* CFLGraph);
 
-    void statNullPtr();
-
     void constraintGraphStat();
+
+    void CFLGrammarStat();
 };
 
 } // End namespace SVF
 
-#endif /* FLOWSENSITIVESTAT_H_ */
+#endif /* CFL_CFLSTAT_H_ */

package/SVF-linux/include/CFL/CFLVF.h

@@ -52,10 +52,8 @@ public:
     /// Print grammar and graph
     virtual void finalize();
 
-    /// Start Analysis here (main part of pointer analysis).
-    virtual void analyze();
-
-    virtual void countSumEdges();
+    /// Build CFLGraph via VFG
+    void buildCFLGraph();
 
 private:
     SaberSVFGBuilder memSSA;

package/package.json

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