angr 9.2.158__cp310-abi3-macosx_11_0_arm64.whl → 9.2.160__cp310-abi3-macosx_11_0_arm64.whl

angr/analyses/variable_recovery/engine_ail.py

@@ -3,8 +3,8 @@ from __future__ import annotations
 from typing import TYPE_CHECKING, cast
 import logging
 
-import ailment
-from ailment.constant import UNDETERMINED_SIZE
+import angr.ailment as ailment
+from angr.ailment.constant import UNDETERMINED_SIZE
 import claripy
 from unique_log_filter import UniqueLogFilter
 
@@ -633,10 +633,7 @@ class SimEngineVRAIL(
         if not r1.data.concrete:
             # we don't support symbolic shiftamount
             r = self.state.top(result_size)
-            return RichR(
-                r,
-                typevar=r0.typevar,
-            )
+            return RichR(r)
 
         shiftamount = r1.data.concrete_value
         return RichR(r0.data << shiftamount, typevar=typeconsts.int_type(result_size), type_constraints=None)
@@ -651,10 +648,7 @@ class SimEngineVRAIL(
         if not r1.data.concrete:
             # we don't support symbolic shiftamount
             r = self.state.top(result_size)
-            return RichR(
-                r,
-                typevar=r0.typevar,
-            )
+            return RichR(r)
 
         shiftamount = r1.data.concrete_value
 
@@ -672,10 +666,7 @@ class SimEngineVRAIL(
         if not r1.data.concrete:
             # we don't support symbolic shiftamount
             r = self.state.top(result_size)
-            return RichR(
-                r,
-                typevar=r0.typevar,
-            )
+            return RichR(r)
 
         shiftamount = r1.data.concrete_value
 
@@ -691,10 +682,7 @@ class SimEngineVRAIL(
         if not r1.data.concrete:
             # we don't support symbolic shiftamount
             r = self.state.top(result_size)
-            return RichR(
-                r,
-                typevar=r0.typevar,
-            )
+            return RichR(r)
 
         shiftamount = r1.data.concrete_value
 
@@ -761,22 +749,22 @@ class SimEngineVRAIL(
     def _handle_binop_Rol(self, expr):
         arg0, arg1 = expr.operands
 
-        r0 = self._expr_bv(arg0)
+        _ = self._expr_bv(arg0)
         _ = self._expr_bv(arg1)
         result_size = arg0.bits
 
         r = self.state.top(result_size)
-        return RichR(r, typevar=r0.typevar)
+        return RichR(r)
 
     def _handle_binop_Ror(self, expr):
         arg0, arg1 = expr.operands
 
-        r0 = self._expr_bv(arg0)
+        _ = self._expr_bv(arg0)
         _ = self._expr_bv(arg1)
         result_size = arg0.bits
 
         r = self.state.top(result_size)
-        return RichR(r, typevar=r0.typevar)
+        return RichR(r)
 
     def _handle_binop_Concat(self, expr):
         arg0, arg1 = expr.operands

angr/analyses/variable_recovery/engine_base.py

@@ -3,7 +3,7 @@ from typing import Any, Generic, TypeVar, cast
 import contextlib
 import logging
 
-import ailment
+import angr.ailment as ailment
 import claripy
 
 from angr.analyses.variable_recovery.variable_recovery_base import VariableRecoveryStateBase

angr/analyses/variable_recovery/variable_recovery_base.py

@@ -9,7 +9,7 @@ import archinfo
 import claripy
 from claripy.annotation import Annotation
 from archinfo import Arch
-from ailment.expression import BinaryOp, StackBaseOffset
+from angr.ailment.expression import BinaryOp, StackBaseOffset
 
 from angr.knowledge_plugins.functions.function import Function
 from angr.project import Project

angr/analyses/variable_recovery/variable_recovery_fast.py

@@ -8,8 +8,8 @@ import networkx
 
 import claripy
 import pyvex
-import ailment
-from ailment.expression import VirtualVariable
+import angr.ailment as ailment
+from angr.ailment.expression import VirtualVariable
 
 import angr.errors
 from angr import SIM_TYPE_COLLECTIONS

angr/engines/light/data.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-import ailment
+import angr.ailment as ailment
 
 from angr.utils.constants import is_alignment_mask
 

angr/engines/light/engine.py

@@ -6,7 +6,7 @@ from abc import abstractmethod
 import re
 import logging
 
-import ailment
+import angr.ailment as ailment
 import pyvex
 import claripy
 from pyvex.expr import IRExpr

angr/knowledge_plugins/key_definitions/atoms.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 from enum import Enum, auto
 
 import claripy
-import ailment
+import angr.ailment as ailment
 from archinfo import Arch, Endness, RegisterOffset
 
 from angr.calling_conventions import SimFunctionArgument, SimRegArg, SimStackArg

angr/knowledge_plugins/propagations/prop_value.py

@@ -3,7 +3,7 @@ from typing import Any, TYPE_CHECKING
 from collections.abc import Iterable, Generator
 
 import claripy
-import ailment
+import angr.ailment as ailment
 
 if TYPE_CHECKING:
     from angr.code_location import CodeLocation

angr/knowledge_plugins/propagations/propagation_model.py

@@ -3,7 +3,7 @@ from typing import Any
 from collections import defaultdict
 
 import claripy
-import ailment
+import angr.ailment as ailment
 from angr.serializable import Serializable
 from angr.knowledge_plugins.functions.function import Function
 from .states import PropagatorVEXState, PropagatorState

angr/knowledge_plugins/propagations/states.py

@@ -7,7 +7,7 @@ import weakref
 
 from typing_extensions import Self
 
-import ailment
+import angr.ailment as ailment
 import claripy
 import archinfo
 

angr/knowledge_plugins/variables/variable_manager.py

@@ -6,7 +6,7 @@ from itertools import count, chain
 
 import networkx
 
-import ailment
+import angr.ailment as ailment
 from cle.backends.elf.compilation_unit import CompilationUnit
 from cle.backends.elf.variable import Variable
 

angr/state_plugins/unicorn_engine.py

@@ -394,14 +394,14 @@ class _VexArchInfo(ctypes.Structure):
 
 def _load_native():
     if sys.platform == "darwin":
-        libfile = "angr_native.dylib"
+        libfile = "unicornlib.dylib"
     elif sys.platform in {"win32", "cygwin"}:
-        libfile = "angr_native.dll"
+        libfile = "unicornlib.dll"
     else:
-        libfile = "angr_native.so"
+        libfile = "unicornlib.so"
 
     try:
-        angr_path = str(importlib.resources.files("angr") / "lib" / libfile)
+        angr_path = str(importlib.resources.files("angr") / libfile)
         h = ctypes.CDLL(angr_path)
 
         VexArch = ctypes.c_int

angr/utils/ail.py

@@ -1,9 +1,9 @@
 from __future__ import annotations
 
-from ailment import AILBlockWalkerBase
-from ailment.block import Block
-from ailment.expression import Expression, VirtualVariable, Phi
-from ailment.statement import Assignment, Statement, ConditionalJump
+from angr.ailment import AILBlockWalkerBase
+from angr.ailment.block import Block
+from angr.ailment.expression import Expression, VirtualVariable, Phi
+from angr.ailment.statement import Assignment, Statement, ConditionalJump
 
 
 def is_phi_assignment(stmt: Statement) -> bool:

angr/utils/endness.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from ailment.expression import Const
+from angr.ailment.expression import Const
 
 
 def ail_const_to_be(expr: Const, endness: str) -> Const:

angr/utils/ssa/__init__.py

@@ -6,10 +6,20 @@ from typing import Any, Literal, overload
 import networkx
 
 import archinfo
-from ailment import Expression, Block
-from ailment.expression import VirtualVariable, Const, Phi, Tmp, Load, Register, StackBaseOffset, DirtyExpression, ITE
-from ailment.statement import Statement, Assignment, Call, Store, CAS
-from ailment.block_walker import AILBlockWalkerBase
+from angr.ailment import Expression, Block
+from angr.ailment.expression import (
+    VirtualVariable,
+    Const,
+    Phi,
+    Tmp,
+    Load,
+    Register,
+    StackBaseOffset,
+    DirtyExpression,
+    ITE,
+)
+from angr.ailment.statement import Statement, Assignment, Call, Store, CAS
+from angr.ailment.block_walker import AILBlockWalkerBase
 
 from angr.knowledge_plugins.key_definitions import atoms
 from angr.code_location import CodeLocation

angr/utils/ssa/tmp_uses_collector.py

@@ -1,10 +1,10 @@
 from __future__ import annotations
 from collections import defaultdict
 
-from ailment import AILBlockWalkerBase
-from ailment.expression import Tmp
-from ailment.statement import Statement, Assignment
-from ailment.block import Block
+from angr.ailment import AILBlockWalkerBase
+from angr.ailment.expression import Tmp
+from angr.ailment.statement import Statement, Assignment
+from angr.ailment.block import Block
 
 
 class TmpUsesCollector(AILBlockWalkerBase):

angr/utils/ssa/vvar_uses_collector.py

@@ -1,10 +1,10 @@
 from __future__ import annotations
 from collections import defaultdict
 
-from ailment import AILBlockWalkerBase
-from ailment.expression import VirtualVariable, Phi
-from ailment.statement import Statement, Assignment
-from ailment.block import Block
+from angr.ailment import AILBlockWalkerBase
+from angr.ailment.expression import VirtualVariable, Phi
+from angr.ailment.statement import Statement, Assignment
+from angr.ailment.block import Block
 
 from angr.code_location import CodeLocation
 

{angr-9.2.158.dist-info → angr-9.2.160.dist-info}/METADATA

@@ -1,11 +1,10 @@
 Metadata-Version: 2.4
 Name: angr
-Version: 9.2.158
+Version: 9.2.160
 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/
 Project-URL: Repository, https://github.com/angr/angr
-Classifier: License :: OSI Approved :: BSD License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3.10
@@ -17,13 +16,12 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: cxxheaderparser
 Requires-Dist: GitPython
-Requires-Dist: ailment==9.2.158
-Requires-Dist: archinfo==9.2.158
+Requires-Dist: archinfo==9.2.160
 Requires-Dist: cachetools
 Requires-Dist: capstone==5.0.3
 Requires-Dist: cffi>=1.14.0
-Requires-Dist: claripy==9.2.158
-Requires-Dist: cle==9.2.158
+Requires-Dist: claripy==9.2.160
+Requires-Dist: cle==9.2.160
 Requires-Dist: mulpyplexer
 Requires-Dist: networkx!=2.8.1,>=2.0
 Requires-Dist: protobuf>=5.28.2
@@ -32,10 +30,11 @@ Requires-Dist: pycparser>=2.18
 Requires-Dist: pydemumble
 Requires-Dist: pyformlang
 Requires-Dist: pypcode<4.0,>=3.2.1
-Requires-Dist: pyvex==9.2.158
+Requires-Dist: pyvex==9.2.160
 Requires-Dist: rich>=13.1.0
 Requires-Dist: sortedcontainers
 Requires-Dist: sympy
+Requires-Dist: typing-extensions
 Requires-Dist: unique-log-filter
 Requires-Dist: colorama; platform_system == "Windows"
 Provides-Extra: angrdb