svf-lib 1.0.726 → 1.0.727

package/SVF-osx/include/SVF-FE/MemModelBuilder.h

@@ -0,0 +1,102 @@
+//===- LocMemModel.h -- Memory model builder-----------------------//
+//
+//                     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/>.
+//
+//===----------------------------------------------------------------------===//
+
+/*
+ * MemModelBuilder.h
+ *
+ *  Created on: Apr 28, 2014
+ *      Author: Yulei
+ */
+
+#ifndef MEMMODELBUILDER_H_
+#define MEMMODELBUILDER_H_
+
+#include "MemoryModel/MemModel.h"
+#include "SVF-FE/LLVMModule.h"
+#include "SVF-FE/SymbolTableInfo.h"
+
+/*
+* This class is to build SymbolTableInfo, MemObjs and ObjTypeInfo
+*/
+namespace SVF
+{
+
+class MemModelBuilder 
+{
+
+private:
+    SymbolTableInfo* symInfo;
+
+public:
+    /// Constructor
+    MemModelBuilder(SymbolTableInfo* si): symInfo(si){
+
+    }
+
+    /// Start building memory model
+    void buildMemModel(SVFModule* svfModule);
+
+    /// collect the syms
+    //@{
+    void collectSym(const Value *val);
+
+    void collectVal(const Value *val);
+
+    void collectObj(const Value *val);
+
+    void collectRet(const Function *val);
+
+    void collectVararg(const Function *val);
+    //@}
+
+    /// Handle constant expression
+    // @{
+    void handleGlobalCE(const GlobalVariable *G);
+    void handleGlobalInitializerCE(const Constant *C, u32_t offset);
+    void handleCE(const Value *val);
+    // @}
+
+
+    //     /// Collect the struct info
+    // virtual void collectStructInfo(const StructType *T);
+    // /// Collect the array info
+    // virtual void collectArrayInfo(const ArrayType* T);
+    // /// Collect simple type (non-aggregate) info
+    // virtual void collectSimpleTypeInfo(const Type* T);
+
+    /// Create an objectInfo based on LLVM value
+    ObjTypeInfo* createObjTypeInfo(const Value *val);
+    /// Create an objectInfo based on LLVM type (value is null, and type could be null, representing a dummy object)
+    // ObjTypeInfo* createObjTypeInfo(const Type *type = nullptr);
+
+    /// Initialize TypeInfo based on LLVM Value
+    void initTypeInfo(ObjTypeInfo* typeinfo, const Value* value);
+    /// Analyse types of all flattened fields of this object
+    void analyzeGlobalStackObjType(ObjTypeInfo* typeinfo, const Value* val);
+    /// Return size of this object based on LLVM value
+    u32_t getObjSize(const Value* val);
+
+};
+
+}
+
+#endif /* MEMMODELBUILDER_H_ */

package/SVF-osx/include/SVF-FE/SymbolTableInfo.h

@@ -42,6 +42,8 @@ namespace SVF
 class SymbolTableInfo
 {
 
+friend class MemModelBuilder;
+
 public:
     /// various maps defined
     //{@
@@ -142,6 +144,11 @@ public:
     {
         return mod;
     }
+        /// Module
+    inline void setModule(SVFModule* m)
+    {
+        mod = m;
+    }
 
     /// Get target machine data layout
     inline static DataLayout* getDataLayout(Module* mod)
@@ -157,22 +164,6 @@ public:
     u32_t getTypeSizeInBytes(const StructType *sty, u32_t field_index);
     //@}
 
-    /// Start building memory model
-    void buildMemModel(SVFModule* svfModule);
-
-    /// collect the syms
-    //@{
-    void collectSym(const Value *val);
-
-    void collectVal(const Value *val);
-
-    void collectObj(const Value *val);
-
-    void collectRet(const Function *val);
-
-    void collectVararg(const Function *val);
-    //@}
-
     /// special value
     // @{
     static bool isNullPtrSym(const Value *val);
@@ -248,13 +239,6 @@ public:
     }
     // @}
 
-    /// Handle constant expression
-    // @{
-    void handleGlobalCE(const GlobalVariable *G);
-    void handleGlobalInitializerCE(const Constant *C, u32_t offset);
-    void handleCE(const Value *val);
-    // @}
-
     /// Get different kinds of syms
     //@{
     SymID getValSym(const Value *val)
@@ -433,18 +417,9 @@ protected:
     /// Collect simple type (non-aggregate) info
     virtual void collectSimpleTypeInfo(const Type* T);
 
-    /// Create an objectInfo based on LLVM value
-    ObjTypeInfo* createObjTypeInfo(const Value *val);
     /// Create an objectInfo based on LLVM type (value is null, and type could be null, representing a dummy object)
     ObjTypeInfo* createObjTypeInfo(const Type *type = nullptr);
 
-    /// Initialize TypeInfo based on LLVM Value
-    void initTypeInfo(ObjTypeInfo* typeinfo, const Value* value);
-    /// Analyse types of all flattened fields of this object
-    void analyzeGlobalStackObjType(ObjTypeInfo* typeinfo, const Value* val);
-    /// Return size of this object based on LLVM value
-    u32_t getObjSize(const Value* val);
-
     /// Every type T is mapped to StInfo
     /// which contains size (fsize) , offset(foffset)
     /// fsize[i] is the number of fields in the largest such struct, else fsize[i] = 1.

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

@@ -68,7 +68,7 @@ public:
     NodeID allocateValueId(void);
 
     /// Notify the allocator that all symbols have had IDs allocated.
-    void endSymbolAllocation(void);
+    NodeID endSymbolAllocation(void);
 
     /// Returns the total number of memory objects.
     NodeID getNumObjects(void) const { return numObjects; }

package/package.json

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