svf-tools 1.0.729 → 1.0.731

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.729",
+  "version": "1.0.731",
   "description": "* <b>[TypeClone](https://github.com/SVF-tools/SVF/wiki/TypeClone) published in our [ECOOP paper](https://yuleisui.github.io/publications/ecoop20.pdf) is now available in SVF </b> * <b>SVF now uses a single script for its build. Just type [`source ./build.sh`](https://github.com/SVF-tools/SVF/blob/master/build.sh) in your terminal, that's it!</b> * <b>SVF now supports LLVM-10.0.0! </b> * <b>We thank [bsauce](https://github.com/bsauce) for writing a user manual of SVF ([link1](https://www.jianshu.com/p/068a08ec749c) and [link2](https://www.jianshu.com/p/777c30d4240e)) in Chinese </b> * <b>SVF now supports LLVM-9.0.0 (Thank [Byoungyoung Lee](https://github.com/SVF-tools/SVF/issues/142) for his help!). </b> * <b>SVF now supports a set of [field-sensitive pointer analyses](https://yuleisui.github.io/publications/sas2019a.pdf). </b> * <b>[Use SVF as an external lib](https://github.com/SVF-tools/SVF/wiki/Using-SVF-as-a-lib-in-your-own-tool) for your own project (Contributed by [Hongxu Chen](https://github.com/HongxuChen)). </b> * <b>SVF now supports LLVM-7.0.0. </b> * <b>SVF now supports Docker. [Try SVF in Docker](https://github.com/SVF-tools/SVF/wiki/Try-SVF-in-Docker)! </b> * <b>SVF now supports [LLVM-6.0.0](https://github.com/svf-tools/SVF/pull/38) (Contributed by [Jack Anthony](https://github.com/jackanth)). </b> * <b>SVF now supports [LLVM-4.0.0](https://github.com/svf-tools/SVF/pull/23) (Contributed by Jared Carlson. Thank [Jared](https://github.com/jcarlson23) and [Will](https://github.com/dtzWill) for their in-depth [discussions](https://github.com/svf-tools/SVF/pull/18) about updating SVF!) </b> * <b>SVF now supports analysis for C++ programs.</b> <br />",
   "main": "index.js",
   "scripts": {

package/svf/include/SVFIR/SVFValue.h

@@ -218,6 +218,10 @@ public:
     {
         return name;
     }
+    inline virtual void setName(const std::string& valueName)
+    {
+        name = valueName;
+    }
 
     inline virtual const SVFType* getType() const
     {
@@ -266,6 +270,7 @@ class SVFFunction : public SVFValue
     friend class LLVMModuleSet;
     friend class SVFIRWriter;
     friend class SVFIRReader;
+    friend class SVFIRBuilder;
 
 public:
     typedef std::vector<const SVFBasicBlock*>::const_iterator const_iterator;
@@ -482,6 +487,7 @@ class SVFBasicBlock : public SVFValue
     friend class LLVMModuleSet;
     friend class SVFIRWriter;
     friend class SVFIRReader;
+    friend class SVFIRBuilder;
 
 public:
     typedef std::vector<const SVFInstruction*>::const_iterator const_iterator;
@@ -650,6 +656,7 @@ class SVFCallInst : public SVFInstruction
     friend class SVFIRWriter;
     friend class SVFIRReader;
     friend class LLVMModuleSet;
+    friend class SVFIRBuilder;
 
 private:
     std::vector<const SVFValue*> args;

package/svf/include/Util/ExtAPI.h

@@ -224,38 +224,227 @@ private:
 
 public:
 
-    class Operation
+    enum OperationType
     {
-    public:
-        Operation() {};
-
-        Operation(std::string opn, std::vector<std::string> varstr) : op(opn), operandStr(varstr) {};
+        Addr,
+        Copy,
+        Load,
+        Store,
+        Gep,
+        Call,
+        Return,
+        Rb_tree_ops,
+        Memcpy_like,
+        Memset_like,
+        Other
+    };
 
-        std::string getOperator()
+    class Operand
+    {
+    public:
+        OperationType getType() const
         {
-            return op;
+            return opType;
         }
-
-        std::vector<std::string> getOperandStr()
+        void setType(OperationType type)
         {
-            return operandStr;
+            opType = type;
         }
-
-        std::vector<NodeID> &getOperands()
+        const std::string &getSrcValue() const
+        {
+            return src;
+        }
+        void setSrcValue(const std::string &value)
+        {
+            src = value;
+        }
+        const std::string &getDstValue() const
+        {
+            return dst;
+        }
+        void setDstValue(const std::string &value)
+        {
+            dst = value;
+        }
+        NodeID getSrcID() const
+        {
+            return srcID;
+        }
+        void setSrcID(NodeID id)
+        {
+            srcID = id;
+        }
+        NodeID getDstID() const
+        {
+            return dstID;
+        }
+        void setDstID(NodeID id)
+        {
+            dstID = id;
+        }
+        const std::string &getOffsetOrSizeStr() const
         {
-            return operands;
+            return offsetOrSizeStr;
         }
+        void setOffsetOrSizeStr(const std::string &str)
+        {
+            offsetOrSizeStr = str;
+        }
+        u32_t getOffsetOrSize() const
+        {
+            return offsetOrSize;
+        }
+        void setOffsetOrSize(u32_t off)
+        {
+            offsetOrSize = off;
+        }
+    private:
+        OperationType opType; // 操作数类型
+        std::string src; // 操作数值
+        std::string dst; //
+        std::string offsetOrSizeStr; // Gep
+        NodeID srcID;
+        NodeID dstID;
+        u32_t offsetOrSize;
+    };
 
-        void setOperands(std::vector<NodeID> vars)
+    class ExtOperation
+    {
+    public:
+        bool isCallOp() const
+        {
+            return callOp;
+        }
+        void setCallOp(bool isCall)
+        {
+            callOp = isCall;
+        }
+        bool isConOp() const
+        {
+            return conOp;
+        }
+        void setConOp(bool isCon)
+        {
+            conOp = isCon;
+        }
+        Operand& getBasicOp()
+        {
+            return basicOp;
+        }
+        void setBasicOp(Operand op)
+        {
+            basicOp = op;
+        }
+        const std::string &getCondition() const
+        {
+            return condition;
+        }
+        void setCondition(const std::string &cond)
+        {
+            condition = cond;
+        }
+        std::vector<Operand>& getTrueBranchOperands()
+        {
+            return trueBranch_operands;
+        }
+        void setTrueBranchOperands(std::vector<Operand> tbo)
+        {
+            trueBranch_operands = tbo;
+        }
+        std::vector<Operand>& getFalseBranchOperands()
+        {
+            return falseBranch_operands;
+        }
+        void setFalseBranchOperands(std::vector<Operand> fbo)
+        {
+            falseBranch_operands = fbo;
+        }
+        const std::string &getCalleeName() const
+        {
+            return callee_name;
+        }
+        void setCalleeName(const std::string &name)
+        {
+            callee_name = name;
+        }
+        const std::string &getCalleeReturn() const
+        {
+            return callee_return;
+        }
+        void setCalleeReturn(const std::string &ret)
+        {
+            callee_return = ret;
+        }
+        const std::string &getCalleeArguments() const
+        {
+            return callee_arguments;
+        }
+        void setCalleeArguments(const std::string &args)
+        {
+            callee_arguments = args;
+        }
+        std::vector<Operand>& getCalleeOperands()
         {
-            operands = vars;
+            return callee_operands;
         }
+        void setCalleeOperands(std::vector<Operand> ops)
+        {
+            callee_operands = ops;
+        }
+    private:
+        bool callOp = false;
+        bool conOp = false;
+        Operand basicOp;
+        std::string condition;
+        std::vector<Operand> trueBranch_operands;
+        std::vector<Operand> falseBranch_operands;
+        std::string callee_name;
+        std::string callee_return;
+        std::string callee_arguments;
+        std::vector<Operand> callee_operands;
+    };
 
+    class ExtFunctionOps
+    {
+    public:
+        ExtFunctionOps() {};
+        ExtFunctionOps(const std::string &name, std::vector<ExtOperation> ops) : extFunName(name), extOperations(ops) {};
+        const std::string &getExtFunName() const
+        {
+            return extFunName;
+        }
+        void setExtFunName(const std::string &name)
+        {
+            extFunName = name;
+        }
+        std::vector<ExtOperation>& getOperations()
+        {
+            return extOperations;
+        }
+        void setOperations(std::vector<ExtOperation> ops)
+        {
+            extOperations = ops;
+        }
+        u32_t getCallStmtNum()
+        {
+            return callStmtNum;
+        }
+        void setCallStmtNum(u32_t num)
+        {
+            callStmtNum = num;
+        }
     private:
-        std::string op;
-        std::vector<std::string> operandStr;
-        std::vector<NodeID> operands;
+        std::string extFunName;
+        std::vector<ExtOperation> extOperations;
+        u32_t callStmtNum = 0;
     };
+
+private:
+    // Map an external function to its operations
+    std::map<std::string, ExtFunctionOps> extFunToOps;
+
+public:
+
     static ExtAPI *getExtAPI(const std::string& = "");
 
     static void destory();
@@ -291,7 +480,8 @@ public:
     cJSON *get_FunJson(const std::string &funName);
 
     // Get all operations of an extern function
-    std::vector<Operation> getAllOperations(std::string funName);
+    Operand getBasicOperation(cJSON* obj);
+    ExtFunctionOps getExtFunctionOps(std::string funName);
 
     // Get property of the operation, e.g. "EFT_A1R_A0R"
     extType get_type(const SVF::SVFFunction *callee);

package/svf/include/Util/ExtAPI.json

@@ -4990,35 +4990,55 @@
         "arguments":  "(i8*, i8, i32, i32, i1)",
         "type": "EFT_L_A0__A0R_A1",
         "overwrite_app_function": 0,
-        "memset_like": ["Arg0", "Arg1", "Arg2"]
+        "memset_like":  {
+            "src": "Arg0",
+            "dst": "Arg1",
+            "size": "Arg2"
+        }
     },
     "llvm.memset.p0i8.i32": {
         "return":  "void",
         "arguments":  "(i8*, i8, i32, i32, i1)",
         "type": "EFT_L_A0__A0R_A1",
         "overwrite_app_function": 0,
-        "memset_like": ["Arg0", "Arg1", "Arg2"]
+        "memset_like":  {
+            "src": "Arg0",
+            "dst": "Arg1",
+            "size": "Arg2"
+        }
     },
     "llvm.memset.p0i8.i64": {
         "return":  "void",
         "arguments":  "(i8*, i8, i64, i32, i1)",
         "type": "EFT_L_A0__A0R_A1",
         "overwrite_app_function": 0,
-        "memset_like": ["Arg0", "Arg1", "Arg2"]
+        "memset_like":  {
+            "src": "Arg0",
+            "dst": "Arg1",
+            "size": "Arg2"
+        }
     },
     "__memset_chk": {
         "return":  "void *",
         "arguments":  "(void *, int, size_t, size_t)",
         "type": "EFT_L_A0__A0R_A1",
         "overwrite_app_function": 0,
-        "memset_like": ["Arg0", "Arg1", "Arg2"]
+        "memset_like":  {
+            "src": "Arg0",
+            "dst": "Arg1",
+            "size": "Arg2"
+        }
     },
     "llvm.memcpy":  {
         "return":  "void",
         "arguments":  "(i8*, i8*, i32, i32, i1)",
         "type": "EFT_L_A0__A0R_A1R",
         "overwrite_app_function": 0,
-        "memcpy_like":  ["Arg0", "Arg1", "Arg2"],
+        "memcpy_like":  {
+            "src": "Arg0",
+            "dst": "Arg1",
+            "size": "Arg2"
+        },
         "CopyStmt": {
 			"src": "Arg0",
 			"dst": "Ret"
@@ -5029,7 +5049,11 @@
         "arguments":  "(i8*, i8*, i32, i32, i1)",
         "type": "EFT_L_A0__A0R_A1R",
         "overwrite_app_function": 0,
-        "memcpy_like":  ["Arg0", "Arg1", "Arg2"],
+        "memcpy_like":  {
+            "src": "Arg0",
+            "dst": "Arg1",
+            "size": "Arg2"
+        },
         "CopyStmt": {
 			"src": "Arg0",
 			"dst": "Ret"
@@ -5040,7 +5064,11 @@
         "arguments":  "(i8*, *i8, i64, i32, i1)",
         "type": "EFT_L_A0__A0R_A1R",
         "overwrite_app_function": 0,
-        "memcpy_like":  ["Arg0", "Arg1", "Arg2"],
+        "memcpy_like":  {
+            "src": "Arg0",
+            "dst": "Arg1",
+            "size": "Arg2"
+        },
         "CopyStmt": {
 			"src": "Arg0",
 			"dst": "Ret"
@@ -5051,7 +5079,11 @@
         "arguments":  "(i8*, i8*, i32, i1)",
         "type": "EFT_L_A0__A0R_A1R",
         "overwrite_app_function": 0,
-        "memcpy_like":  ["Arg0", "Arg1", "Arg2"],
+        "memcpy_like":  {
+            "src": "Arg0",
+            "dst": "Arg1",
+            "size": "Arg2"
+        },
         "CopyStmt": {
 			"src": "Arg0",
 			"dst": "Ret"
@@ -5062,7 +5094,11 @@
         "arguments":  "(i8*, i8*, i32, i1)",
         "type": "EFT_L_A0__A0R_A1R",
         "overwrite_app_function": 0,
-        "memcpy_like":  ["Arg0", "Arg1", "Arg2"],
+        "memcpy_like":  {
+            "src": "Arg0",
+            "dst": "Arg1",
+            "size": "Arg2"
+        },
         "CopyStmt": {
 			"src": "Arg0",
 			"dst": "Ret"
@@ -5073,7 +5109,11 @@
         "arguments":  "(i8*, i8*, i64, i1)",
         "type": "EFT_L_A0__A0R_A1R",
         "overwrite_app_function": 0,
-        "memcpy_like":  ["Arg0", "Arg1", "Arg2"],
+        "memcpy_like":  {
+            "src": "Arg0",
+            "dst": "Arg1",
+            "size": "Arg2"
+        },
         "CopyStmt": {
 			"src": "Arg0",
 			"dst": "Ret"
@@ -5084,7 +5124,11 @@
         "arguments":  "(void *restrict, const void *restrict, int, size_t)",
         "type": "EFT_L_A0__A0R_A1R",
         "overwrite_app_function": 0,
-        "memcpy_like":  ["Arg0", "Arg1", "Arg2"],
+        "memcpy_like":  {
+            "src": "Arg0",
+            "dst": "Arg1",
+            "size": "Arg2"
+        },
         "CopyStmt": {
 			"src": "Arg0",
 			"dst": "Ret"
@@ -5095,7 +5139,11 @@
         "arguments":  "(void *, const void *, size_t)",
         "type": "EFT_L_A0__A0R_A1R",
         "overwrite_app_function": 0,
-        "memcpy_like":  ["Arg0", "Arg1", "Arg2"],
+        "memcpy_like":  {
+            "src": "Arg0",
+            "dst": "Arg1",
+            "size": "Arg2"
+        },
         "CopyStmt": {
 			"src": "Arg0",
 			"dst": "Ret"
@@ -5106,7 +5154,11 @@
         "arguments":  "(void *, const void *, size_t)",
         "type": "EFT_L_A0__A0R_A1R",
         "overwrite_app_function": 0,
-        "memcpy_like":  ["Arg0", "Arg1", "Arg2"],
+        "memcpy_like":  {
+            "src": "Arg0",
+            "dst": "Arg1",
+            "size": "Arg2"
+        },
         "CopyStmt": {
 			"src": "Arg0",
 			"dst": "Ret"
@@ -5117,14 +5169,21 @@
         "arguments":  "(const void *, void *, size_t)",
         "type": "EFT_A1R_A0R",
         "overwrite_app_function": 0,
-        "memcpy_like":  ["Arg1", "Arg0", "Arg2"]
+        "memcpy_like":  {
+            "src": "Arg1",
+            "dst": "Arg0",
+            "size": "Arg2"
+        }
     },
     "iconv":    {
         "return":  "size_t",
         "arguments":  "(iconv_t, char **restrict, size_t *restrict, char **restrict, size_t *restrict)",
         "type": "EFT_A3R_A1R_NS",
         "overwrite_app_function": 0,
-        "memcpy_like":  ["Arg3", "Arg1"]
+        "memcpy_like":  {
+            "src": "Arg3",
+            "dst": "Arg1"
+        }
     },
     "strtod":   {
         "return":  "double",
@@ -5201,7 +5260,11 @@
         "arguments":  "(char *, const char *, size_t)",
         "type": "EFT_L_A0__A1_A0",
         "overwrite_app_function": 0,
-        "memcpy_like":  ["Arg0", "Arg1", "Arg2"],
+        "memcpy_like":  {
+            "src": "Arg0",
+            "dst": "Arg1",
+            "size": "Arg2"
+        },
         "CopyStmt": {
 			"src": "Arg0",
 			"dst": "Ret"
@@ -5212,7 +5275,11 @@
         "arguments":  "(char *, const char *, size_t)",
         "type": "EFT_L_A0__A1_A0",
         "overwrite_app_function": 0,
-        "memcpy_like":  ["Arg0", "Arg1", "Arg2"],
+        "memcpy_like":  {
+            "src": "Arg0",
+            "dst": "Arg1",
+            "size": "Arg2"
+        },
         "CopyStmt": {
 			"src": "Arg0",
 			"dst": "Ret"
@@ -5223,7 +5290,10 @@
         "arguments":  "(char *restrict, const char *restrict)",
         "type": "EFT_L_A0__A1_A0",
         "overwrite_app_function": 0,
-        "memcpy_like":  ["Arg0", "Arg1"],
+        "memcpy_like":  {
+            "src": "Arg0",
+            "dst": "Arg1"
+        },
         "CopyStmt": {
 			"src": "Arg0",
 			"dst": "Ret"
@@ -5234,7 +5304,10 @@
         "arguments":  "(char *, char *)", 
         "type": "EFT_L_A0__A1_A0",
         "overwrite_app_function": 0,
-        "memcpy_like":  ["Arg0", "Arg1"],
+        "memcpy_like":  {
+            "src": "Arg0",
+            "dst": "Arg1"
+        },
         "CopyStmt": {
 			"src": "Arg0",
 			"dst": "Ret"
@@ -5245,7 +5318,10 @@
         "arguments":  "(char *, const char *)",
         "type": "EFT_L_A0__A1_A0",
         "overwrite_app_function": 0,
-        "memcpy_like":  ["Arg0", "Arg1"],
+        "memcpy_like":  {
+            "src": "Arg0",
+            "dst": "Arg1"
+        },
         "CopyStmt": {
 			"src": "Arg0",
 			"dst": "Ret"
@@ -5256,7 +5332,11 @@
         "arguments":  "(char *, const char *, size_t)",
         "type": "EFT_L_A0__A1_A0",
         "overwrite_app_function": 0,
-        "memcpy_like":  ["Arg0", "Arg1", "Arg2"],
+        "memcpy_like":  {
+            "src": "Arg0",
+            "dst": "Arg1",
+            "size": "Arg2"
+        },
         "CopyStmt": {
 			"src": "Arg0",
 			"dst": "Ret"
@@ -5267,7 +5347,11 @@
         "arguments":  "(char *, const char *, size_t)",
         "type": "EFT_L_A0__A1_A0",
         "overwrite_app_function": 0,
-        "memcpy_like":  ["Arg0", "Arg1", "Arg2"],
+        "memcpy_like":  {
+            "src": "Arg0",
+            "dst": "Arg1",
+            "size": "Arg2"
+        },
         "CopyStmt": {
 			"src": "Arg0",
 			"dst": "Ret"
@@ -5726,5 +5810,24 @@
             "src": "NullPtr",
             "dst": "Dummy"
         }
+    },
+    "swapExtCallStmt":{
+        "return":  "void",
+        "arguments":  "(char **, char **)",
+        "type": "EFT_NOOP",
+        "overwrite_app_function": 0,
+        "CallStmt": {
+            "callee_name": "swap",
+            "callee_return": "void",
+            "callee_arguments": "(char **, char **)",
+            "CopyStmt1": {
+                "src": "swapExtCallStmt_Arg0",
+                "dst": "swap_Arg0"
+            },
+            "CopyStmt2": {
+                "src": "swapExtCallStmt_Arg1",
+                "dst": "swap_Arg1"
+            }
+        }
     }
 }