angr 9.2.135__py3-none-win_amd64.whl → 9.2.136__py3-none-win_amd64.whl

angr/storage/memory_mixins/smart_find_mixin.py

@@ -134,7 +134,7 @@ class SmartFindMixin(MemoryMixin):
     def _find_are_bytes_symbolic(self, b):
         if not b.symbolic:
             return False
-        if b.uninitialized:
+        if b.has_annotation_type(claripy.annotation.UninitializedAnnotation):
             return True
         return len(self.state.solver.eval_upto(b, 2)) > 1
 

angr/storage/memory_mixins/underconstrained_mixin.py

@@ -52,7 +52,7 @@ class UnderconstrainedMixin(MemoryMixin):
         if (
             o.UNDER_CONSTRAINED_SYMEXEC in self.state.options
             and isinstance(addr, claripy.ast.Base)
-            and addr.uninitialized
+            and addr.has_annotation_type(claripy.annotation.UninitializedAnnotation)
             and self.state.uc_manager.get_alloc_depth(addr) is not None
         ) and (
             not self.state.uc_manager.is_bounded(addr)

angr/storage/memory_mixins/unwrapper_mixin.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+from angr.state_plugins.sim_action_object import _raw_ast
 from angr.storage.memory_mixins.memory_mixin import MemoryMixin
 
 
@@ -23,6 +24,3 @@ class UnwrapperMixin(MemoryMixin):
 
     def copy_contents(self, dst, src, size, condition=None, **kwargs):
         return super().copy_contents(_raw_ast(dst), _raw_ast(src), _raw_ast(size), _raw_ast(condition), **kwargs)
-
-
-from angr.state_plugins.sim_action_object import _raw_ast

angr/utils/enums_conv.py

@@ -2,29 +2,45 @@
 from __future__ import annotations
 import logging
 
-l = logging.getLogger(name=__name__)
-
 from angr.protos.primitives_pb2 import Edge
 
+l = logging.getLogger(name=__name__)
 
 _CFG_JUMPKINDS = {
     None: Edge.UnknownJumpkind,
+    "Ijk_8jzf8": Edge._8jzf8,
     "Ijk_Boring": Edge.Boring,
     "Ijk_Call": Edge.Call,
-    "Ijk_Ret": Edge.Return,
+    "Ijk_ClientReq": Edge.ClientReq,
+    "Ijk_EmFail": Edge.EmFail,
+    "Ijk_EmWarn": Edge.EmWarn,
+    "Ijk_Exception": Edge.Exception,
     "Ijk_FakeRet": Edge.FakeReturn,
-    "Ijk_Syscall": Edge.Syscall,
-    "Ijk_Sys_syscall": Edge.Sys_syscall,
-    "Ijk_Sys_int128": Edge.Sys_int128,
+    "Ijk_FlushDCache": Edge.FlushDCache,
+    "Ijk_InvalICache": Edge.InvalICache,
+    "Ijk_MapFail": Edge.MapFail,
     "Ijk_NoDecode": Edge.NoDecode,
-    "Ijk_EmWarn": Edge.EmWarn,
+    "Ijk_NoRedir": Edge.NoRedir,
+    "Ijk_Privileged": Edge.Privileged,
+    "Ijk_Ret": Edge.Return,
+    "Ijk_SigBUS": Edge.SigBUS,
+    "Ijk_SigFPE": Edge.SigFPE,
     "Ijk_SigFPE_IntDiv": Edge.SigFPE_IntDiv,
-    "Ijk_SigTRAP": Edge.SigTRAP,
+    "Ijk_SigFPE_IntOvf": Edge.SigFPE_IntOvf,
+    "Ijk_SigILL": Edge.SigILL,
     "Ijk_SigSEGV": Edge.SigSEGV,
-    "Ijk_MapFail": Edge.MapFail,
-    "Ijk_NoRedir": Edge.NoRedir,
-    "Ijk_ClientReq": Edge.ClientReq,
-    "Ijk_Exception": Edge.Exception,
+    "Ijk_SigTRAP": Edge.SigTRAP,
+    "Ijk_Syscall": Edge.Syscall,
+    "Ijk_Sys_int": Edge.Sys_int,
+    "Ijk_Sys_int128": Edge.Sys_int128,
+    "Ijk_Sys_int129": Edge.Sys_int129,
+    "Ijk_Sys_int130": Edge.Sys_int130,
+    "Ijk_Sys_int145": Edge.Sys_int145,
+    "Ijk_Sys_int210": Edge.Sys_int210,
+    "Ijk_Sys_int32": Edge.Sys_int32,
+    "Ijk_Sys_syscall": Edge.Sys_syscall,
+    "Ijk_Sys_sysenter": Edge.Sys_sysenter,
+    "Ijk_Yield": Edge.Yield,
 }
 
 

angr/utils/segment_list.py

@@ -1,5 +1,6 @@
 # pylint:disable=no-else-break
 from __future__ import annotations
+from bisect import bisect_left
 import logging
 
 from angr.errors import AngrCFGError, AngrRuntimeError
@@ -221,7 +222,19 @@ class SegmentList:
                     new_size = sum(seg.size for seg in new_segments)
                     bytes_changed = new_size - old_size
 
-                    self._list = self._list[:previous_segment_pos] + new_segments + self._list[segment_pos + 1 :]
+                    if len(new_segments) == 2:
+                        self._list[previous_segment_pos] = new_segments[0]
+                        self._list[segment_pos] = new_segments[1]
+                    elif len(new_segments) == 1:
+                        self._list.pop(segment_pos)
+                        self._list[previous_segment_pos] = new_segments[0]
+                    elif len(new_segments) == 3:
+                        self._list[previous_segment_pos] = new_segments[0]
+                        self._list[segment_pos] = new_segments[1]
+                        self._list.insert(segment_pos + 1, new_segments[2])
+                    else:
+                        # this does not happen for now, but may happen when the above logic changes
+                        self._list = self._list[:previous_segment_pos] + new_segments + self._list[segment_pos + 1 :]
 
                     merged = True
 
@@ -245,6 +258,9 @@ class SegmentList:
                     #      |---address + size---|
                     # shrink segment
                     segment.end = address
+                    if segment.size == 0:
+                        # remove the segment
+                        self._list.pop(idx)
                     # adjust address
                     new_address = segment.start + segment.size
                     # adjust size
@@ -259,7 +275,7 @@ class SegmentList:
                     seg0 = Segment(segment.start, address, segment.sort)
                     seg1 = Segment(address + size, segment.start + segment.size, segment.sort)
                     # remove the current segment
-                    self._list.remove(segment)
+                    self._list.pop(idx)
                     if seg1.size > 0:
                         self._list.insert(idx, seg1)
                     if seg0.size > 0:
@@ -282,12 +298,12 @@ class SegmentList:
                     segment.start = address + size
                     if segment.size == 0:
                         # remove the segment
-                        self._list.remove(segment)
+                        self._list.pop(idx)
                     break
                 if address + size > segment.start + segment.size:
                     #            |---- segment ----|
                     # |--------- address + size ----------|
-                    self._list.remove(segment)
+                    self._list.pop(idx)  # remove the segment
                     new_address = segment.end
                     size = address + size - new_address
                     address = new_address
@@ -339,23 +355,10 @@ class SegmentList:
         :return: The offset of the segment.
         """
 
-        start = 0
-        end = len(self._list)
-
-        while start != end:
-            mid = (start + end) // 2
-
-            segment = self._list[mid]
-            if addr < segment.start:
-                end = mid
-            elif addr >= segment.end:
-                start = mid + 1
-            else:
-                # Overlapped :(
-                start = mid
-                break
-
-        return start
+        off = bisect_left(self._list, addr, key=lambda x: x.start)
+        if 0 < off <= len(self._list) and self._list[off - 1].end > addr:
+            off -= 1
+        return off
 
     def next_free_pos(self, address):
         """
@@ -487,7 +490,7 @@ class SegmentList:
             # Cannot occupy a non-existent block
             return
 
-        # l.debug("Occpuying 0x%08x-0x%08x", address, address + size)
+        # l.debug("Occupying 0x%08x-0x%08x", address, address + size)
         if not self._list:
             self._list.append(Segment(address, address + size, sort))
             self._bytes_occupied += size

angr/utils/timing.py

@@ -7,13 +7,30 @@ from collections import defaultdict
 
 TIMING = os.environ.get("TIMING", "").lower() not in {"", "no", "0", "false"}
 PRINT = os.environ.get("PRINT", "").lower() not in {"", "no", "0", "false"}
-TIME_DISTRIBUTION = False
+TIME_DISTRIBUTION = os.environ.get("TIMING_DIST", "").lower() not in {"", "no", "0", "false"}
 
 total_time = defaultdict(float)
 time_distribution = defaultdict(list)
 depth = 0
 
 
+def print_timing_total():
+    sorted_keys = sorted(time_distribution.keys(), key=lambda x: sum(time_distribution[x]), reverse=True)
+    for func in sorted_keys:
+        millisec = sum(time_distribution[func])
+        sec = millisec / 1000
+        if sec > 1.0:
+            print(f"[timing] {func.__name__}: {sec} seconds.")
+        else:
+            print(f"[timing] {func.__name__}: {millisec} milliseconds.")
+
+        # list top-ten slowest calls
+        sorted_calls = sorted(time_distribution[func], reverse=True)
+        print("[timing]   Slowest top 10:")
+        for idx, call in enumerate(sorted_calls[:10]):
+            print(f"[timing]     {idx + 1}: {call} ms")
+
+
 def _t():
     return time.perf_counter_ns() / 1000000
 

angr/vaults.py

@@ -13,6 +13,11 @@ import io
 
 import claripy
 
+from .errors import AngrVaultError
+from .project import Project
+from .sim_state import SimState
+from .sim_type import SimType
+
 l = logging.getLogger("angr.vault")
 
 
@@ -360,9 +365,3 @@ class VaultDirShelf(VaultDict):
             else:
                 s.add(n[: n.rfind(".")])  # remove the suffix
         return s
-
-
-from .errors import AngrVaultError
-from .project import Project
-from .sim_type import SimType
-from .sim_state import SimState

{angr-9.2.135.dist-info → angr-9.2.136.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: angr
-Version: 9.2.135
+Version: 9.2.136
 Summary: A multi-architecture binary analysis toolkit, with the ability to perform dynamic symbolic execution and various static analyses on binaries
 Home-page: https://github.com/angr/angr
 License: BSD-2-Clause
@@ -16,13 +16,13 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: CppHeaderParser
 Requires-Dist: GitPython
-Requires-Dist: ailment==9.2.135
-Requires-Dist: archinfo==9.2.135
+Requires-Dist: ailment==9.2.136
+Requires-Dist: archinfo==9.2.136
 Requires-Dist: cachetools
 Requires-Dist: capstone==5.0.3
 Requires-Dist: cffi>=1.14.0
-Requires-Dist: claripy==9.2.135
-Requires-Dist: cle==9.2.135
+Requires-Dist: claripy==9.2.136
+Requires-Dist: cle==9.2.136
 Requires-Dist: itanium-demangler
 Requires-Dist: mulpyplexer
 Requires-Dist: nampa
@@ -31,7 +31,7 @@ Requires-Dist: protobuf>=5.28.2
 Requires-Dist: psutil
 Requires-Dist: pycparser>=2.18
 Requires-Dist: pyformlang
-Requires-Dist: pyvex==9.2.135
+Requires-Dist: pyvex==9.2.136
 Requires-Dist: rich>=13.1.0
 Requires-Dist: sortedcontainers
 Requires-Dist: sympy