svf-tools 1.0.537 → 1.0.540

package/SVF-doxygen/html/html/search/variables_3.js

@@ -81,7 +81,7 @@ var searchData=
   ['context',['context',['../classSVF_1_1ContextCond.html#ac431eae00244cc7792b6e7e00634d535',1,'SVF::ContextCond::context()'],['../classSVF_1_1CxtStmtDPItem.html#a96f1d7c309e3b69af66200e2cfb5a466',1,'SVF::CxtStmtDPItem::context()'],['../classSVF_1_1CxtDPItem.html#ab89e9f588054ad8a99d9af8e756c951b',1,'SVF::CxtDPItem::context()']]],
   ['contextdda',['contextDDA',['../classSVF_1_1DDAStat.html#ac3fb8b15c5308c926209a941c7cf62e1',1,'SVF::DDAStat']]],
   ['contextinsensitive',['ContextInsensitive',['../classSVF_1_1Options.html#ac3ad7d0cf734e867b91a081aad1faff2',1,'SVF::Options']]],
-  ['copy',['Copy',['../CFLGrammar_8txt.html#a36f63c7a581bf6d351f835c6127a2519',1,'Copy(): CFLGrammar.txt'],['../cJSON_8cpp.html#a7669ee67a0563250c1efaa24d130e1ac',1,'copy(): cJSON.cpp']]],
+  ['copy',['Copy',['../CFLGrammar_8txt.html#a36f63c7a581bf6d351f835c6127a2519',1,'Copy(): CFLGrammar.txt'],['../PEGGrammar_8txt.html#a36f63c7a581bf6d351f835c6127a2519',1,'Copy(): PEGGrammar.txt'],['../cJSON_8cpp.html#a7669ee67a0563250c1efaa24d130e1ac',1,'copy(): cJSON.cpp']]],
   ['copyinedges',['copyInEdges',['../classSVF_1_1ConstraintNode.html#a4d413d64bf554ecdc72709afeeb85775',1,'SVF::ConstraintNode']]],
   ['copyoutedges',['copyOutEdges',['../classSVF_1_1ConstraintNode.html#a12df688fd9b5b7617daadc7bee0fff40',1,'SVF::ConstraintNode']]],
   ['copytime',['copyTime',['../classSVF_1_1FlowSensitive.html#a888d6334e5e226c634680e4c0674dcfb',1,'SVF::FlowSensitive']]],

package/SVF-doxygen/html/html/search/variables_5.js

@@ -21,7 +21,7 @@ var searchData=
   ['entry',['entry',['../classSVF_1_1CallPE.html#a88e420e259b8d7d34c9850ddde53d372',1,'SVF::CallPE']]],
   ['entryfuncset',['entryFuncSet',['../classSVF_1_1TCT.html#a140eaf9440ae9d52dbfb659967aa449a',1,'SVF::TCT']]],
   ['entryicfgedges',['entryICFGEdges',['../classSVF_1_1SVFLoop.html#a681d712db88d105c8a2f758de3d7e72e',1,'SVF::SVFLoop']]],
-  ['epsilon',['epsilon',['../CFLGrammar_8txt.html#a114c2e5cd44b3ea4720e9191ed819f3b',1,'CFLGrammar.txt']]],
+  ['epsilon',['epsilon',['../CFLGrammar_8txt.html#a114c2e5cd44b3ea4720e9191ed819f3b',1,'epsilon(): CFLGrammar.txt'],['../PEGGrammar_8txt.html#a114c2e5cd44b3ea4720e9191ed819f3b',1,'epsilon(): PEGGrammar.txt']]],
   ['epsilonprods',['epsilonProds',['../classSVF_1_1CFLGrammar.html#a4d9770a2b935bcad74ae551389925f74',1,'SVF::CFLGrammar']]],
   ['equivalentobject',['equivalentObject',['../classSVF_1_1VersionedFlowSensitive.html#a2d451d89f99a4bff828b682723df477f',1,'SVF::VersionedFlowSensitive']]],
   ['evaltime',['EvalTime',['../classSVF_1_1NodeIDAllocator_1_1Clusterer.html#a1d98862e19affdd08740f85490d0d856',1,'SVF::NodeIDAllocator::Clusterer']]],

package/SVF-doxygen/html/html/search/variables_6.js

@@ -1,8 +1,8 @@
 var searchData=
 [
-  ['f',['F',['../CFLGrammar_8txt.html#a00967427d1c110ffcc82ea2a966f4564',1,'CFLGrammar.txt']]],
+  ['f',['F',['../CFLGrammar_8txt.html#a00967427d1c110ffcc82ea2a966f4564',1,'F(): CFLGrammar.txt'],['../PEGGrammar_8txt.html#acc7b4cf736579c4d83be2316d5a9e5f2',1,'F(): PEGGrammar.txt']]],
   ['fastclustertime',['FastClusterTime',['../classSVF_1_1NodeIDAllocator_1_1Clusterer.html#ae78d2b60035350c634f6f58d7a043c22',1,'SVF::NodeIDAllocator::Clusterer']]],
-  ['fbar',['Fbar',['../CFLGrammar_8txt.html#afb129e761aae1ddaa005123832b88cd2',1,'CFLGrammar.txt']]],
+  ['fbar',['Fbar',['../CFLGrammar_8txt.html#aa92a4b37b902f3a59efef16528e4f905',1,'Fbar(): CFLGrammar.txt'],['../PEGGrammar_8txt.html#aa92a4b37b902f3a59efef16528e4f905',1,'Fbar(): PEGGrammar.txt']]],
   ['fieldreps',['fieldReps',['../classSVF_1_1AndersenSFR.html#a99337c429aebe9046c65068b44eff7cc',1,'SVF::AndersenSFR']]],
   ['fieldtypes',['fieldTypes',['../classSVF_1_1DCHGraph.html#a574ec14099f1112b394b00a79f3fdf1a',1,'SVF::DCHGraph']]],
   ['file',['file',['../classSVF_1_1PAGBuilderFromFile.html#a9ce304b448de65fbde586655dce885a4',1,'SVF::PAGBuilderFromFile']]],

package/SVF-doxygen/html/html/search/variables_7.js

@@ -1,11 +1,11 @@
 var searchData=
 [
   ['generalnummap',['generalNumMap',['../classSVF_1_1PTAStat.html#afa718535839a939e51afc0f8c1fbdac6',1,'SVF::PTAStat']]],
-  ['gep_5f0',['Gep_0',['../CFLGrammar_8txt.html#ace8178aa913f2a15d4b3f12778dfc6f1',1,'CFLGrammar.txt']]],
+  ['gep_5f0',['Gep_0',['../CFLGrammar_8txt.html#ace8178aa913f2a15d4b3f12778dfc6f1',1,'Gep_0(): CFLGrammar.txt'],['../PEGGrammar_8txt.html#ace8178aa913f2a15d4b3f12778dfc6f1',1,'Gep_0(): PEGGrammar.txt']]],
   ['gep_5f1',['Gep_1',['../CFLGrammar_8txt.html#a92c75ced313339aea5e3e0c9f0726e5a',1,'CFLGrammar.txt']]],
-  ['gep_5fi',['Gep_i',['../CFLGrammar_8txt.html#a653086130f70f043218d296d00529455',1,'CFLGrammar.txt']]],
-  ['gepbar_5f0',['Gepbar_0',['../CFLGrammar_8txt.html#a38750813346a2f7d4d2f74101bf1be37',1,'CFLGrammar.txt']]],
-  ['gepbar_5fi',['Gepbar_i',['../CFLGrammar_8txt.html#a1e1e10a9f0c4b902df72da76a308ae21',1,'CFLGrammar.txt']]],
+  ['gep_5fi',['Gep_i',['../CFLGrammar_8txt.html#af184db68cfa45428afdc186dd62e32a3',1,'Gep_i(): CFLGrammar.txt'],['../PEGGrammar_8txt.html#af184db68cfa45428afdc186dd62e32a3',1,'Gep_i(): PEGGrammar.txt']]],
+  ['gepbar_5f0',['Gepbar_0',['../CFLGrammar_8txt.html#a74e2e5aac99754fa661689592e053e27',1,'Gepbar_0(): CFLGrammar.txt'],['../PEGGrammar_8txt.html#a74e2e5aac99754fa661689592e053e27',1,'Gepbar_0(): PEGGrammar.txt']]],
+  ['gepbar_5fi',['Gepbar_i',['../CFLGrammar_8txt.html#aa3f2c8659adb9738e29e47d3a607ff1e',1,'Gepbar_i(): CFLGrammar.txt'],['../PEGGrammar_8txt.html#aa3f2c8659adb9738e29e47d3a607ff1e',1,'Gepbar_i(): PEGGrammar.txt']]],
   ['gepinedges',['gepInEdges',['../classSVF_1_1ConstraintNode.html#a4d0113f2af3a61892acee1fb21f0b938',1,'SVF::ConstraintNode']]],
   ['gepnodenumindex',['gepNodeNumIndex',['../PAGBuilderFromFile_8cpp.html#a1af3947dbaf1ad4364bc4818f70ead40',1,'PAGBuilderFromFile.cpp']]],
   ['gepobjvarmap',['GepObjVarMap',['../classSVF_1_1SVFIR.html#a148b51118eeba8117e033fea84b56be8',1,'SVF::SVFIR']]],

package/SVF-doxygen/html/html/search/variables_d.js

@@ -1,6 +1,6 @@
 var searchData=
 [
-  ['m',['M',['../classSVF_1_1RaceResultValidator.html#abd3ad42a71357dfd1483e6e0d18d5ebd',1,'SVF::RaceResultValidator']]],
+  ['m',['M',['../classSVF_1_1RaceResultValidator.html#abd3ad42a71357dfd1483e6e0d18d5ebd',1,'SVF::RaceResultValidator::M()'],['../PEGGrammar_8txt.html#abd600039647a1e73c88e7161fa6eb989',1,'M(): PEGGrammar.txt']]],
   ['m_5fcond',['m_cond',['../classSVF_1_1CondVar.html#a90b13685d2126f8c10dde4a504bb28df',1,'SVF::CondVar']]],
   ['m_5fid',['m_id',['../classSVF_1_1CondVar.html#a26fd04b3f2d45f0c230e1823f3eea49a',1,'SVF::CondVar']]],
   ['mainmodule',['mainModule',['../classSVF_1_1IRAnnotator.html#a01462e9ee84f490514598c68e8c9557b',1,'SVF::IRAnnotator']]],

package/SVF-doxygen/html/html/search/variables_e.js

@@ -28,6 +28,7 @@ var searchData=
   ['nonterminals',['nonterminals',['../classSVF_1_1GrammarBase.html#ac0e54c6a5e87f9d91a5296504914849b',1,'SVF::GrammarBase']]],
   ['normalized',['normalized',['../classSVF_1_1CondPTAImpl.html#ab4115f25e2e477bfd73d01f069f47241',1,'SVF::CondPTAImpl']]],
   ['null',['NULL',['../cJSON_8cpp.html#a1a05ede2ad100bf5de5dfa7ccdfa4397',1,'cJSON.cpp']]],
+  ['nulldummynode',['NullDummyNode',['../classSVF_1_1Options.html#a59afe4356aae2133beb4819c013d3fbf',1,'SVF::Options']]],
   ['nullpointerid',['nullPointerId',['../classSVF_1_1NodeIDAllocator.html#a1e3a98be74d5dfd3b4c1b5f9c0941353',1,'SVF::NodeIDAllocator']]],
   ['nullptrsyms',['nullPtrSyms',['../classSVF_1_1SVFModule.html#a54f4857ba920d4d7c36d5258616d5dae',1,'SVF::SVFModule']]],
   ['number',['number',['../cJSON_8h.html#a6288dae99eabb0a393b1d4974e01cde7',1,'number(): cJSON.h'],['../cJSON_8cpp.html#a0b3e94800c28aaf801bbbf0b9b69fee4',1,'number(): cJSON.cpp']]],
@@ -36,7 +37,7 @@ var searchData=
   ['numgtintregions',['NumGtIntRegions',['../classSVF_1_1NodeIDAllocator_1_1Clusterer.html#ad7cb36a1f0f67864fb8290e9dfd7b639',1,'SVF::NodeIDAllocator::Clusterer']]],
   ['numnodes',['numNodes',['../classSVF_1_1NodeIDAllocator.html#a8e76e0da58f0a5bdbd8118ac419cfa62',1,'SVF::NodeIDAllocator']]],
   ['numnontrivialregionobjects',['NumNonTrivialRegionObjects',['../classSVF_1_1NodeIDAllocator_1_1Clusterer.html#a1bf9461c717e8dabaee6a57f3d76d61f',1,'SVF::NodeIDAllocator::Clusterer']]],
-  ['numobjects',['numObjects',['../classSVF_1_1NodeIDAllocator.html#a190c729a3f3f622f82cee4917946b50f',1,'SVF::NodeIDAllocator::numObjects()'],['../classSVF_1_1NodeIDAllocator_1_1Clusterer.html#afa74c5ccd22bebe0b76db33066d8b498',1,'SVF::NodeIDAllocator::Clusterer::NumObjects()']]],
+  ['numobjects',['NumObjects',['../classSVF_1_1NodeIDAllocator_1_1Clusterer.html#afa74c5ccd22bebe0b76db33066d8b498',1,'SVF::NodeIDAllocator::Clusterer::NumObjects()'],['../classSVF_1_1NodeIDAllocator.html#a190c729a3f3f622f82cee4917946b50f',1,'SVF::NodeIDAllocator::numObjects()']]],
   ['numofactualin',['numOfActualIn',['../classSVF_1_1SVFGStat.html#a5365744d2ec3594e2255d274f7256569',1,'SVF::SVFGStat']]],
   ['numofactualout',['numOfActualOut',['../classSVF_1_1SVFGStat.html#a122555f5c4b9746cc2b7f38c7cd6b505',1,'SVF::SVFGStat']]],
   ['numofactualparam',['numOfActualParam',['../classSVF_1_1SVFGStat.html#a0494c59483520b57acdca95952c93d76',1,'SVF::SVFGStat']]],
@@ -66,7 +67,7 @@ var searchData=
   ['numofentrychi',['NumOfEntryChi',['../classSVF_1_1MemSSAStat.html#ad96437d0c28f8088c711a718d2f2730e',1,'SVF::MemSSAStat']]],
   ['numofentrynodes',['numOfEntryNodes',['../classSVF_1_1ICFGStat.html#ad37793e64fe58a8faba201c18d876685',1,'SVF::ICFGStat']]],
   ['numofexitnodes',['numOfExitNodes',['../classSVF_1_1ICFGStat.html#ad7e00680fb8ca31afbd166f9a4adc5ec',1,'SVF::ICFGStat']]],
-  ['numoffieldexpand',['numOfFieldExpand',['../classSVF_1_1AndersenBase.html#a9f453ec1b4236b8194ae590981217259',1,'SVF::AndersenBase::numOfFieldExpand()'],['../classSVF_1_1PTAStat.html#a1745e5c3c026a130a70954da9c0074b1',1,'SVF::PTAStat::NumOfFieldExpand()']]],
+  ['numoffieldexpand',['NumOfFieldExpand',['../classSVF_1_1PTAStat.html#a1745e5c3c026a130a70954da9c0074b1',1,'SVF::PTAStat::NumOfFieldExpand()'],['../classSVF_1_1AndersenBase.html#a9f453ec1b4236b8194ae590981217259',1,'SVF::AndersenBase::numOfFieldExpand()']]],
   ['numofflattenelements',['numOfFlattenElements',['../classSVF_1_1StInfo.html#a7aa5b5018b4dec4913eb6aecf25568a4',1,'SVF::StInfo']]],
   ['numofflattenfields',['numOfFlattenFields',['../classSVF_1_1StInfo.html#aa9b4e659f4a4421aadf736a3de24ca50',1,'SVF::StInfo']]],
   ['numofformalin',['numOfFormalIn',['../classSVF_1_1SVFGStat.html#abc5e079242666bb55ec7dbc7f258b3db',1,'SVF::SVFGStat']]],

package/include/CFL/CFGNormalizer.h

@@ -27,8 +27,8 @@
  *      Author: Pei Xu
  */
 
-#ifndef INCLUDE_CFL_CFGNormalizer_H_
-#define INCLUDE_CFL_CFGNormalizer_H_
+#ifndef INCLUDE_CFL_CFGNORMALIZER_H_
+#define INCLUDE_CFL_CFGNORMALIZER_H_
 
 #include "CFLGrammar.h"
 
@@ -79,4 +79,4 @@ private:
 
 } // End namespace SVF
 
-#endif /* INCLUDE_CFL_CFGNormalizer_H_*/
+#endif /* INCLUDE_CFL_CFGNORMALIZER_H_*/

package/include/CFL/CFLAlias.h

@@ -27,6 +27,8 @@
  *      Author: Yulei Sui
  */
 
+#ifndef INCLUDE_CFL_CFLALIAS_H_
+#define INCLUDE_CFL_CFLALIAS_H_
 
 #include "CFL/CFLSolver.h"
 #include "CFL/CFGNormalizer.h"
@@ -144,4 +146,6 @@ private:
     CFLSolver *solver;
 };
 
-}
+} // End namespace SVF
+
+#endif /* INCLUDE_CFL_CFLALIAS_H_*/

package/include/CFL/CFLGraphBuilder.h

@@ -27,6 +27,9 @@
  *      Author: Pei Xu
  */
 
+#ifndef INCLUDE_CFL_CFLGRAPHBUILDER_H_
+#define INCLUDE_CFL_CFLGRAPHBUILDER_H_
+
 #include "CFL/CFLGrammar.h"
 #include "Graphs/CFLGraph.h"
 namespace SVF
@@ -118,6 +121,7 @@ public:
         }
         return cflGraph;
     }
+
     /// Build graph from file
     void build(std::string filename, CFLGraph* cflGraph);
 
@@ -138,6 +142,8 @@ public:
     {
         return this->kind2AttrsMap;
     }
+
+
 };
 
 class AliasCFLGraphBuilder : public CFLGraphBuilder
@@ -145,8 +151,12 @@ class AliasCFLGraphBuilder : public CFLGraphBuilder
 public:
     /// Build Bidirectional graph by copying nodes and edges from const graph inherited from GenericGraph
     CFLGraph* buildBigraph(ConstraintGraph *graph, Kind startKind, GrammarBase *grammar);
+
+    /// Build Bidirectional graph by copying nodes and edges from any graph inherited from GenericGraph
+    /// And transfer Load Store to copy edge and address edge to construct PEG style CFG
+    CFLGraph* buildBiPEGgraph(ConstraintGraph *graph, Kind startKind, GrammarBase *grammar, SVFIR* pag);
 };
 
 }// SVF
 
-
+#endif /* INCLUDE_CFL_CFLGRAPHBUILDER_H_*/

package/include/CFL/PEGGrammar.txt

@@ -0,0 +1,28 @@
+Start:  
+   V
+Terminal:
+   Addr Copy Store Load Gep Vgep 
+Productions:
+   F -> epsilon;
+   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;
+   Gep_1 -> Gep_0 F Vgep;
+   Gepbar_1 -> Vgepbar Fbar Gepbar_0;
+   Gepbarpath -> Gepbar_0 Gepbar_0;
+   Gepbarpath -> Gepbarpath Gepbar_0;
+   Gep_3 -> Gep_0;
+   Gepbar_3 -> 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 -> Gepbarpath V Gep_0;

package/include/DDA/DDAStat.h

@@ -8,7 +8,7 @@
 #ifndef DDASTAT_H_
 #define DDASTAT_H_
 
-#include "MemoryModel/PTAStat.h"
+#include "Util/PTAStat.h"
 #include "MemoryModel/PointsTo.h"
 
 namespace SVF

package/include/Graphs/ICFGStat.h

@@ -29,7 +29,7 @@
 #ifndef INCLUDE_UTIL_ICFGSTAT_H_
 #define INCLUDE_UTIL_ICFGSTAT_H_
 
-#include "MemoryModel/PTAStat.h"
+#include "Util/PTAStat.h"
 #include "Graphs/ICFG.h"
 #include <iomanip>
 

package/include/Graphs/SVFGStat.h

@@ -37,7 +37,7 @@
 #define SVFGSTAT_H_
 
 #include "Graphs/SVFG.h"
-#include "MemoryModel/PTAStat.h"
+#include "Util/PTAStat.h"
 #include "Util/SCC.h"
 
 namespace SVF

package/include/MTA/MTAStat.h

@@ -8,7 +8,7 @@
 #ifndef MTASTAT_H_
 #define MTASTAT_H_
 
-#include "MemoryModel/PTAStat.h"
+#include "Util/PTAStat.h"
 
 namespace SVF
 {

package/include/MemoryModel/SVFIR.h

@@ -367,10 +367,7 @@ public:
     }
     inline NodeID getFIObjVar(NodeID id) const
     {
-        SVFVar* node = pag->getGNode(id);
-        assert(SVFUtil::isa<ObjVar>(node) && "need an object node");
-        ObjVar* obj = SVFUtil::cast<ObjVar>(node);
-        return getFIObjVar(obj->getMemObj());
+        return getBaseObjVar(id);
     }
     //@}
 

package/include/SVF-FE/LLVMUtil.h

@@ -1,4 +1,4 @@
-//===- SVFUtil.h -- Analysis helper functions----------------------------//
+//===- LLVMUtil.h -- Analysis helper functions----------------------------//
 //
 //                     SVF: Static Value-Flow Analysis
 //
@@ -21,7 +21,7 @@
 //===----------------------------------------------------------------------===//
 
 /*
- * SVFUtil.h
+ * LLVMUtil.h
  *
  *  Created on: Apr 11, 2013
  *      Author: Yulei Sui

package/include/Util/ExtAPI.h

@@ -63,14 +63,14 @@ overwrite_app_function = 1: Use specifications in ExtAPI.json to overwrite the u
 Function type represents the properties of the function.
 For example,
 "EFT_ALLOC" represents if this external function allocates a new object and assigns it to one of its arguments,
-For the selection of function type and a more detailed explanation, please refer to the definition of enum *extf_t* in ExtAPI.h.
+For the selection of function type and a more detailed explanation, please refer to the definition of enum *extType* in ExtAPI.h.
 
 *** [4] Function operations
 Function operations indicate the relationships between input and output,
 mainly between function parameters or between parameters and return values after the execution.
 For example,
 "copy": ["A2", "L"] indicates that after this external function is executed, the value of the 2nd parameter is copied into the return value.
-For the selection of function type and a more detailed explanation, please refer to the definition of enum *extType* in ExtAPI.h.
+For the selection of function type and a more detailed explanation, please refer to the definition of enum *extf_t* in ExtAPI.h.
 
 For operands of function operation, e.g., "A2", "L", there are the following options:
 "A": represents a parameter;

package/include/Util/Options.h

@@ -5,7 +5,7 @@
 
 #include <sstream>
 #include "FastCluster/fastcluster.h"
-#include "MemoryModel/PTAStat.h"
+#include "Util/PTAStat.h"
 #include "MemoryModel/PointerAnalysisImpl.h"
 #include "Util/NodeIDAllocator.h"
 #include "MSSA/MemSSA.h"
@@ -253,6 +253,8 @@ public:
     static const llvm::cl::opt<std::string> CFLGraph;
     static const llvm::cl::opt<bool> PrintCFL;
     static const llvm::cl::opt<bool> FlexSymMap;
+    static const llvm::cl::opt<bool>  PEGTransfer;
+    static const llvm::cl::opt<bool> NullDummyNode;
 
     // Loop Analysis
     static const llvm::cl::opt<bool> LoopAnalysis;

package/include/WPA/Andersen.h

@@ -27,8 +27,8 @@
  *      Author: Yulei Sui
  */
 
-#ifndef ANDERSENPASS_H_
-#define ANDERSENPASS_H_
+#ifndef INCLUDE_WPA_ANDERSEN_H_
+#define INCLUDE_WPA_ANDERSEN_H_
 
 #include "MemoryModel/PointerAnalysisImpl.h"
 #include "WPA/WPAStat.h"
@@ -386,17 +386,6 @@ protected:
         return "AndersenWPA";
     }
 
-    /// match types for Gep Edges
-    virtual bool matchType(NodeID, NodeID, const NormalGepCGEdge*)
-    {
-        return true;
-    }
-    /// add type for newly created GepObjNode
-    virtual void addTypeForGepObjNode(NodeID, const NormalGepCGEdge*)
-    {
-        return;
-    }
-
     /// Runs a Steensgaard analysis and performs clustering based on those
     /// results set the global best mapping.
     virtual void cluster(void) const;
@@ -444,4 +433,4 @@ public:
 
 } // End namespace SVF
 
-#endif /* ANDERSENPASS_H_ */
+#endif /* INCLUDE_WPA_ANDERSEN_H_ */

package/include/WPA/WPAStat.h

@@ -31,7 +31,7 @@
 #ifndef FLOWSENSITIVESTAT_H_
 #define FLOWSENSITIVESTAT_H_
 
-#include "MemoryModel/PTAStat.h"
+#include "Util/PTAStat.h"
 #include "WPA/FlowSensitive.h"
 #include "WPA/VersionedFlowSensitive.h"
 

package/lib/CFL/CFLAlias.cpp

@@ -206,7 +206,15 @@ void CFLAlias::analyze()
         PointerAnalysis::initialize();
         GrammarBase *grammarBase = grammarBuilder.build();
         ConstraintGraph *consCG = new ConstraintGraph(svfir);
-        graph = cflGraphBuilder.buildBigraph(consCG, grammarBase->getStartKind(), grammarBase);
+        if (Options::PEGTransfer)
+        {
+            graph = cflGraphBuilder.buildBiPEGgraph(consCG, grammarBase->getStartKind(), grammarBase, svfir);
+        }
+        else
+        {
+            graph = cflGraphBuilder.buildBigraph(consCG, grammarBase->getStartKind(), grammarBase);
+        }
+
         cflChecker.check(grammarBase, &cflGraphBuilder, graph);
         grammar = normalizer.normalize(grammarBase);
         cflChecker.check(grammar, &cflGraphBuilder, graph);
@@ -228,12 +236,9 @@ void CFLAlias::analyze()
         solver->solve();
     if(Options::PrintCFL == true)
     {
-        std::string svfirName = Options::CFLGraph.c_str();
-        svfir->dump(svfirName.append("_IR"));
-        std::string grammarName = Options::CFLGraph.c_str();
-        grammar->dump(grammarName.append("_Grammar"));
-        std::string CFLGraphFileName = Options::CFLGraph.c_str();
-        graph->dump(CFLGraphFileName.append("_CFL"));
+        svfir->dump("IR");
+        grammar->dump("Grammar");
+        graph->dump("CFLGraph");
     }
     if (Options::CFLGraph.empty())
     {

package/lib/CFL/CFLGraphBuilder.cpp

@@ -222,4 +222,139 @@ CFLGraph* AliasCFLGraphBuilder::buildBigraph(ConstraintGraph *graph, Kind startK
     return cflGraph;
 }
 
+CFLGraph* AliasCFLGraphBuilder::buildBiPEGgraph(ConstraintGraph *graph, Kind startKind, GrammarBase *grammar, SVFIR* pag)
+{
+    CFLGraph *cflGraph = new CFLGraph(startKind);
+    externMap = true;
+    for(auto pairV : grammar->getTerminals())
+    {
+        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 pairV : grammar->getNonterminals())
+    {
+        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);
+        cflGraph->addCFLNode((*it).first, node);
+    }
+    for(auto it = graph->begin(); it!= graph->end(); it++)
+    {
+        ConstraintNode* node = (*it).second;
+        for(ConstraintEdge* edge : node->getOutEdges())
+        {
+            /// Process Store
+            if (edge->getEdgeKind() == ConstraintEdge::Store)
+            {
+                if (pag->isNullPtr(edge->getSrcID()) && (Options::NullDummyNode == false))
+                    continue;
+                /// Check Dst of Store Dereference Node
+                ConstraintNode* Dst = edge->getDstNode();
+                ConstraintNode* DerefNode = nullptr;
+                CFLNode* CFLDerefNode = nullptr;
+                for (ConstraintEdge* DstInEdge : Dst->getInEdges())
+                {
+                    if (DstInEdge->getEdgeKind() == ConstraintEdge::Addr)
+                    {
+                        DerefNode = DstInEdge->getSrcNode();
+                        CFLDerefNode = cflGraph->getGNode(DstInEdge->getSrcID());
+                        break;
+                    }
+                }
+                if (DerefNode == nullptr)
+                {
+
+                    NodeID refId = pag->addDummyValNode();
+                    CFLDerefNode = new CFLNode(refId);
+                    cflGraph->addCFLNode(refId, CFLDerefNode);
+                    /// Add Addr Edge
+                    cflGraph->addCFLEdge(CFLDerefNode, cflGraph->getGNode(edge->getDstID()), ConstraintEdge::Addr);
+                    std::string key = kind2LabelMap[ConstraintEdge::Addr];
+                    key.append("bar");
+                    cflGraph->addCFLEdge(cflGraph->getGNode(edge->getDstID()), CFLDerefNode, label2KindMap[key]);
+                }
+                /// Add Copy Edge
+                cflGraph->addCFLEdge(cflGraph->getGNode(edge->getSrcID()), cflGraph->getGNode(CFLDerefNode->getId()), ConstraintEdge::Copy);
+                std::string key = kind2LabelMap[ConstraintEdge::Copy];
+                key.append("bar");
+                cflGraph->addCFLEdge(cflGraph->getGNode(CFLDerefNode->getId()), cflGraph->getGNode(edge->getSrcID()), label2KindMap[key]);
+            }
+            /// Process Load
+            else if ( edge->getEdgeKind() == ConstraintEdge::Load)
+            {
+                /// Check Src of Load Dereference Node
+                ConstraintNode* Src = edge->getSrcNode();
+                ConstraintNode* DerefNode = nullptr;
+                CFLNode* CFLDerefNode = nullptr;
+                for (ConstraintEdge* SrcInEdge : Src->getInEdges())
+                {
+                    if (SrcInEdge->getEdgeKind() == ConstraintEdge::Addr)
+                    {
+                        DerefNode = SrcInEdge->getSrcNode();
+                        CFLDerefNode = cflGraph->getGNode(SrcInEdge->getSrcID());
+                    }
+                }
+                if (DerefNode == nullptr)
+                {
+                    NodeID refId = pag->addDummyValNode();
+                    CFLDerefNode = new CFLNode(refId);
+                    cflGraph->addCFLNode(refId, CFLDerefNode);
+                    /// Add Addr Edge
+                    cflGraph->addCFLEdge(CFLDerefNode, cflGraph->getGNode(edge->getSrcID()), ConstraintEdge::Addr);
+                    std::string key = kind2LabelMap[ConstraintEdge::Addr];
+                    key.append("bar");
+                    cflGraph->addCFLEdge(cflGraph->getGNode(edge->getSrcID()), CFLDerefNode, label2KindMap[key]);
+                }
+                /// Add Copy Edge
+                cflGraph->addCFLEdge(cflGraph->getGNode(CFLDerefNode->getId()), cflGraph->getGNode(edge->getDstID()),  ConstraintEdge::Copy);
+                std::string key = kind2LabelMap[ConstraintEdge::Copy];
+                key.append("bar");
+                cflGraph->addCFLEdge(cflGraph->getGNode(edge->getDstID()), cflGraph->getGNode(CFLDerefNode->getId()),  label2KindMap[key]);
+            }
+            else
+            {
+                CFLGrammar::Kind edgeLabel = edge->getEdgeKind();
+                // Need to get the offset from the Const Edge
+                // The offset present edge is only from Normal Gep CG at moment
+                if(NormalGepCGEdge::classof(edge))
+                {
+                    NormalGepCGEdge *nGepEdge = SVFUtil::dyn_cast<NormalGepCGEdge>(edge);
+                    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 = kind2LabelMap[edge->getEdgeKind()];
+                    key.append("bar");   // for example Gep_i should be Gepbar_i, not Gep_ibar
+                    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 = kind2LabelMap[edge->getEdgeKind()];
+                    key.append("bar");
+                    cflGraph->addCFLEdge(cflGraph->getGNode(edge->getDstID()), cflGraph->getGNode(edge->getSrcID()), label2KindMap[key]);
+                }
+            }
+        }
+    }
+    return cflGraph;
+}
+
+
 } // end of SVF namespace

package/lib/CFL/GrammarBuilder.cpp

@@ -42,6 +42,7 @@ const inline std::string GrammarBuilder::parseProductionsString() const
     std::string lineString;
     std::string lines = "";
     std::string startString;
+    std::string symbolString;
     const std::string WHITESPACE = " \n\r\t\f\v";
     int lineNum = 0;
     while (getline(textFile, lineString))
@@ -50,25 +51,28 @@ const inline std::string GrammarBuilder::parseProductionsString() const
         {
             startString = stripSpace(lineString);
         }
+        if(lineNum == 3)
+        {
+            symbolString = lineString.substr(lineString.find_first_not_of(WHITESPACE), lineString.find_last_not_of(WHITESPACE)+1);
+        }
 
         lines.append(lineString.substr(lineString.find_first_not_of(WHITESPACE), lineString.find_last_not_of(WHITESPACE)+1));
         lineNum++;
     }
 
-    std::regex reg("Start:([\\s\\S]*)Terminal:([\\s\\S]*)Productions:([\\s\\S]*)");
+    std::regex reg("Start:([\\s\\S]*)Terminal:(.*)Productions:([\\s\\S]*)");
     std::smatch matches;
     if (std::regex_search(lines, matches, reg))
     {
         lines = matches.str(3);
     }
-    std::string terminalString = matches.str(2);
-    std::string symbolString;
-    size_t pos;
-    while ((pos = terminalString.find(" ")) != std::string::npos)
+    std::string sString;
+    size_t pos = 0;
+    while ((pos = symbolString.find(" ")) != std::string::npos)
     {
-        symbolString = stripSpace(terminalString.substr(0, pos));
-        terminalString.erase(0, pos + 1); //Capital is Nonterminal, Otherwise is terminal
-        grammar->insertSymbol(symbolString);
+        sString = stripSpace(symbolString.substr(0, pos));
+        symbolString.erase(0, pos + 1); //Capital is Nonterminal, Otherwise is terminal
+        grammar->insertSymbol(sString);
     }
     grammar->insertSymbol(symbolString);
     grammar->setStartKind(grammar->insertSymbol(startString));

package/lib/Graphs/SVFGReadWrite.cpp

@@ -124,7 +124,7 @@ void SVFG::writeToFile(const string& filename)
                 if(LOADMU* mu = SVFUtil::dyn_cast<LOADMU>(*it))
                 {
                     NodeID def = getDef(mu->getMRVer());
-                    f << "srcSVFGNodeID: " << nodeId << " => " << "dstSVFGNodeID: " << def << " >= LoadNode | MVER: {"<< *mu->getMRVer() << "}" << "\n";
+                    f << "srcSVFGNodeID: " << nodeId << " => " << "dstSVFGNodeID: " << def << " >= LoadNode | MVER: {" << *mu->getMRVer() << "}" << "\n";
                 }
             }
         }
@@ -136,7 +136,7 @@ void SVFG::writeToFile(const string& filename)
                 if(STORECHI* chi = SVFUtil::dyn_cast<STORECHI>(*it))
                 {
                     NodeID def = getDef(chi->getOpVer());
-                    f << "srcSVFGNodeID: " << nodeId << " => " << "dstSVFGNodeID: " << def << " >= StoreNode | MVER: {"<< *chi->getOpVer() << "}" << "\n";
+                    f << "srcSVFGNodeID: " << nodeId << " => " << "dstSVFGNodeID: " << def << " >= StoreNode | MVER: {" << *chi->getOpVer() << "}" << "\n";
                 }
             }
         }
@@ -189,7 +189,7 @@ void SVFG::writeToFile(const string& filename)
             {
                 const MRVer* op = it->second;
                 NodeID def = getDef(op);
-                f << "srcSVFGNodeID: " << nodeId << " => " << "dstSVFGNodeID: " << def << " >= PHISVFGNode | MVER: {"<< *op << "}" << "\n";
+                f << "srcSVFGNodeID: " << nodeId << " => " << "dstSVFGNodeID: " << def << " >= PHISVFGNode | MVER: {" << *op << "}" << "\n";
             }
         }
     }

package/lib/MTA/LockAnalysis.cpp

@@ -10,7 +10,7 @@
 #include "MTA/MTA.h"
 #include "MTA/MTAResultValidator.h"
 #include "Util/SVFUtil.h"
-#include "MemoryModel/PTAStat.h"
+#include "Util/PTAStat.h"
 #include "MTA/LockResultValidator.h"
 
 

package/lib/MTA/MHP.cpp

@@ -11,7 +11,7 @@
 #include "MTA/LockAnalysis.h"
 #include "MTA/MTAResultValidator.h"
 #include "Util/SVFUtil.h"
-#include "MemoryModel/PTAStat.h"
+#include "Util/PTAStat.h"
 #include "SVF-FE/BasicTypes.h"
 
 using namespace SVF;

package/lib/MemoryModel/PointerAnalysis.cpp

@@ -37,7 +37,7 @@
 
 #include "MemoryModel/PointerAnalysisImpl.h"
 #include "MemoryModel/PAGBuilderFromFile.h"
-#include "MemoryModel/PTAStat.h"
+#include "Util/PTAStat.h"
 #include "Graphs/ThreadCallGraph.h"
 #include "Graphs/ICFG.h"
 

package/lib/SVF-FE/CHGBuilder.cpp

@@ -43,7 +43,7 @@
 #include "Util/SVFUtil.h"
 #include "SVF-FE/LLVMUtil.h"
 #include "Util/SVFModule.h"
-#include "MemoryModel/PTAStat.h"
+#include "Util/PTAStat.h"
 
 using namespace SVF;
 using namespace SVFUtil;