angr 9.2.158__cp310-abi3-win_amd64.whl → 9.2.159__cp310-abi3-win_amd64.whl

angr/analyses/decompiler/structuring/dream.py

@@ -7,7 +7,7 @@ from collections import defaultdict, OrderedDict
 import networkx
 
 import claripy
-import ailment
+import angr.ailment as ailment
 
 from angr.utils.graph import GraphUtils
 from angr.knowledge_plugins.cfg import IndirectJumpType

angr/analyses/decompiler/structuring/phoenix.py

@@ -9,9 +9,9 @@ import logging
 import networkx
 
 import claripy
-from ailment.block import Block
-from ailment.statement import Statement, ConditionalJump, Jump, Label, Return
-from ailment.expression import Const, UnaryOp, MultiStatementExpression
+from angr.ailment.block import Block
+from angr.ailment.statement import Statement, ConditionalJump, Jump, Label, Return
+from angr.ailment.expression import Const, UnaryOp, MultiStatementExpression
 
 from angr.utils.graph import GraphUtils
 from angr.utils.ail import is_phi_assignment, is_head_controlled_loop_block

angr/analyses/decompiler/structuring/structurer_base.py

@@ -6,7 +6,7 @@ import logging
 
 import networkx
 
-import ailment
+import angr.ailment as ailment
 import claripy
 
 from angr.analyses import Analysis

angr/analyses/decompiler/structuring/structurer_nodes.py

@@ -4,8 +4,7 @@ from typing import Any
 from collections import OrderedDict
 
 import claripy
-import ailment
-import ailment.utils
+import angr.ailment as ailment
 
 
 INDENT_DELTA = 2

angr/analyses/decompiler/utils.py

@@ -7,7 +7,7 @@ from collections.abc import Iterable
 import logging
 
 import networkx
-import ailment
+import angr.ailment as ailment
 
 import angr
 from angr.analyses.decompiler.counters.call_counter import AILBlockCallCounter

angr/analyses/deobfuscator/api_obf_peephole_optimizer.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from ailment.expression import Const, Load
+from angr.ailment.expression import Const, Load
 
 from angr import SIM_LIBRARIES
 from angr.calling_conventions import default_cc

angr/analyses/deobfuscator/string_obf_opt_passes.py

@@ -3,9 +3,9 @@ from __future__ import annotations
 
 import archinfo
 
-from ailment import Block
-from ailment.statement import Statement, Call, Assignment
-from ailment.expression import Const, Register, VirtualVariable
+from angr.ailment import Block
+from angr.ailment.statement import Statement, Call, Assignment
+from angr.ailment.expression import Const, Register, VirtualVariable
 
 from angr.analyses.decompiler.optimization_passes.optimization_pass import OptimizationPass, OptimizationPassStage
 from angr.analyses.decompiler.optimization_passes import register_optimization_pass

angr/analyses/deobfuscator/string_obf_peephole_optimizer.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
-from ailment.statement import Call
-from ailment.expression import Const
+from angr.ailment.statement import Call
+from angr.ailment.expression import Const
 import claripy
 
 from angr.analyses.decompiler.peephole_optimizations.base import PeepholeOptimizationExprBase

angr/analyses/propagator/propagator.py

@@ -6,7 +6,7 @@ import time
 import contextlib
 
 import claripy
-import ailment
+import angr.ailment as ailment
 import pyvex
 
 from angr.code_location import CodeLocation

angr/analyses/proximity_graph.py

@@ -4,8 +4,8 @@ import logging
 
 import networkx
 
-import ailment
-from ailment import AILBlockWalker
+import angr.ailment as ailment
+from angr.ailment import AILBlockWalker
 
 from angr.codenode import BlockNode
 from angr.sim_variable import SimMemoryVariable

angr/analyses/reaching_definitions/engine_ail.py

@@ -7,7 +7,7 @@ from typing import cast
 
 from archinfo.types import RegisterOffset
 import claripy
-import ailment
+import angr.ailment as ailment
 from claripy import FSORT_DOUBLE, FSORT_FLOAT
 
 from angr.engines.light import SpOffset

angr/analyses/reaching_definitions/reaching_definitions.py

@@ -4,7 +4,7 @@ from typing import Any
 from collections.abc import Iterable
 from collections import defaultdict
 
-import ailment
+import angr.ailment as ailment
 import pyvex
 
 from angr.analyses import ForwardAnalysis

angr/analyses/reaching_definitions/subject.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 from enum import Enum
 
-import ailment
+import angr.ailment as ailment
 
 from angr.block import Block
 from angr.knowledge_plugins.functions.function_manager import Function

angr/analyses/s_liveness.py

@@ -1,8 +1,8 @@
 from __future__ import annotations
 
 import networkx
-from ailment.expression import VirtualVariable
-from ailment.statement import Assignment, Call, ConditionalJump
+from angr.ailment.expression import VirtualVariable
+from angr.ailment.statement import Assignment, Call, ConditionalJump
 
 from angr.analyses import Analysis, register_analysis
 from angr.utils.ail import is_head_controlled_loop_block, is_phi_assignment

angr/analyses/s_propagator.py

@@ -6,8 +6,8 @@ from collections import defaultdict
 
 import networkx
 
-from ailment.block import Block
-from ailment.expression import (
+from angr.ailment.block import Block
+from angr.ailment.expression import (
     Const,
     VirtualVariable,
     VirtualVariableCategory,
@@ -16,7 +16,7 @@ from ailment.expression import (
     Convert,
     Expression,
 )
-from ailment.statement import Assignment, Store, Return, Jump, ConditionalJump
+from angr.ailment.statement import Assignment, Store, Return, Jump, ConditionalJump
 
 from angr.knowledge_plugins.functions import Function
 from angr.code_location import CodeLocation, ExternalCodeLocation

angr/analyses/s_reaching_definitions/s_rda_model.py

@@ -4,7 +4,7 @@ from collections import defaultdict
 from collections.abc import Generator
 from typing import Any, Literal, overload
 
-from ailment.expression import VirtualVariable, Tmp
+from angr.ailment.expression import VirtualVariable, Tmp
 
 from angr.knowledge_plugins.key_definitions import atoms, Definition
 from angr.code_location import CodeLocation

angr/analyses/s_reaching_definitions/s_rda_view.py

@@ -4,9 +4,9 @@ import logging
 from collections.abc import Callable
 from collections import defaultdict
 
-from ailment import Block
-from ailment.statement import Statement, Assignment, Call, Label
-from ailment.expression import VirtualVariable, VirtualVariableCategory, Expression
+from angr.ailment import Block
+from angr.ailment.statement import Statement, Assignment, Call, Label
+from angr.ailment.expression import VirtualVariable, VirtualVariableCategory, Expression
 
 from angr.utils.ail import is_phi_assignment
 from angr.utils.graph import GraphUtils

angr/analyses/s_reaching_definitions/s_reaching_definitions.py

@@ -1,8 +1,8 @@
 from __future__ import annotations
 
-from ailment.block import Block
-from ailment.statement import Assignment, Call, Return
-from ailment.expression import VirtualVariable
+from angr.ailment.block import Block
+from angr.ailment.statement import Assignment, Call, Return
+from angr.ailment.expression import VirtualVariable
 import networkx
 
 from angr.knowledge_plugins.functions import Function

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
 

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/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.159.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: angr
-Version: 9.2.158
+Version: 9.2.159
 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/
@@ -17,13 +17,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.159
 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.159
+Requires-Dist: cle==9.2.159
 Requires-Dist: mulpyplexer
 Requires-Dist: networkx!=2.8.1,>=2.0
 Requires-Dist: protobuf>=5.28.2
@@ -32,10 +31,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.159
 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