svf-lib 1.0.1226 → 1.0.1229

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

@@ -36,7 +36,7 @@ namespace SVF
 {
 
 /*!
- *  Generate Normalized Grammar from a grammarbase
+ *  Generate Normalized Grammar (backus naur form) from a grammarbase (Extended extended Backus–Naur form )
  *
  *  To Do:
  *      Error Notice for ill formed production,
@@ -64,6 +64,8 @@ private:
 
     void ebnfSignReplace(char sign, CFLGrammar *grammar);
 
+    void barReplace(CFLGrammar *grammar);
+
     void insertToCFLGrammar(CFLGrammar *grammar, GrammarBase::Production &prod);
 
     int ebnfBracketMatch(GrammarBase::Production& prod, int i, CFLGrammar *grammar) ;

package/SVF-linux/include/CFL/PEGGrammar.txt

@@ -3,22 +3,9 @@ Start:
 Terminal:
    Addr Copy Store Load Gep
 Productions:
-   F -> epsilon;
+   F -> ( Copy M ? ) *;
+   Fbar -> ( M ? Copybar ) *;
    M -> Addr V Addrbar;
-   V -> Fbar V F;
-   V -> Gepbar_i V Gep_i;
-   V -> M;
-   V -> epsilon;
-   F -> F Copy;
-   F -> F Copy M;
-   Fbar -> epsilon;
-   Fbar -> Copybar Fbar;
-   Fbar -> M Copybar Fbar;
-   ArrayPath -> Gepbar_0 Gepbar_0;
-   ArrayPath -> ArrayPath Gepbar_0;
-   Memcpy -> Addrbar V Addr;
-   Memcpy -> Gep_i Memcpy Gepbar_i;
-   Memcpy -> F Memcpy Fbar;
-   V -> Gepbar_i Memcpy Gep_i;
-   V -> Gep_i Memcpy Gepbar_i;
-   V -> ArrayPath V Gep_0;
+   V -> Fbar V F | Gepbar_i V Gep_i | M | epsilon | Gepbar_i Memcpy Gep_i | Gep_i Memcpy Gepbar_i | ArrayPath V Gep_0;
+   ArrayPath -> Gepbar_0 Gepbar_0 | ArrayPath Gepbar_0;
+   Memcpy -> Addrbar V Addr | Gep_i Memcpy Gepbar_i | F Memcpy Fbar;

package/SVF-linux/include/Util/PTAStat.h

@@ -48,95 +48,16 @@ class PointerAnalysis;
 class PTAStat: public SVFStat
 {
 public:
-    static const char* TotalAnalysisTime; ///< Total analysis time
-    static const char* SCCDetectionTime; ///< Total SCC detection time
-    static const char* SCCMergeTime; ///< Total SCC merge time
-
-    static const char* ProcessLoadStoreTime;///< time of processing loads and stores
-    static const char* ProcessCopyGepTime;	///< time of processing copys and geps
-    static const char* UpdateCallGraphTime;	///< time of updating call graph
-
-    static const char* TotalNumOfPointers;	///< Total SVFIR value node
-    static const char* TotalNumOfObjects;	///< Total SVFIR object node
-    static const char* TotalNumOfFieldObjects;	///< Total SVFIR field object node
-    static const char* MaxStructSize;	///< Max struct size
-    static const char* TotalNumOfEdges;	///< Total SVFIR edge number
-
-    static const char* NumOfAddrs;		///< SVFIR addr edge
-    static const char* NumOfLoads;		///< SVFIR load edge
-    static const char* NumOfStores;		///< SVFIR store edge
-    static const char* NumOfCopys;		///< SVFIR copy edge
-    static const char* NumOfGeps;		///< SVFIR gep edge
-    static const char* NumOfCalls;		///< SVFIR call edge
-    static const char* NumOfReturns;	///< SVFIR return edge
-
-    static const char* NumOfProcessedAddrs;		///< SVFIR processed addr edge
-    static const char* NumOfProcessedLoads;		///< SVFIR processed load edge
-    static const char* NumOfProcessedStores;	///< SVFIR processed store edge
-    static const char* NumOfProcessedCopys;		///< SVFIR processed copy edge
-    static const char* NumOfProcessedGeps;		///< SVFIR processed gep edge
-
-    static const char* NumOfSfr;                ///< num of field representatives
-    static const char* NumOfFieldExpand;
-
-    static const char* NumOfFunctionObjs;	///< Function numbers
-    static const char* NumOfGlobalObjs;	///< SVFIR global object node
-    static const char* NumOfHeapObjs;	///< SVFIR heap object node
-    static const char* NumOfStackObjs;	///< SVFIR stack object node
-
-    static const char* NumOfObjsHasVarStruct;	///< SVFIR object node has var struct (maybe nested with array)
-    static const char* NumOfObjsHasVarArray;	///< SVFIR object node has var array (maybe nested with struct)
-    static const char* NumOfObjsHasConstStruct;	///< SVFIR object node has const struct (maybe nested with array)
-    static const char* NumOfObjsHasConstArray;	///< SVFIR object node has const array (maybe nested with struct)
-    static const char* NumOfNonPtrObjs;	///< SVFIR object node which is non pointer type object (do not have pts)
-    static const char* NumOfConstantObjs;	///< SVFIR object node which is purely constant
-
-    static const char* NumberOfFieldInsensitiveObj;
-    static const char* NumberOfFieldSensitiveObj;
-
-    static const char* NumOfPointers;	///< SVFIR value node, each of them maps to a llvm value
-    static const char* NumOfGepFieldPointers;	///< SVFIR gep value node (field value, dynamically created dummy node)
-
-    static const char* NumOfMemObjects;	///< SVFIR object node, each of them maps to a llvm value
-    static const char* NumOfGepFieldObjects;	///< SVFIR gep object node (field obj, dynamically created dummy node)
-
-    static const char* AveragePointsToSetSize;		///< Average points-to size of all variables
-    static const char* AverageTopLevPointsToSetSize; ///< Average points-to size of top-level variables
-    static const char* MaxPointsToSetSize;			///< Max points-to size
-
-    static const char* NumOfIterations;	///< Number of iterations during resolution
-
-    static const char* NumOfIndirectCallSites;	///< Number of indirect callsites
-    static const char* NumOfIndirectEdgeSolved;	///< Number of indirect calledge resolved
-
-    static const char* NumOfSCCDetection; ///< Number of scc detection performed
-    static const char* NumOfCycles;   ///< Number of scc cycles detected
-    static const char* NumOfPWCCycles;   ///< Number of scc cycles detected
-    static const char* NumOfNodesInCycles; ///< Number of nodes in cycles detected
-    static const char* MaxNumOfNodesInSCC;	///< max Number of nodes in one scc
-
-    static const char* NumOfNullPointer;	///< Number of pointers points-to null
-
     PTAStat(PointerAnalysis* p);
     virtual ~PTAStat() {}
 
-    NUMStatMap PTNumStatMap;
     NodeBS localVarInRecursion;
 
-    double startTime;
-    double endTime;
-
     void performStat() override;
 
-    virtual void printStat(std::string str = "") override;
-
     void callgraphStat() override;
 private:
-    void bitcastInstStat();
-    void branchStat();
-
     PointerAnalysis* pta;
-    std::string moduleName;
 };
 
 } // End namespace SVF

package/SVF-linux/include/Util/SVFStat.h

@@ -71,6 +71,7 @@ public:
     static double getClk(bool mark = false);
 
     NUMStatMap generalNumMap;
+    NUMStatMap PTNumStatMap;
     TIMEStatMap timeStatMap;
 
     double startTime;
@@ -78,7 +79,7 @@ public:
 
     virtual void performStat() = 0;
 
-    virtual void printStat(std::string str = "") = 0;
+    virtual void printStat(std::string str = "");
 
     virtual void performStatPerQuery(NodeID) {}
 
@@ -91,7 +92,7 @@ public:
     static double timeOfBuildingSVFIR;
 
 private:
-
+    void branchStat();
     std::string moduleName;
 }; // End class SVFStat
 

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

@@ -36,7 +36,7 @@ namespace SVF
 {
 
 /*!
- *  Generate Normalized Grammar from a grammarbase
+ *  Generate Normalized Grammar (backus naur form) from a grammarbase (Extended extended Backus–Naur form )
  *
  *  To Do:
  *      Error Notice for ill formed production,
@@ -64,6 +64,8 @@ private:
 
     void ebnfSignReplace(char sign, CFLGrammar *grammar);
 
+    void barReplace(CFLGrammar *grammar);
+
     void insertToCFLGrammar(CFLGrammar *grammar, GrammarBase::Production &prod);
 
     int ebnfBracketMatch(GrammarBase::Production& prod, int i, CFLGrammar *grammar) ;

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

@@ -3,22 +3,9 @@ Start:
 Terminal:
    Addr Copy Store Load Gep
 Productions:
-   F -> epsilon;
+   F -> ( Copy M ? ) *;
+   Fbar -> ( M ? Copybar ) *;
    M -> Addr V Addrbar;
-   V -> Fbar V F;
-   V -> Gepbar_i V Gep_i;
-   V -> M;
-   V -> epsilon;
-   F -> F Copy;
-   F -> F Copy M;
-   Fbar -> epsilon;
-   Fbar -> Copybar Fbar;
-   Fbar -> M Copybar Fbar;
-   ArrayPath -> Gepbar_0 Gepbar_0;
-   ArrayPath -> ArrayPath Gepbar_0;
-   Memcpy -> Addrbar V Addr;
-   Memcpy -> Gep_i Memcpy Gepbar_i;
-   Memcpy -> F Memcpy Fbar;
-   V -> Gepbar_i Memcpy Gep_i;
-   V -> Gep_i Memcpy Gepbar_i;
-   V -> ArrayPath V Gep_0;
+   V -> Fbar V F | Gepbar_i V Gep_i | M | epsilon | Gepbar_i Memcpy Gep_i | Gep_i Memcpy Gepbar_i | ArrayPath V Gep_0;
+   ArrayPath -> Gepbar_0 Gepbar_0 | ArrayPath Gepbar_0;
+   Memcpy -> Addrbar V Addr | Gep_i Memcpy Gepbar_i | F Memcpy Fbar;

package/package.json

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