angr 9.2.118__py3-none-manylinux2014_x86_64.whl → 9.2.120__py3-none-manylinux2014_x86_64.whl

angr/analyses/decompiler/region_simplifiers/region_simplifier.py

@@ -1,12 +1,12 @@
 from __future__ import annotations
 import ailment
 
-from ..goto_manager import GotoManager
-from ....analyses import AnalysesHub
-from ...analysis import Analysis
-from ..empty_node_remover import EmptyNodeRemover
-from ..jump_target_collector import JumpTargetCollector
-from ..redundant_label_remover import RedundantLabelRemover
+from angr.analyses.decompiler.goto_manager import GotoManager
+from angr.analyses import AnalysesHub
+from angr.analyses.analysis import Analysis
+from angr.analyses.decompiler.empty_node_remover import EmptyNodeRemover
+from angr.analyses.decompiler.jump_target_collector import JumpTargetCollector
+from angr.analyses.decompiler.redundant_label_remover import RedundantLabelRemover
 from .goto import GotoSimplifier
 from .if_ import IfSimplifier
 from .cascading_ifs import CascadingIfsRemover

angr/analyses/decompiler/region_simplifiers/switch_cluster_simplifier.py

@@ -8,11 +8,18 @@ import ailment
 from ailment import UnaryOp
 from ailment.expression import negate
 
-from ....utils.constants import SWITCH_MISSING_DEFAULT_NODE_ADDR
-from ..structuring.structurer_nodes import SwitchCaseNode, ConditionNode, SequenceNode, MultiNode, BaseNode, BreakNode
-from ..sequence_walker import SequenceWalker
-from ..condition_processor import ConditionProcessor, EmptyBlockNotice
-from ..utils import is_statement_terminating
+from angr.utils.constants import SWITCH_MISSING_DEFAULT_NODE_ADDR
+from angr.analyses.decompiler.structuring.structurer_nodes import (
+    SwitchCaseNode,
+    ConditionNode,
+    SequenceNode,
+    MultiNode,
+    BaseNode,
+    BreakNode,
+)
+from angr.analyses.decompiler.sequence_walker import SequenceWalker
+from angr.analyses.decompiler.condition_processor import ConditionProcessor, EmptyBlockNotice
+from angr.analyses.decompiler.utils import is_statement_terminating
 
 
 class CmpOp(enum.Enum):

angr/analyses/decompiler/region_simplifiers/switch_expr_simplifier.py

@@ -4,8 +4,8 @@ from collections import OrderedDict
 
 import ailment
 
-from ..structuring.structurer_nodes import SwitchCaseNode
-from ..sequence_walker import SequenceWalker
+from angr.analyses.decompiler.structuring.structurer_nodes import SwitchCaseNode
+from angr.analyses.decompiler.sequence_walker import SequenceWalker
 
 
 class SwitchExpressionSimplifier(SequenceWalker):
@@ -29,7 +29,7 @@ class SwitchExpressionSimplifier(SequenceWalker):
         convert = None
 
         # pylint: disable=import-outside-toplevel
-        from ..peephole_optimizations.remove_noop_conversions import RemoveNoopConversions
+        from angr.analyses.decompiler.peephole_optimizations.remove_noop_conversions import RemoveNoopConversions
 
         while isinstance(switch_expr, ailment.Expr.Convert):
             optimized = RemoveNoopConversions(None, None).optimize(switch_expr)

angr/analyses/decompiler/sequence_walker.py

@@ -4,7 +4,7 @@ from collections import OrderedDict
 
 import ailment
 
-from ...errors import UnsupportedNodeTypeError
+from angr.errors import UnsupportedNodeTypeError
 from .structuring.structurer_nodes import (
     MultiNode,
     CodeNode,
@@ -181,22 +181,21 @@ class SequenceWalker:
         return None
 
     def _handle_Loop(self, node: LoopNode, **kwargs):
-        if node.initializer is not None:
-            self._handle(node.initializer)
-        if node.iterator is not None:
-            self._handle(node.iterator)
-        if node.condition is not None:
-            self._handle(node.condition, parent=node, label="condition")
+        new_initializer = self._handle(node.initializer) if node.initializer is not None else None
+        new_iterator = self._handle(node.iterator) if node.iterator is not None else None
+        new_condition = (
+            self._handle(node.condition, parent=node, label="condition") if node.condition is not None else None
+        )
         seq_node = self._handle(node.sequence_node, parent=node, label="body", index=0)
-        if seq_node is not None:
+        if seq_node is not None or new_initializer is not None or new_iterator is not None or new_condition is not None:
             return LoopNode(
                 node.sort,
-                node.condition,
-                seq_node,
+                new_condition if new_condition is not None else node.condition,
+                seq_node if seq_node is not None else node.sequence_node,
                 addr=node.addr,
                 continue_addr=node.continue_addr,
-                initializer=node.initializer,
-                iterator=node.iterator,
+                initializer=new_initializer if new_initializer is not None else node.initializer,
+                iterator=new_iterator if new_iterator is not None else node.iterator,
             )
         return None
 

angr/analyses/decompiler/structured_codegen/__init__.py

@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 from .base import (
     BaseStructuredCodeGenerator,
     InstructionMapping,
@@ -9,3 +10,16 @@ from .base import (
 from .c import CStructuredCodeGenerator, CStructuredCodeWalker
 from .dwarf_import import ImportSourceCode
 from .dummy import DummyStructuredCodeGenerator
+
+
+__all__ = (
+    "BaseStructuredCodeGenerator",
+    "InstructionMapping",
+    "InstructionMappingElement",
+    "PositionMappingElement",
+    "PositionMapping",
+    "CStructuredCodeGenerator",
+    "CStructuredCodeWalker",
+    "ImportSourceCode",
+    "DummyStructuredCodeGenerator",
+)

angr/analyses/decompiler/structured_codegen/base.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 from sortedcontainers import SortedDict
 
-from ....sim_variable import SimVariable
+from angr.sim_variable import SimVariable
 
 #
 #   Position Mapping Classes

angr/analyses/decompiler/structured_codegen/c.py

@@ -10,8 +10,8 @@ from ailment import Block, Expr, Stmt, Tmp
 from ailment.expression import StackBaseOffset, BinaryOp
 from unique_log_filter import UniqueLogFilter
 
-from ....procedures import SIM_LIBRARIES, SIM_TYPE_COLLECTIONS
-from ....sim_type import (
+from angr.procedures import SIM_LIBRARIES, SIM_TYPE_COLLECTIONS
+from angr.sim_type import (
     SimTypeLongLong,
     SimTypeInt,
     SimTypeShort,
@@ -31,18 +31,20 @@ from ....sim_type import (
     SimTypeLength,
     SimTypeReg,
     dereference_simtype,
+    SimTypeInt128,
+    SimTypeInt256,
 )
-from ....knowledge_plugins.functions import Function
-from ....sim_variable import SimVariable, SimTemporaryVariable, SimStackVariable, SimMemoryVariable
-from ....utils.constants import is_alignment_mask
-from ....utils.library import get_cpp_function_name
-from ....utils.loader import is_in_readonly_segment, is_in_readonly_section
-from ..utils import structured_node_is_simple_return
-from ....errors import UnsupportedNodeTypeError, AngrRuntimeError
-from ....knowledge_plugins.cfg.memory_data import MemoryData, MemoryDataSort
-from ... import Analysis, register_analysis
-from ..region_identifier import MultiNode
-from ..structuring.structurer_nodes import (
+from angr.knowledge_plugins.functions import Function
+from angr.sim_variable import SimVariable, SimTemporaryVariable, SimStackVariable, SimMemoryVariable
+from angr.utils.constants import is_alignment_mask
+from angr.utils.library import get_cpp_function_name
+from angr.utils.loader import is_in_readonly_segment, is_in_readonly_section
+from angr.analyses.decompiler.utils import structured_node_is_simple_return
+from angr.errors import UnsupportedNodeTypeError, AngrRuntimeError
+from angr.knowledge_plugins.cfg.memory_data import MemoryData, MemoryDataSort
+from angr.analyses import Analysis, register_analysis
+from angr.analyses.decompiler.region_identifier import MultiNode
+from angr.analyses.decompiler.structuring.structurer_nodes import (
     SequenceNode,
     CodeNode,
     ConditionNode,
@@ -3479,8 +3481,13 @@ class CStructuredCodeGenerator(BaseStructuredCodeGenerator, Analysis):
 
     def _handle_Expr_Convert(self, expr: Expr.Convert, **kwargs):
         # width of converted type is easy
-        if 64 >= expr.to_bits > 32:
-            dst_type: SimTypeInt | SimTypeChar = SimTypeLongLong()
+        dst_type: SimTypeInt | SimTypeChar
+        if 258 >= expr.to_bits > 128:
+            dst_type = SimTypeInt256()
+        elif 128 >= expr.to_bits > 64:
+            dst_type = SimTypeInt128()
+        elif 64 >= expr.to_bits > 32:
+            dst_type = SimTypeLongLong()
         elif 32 >= expr.to_bits > 16:
             dst_type = SimTypeInt()
         elif 16 >= expr.to_bits > 8:

angr/analyses/decompiler/structured_codegen/dwarf_import.py

@@ -4,9 +4,9 @@ import re
 import logging
 from sortedcontainers import SortedList
 
-from ... import Analysis, register_analysis
+from angr.analyses import Analysis, register_analysis
 from .base import BaseStructuredCodeGenerator, InstructionMapping, PositionMapping
-from ....knowledge_plugins.functions.function import Function
+from angr.knowledge_plugins.functions.function import Function
 
 
 l = logging.getLogger(__name__)

angr/analyses/decompiler/structuring/__init__.py

@@ -1,5 +1,4 @@
 from __future__ import annotations
-from typing import Optional, Type
 
 from .dream import DreamStructurer
 from .phoenix import PhoenixStructurer
@@ -18,3 +17,14 @@ DEFAULT_STRUCTURER = SAILRStructurer
 
 def structurer_class_from_name(name: str) -> type | None:
     return STRUCTURER_CLASSES.get(name.lower(), None)
+
+
+__all__ = (
+    "DreamStructurer",
+    "PhoenixStructurer",
+    "SAILRStructurer",
+    "RecursiveStructurer",
+    "STRUCTURER_CLASSES",
+    "DEFAULT_STRUCTURER",
+    "structurer_class_from_name",
+)

angr/analyses/decompiler/structuring/dream.py

@@ -10,13 +10,13 @@ import claripy
 import ailment
 
 from angr.utils.graph import GraphUtils
-from ....knowledge_plugins.cfg import IndirectJump, IndirectJumpType
-from ..graph_region import GraphRegion
-from ..empty_node_remover import EmptyNodeRemover
-from ..jumptable_entry_condition_rewriter import JumpTableEntryConditionRewriter
-from ..condition_processor import ConditionProcessor
-from ..region_simplifiers.cascading_cond_transformer import CascadingConditionTransformer
-from ..utils import (
+from angr.knowledge_plugins.cfg import IndirectJump, IndirectJumpType
+from angr.analyses.decompiler.graph_region import GraphRegion
+from angr.analyses.decompiler.empty_node_remover import EmptyNodeRemover
+from angr.analyses.decompiler.jumptable_entry_condition_rewriter import JumpTableEntryConditionRewriter
+from angr.analyses.decompiler.condition_processor import ConditionProcessor
+from angr.analyses.decompiler.region_simplifiers.cascading_cond_transformer import CascadingConditionTransformer
+from angr.analyses.decompiler.utils import (
     extract_jump_targets,
     get_ast_subexprs,
     switch_extract_cmp_bounds,
@@ -767,7 +767,7 @@ class DreamStructurer(StructurerBase):
                 if (
                     arg.op == "__eq__"
                     and arg.args[0] is jumptable_var
-                    and isinstance(arg.args[1], claripy.Bits)
+                    and isinstance(arg.args[1], claripy.ast.Bits)
                     and arg.args[1].concrete
                 ):
                     # found it
@@ -780,7 +780,7 @@ class DreamStructurer(StructurerBase):
                 # unsupported
                 return None
         elif cond.op == "__eq__":
-            if cond.args[0] is jumptable_var and isinstance(cond.args[1], claripy.Bits) and cond.args[1].concrete:
+            if cond.args[0] is jumptable_var and isinstance(cond.args[1], claripy.ast.Bits) and cond.args[1].concrete:
                 # found it
                 eq_condition = cond
                 true_node = cond_node.true_node
@@ -800,7 +800,8 @@ class DreamStructurer(StructurerBase):
             return None
 
         return CodeNode(
-            ConditionNode(cond_node.addr, claripy.true, remaining_cond, true_node, false_node=false_node), eq_condition
+            ConditionNode(cond_node.addr, claripy.true(), remaining_cond, true_node, false_node=false_node),
+            eq_condition,
         )
 
     def _switch_check_existence_of_jumptable_entries(
@@ -942,11 +943,11 @@ class DreamStructurer(StructurerBase):
                         )
                     ],
                 )
-                case_node = SequenceNode(0, nodes=[CodeNode(case_inner_node, claripy.true)])
+                case_node = SequenceNode(0, nodes=[CodeNode(case_inner_node, claripy.true())])
                 converted_nodes[entry_addr] = case_node
                 continue
 
-            case_node = SequenceNode(entry_node.addr, nodes=[CodeNode(entry_node.node, claripy.true)])
+            case_node = SequenceNode(entry_node.addr, nodes=[CodeNode(entry_node.node, claripy.true())])
             to_remove.add(entry_node)
             entry_node_idx = seq.nodes.index(entry_node)
 
@@ -966,7 +967,7 @@ class DreamStructurer(StructurerBase):
                         )
                     ],
                 )
-                case_node = SequenceNode(0, nodes=[CodeNode(case_inner_node, claripy.true)])
+                case_node = SequenceNode(0, nodes=[CodeNode(case_inner_node, claripy.true())])
                 converted_nodes[entry_addr] = case_node
                 continue
 
@@ -1097,7 +1098,7 @@ class DreamStructurer(StructurerBase):
     def _nodes_guarded_by_common_subexpr(seq, common_subexpr, starting_idx):
         candidates = []
 
-        if common_subexpr is claripy.true:
+        if common_subexpr is claripy.true():
             return []
         for j, node_1 in enumerate(seq.nodes[starting_idx:]):
             rcond_1 = getattr(node_1, "reaching_condition", None)
@@ -1204,4 +1205,4 @@ class DreamStructurer(StructurerBase):
 
 
 # delayed import
-from ..sequence_walker import SequenceWalker  # pylint:disable=wrong-import-position
+from angr.analyses.decompiler.sequence_walker import SequenceWalker  # pylint:disable=wrong-import-position

angr/analyses/decompiler/structuring/phoenix.py

@@ -14,11 +14,11 @@ from ailment.expression import Const, UnaryOp, MultiStatementExpression
 
 from angr.utils.graph import GraphUtils
 from angr.utils.ail import is_phi_assignment
-from ....knowledge_plugins.cfg import IndirectJumpType
-from ....utils.constants import SWITCH_MISSING_DEFAULT_NODE_ADDR
-from ....utils.graph import dominates, to_acyclic_graph, dfs_back_edges
-from ..sequence_walker import SequenceWalker
-from ..utils import (
+from angr.knowledge_plugins.cfg import IndirectJumpType
+from angr.utils.constants import SWITCH_MISSING_DEFAULT_NODE_ADDR
+from angr.utils.graph import dominates, to_acyclic_graph, dfs_back_edges
+from angr.analyses.decompiler.sequence_walker import SequenceWalker
+from angr.analyses.decompiler.utils import (
     remove_last_statement,
     extract_jump_targets,
     switch_extract_cmp_bounds,
@@ -26,7 +26,7 @@ from ..utils import (
     has_nonlabel_nonphi_statements,
     first_nonlabel_nonphi_statement,
 )
-from ..counters.call_counter import AILCallCounter
+from angr.analyses.decompiler.counters.call_counter import AILCallCounter
 from .structurer_nodes import (
     ConditionNode,
     SequenceNode,
@@ -368,7 +368,7 @@ class PhoenixStructurer(StructurerBase):
                         jump_node = Block(last_stmt.ins_addr, None, statements=[cond_jump])
                         cond_jump_node = ConditionNode(last_stmt.ins_addr, None, edge_cond_right, jump_node)
                         new_node = SequenceNode(node.addr, nodes=[node, cond_jump_node, left])
-                        loop_node = LoopNode("while", claripy.true, new_node, addr=node.addr)
+                        loop_node = LoopNode("while", claripy.true(), new_node, addr=node.addr)
 
                         # on the original graph
                         self.replace_nodes(graph, node, loop_node, old_node_1=left, self_loop=False)
@@ -392,7 +392,7 @@ class PhoenixStructurer(StructurerBase):
                             self._remove_last_statement_if_jump(head_block)
                             cond_break = ConditionalBreakNode(node.addr, edge_cond_right, right.addr)
                             new_node = SequenceNode(node.addr, nodes=[node, cond_break, left])
-                            loop_node = LoopNode("while", claripy.true, new_node, addr=node.addr)
+                            loop_node = LoopNode("while", claripy.true(), new_node, addr=node.addr)
 
                             # on the original graph
                             self.replace_nodes(graph, node, loop_node, old_node_1=left, self_loop=False)
@@ -572,7 +572,7 @@ class PhoenixStructurer(StructurerBase):
             seen_nodes.add(next_node)
             seq_node.nodes.append(next_node)
 
-        loop_node = LoopNode("while", claripy.true, seq_node, addr=node.addr)
+        loop_node = LoopNode("while", claripy.true(), seq_node, addr=node.addr)
 
         # on the original graph
         for node_ in seq_node.nodes:

angr/analyses/decompiler/structuring/recursive_structurer.py

@@ -5,13 +5,13 @@ import logging
 
 import networkx
 
-from ... import Analysis, register_analysis
-from ..condition_processor import ConditionProcessor
-from ..graph_region import GraphRegion
-from ..jumptable_entry_condition_rewriter import JumpTableEntryConditionRewriter
-from ..empty_node_remover import EmptyNodeRemover
-from ..jump_target_collector import JumpTargetCollector
-from ..redundant_label_remover import RedundantLabelRemover
+from angr.analyses import Analysis, register_analysis
+from angr.analyses.decompiler.condition_processor import ConditionProcessor
+from angr.analyses.decompiler.graph_region import GraphRegion
+from angr.analyses.decompiler.jumptable_entry_condition_rewriter import JumpTableEntryConditionRewriter
+from angr.analyses.decompiler.empty_node_remover import EmptyNodeRemover
+from angr.analyses.decompiler.jump_target_collector import JumpTargetCollector
+from angr.analyses.decompiler.redundant_label_remover import RedundantLabelRemover
 from .structurer_nodes import BaseNode
 from .structurer_base import StructurerBase
 from .dream import DreamStructurer

angr/analyses/decompiler/structuring/sailr.py

@@ -3,8 +3,8 @@ from typing import Any
 
 import networkx
 
-from ..utils import structured_node_is_simple_return
-from ....utils.graph import PostDominators, TemporaryNode
+from angr.analyses.decompiler.utils import structured_node_is_simple_return
+from angr.utils.graph import PostDominators, TemporaryNode
 from .phoenix import PhoenixStructurer
 
 

angr/analyses/decompiler/structuring/structurer_base.py

@@ -9,10 +9,15 @@ import networkx
 import ailment
 import claripy
 
-from ... import Analysis
-from ..condition_processor import ConditionProcessor
-from ..sequence_walker import SequenceWalker
-from ..utils import extract_jump_targets, insert_node, remove_last_statement, has_nonlabel_nonphi_statements
+from angr.analyses import Analysis
+from angr.analyses.decompiler.condition_processor import ConditionProcessor
+from angr.analyses.decompiler.sequence_walker import SequenceWalker
+from angr.analyses.decompiler.utils import (
+    extract_jump_targets,
+    insert_node,
+    remove_last_statement,
+    has_nonlabel_nonphi_statements,
+)
 from .structurer_nodes import (
     MultiNode,
     SequenceNode,

angr/analyses/decompiler/structuring/structurer_nodes.py

@@ -24,7 +24,7 @@ class MultiNode:
 
     def __init__(self, nodes, addr=None, idx=None):
         # delayed import
-        from ..graph_region import GraphRegion  # pylint:disable=import-outside-toplevel
+        from angr.analyses.decompiler.graph_region import GraphRegion  # pylint:disable=import-outside-toplevel
 
         self.nodes = []
 
@@ -247,14 +247,23 @@ class LoopNode(BaseNode):
         "_continue_addr",
     )
 
-    def __init__(self, sort, condition, sequence_node, addr=None, continue_addr=None, initializer=None, iterator=None):
-        self.sort = sort
-        self.condition = condition
-        self.sequence_node = sequence_node
-        self.initializer = initializer
-        self.iterator = iterator
-        self._addr = addr
-        self._continue_addr = continue_addr
+    def __init__(
+        self,
+        sort: str,
+        condition: ailment.Expr.Expression | None,
+        sequence_node: SequenceNode,
+        addr: int | None = None,
+        continue_addr: int | None = None,
+        initializer: ailment.Stmt.Assignment | None = None,
+        iterator: ailment.Stmt.Assignment | None = None,
+    ):
+        self.sort: str = sort
+        self.condition: ailment.Expr.Expression | None = condition
+        self.sequence_node: SequenceNode = sequence_node
+        self.initializer: ailment.Stmt.Assignment | None = initializer
+        self.iterator: ailment.Stmt.Assignment | None = iterator
+        self._addr: int | None = addr
+        self._continue_addr: int | None = continue_addr
 
     def copy(self):
         return LoopNode(

angr/analyses/decompiler/utils.py

@@ -694,6 +694,7 @@ def decompile_functions(
     catch_errors: bool = False,
     show_casts: bool = True,
     base_address: int | None = None,
+    preset: str | None = None,
 ) -> str | None:
     """
     Decompile a binary into a set of functions.
@@ -704,6 +705,7 @@ def decompile_functions(
     :param catch_errors:    The structuring algorithms to use.
     :param show_casts:      Whether to show casts in the decompiled output.
     :param base_address:    The base address of the binary.
+    :param preset:          The configuration preset to use during decompilation.
     :return:                The decompilation of all functions appended in order.
     """
     # delayed imports to avoid circular imports
@@ -757,11 +759,11 @@ def decompile_functions(
 
         exception_string = ""
         if not catch_errors:
-            dec = proj.analyses.Decompiler(f, cfg=cfg, options=dec_options)
+            dec = proj.analyses.Decompiler(f, cfg=cfg, options=dec_options, preset=preset)
         else:
             try:
                 # TODO: add a timeout
-                dec = proj.analyses.Decompiler(f, cfg=cfg, options=dec_options)
+                dec = proj.analyses.Decompiler(f, cfg=cfg, options=dec_options, preset=preset)
             except Exception as e:
                 exception_string = str(e).replace("\n", " ")
                 dec = None

angr/analyses/disassembly.py

@@ -10,16 +10,16 @@ from angr.knowledge_plugins import Function
 
 from . import Analysis
 
-from ..errors import AngrTypeError
-from ..utils.library import get_cpp_function_name
-from ..utils.formatting import ansi_color_enabled, ansi_color, add_edge_to_buffer
-from ..block import DisassemblerInsn, CapstoneInsn, SootBlockNode
-from ..codenode import BlockNode
+from angr.errors import AngrTypeError
+from angr.utils.library import get_cpp_function_name
+from angr.utils.formatting import ansi_color_enabled, ansi_color, add_edge_to_buffer
+from angr.block import DisassemblerInsn, CapstoneInsn, SootBlockNode
+from angr.codenode import BlockNode
 from .disassembly_utils import decode_instruction
 import contextlib
 
 try:
-    from ..engines import pcode
+    from angr.engines import pcode
     import pypcode
 
     IRSBType = Union[pyvex.IRSB, pcode.lifter.IRSB]

angr/analyses/disassembly_utils.py

@@ -5,7 +5,7 @@ import logging
 import capstone as cs
 from archinfo.arch_arm import is_arm_arch
 
-from ..misc.ux import once
+from angr.misc.ux import once
 
 l = logging.getLogger(name=__name__)
 

angr/analyses/dominance_frontier.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from ..utils.graph import compute_dominance_frontier, Dominators
+from angr.utils.graph import compute_dominance_frontier, Dominators
 from .analysis import Analysis
 from . import register_analysis
 

angr/analyses/find_objects_static.py

@@ -4,11 +4,11 @@ from collections import defaultdict
 
 import claripy
 
-from ..analyses import AnalysesHub
-from ..analyses.reaching_definitions.function_handler import FunctionHandler
-from ..knowledge_plugins.key_definitions.atoms import Register, MemoryLocation
-from ..storage.memory_mixins.paged_memory.pages.multi_values import MultiValues
-from ..knowledge_plugins.key_definitions.constants import OP_BEFORE, OP_AFTER
+from angr.analyses import AnalysesHub
+from angr.analyses.reaching_definitions.function_handler import FunctionHandler
+from angr.knowledge_plugins.key_definitions.atoms import Register, MemoryLocation
+from angr.storage.memory_mixins.paged_memory.pages.multi_values import MultiValues
+from angr.knowledge_plugins.key_definitions.constants import OP_BEFORE, OP_AFTER
 from . import Analysis, VtableFinder, CFGFast, ReachingDefinitionsAnalysis
 
 if TYPE_CHECKING:

angr/analyses/flirt.py

@@ -7,9 +7,9 @@ import logging
 import nampa
 from archinfo.arch_arm import is_arm_arch
 
-from ..analyses import AnalysesHub
-from ..errors import AngrRuntimeError
-from ..flirt import FlirtSignature, STRING_TO_LIBRARIES, LIBRARY_TO_SIGNATURES, FLIRT_SIGNATURES_BY_ARCH
+from angr.analyses import AnalysesHub
+from angr.errors import AngrRuntimeError
+from angr.flirt import FlirtSignature, STRING_TO_LIBRARIES, LIBRARY_TO_SIGNATURES, FLIRT_SIGNATURES_BY_ARCH
 from .analysis import Analysis
 import contextlib
 

angr/analyses/forward_analysis/__init__.py

@@ -1,3 +1,12 @@
 from __future__ import annotations
+
 from .forward_analysis import ForwardAnalysis
 from .visitors import CallGraphVisitor, FunctionGraphVisitor, LoopVisitor, SingleNodeGraphVisitor
+
+__all__ = (
+    "ForwardAnalysis",
+    "CallGraphVisitor",
+    "FunctionGraphVisitor",
+    "LoopVisitor",
+    "SingleNodeGraphVisitor",
+)

angr/analyses/forward_analysis/forward_analysis.py

@@ -6,10 +6,10 @@ from collections.abc import Callable
 import networkx
 
 from .visitors.graph import NodeType
-from ...sim_state import SimState
-from ...errors import AngrForwardAnalysisError
-from ...errors import AngrSkipJobNotice, AngrDelayJobNotice, AngrJobMergingFailureNotice, AngrJobWideningFailureNotice
-from ...utils.algo import binary_insert
+from angr.sim_state import SimState
+from angr.errors import AngrForwardAnalysisError
+from angr.errors import AngrSkipJobNotice, AngrDelayJobNotice, AngrJobMergingFailureNotice, AngrJobWideningFailureNotice
+from angr.utils.algo import binary_insert
 from .job_info import JobInfo, JobType, JobKey
 
 if TYPE_CHECKING:

angr/analyses/forward_analysis/job_info.py

@@ -20,7 +20,7 @@ class JobInfo(Generic[JobType, JobKey]):
         return hash((self.key, *tuple(self.jobs)))
 
     def __eq__(self, o):
-        return type(self) == type(o) and self.key == o.key and self.job == o.job
+        return type(self) is type(o) and self.key == o.key and self.job == o.job
 
     def __repr__(self):
         return f"<JobInfo {self.key!s}>"

angr/analyses/forward_analysis/visitors/__init__.py

@@ -1,5 +1,14 @@
 from __future__ import annotations
+
 from .call_graph import CallGraphVisitor
 from .function_graph import FunctionGraphVisitor
 from .loop import LoopVisitor
 from .single_node_graph import SingleNodeGraphVisitor
+
+
+__all__ = (
+    "CallGraphVisitor",
+    "FunctionGraphVisitor",
+    "LoopVisitor",
+    "SingleNodeGraphVisitor",
+)

angr/analyses/forward_analysis/visitors/graph.py

@@ -3,8 +3,8 @@ from typing import TypeVar, Generic
 from collections.abc import Collection, Iterator
 from collections import defaultdict
 
-from ....misc.ux import deprecated
-from ....utils.algo import binary_insert
+from angr.misc.ux import deprecated
+from angr.utils.algo import binary_insert
 
 NodeType = TypeVar("NodeType")
 

angr/analyses/identifier/__init__.py

@@ -1,2 +1,5 @@
 from __future__ import annotations
+
 from .identify import Identifier
+
+__all__ = ("Identifier",)