svf-lib 1.0.1212 → 1.0.1215

package/SVF-linux/include/Graphs/ICFGStat.h

@@ -142,7 +142,7 @@ public:
         }
     }
 
-    void printStat(string statname)
+    void printStat(std::string statname)
     {
 
         SVFUtil::outs() << "\n************ " << statname << " ***************\n";

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

@@ -21,7 +21,7 @@
 //===----------------------------------------------------------------------===//
 
 /*
- * AndersenStat.h
+ * PTAStat.h
  *
  *  Created on: Oct 12, 2013
  *      Author: Yulei Sui
@@ -32,12 +32,11 @@
 
 #include "Util/BasicTypes.h"
 #include "MemoryModel/PointsTo.h"
+#include "Util/SVFStat.h"
 #include <iostream>
 #include <map>
 #include <string>
 
-using namespace std;
-
 namespace SVF
 {
 
@@ -46,7 +45,7 @@ class PointerAnalysis;
 /*!
  * Pointer Analysis Statistics
  */
-class PTAStat
+class PTAStat: public SVFStat
 {
 public:
     static const char* TotalAnalysisTime; ///< Total analysis time
@@ -118,49 +117,20 @@ public:
 
     static const char* NumOfNullPointer;	///< Number of pointers points-to null
 
-    typedef Map<const char*,u32_t> NUMStatMap;
-
-    typedef Map<const char*,double> TIMEStatMap;
-
-    enum ClockType
-    {
-        Wall,
-        CPU,
-    };
-
     PTAStat(PointerAnalysis* p);
     virtual ~PTAStat() {}
 
-    virtual inline void startClk()
-    {
-        startTime = getClk(true);
-    }
-    virtual inline void endClk()
-    {
-        endTime = getClk(true);
-    }
-    /// When mark is true, real clock is always returned. When mark is false, it is
-    /// only returned when Options::MarkedClocksOnly is not set.
-    /// Default call for getClk is unmarked, while MarkedClocksOnly is false by default.
-    static double getClk(bool mark=false);
-
-    NUMStatMap generalNumMap;
     NUMStatMap PTNumStatMap;
-    TIMEStatMap timeStatMap;
     NodeBS localVarInRecursion;
 
     double startTime;
     double endTime;
 
-    virtual void performStat();
-
-    virtual void printStat(string str = "");
-
-    virtual void performStatPerQuery(NodeID) {}
+    void performStat() override;
 
-    virtual void printStatPerQuery(NodeID, const PointsTo&) {}
+    virtual void printStat(std::string str = "") override;
 
-    virtual void callgraphStat();
+    void callgraphStat() override;
 private:
     void bitcastInstStat();
     void branchStat();

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

@@ -0,0 +1,95 @@
+//===- SVFStat.h -- Base class for statistics---------------------------------//
+//
+//                     SVF: Static Value-Flow Analysis
+//
+// Copyright (C) <2013-2017>  <Yulei Sui>
+//
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+//===----------------------------------------------------------------------===//
+
+/*
+ * SVFStat.h
+ *
+ *  Created on: Sep 1, 2022
+ *      Author: Xiao Cheng
+ */
+
+#ifndef SVF_SVFSTAT_H
+#define SVF_SVFSTAT_H
+
+namespace SVF
+{
+
+
+/*!
+ * Pointer Analysis Statistics
+ */
+class SVFStat
+{
+public:
+
+    typedef OrderedMap<const char *, u32_t> NUMStatMap;
+
+    typedef OrderedMap<const char *, double> TIMEStatMap;
+
+    enum ClockType
+    {
+        Wall,
+        CPU,
+    };
+
+    SVFStat();
+
+    virtual ~SVFStat() {}
+
+    virtual inline void startClk()
+    {
+        startTime = getClk(true);
+    }
+
+    virtual inline void endClk()
+    {
+        endTime = getClk(true);
+    }
+
+    /// When mark is true, real clock is always returned. When mark is false, it is
+    /// only returned when Options::MarkedClocksOnly is not set.
+    /// Default call for getClk is unmarked, while MarkedClocksOnly is false by default.
+    static double getClk(bool mark = false);
+
+    NUMStatMap generalNumMap;
+    TIMEStatMap timeStatMap;
+
+    double startTime;
+    double endTime;
+
+    virtual void performStat() = 0;
+
+    virtual void printStat(std::string str = "") = 0;
+
+    virtual void performStatPerQuery(NodeID) {}
+
+    virtual void printStatPerQuery(NodeID, const PointsTo &) {}
+
+    virtual void callgraphStat() {}
+
+private:
+
+    std::string moduleName;
+}; // End class SVFStat
+
+} // End namespace SVF
+#endif //SVF_SVFSTAT_H

package/SVF-linux/include/WPA/AndersenPWC.h

@@ -104,7 +104,7 @@ class AndersenSFR : public AndersenSCD
 public:
     typedef Map<NodeID, NodeBS> NodeStrides;
     typedef Map<NodeID, NodeSet> FieldReps;
-    typedef Map<NodeID, pair<NodeID, NodeSet>> SFRTrait;
+    typedef Map<NodeID, std::pair<NodeID, NodeSet>> SFRTrait;
 
 private:
     static AndersenSFR* sfrAndersen;

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

@@ -142,7 +142,7 @@ public:
         }
     }
 
-    void printStat(string statname)
+    void printStat(std::string statname)
     {
 
         SVFUtil::outs() << "\n************ " << statname << " ***************\n";

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

@@ -21,7 +21,7 @@
 //===----------------------------------------------------------------------===//
 
 /*
- * AndersenStat.h
+ * PTAStat.h
  *
  *  Created on: Oct 12, 2013
  *      Author: Yulei Sui
@@ -32,12 +32,11 @@
 
 #include "Util/BasicTypes.h"
 #include "MemoryModel/PointsTo.h"
+#include "Util/SVFStat.h"
 #include <iostream>
 #include <map>
 #include <string>
 
-using namespace std;
-
 namespace SVF
 {
 
@@ -46,7 +45,7 @@ class PointerAnalysis;
 /*!
  * Pointer Analysis Statistics
  */
-class PTAStat
+class PTAStat: public SVFStat
 {
 public:
     static const char* TotalAnalysisTime; ///< Total analysis time
@@ -118,49 +117,20 @@ public:
 
     static const char* NumOfNullPointer;	///< Number of pointers points-to null
 
-    typedef Map<const char*,u32_t> NUMStatMap;
-
-    typedef Map<const char*,double> TIMEStatMap;
-
-    enum ClockType
-    {
-        Wall,
-        CPU,
-    };
-
     PTAStat(PointerAnalysis* p);
     virtual ~PTAStat() {}
 
-    virtual inline void startClk()
-    {
-        startTime = getClk(true);
-    }
-    virtual inline void endClk()
-    {
-        endTime = getClk(true);
-    }
-    /// When mark is true, real clock is always returned. When mark is false, it is
-    /// only returned when Options::MarkedClocksOnly is not set.
-    /// Default call for getClk is unmarked, while MarkedClocksOnly is false by default.
-    static double getClk(bool mark=false);
-
-    NUMStatMap generalNumMap;
     NUMStatMap PTNumStatMap;
-    TIMEStatMap timeStatMap;
     NodeBS localVarInRecursion;
 
     double startTime;
     double endTime;
 
-    virtual void performStat();
-
-    virtual void printStat(string str = "");
-
-    virtual void performStatPerQuery(NodeID) {}
+    void performStat() override;
 
-    virtual void printStatPerQuery(NodeID, const PointsTo&) {}
+    virtual void printStat(std::string str = "") override;
 
-    virtual void callgraphStat();
+    void callgraphStat() override;
 private:
     void bitcastInstStat();
     void branchStat();

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

@@ -0,0 +1,95 @@
+//===- SVFStat.h -- Base class for statistics---------------------------------//
+//
+//                     SVF: Static Value-Flow Analysis
+//
+// Copyright (C) <2013-2017>  <Yulei Sui>
+//
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+//===----------------------------------------------------------------------===//
+
+/*
+ * SVFStat.h
+ *
+ *  Created on: Sep 1, 2022
+ *      Author: Xiao Cheng
+ */
+
+#ifndef SVF_SVFSTAT_H
+#define SVF_SVFSTAT_H
+
+namespace SVF
+{
+
+
+/*!
+ * Pointer Analysis Statistics
+ */
+class SVFStat
+{
+public:
+
+    typedef OrderedMap<const char *, u32_t> NUMStatMap;
+
+    typedef OrderedMap<const char *, double> TIMEStatMap;
+
+    enum ClockType
+    {
+        Wall,
+        CPU,
+    };
+
+    SVFStat();
+
+    virtual ~SVFStat() {}
+
+    virtual inline void startClk()
+    {
+        startTime = getClk(true);
+    }
+
+    virtual inline void endClk()
+    {
+        endTime = getClk(true);
+    }
+
+    /// When mark is true, real clock is always returned. When mark is false, it is
+    /// only returned when Options::MarkedClocksOnly is not set.
+    /// Default call for getClk is unmarked, while MarkedClocksOnly is false by default.
+    static double getClk(bool mark = false);
+
+    NUMStatMap generalNumMap;
+    TIMEStatMap timeStatMap;
+
+    double startTime;
+    double endTime;
+
+    virtual void performStat() = 0;
+
+    virtual void printStat(std::string str = "") = 0;
+
+    virtual void performStatPerQuery(NodeID) {}
+
+    virtual void printStatPerQuery(NodeID, const PointsTo &) {}
+
+    virtual void callgraphStat() {}
+
+private:
+
+    std::string moduleName;
+}; // End class SVFStat
+
+} // End namespace SVF
+#endif //SVF_SVFSTAT_H

package/SVF-osx/include/WPA/AndersenPWC.h

@@ -104,7 +104,7 @@ class AndersenSFR : public AndersenSCD
 public:
     typedef Map<NodeID, NodeBS> NodeStrides;
     typedef Map<NodeID, NodeSet> FieldReps;
-    typedef Map<NodeID, pair<NodeID, NodeSet>> SFRTrait;
+    typedef Map<NodeID, std::pair<NodeID, NodeSet>> SFRTrait;
 
 private:
     static AndersenSFR* sfrAndersen;

package/package.json

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