svf-lib 1.0.2004 → 1.0.2006

package/SVF-linux/Release-build/include/AE/Core/AbstractState.h

@@ -393,7 +393,7 @@ public:
             auto it = rhs.find(item.first);
             if (it == rhs.end()) return false;
             // judge from expr id
-            if (item.second.getInterval().geq(it->second.getInterval())) return false;
+            if (item.second.getInterval().contain(it->second.getInterval())) return false;
         }
         return true;
     }
@@ -409,7 +409,8 @@ public:
             // judge from expr id
             if (it->second.isInterval() && item.second.isInterval())
             {
-                if (!it->second.getInterval().geq(item.second.getInterval()))
+                if (!it->second.getInterval().contain(
+                            item.second.getInterval()))
                     return false;
             }
 

package/SVF-linux/Release-build/include/AE/Core/IntervalValue.h

@@ -298,8 +298,11 @@ public:
         this->_ub = plus_infinity();
     }
 
-    /// Check current IntervalValue is smaller than or equal to the other
-    bool leq(const IntervalValue &other) const
+    /// Determines if the current IntervalValue is fully contained within another IntervalValue.
+    /// Example: this: [2, 3], other: [1, 4] -> returns true
+    /// Note: If the current interval is 'bottom', it is considered contained within any interval.
+    ///       If the other interval is 'bottom', it cannot contain any interval.
+    bool containedWithin(const IntervalValue &other) const
     {
         if (this->isBottom())
         {
@@ -316,8 +319,11 @@ public:
 
     }
 
-    /// Check current IntervalValue is greater than or equal to the other
-    bool geq(const IntervalValue &other) const
+    /// Determines if the current IntervalValue fully contains another IntervalValue.
+    /// Example: this: [1, 4], other: [2, 3] -> returns true
+    /// Note: If the current interval is 'bottom', it is considered to contain any interval.
+    ///       If the other interval is 'bottom', it cannot be contained by any interval.
+    bool contain(const IntervalValue &other) const
     {
         if (this->isBottom())
         {
@@ -333,6 +339,42 @@ public:
         }
     }
 
+    /// Check the upper bound of this Interval is less than or equal to the lower bound
+    /// e.g. [1, 3] < [3, 5] return true, lhs.ub <= rhs.lb
+    bool leq(const IntervalValue &other) const
+    {
+        if (this->isBottom())
+        {
+            return true;
+        }
+        else if (other.isBottom())
+        {
+            return false;
+        }
+        else
+        {
+            return this->_ub.leq(other._lb);
+        }
+    }
+
+    /// Check the lower bound of this Interval is greater than or equal to the upper bound
+    /// e.g. [3, 5] > [1, 3] return true, lhs.lb >= rhs.ub
+    bool geq(const IntervalValue &other) const
+    {
+        if (this->isBottom())
+        {
+            return true;
+        }
+        else if (other.isBottom())
+        {
+            return false;
+        }
+        else
+        {
+            return this->_lb.geq(other._ub);
+        }
+    }
+
 
     /// Equality comparison
     bool equals(const IntervalValue &other) const

package/SVF-osx/Release-build/include/AE/Core/AbstractState.h

@@ -224,7 +224,7 @@ public:
     }
 
     /// whether the memory address stores memory addresses
-    inline bool inLocToAddrsTable(u32_t id) const
+    inline bool inAddrToAddrsTable(u32_t id) const
     {
         if (_addrToAbsVal.find(id)!= _addrToAbsVal.end())
         {
@@ -237,7 +237,7 @@ public:
     }
 
     /// whether the memory address stores abstract value
-    inline virtual bool inLocToValTable(u32_t id) const
+    inline virtual bool inAddrToValTable(u32_t id) const
     {
         if (_addrToAbsVal.find(id) != _addrToAbsVal.end())
         {

package/SVF-osx/Release-build/include/AE/Core/AbstractValue.h

@@ -39,7 +39,7 @@ public:
     };
     DataType type;
     IntervalValue interval;
-    AddressValue addr;
+    AddressValue addrs;
 
     AbstractValue() : type(IntervalType)
     {
@@ -53,7 +53,7 @@ public:
             interval = IntervalValue::top();
             break;
         case AddressType:
-            addr = AddressValue();
+            addrs = AddressValue();
             break;
         case UnknownType:
             break;
@@ -68,7 +68,7 @@ public:
             interval = other.interval;
             break;
         case AddressType:
-            addr = other.addr;
+            addrs = other.addrs;
             break;
         case UnknownType:
             break;
@@ -101,7 +101,7 @@ public:
             interval = other.interval;
             break;
         case AddressType:
-            addr = other.addr;
+            addrs = other.addrs;
             break;
         case UnknownType:
             break;
@@ -118,7 +118,7 @@ public:
             interval = other.interval;
             break;
         case AddressType:
-            addr = other.addr;
+            addrs = other.addrs;
             break;
         case UnknownType:
             break;
@@ -136,38 +136,13 @@ public:
     AbstractValue& operator=(const AddressValue& other)
     {
         type = AddressType;
-        addr = other;
+        addrs = other;
         return *this;
     }
 
-    AbstractValue operator==(const AbstractValue& other) const
-    {
-        assert(isInterval() && other.isInterval());
-        return interval == other.interval;
-    }
-
-    AbstractValue operator==(const IntervalValue& other) const
-    {
-        assert(isInterval());
-        return interval == other;
-    }
-
-    AbstractValue operator!=(const AbstractValue& other) const
-    {
-        assert(isInterval());
-        return interval != other.interval;
-    }
-
-    AbstractValue operator!=(const IntervalValue& other) const
-    {
-        assert(isInterval());
-        return interval != other;
-    }
-
-
     AbstractValue(const IntervalValue& ival) : type(IntervalType), interval(ival) {}
 
-    AbstractValue(const AddressValue& addr) : type(AddressType), addr(addr) {}
+    AbstractValue(const AddressValue& addr) : type(AddressType), addrs(addr) {}
 
     IntervalValue& getInterval()
     {
@@ -175,26 +150,22 @@ public:
         {
             interval = IntervalValue::top();
         }
-        assert(isInterval() && "Attempting to retrieve an AbstractValue that is not an Interval!");
         return interval;
     }
 
     const IntervalValue getInterval() const
     {
-        assert(isInterval() && "Attempting to retrieve an AbstractValue that is not an Interval!");
         return interval;
     }
 
     AddressValue& getAddrs()
     {
-        assert(isAddr() && "Attempting to retrieve an AbstractValue that is not an Address!");
-        return addr;
+        return addrs;
     }
 
     const AddressValue getAddrs() const
     {
-        assert(isAddr() && "Attempting to retrieve an AbstractValue that is not an Address!");
-        return addr;
+        return addrs;
     }
 
     ~AbstractValue() {};
@@ -211,7 +182,7 @@ public:
         }
         if (isAddr())
         {
-            return addr.equals(rhs.addr);
+            return addrs.equals(rhs.addrs);
         }
         return false;
     }
@@ -233,7 +204,7 @@ public:
         }
         if (isAddr() && other.isAddr())
         {
-            addr.join_with(other.addr);
+            addrs.join_with(other.addrs);
         }
         return;
     }
@@ -250,7 +221,7 @@ public:
         }
         if (isAddr() && other.isAddr())
         {
-            addr.meet_with(other.addr);
+            addrs.meet_with(other.addrs);
         }
         return;
     }
@@ -281,7 +252,7 @@ public:
         }
         else if (isAddr())
         {
-            return addr.toString();
+            return addrs.toString();
         }
         return "";
     }

package/SVF-osx/Release-build/include/AE/Core/AddressValue.h

@@ -211,13 +211,15 @@ public:
     /// The physical address starts with 0x7f...... + idx
     static inline u32_t getVirtualMemAddress(u32_t idx)
     {
+        // 0 is the null address, should not be used as a virtual address
+        assert(idx != 0 && "idx can’t be 0 because it represents a nullptr");
         return AddressMask + idx;
     }
 
     /// Check bit value of val start with 0x7F000000, filter by 0xFF000000
     static inline bool isVirtualMemAddress(u32_t val)
     {
-        return (val & 0xff000000) == AddressMask;
+        return (val & 0xff000000) == AddressMask && val != AddressMask + 0;
     }
 
     /// Return the internal index if idx is an address otherwise return the value of idx

package/SVF-osx/Release-build/include/AE/Core/RelExeState.h

@@ -175,6 +175,8 @@ public:
     /// Check bit value of val start with 0x7F000000, filter by 0xFF000000
     static inline bool isVirtualMemAddress(u32_t val)
     {
+        if (val == 0)
+            assert(false && "val cannot be 0");
         return AddressValue::isVirtualMemAddress(val);
     }
 

package/SVF-osx/Release-build/include/AE/Svfexe/SVFIR2AbsState.h

@@ -109,6 +109,15 @@ public:
             return globalNulladdrs;
     }
 
+    inline bool inVarTable(const AbstractState& es, u32_t id) const
+    {
+        return es.inVarToValTable(id) || es.inVarToAddrsTable(id);
+    }
+
+    inline bool inAddrTable(const AbstractState& es, u32_t id) const
+    {
+        return es.inAddrToValTable(id) || es.inAddrToAddrsTable(id);
+    }
 
     /// whether the variable is in varToVal table
     inline bool inVarToValTable(const AbstractState& es, u32_t id) const
@@ -126,13 +135,13 @@ public:
     /// whether the memory address stores a interval value
     inline bool inLocToValTable(const AbstractState& es, u32_t id) const
     {
-        return es.inLocToValTable(id);
+        return es.inAddrToValTable(id);
     }
 
     /// whether the memory address stores memory addresses
     inline bool inLocToAddrsTable(const AbstractState& es, u32_t id) const
     {
-        return es.inLocToAddrsTable(id);
+        return es.inAddrToAddrsTable(id);
     }
 
     void handleAddr(AbstractState& es, const AddrStmt *addr);

package/package.json

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