angr 9.2.163__cp310-abi3-macosx_11_0_arm64.whl → 9.2.165__cp310-abi3-macosx_11_0_arm64.whl

angr/knowledge_plugins/propagations/propagation_model.py

@@ -19,6 +19,7 @@ class PropagationModel(Serializable):
         "_initial_state",
         "block_initial_reg_values",
         "equivalence",
+        "function_block_count",
         "graph_visitor",
         "input_states",
         "key",
@@ -37,6 +38,7 @@ class PropagationModel(Serializable):
         equivalence: set | None = None,
         function: Function | None = None,
         input_states: dict | None = None,
+        function_block_count: int | None = None,
     ):
         self.key = prop_key
         self.node_iterations = node_iterations if node_iterations is not None else defaultdict(int)
@@ -49,6 +51,11 @@ class PropagationModel(Serializable):
         self.graph_visitor = None
         self._initial_state = None
         self._function = function
+        self.function_block_count = (
+            function_block_count
+            if function_block_count is not None
+            else len(function.block_addrs_set) if function is not None else None
+        )
 
     def downsize(self):
         self.node_iterations = None

angr/sim_type.py

@@ -1789,6 +1789,7 @@ class SimCppClass(SimStruct):
         vtable_ptrs=None,
         pack: bool = False,
         align=None,
+        size: int | None = None,
     ):
         super().__init__(members or {}, name=name, pack=pack, align=align)
         self.unique_name = unique_name
@@ -1797,6 +1798,10 @@ class SimCppClass(SimStruct):
         # this should also be added to the fields once we know the offsets of the members of this object
         self.vtable_ptrs = [] if vtable_ptrs is None else vtable_ptrs
 
+        # we can force the size (in bits) of a class because sometimes the class can be opaque and we don't know its
+        # layout
+        self._size = size
+
     @property
     def members(self):
         return self.fields
@@ -1805,6 +1810,12 @@ class SimCppClass(SimStruct):
     def members(self, value):
         self.fields = value
 
+    @property
+    def size(self):
+        if self._size is not None:
+            return self._size
+        return super().size
+
     def __repr__(self):
         return f"class {self.name}" if not self.name.startswith("class") else self.name
 
@@ -1848,6 +1859,7 @@ class SimCppClass(SimStruct):
             vtable_ptrs=self.vtable_ptrs,
             pack=self._pack,
             align=self._align,
+            size=self._size,
         )
         out._arch = arch
         self._arch_memo[arch.name] = out
@@ -1877,6 +1889,7 @@ class SimCppClass(SimStruct):
             align=self._align,
             function_members=self.function_members,
             vtable_ptrs=self.vtable_ptrs,
+            size=self._size,
         )
 
 
@@ -2029,6 +2042,8 @@ BASIC_TYPES: dict[str, SimType] = {
     "long long int": SimTypeLongLong(True),
     "signed long long int": SimTypeLongLong(True),
     "unsigned long long int": SimTypeLongLong(False),
+    "__int32": SimTypeInt(True),
+    "__int64": SimTypeLongLong(True),
     "__int128": SimTypeNum(128, True),
     "unsigned __int128": SimTypeNum(128, False),
     "__int256": SimTypeNum(256, True),
@@ -3563,7 +3578,7 @@ def _cpp_decl_to_type(
             t = ALL_TYPES[lbl]
         elif opaque_classes is True:
             # create a class without knowing the internal members
-            t = SimCppClass(unique_name=lbl, name=lbl, members={})
+            t = SimCppClass(unique_name=lbl, name=lbl, members={}, size=32)
         else:
             raise TypeError(f'Unknown type "{lbl}"')
 

angr/state_plugins/history.py

@@ -59,6 +59,9 @@ class SimStateHistory(SimStatePlugin):
         self.recent_syscall_count = 0 if clone is None else clone.recent_syscall_count
         self.recent_instruction_count = -1 if clone is None else clone.recent_instruction_count
 
+        # afl-style hitmap
+        self.edge_hitmap: bytes | None = None if clone is None else clone.edge_hitmap
+
         # satness stuff
         self._all_constraints = ()
         self._satisfiable = None
@@ -402,6 +405,19 @@ class SimStateHistory(SimStatePlugin):
     def stack_actions(self):
         return LambdaIterIter(self, operator.attrgetter("recent_stack_actions"))
 
+    @property
+    def last_edge_hitmap(self) -> bytes | None:
+        """
+        Returns the last edge hitmap in the history chain, or None if there is no edge hitmap.
+        """
+        history = self
+        while history is not None:
+            if history.edge_hitmap is not None:
+                return history.edge_hitmap
+            # Traverse to the previous state in the history chain
+            history = history.parent
+        return None
+
     #
     # Merging support
     #

angr/utils/constants.py

@@ -6,4 +6,4 @@ MAX_POINTSTO_BITS = -1330 * 8
 
 
 def is_alignment_mask(n):
-    return n in {0xFFFFFFFFFFFFFFE0, 0xFFFFFFFFFFFFFFF0, 0xFFFFFFF0, 0xFFFFFFFC, 0xFFFFFFF8}
+    return n in {0xFFFFFFFFFFFFFFE0, 0xFFFFFFFFFFFFFFF0, 0xFFFFFFE0, 0xFFFFFFF0, 0xFFFFFFFC, 0xFFFFFFF8}

angr/utils/graph.py

@@ -76,7 +76,7 @@ def to_acyclic_graph(
     for src, dst in graph.edges():
         src_order = node_order[src]
         dst_order = node_order[dst]
-        if src_order > dst_order:
+        if src_order >= dst_order:
             # this is a back edge, we need to remove it
             edges_to_remove.append((src, dst))
 

angr/utils/vex.py

@@ -0,0 +1,11 @@
+from __future__ import annotations
+
+from pyvex import IRSB
+from pyvex.stmt import WrTmp
+
+
+def get_tmp_def_stmt(vex_block: IRSB, tmp_idx: int) -> int | None:
+    for i, stmt in enumerate(vex_block.statements):
+        if isinstance(stmt, WrTmp) and stmt.tmp == tmp_idx:
+            return i
+    return None

{angr-9.2.163.dist-info → angr-9.2.165.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: angr
-Version: 9.2.163
+Version: 9.2.165
 Summary: A multi-architecture binary analysis toolkit, with the ability to perform dynamic symbolic execution and various static analyses on binaries
 License: BSD-2-Clause
 Project-URL: Homepage, https://angr.io/
@@ -16,12 +16,12 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: cxxheaderparser
 Requires-Dist: GitPython
-Requires-Dist: archinfo==9.2.163
+Requires-Dist: archinfo==9.2.165
 Requires-Dist: cachetools
 Requires-Dist: capstone==5.0.3
 Requires-Dist: cffi>=1.14.0
-Requires-Dist: claripy==9.2.163
-Requires-Dist: cle==9.2.163
+Requires-Dist: claripy==9.2.165
+Requires-Dist: cle==9.2.165
 Requires-Dist: mulpyplexer
 Requires-Dist: networkx!=2.8.1,>=2.0
 Requires-Dist: protobuf>=5.28.2
@@ -30,7 +30,7 @@ Requires-Dist: pycparser>=2.18
 Requires-Dist: pydemumble
 Requires-Dist: pyformlang
 Requires-Dist: pypcode<4.0,>=3.2.1
-Requires-Dist: pyvex==9.2.163
+Requires-Dist: pyvex==9.2.165
 Requires-Dist: rich>=13.1.0
 Requires-Dist: sortedcontainers
 Requires-Dist: sympy