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

angr/analyses/decompiler/optimization_passes/duplication_reverter/ail_merge_graph.py

@@ -4,8 +4,8 @@ from collections import defaultdict
 
 import networkx as nx
 
-from ailment.block import Block
-from ailment.statement import ConditionalJump
+from angr.ailment.block import Block
+from angr.ailment.statement import ConditionalJump
 
 from .errors import SAILRSemanticError
 from .similarity import ail_similarity_to_orig_blocks

angr/analyses/decompiler/optimization_passes/duplication_reverter/duplication_reverter.py

@@ -6,10 +6,10 @@ import itertools
 
 import networkx as nx
 
-import ailment
-from ailment.block import Block
-from ailment.statement import ConditionalJump, Jump, Assignment, Return, Label
-from ailment.expression import Const, Register, Convert, Expression
+import angr.ailment as ailment
+from angr.ailment.block import Block
+from angr.ailment.statement import ConditionalJump, Jump, Assignment, Return, Label
+from angr.ailment.expression import Const, Register, Convert, Expression
 
 from .ail_merge_graph import AILMergeGraph, AILBlockSplit
 from .errors import SAILRSemanticError

angr/analyses/decompiler/optimization_passes/duplication_reverter/similarity.py

@@ -4,7 +4,7 @@ import logging
 
 import networkx as nx
 
-from ailment.block import Block
+from angr.ailment.block import Block
 
 from .utils import bfs_list_blocks
 from angr.analyses.decompiler.block_similarity import longest_ail_subseq, is_similar

angr/analyses/decompiler/optimization_passes/duplication_reverter/utils.py

@@ -3,10 +3,10 @@ import logging
 
 import networkx as nx
 
-import ailment
-from ailment import Const
-from ailment.block import Block
-from ailment.statement import Statement, ConditionalJump, Jump
+import angr.ailment as ailment
+from angr.ailment import Const
+from angr.ailment.block import Block
+from angr.ailment.statement import Statement, ConditionalJump, Jump
 
 from angr.analyses.decompiler.structuring.structurer_nodes import IncompleteSwitchCaseHeadStatement
 from .errors import UnsupportedAILNodeError

angr/analyses/decompiler/optimization_passes/eager_std_string_concatenation.py

@@ -6,9 +6,9 @@ import re
 
 from archinfo import Endness
 
-from ailment.constant import UNDETERMINED_SIZE
-from ailment.statement import Assignment, WeakAssignment
-from ailment.expression import VirtualVariable, BinaryOp, Const, Load
+from angr.ailment.constant import UNDETERMINED_SIZE
+from angr.ailment.statement import Assignment, WeakAssignment
+from angr.ailment.expression import VirtualVariable, BinaryOp, Const, Load
 
 from .optimization_pass import OptimizationPass, OptimizationPassStage
 

angr/analyses/decompiler/optimization_passes/engine_base.py

@@ -2,7 +2,7 @@
 from __future__ import annotations
 import logging
 
-import ailment
+import angr.ailment as ailment
 
 from angr.engines.light import SimEngineLightAIL
 

angr/analyses/decompiler/optimization_passes/expr_op_swapper.py

@@ -3,9 +3,9 @@ import logging
 from typing import Any, TYPE_CHECKING
 from collections.abc import Callable
 
-from ailment.block import Block as AILBlock
-from ailment.statement import Statement
-from ailment.expression import Expression, BinaryOp
+from angr.ailment.block import Block as AILBlock
+from angr.ailment.statement import Statement
+from angr.ailment.expression import Expression, BinaryOp
 
 from angr.analyses.decompiler.sequence_walker import SequenceWalker
 from angr.analyses.decompiler.ail_simplifier import AILBlockWalker

angr/analyses/decompiler/optimization_passes/flip_boolean_cmp.py

@@ -2,8 +2,8 @@
 from __future__ import annotations
 from typing import Any
 
-import ailment
-from ailment.expression import Op
+import angr.ailment as ailment
+from angr.ailment.expression import Op
 
 from angr.analyses.decompiler.structuring.structurer_nodes import ConditionNode
 from angr.analyses.decompiler.utils import (

angr/analyses/decompiler/optimization_passes/inlined_string_transformation_simplifier.py

@@ -5,7 +5,7 @@ from collections.abc import Callable
 from collections import defaultdict
 
 from archinfo import Endness
-from ailment.expression import (
+from angr.ailment.expression import (
     Const,
     Register,
     Expression,
@@ -17,7 +17,7 @@ from ailment.expression import (
     UnaryOp,
     VirtualVariableCategory,
 )
-from ailment.statement import ConditionalJump, Jump, Assignment
+from angr.ailment.statement import ConditionalJump, Jump, Assignment
 import claripy
 
 from angr.utils.bits import zeroextend_on_demand

angr/analyses/decompiler/optimization_passes/ite_expr_converter.py

@@ -3,8 +3,8 @@ from __future__ import annotations
 import logging
 from typing import Any, TYPE_CHECKING
 
-from ailment.statement import ConditionalJump, Assignment, Statement
-from ailment.expression import Const, ITE, Expression
+from angr.ailment.statement import ConditionalJump, Assignment, Statement
+from angr.ailment.expression import Const, ITE, Expression
 
 from angr.analyses import ReachingDefinitionsAnalysis
 from angr.code_location import CodeLocation
@@ -15,7 +15,7 @@ from angr.analyses.decompiler.structuring.structurer_nodes import EmptyBlockNoti
 from .optimization_pass import OptimizationPass, OptimizationPassStage
 
 if TYPE_CHECKING:
-    from ailment import Block as AILBlock
+    from angr.ailment import Block as AILBlock
 
 
 _l = logging.getLogger(__name__)

angr/analyses/decompiler/optimization_passes/ite_region_converter.py

@@ -2,9 +2,9 @@
 from __future__ import annotations
 import logging
 
-from ailment.block import Block
-from ailment.statement import Statement, Call, ConditionalJump, Assignment, Jump
-from ailment.expression import ITE, Const, VirtualVariable, Phi
+from angr.ailment.block import Block
+from angr.ailment.statement import Statement, Call, ConditionalJump, Assignment, Jump
+from angr.ailment.expression import ITE, Const, VirtualVariable, Phi
 
 from angr.utils.ail import is_phi_assignment
 from angr.utils.graph import subgraph_between_nodes

angr/analyses/decompiler/optimization_passes/lowered_switch_simplifier.py

@@ -5,9 +5,9 @@ import logging
 
 import networkx
 
-from ailment import Block, AILBlockWalkerBase
-from ailment.statement import ConditionalJump, Label, Assignment, Jump
-from ailment.expression import VirtualVariable, Expression, BinaryOp, Const, Load
+from angr.ailment import Block, AILBlockWalkerBase
+from angr.ailment.statement import ConditionalJump, Label, Assignment, Jump
+from angr.ailment.expression import VirtualVariable, Expression, BinaryOp, Const, Load
 
 from angr.utils.graph import GraphUtils
 from angr.analyses.decompiler.utils import first_nonlabel_nonphi_statement, remove_last_statement
@@ -20,7 +20,7 @@ from .optimization_pass import MultipleBlocksException, StructuringOptimizationP
 from angr.analyses.decompiler.region_simplifiers.switch_cluster_simplifier import SwitchClusterFinder
 
 if TYPE_CHECKING:
-    from ailment.expression import UnaryOp, Convert
+    from angr.ailment.expression import UnaryOp, Convert
 
 _l = logging.getLogger(name=__name__)
 

angr/analyses/decompiler/optimization_passes/mod_simplifier.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 import logging
 
-from ailment import Expr
+from angr.ailment import Expr
 from unique_log_filter import UniqueLogFilter
 
 from .engine_base import SimplifierAILEngine, SimplifierAILState

angr/analyses/decompiler/optimization_passes/optimization_pass.py

@@ -8,7 +8,7 @@ from enum import Enum
 
 import networkx
 
-import ailment
+import angr.ailment as ailment
 
 from angr.analyses.decompiler import RegionIdentifier
 from angr.analyses.decompiler.ailgraph_walker import AILGraphWalker
@@ -179,6 +179,30 @@ class OptimizationPass(BaseOptimizationPass):
     # Util methods
     #
 
+    def bfs_nodes(self, depth: int | None = None, start_node: ailment.Block | None = None) -> Generator[ailment.Block]:
+        seen = set()
+
+        if start_node is None:
+            start_node = self._get_block(self._func.addr)
+        if start_node is None:
+            return
+
+        queue = [(0, start_node)]
+        while queue:
+            node_depth, node = queue.pop(0)
+            if node in seen:
+                continue
+            seen.add(node)
+
+            yield node
+
+            if depth is not None and node_depth >= depth:
+                continue
+
+            for succ in sorted(self._graph.successors(node), key=lambda x: (x.addr, x.idx if hasattr(x, "idx") else 0)):
+                if succ not in seen:
+                    queue.append((node_depth + 1, succ))
+
     def new_block_addr(self) -> int:
         """
         Return a block address that does not conflict with any existing blocks.

angr/analyses/decompiler/optimization_passes/register_save_area_simplifier.py

@@ -4,7 +4,7 @@ from collections.abc import Iterable
 import logging
 
 import archinfo
-import ailment
+import angr.ailment as ailment
 
 from angr.calling_conventions import SimRegArg
 from angr.code_location import CodeLocation

angr/analyses/decompiler/optimization_passes/ret_addr_save_simplifier.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 from typing import Any
 import logging
 
-import ailment
+import angr.ailment as ailment
 
 from angr.calling_conventions import SimRegArg, default_cc, DEFAULT_CC
 from .optimization_pass import OptimizationPass, OptimizationPassStage

angr/analyses/decompiler/optimization_passes/ret_deduplicator.py

@@ -2,8 +2,8 @@
 from __future__ import annotations
 import logging
 
-from ailment import Block
-from ailment.statement import ConditionalJump, Return
+from angr.ailment import Block
+from angr.ailment.statement import ConditionalJump, Return
 
 from angr.analyses.decompiler.structuring import SAILRStructurer, DreamStructurer
 from angr.utils.graph import subgraph_between_nodes

angr/analyses/decompiler/optimization_passes/return_duplicator_base.py

@@ -3,12 +3,12 @@ from typing import Any
 import copy
 import logging
 
-import ailment.expression
+import angr.ailment as ailment
 import networkx
 
-from ailment import Block, AILBlockWalker
-from ailment.statement import Jump, ConditionalJump, Assignment, Return, Label
-from ailment.expression import Const, Phi, VirtualVariable
+from angr.ailment import Block, AILBlockWalker
+from angr.ailment.statement import Jump, ConditionalJump, Assignment, Return, Label
+from angr.ailment.expression import Const, Phi, VirtualVariable
 
 from angr.utils.ail import is_phi_assignment
 from angr.analyses.decompiler.condition_processor import ConditionProcessor, EmptyBlockNotice

angr/analyses/decompiler/optimization_passes/return_duplicator_low.py

@@ -5,8 +5,8 @@ from typing import Any
 
 import networkx
 
-from ailment import Block
-from ailment.statement import ConditionalJump, Label
+from angr.ailment import Block
+from angr.ailment.statement import ConditionalJump, Label
 
 from .return_duplicator_base import ReturnDuplicatorBase
 from .optimization_pass import StructuringOptimizationPass

angr/analyses/decompiler/optimization_passes/stack_canary_simplifier.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from collections import defaultdict
 import logging
 
-import ailment
+import angr.ailment as ailment
 
 from angr.utils.bits import s2u
 from angr.analyses.decompiler.stack_item import StackItem, StackItemType

angr/analyses/decompiler/optimization_passes/switch_default_case_duplicator.py

@@ -6,9 +6,9 @@ import logging
 
 import networkx
 
-from ailment.block import Block
-from ailment.statement import Jump
-from ailment.expression import Const
+from angr.ailment.block import Block
+from angr.ailment.statement import Jump
+from angr.ailment.expression import Const
 
 from angr.knowledge_plugins.cfg import IndirectJumpType
 from .optimization_pass import OptimizationPass, OptimizationPassStage

angr/analyses/decompiler/optimization_passes/switch_reused_entry_rewriter.py

@@ -3,9 +3,9 @@ from __future__ import annotations
 from itertools import count
 import logging
 
-from ailment.block import Block
-from ailment.statement import Jump
-from ailment.expression import Const
+from angr.ailment.block import Block
+from angr.ailment.statement import Jump
+from angr.ailment.expression import Const
 
 from angr.knowledge_plugins.cfg import IndirectJumpType
 

angr/analyses/decompiler/optimization_passes/tag_slicer.py

@@ -2,7 +2,7 @@
 from __future__ import annotations
 import logging
 
-from ailment.statement import ConditionalJump, Jump, Label
+from angr.ailment.statement import ConditionalJump, Jump, Label
 from .optimization_pass import OptimizationPass, OptimizationPassStage
 
 

angr/analyses/decompiler/optimization_passes/win_stack_canary_simplifier.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from collections import defaultdict
 import logging
 
-import ailment
+import angr.ailment as ailment
 import cle
 
 from angr.utils.funcid import is_function_security_check_cookie

angr/analyses/decompiler/optimization_passes/x86_gcc_getpc_simplifier.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 from typing import Any
 import logging
 
-import ailment
+import angr.ailment as ailment
 
 from .optimization_pass import OptimizationPass, OptimizationPassStage
 

angr/analyses/decompiler/peephole_optimizations/a_div_const_add_a_mul_n_div_const.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from ailment.expression import BinaryOp, Const
+from angr.ailment.expression import BinaryOp, Const
 
 from .base import PeepholeOptimizationExprBase
 

angr/analyses/decompiler/peephole_optimizations/a_mul_const_div_shr_const.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from ailment.expression import BinaryOp, Const
+from angr.ailment.expression import BinaryOp, Const
 
 from .base import PeepholeOptimizationExprBase
 

angr/analyses/decompiler/peephole_optimizations/a_mul_const_sub_a.py

@@ -1,6 +1,6 @@
 # pylint:disable=missing-class-docstring,no-self-use,too-many-boolean-expressions
 from __future__ import annotations
-from ailment.expression import BinaryOp, Const
+from angr.ailment.expression import BinaryOp, Const
 
 from .base import PeepholeOptimizationExprBase
 

angr/analyses/decompiler/peephole_optimizations/a_shl_const_sub_a.py

@@ -1,6 +1,6 @@
 # pylint:disable=missing-class-docstring,no-self-use
 from __future__ import annotations
-from ailment.expression import BinaryOp, Const
+from angr.ailment.expression import BinaryOp, Const
 
 from .base import PeepholeOptimizationExprBase
 

angr/analyses/decompiler/peephole_optimizations/a_sub_a_div.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from ailment.expression import BinaryOp, Const
+from angr.ailment.expression import BinaryOp, Const
 
 from .base import PeepholeOptimizationExprBase
 

angr/analyses/decompiler/peephole_optimizations/a_sub_a_div_const_mul_const.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from ailment.expression import BinaryOp, Const, Convert
+from angr.ailment.expression import BinaryOp, Const, Convert
 
 from .base import PeepholeOptimizationExprBase
 

angr/analyses/decompiler/peephole_optimizations/a_sub_a_shr_const_shr_const.py

@@ -1,6 +1,6 @@
 # pylint:disable=no-self-use,too-many-boolean-expressions
 from __future__ import annotations
-from ailment.expression import BinaryOp, Const
+from angr.ailment.expression import BinaryOp, Const
 
 from .base import PeepholeOptimizationExprBase
 

angr/analyses/decompiler/peephole_optimizations/a_sub_a_sub_n.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from ailment.expression import BinaryOp
+from angr.ailment.expression import BinaryOp
 
 from .base import PeepholeOptimizationExprBase
 

angr/analyses/decompiler/peephole_optimizations/arm_cmpf.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from ailment.expression import BinaryOp, Const, Convert
+from angr.ailment.expression import BinaryOp, Const, Convert
 
 from .base import PeepholeOptimizationExprBase
 

angr/analyses/decompiler/peephole_optimizations/base.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
-from ailment.expression import BinaryOp, UnaryOp, Expression
-from ailment.statement import Statement, Assignment
-from ailment import Block
+from angr.ailment.expression import BinaryOp, UnaryOp, Expression
+from angr.ailment.statement import Statement, Assignment
+from angr.ailment import Block
 from angr.project import Project
 from angr.knowledge_base import KnowledgeBase
 from angr.knowledge_plugins.key_definitions import atoms

angr/analyses/decompiler/peephole_optimizations/basepointeroffset_add_n.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from ailment.expression import BinaryOp, BasePointerOffset, Const
+from angr.ailment.expression import BinaryOp, BasePointerOffset, Const
 
 from .base import PeepholeOptimizationExprBase
 

angr/analyses/decompiler/peephole_optimizations/basepointeroffset_and_mask.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from ailment.expression import BinaryOp, BasePointerOffset, Const
+from angr.ailment.expression import BinaryOp, BasePointerOffset, Const
 
 from .base import PeepholeOptimizationExprBase
 

angr/analyses/decompiler/peephole_optimizations/bitwise_or_to_logical_or.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from ailment.expression import BinaryOp, Const
+from angr.ailment.expression import BinaryOp, Const
 
 from .base import PeepholeOptimizationExprBase
 

angr/analyses/decompiler/peephole_optimizations/bool_expr_xor_1.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from ailment.expression import BinaryOp, Const, UnaryOp, Convert
+from angr.ailment.expression import BinaryOp, Const, UnaryOp, Convert
 
 from .base import PeepholeOptimizationExprBase
 

angr/analyses/decompiler/peephole_optimizations/bswap.py

@@ -1,7 +1,7 @@
 # pylint:disable=missing-class-docstring,no-self-use
 from __future__ import annotations
-from ailment.expression import BinaryOp, Const, Expression, Convert
-from ailment.statement import Call
+from angr.ailment.expression import BinaryOp, Const, Expression, Convert
+from angr.ailment.statement import Call
 
 from .base import PeepholeOptimizationExprBase
 from .utils import get_expr_shift_left_amount

angr/analyses/decompiler/peephole_optimizations/cas_intrinsics.py

@@ -1,8 +1,8 @@
 # pylint:disable=arguments-differ,too-many-boolean-expressions
 from __future__ import annotations
 
-from ailment.expression import BinaryOp, Load
-from ailment.statement import CAS, ConditionalJump, Statement, Assignment, Call
+from angr.ailment.expression import BinaryOp, Load
+from angr.ailment.statement import CAS, ConditionalJump, Statement, Assignment, Call
 
 from .base import PeepholeOptimizationMultiStmtBase
 

angr/analyses/decompiler/peephole_optimizations/cmpord_rewriter.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
-from ailment.statement import ConditionalJump
-from ailment.expression import BinaryOp, Const
+from angr.ailment.statement import ConditionalJump
+from angr.ailment.expression import BinaryOp, Const
 
 from .base import PeepholeOptimizationStmtBase
 

angr/analyses/decompiler/peephole_optimizations/coalesce_adjacent_shrs.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from ailment.expression import BinaryOp, Const, Convert
+from angr.ailment.expression import BinaryOp, Const, Convert
 
 from .base import PeepholeOptimizationExprBase
 

angr/analyses/decompiler/peephole_optimizations/coalesce_same_cascading_ifs.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
-from ailment.statement import ConditionalJump
-from ailment.expression import ITE
+from angr.ailment.statement import ConditionalJump
+from angr.ailment.expression import ITE
 
 from .base import PeepholeOptimizationStmtBase
 

angr/analyses/decompiler/peephole_optimizations/const_mull_a_shift.py

@@ -1,7 +1,7 @@
 # pylint:disable=too-many-boolean-expressions
 from __future__ import annotations
 
-from ailment.expression import Convert, BinaryOp, Const, Expression
+from angr.ailment.expression import Convert, BinaryOp, Const, Expression
 
 from .base import PeepholeOptimizationExprBase
 

angr/analyses/decompiler/peephole_optimizations/constant_derefs.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from ailment.expression import Load, Const
+from angr.ailment.expression import Load, Const
 from cle.backends import Blob, Hex
 
 from .base import PeepholeOptimizationExprBase

angr/analyses/decompiler/peephole_optimizations/conv_a_sub0_shr_and.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from ailment.expression import Convert, BinaryOp, Const
+from angr.ailment.expression import Convert, BinaryOp, Const
 
 from .base import PeepholeOptimizationExprBase
 

angr/analyses/decompiler/peephole_optimizations/conv_shl_shr.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from ailment.expression import Convert, BinaryOp, Const
+from angr.ailment.expression import Convert, BinaryOp, Const
 
 from .base import PeepholeOptimizationExprBase
 

angr/analyses/decompiler/peephole_optimizations/eager_eval.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 from math import gcd
 
-from ailment.expression import BinaryOp, UnaryOp, Const, Convert, StackBaseOffset
+from angr.ailment.expression import BinaryOp, UnaryOp, Const, Convert, StackBaseOffset
 
 from angr.utils.bits import sign_extend
 from .base import PeepholeOptimizationExprBase

angr/analyses/decompiler/peephole_optimizations/extended_byte_and_mask.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from ailment.expression import BinaryOp, Const, Convert
+from angr.ailment.expression import BinaryOp, Const, Convert
 
 from .base import PeepholeOptimizationExprBase
 

angr/analyses/decompiler/peephole_optimizations/inlined_strcpy.py

@@ -4,8 +4,8 @@ import string
 
 from archinfo import Endness
 
-from ailment.expression import Const, StackBaseOffset, VirtualVariable
-from ailment.statement import Call, Assignment
+from angr.ailment.expression import Const, StackBaseOffset, VirtualVariable
+from angr.ailment.statement import Call, Assignment
 
 from angr import SIM_LIBRARIES
 from angr.utils.endness import ail_const_to_be

angr/analyses/decompiler/peephole_optimizations/inlined_strcpy_consolidation.py

@@ -1,8 +1,8 @@
 # pylint:disable=arguments-differ
 from __future__ import annotations
 
-from ailment.expression import Expression, BinaryOp, Const, Register, StackBaseOffset
-from ailment.statement import Call, Store
+from angr.ailment.expression import Expression, BinaryOp, Const, Register, StackBaseOffset
+from angr.ailment.statement import Call, Store
 
 from angr import SIM_LIBRARIES
 from .base import PeepholeOptimizationMultiStmtBase

angr/analyses/decompiler/peephole_optimizations/inlined_wstrcpy.py

@@ -4,8 +4,8 @@ import string
 
 from archinfo import Endness
 
-from ailment.expression import Const, StackBaseOffset, VirtualVariable
-from ailment.statement import Call, Assignment
+from angr.ailment.expression import Const, StackBaseOffset, VirtualVariable
+from angr.ailment.statement import Call, Assignment
 
 from angr.utils.endness import ail_const_to_be
 from .base import PeepholeOptimizationStmtBase

angr/analyses/decompiler/peephole_optimizations/invert_negated_logical_conjuction_disjunction.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from ailment.expression import UnaryOp, BinaryOp
+from angr.ailment.expression import UnaryOp, BinaryOp
 
 from .base import PeepholeOptimizationExprBase