angr 9.2.119__py3-none-win_amd64.whl → 9.2.120__py3-none-win_amd64.whl

angr/analyses/cfg/cfg_emulated.py

@@ -14,15 +14,15 @@ from archinfo import ArchARM
 from angr.analyses import ForwardAnalysis
 from angr.utils.graph import GraphUtils
 from angr.analyses import AnalysesHub
-from ... import BP, BP_BEFORE, BP_AFTER, SIM_PROCEDURES, procedures
-from ... import options as o
-from ...codenode import BlockNode
-from ...engines.procedure import ProcedureEngine
-from ...exploration_techniques.loop_seer import LoopSeer
-from ...exploration_techniques.slicecutor import Slicecutor
-from ...exploration_techniques.explorer import Explorer
-from ...exploration_techniques.lengthlimiter import LengthLimiter
-from ...errors import (
+from angr import BP, BP_BEFORE, BP_AFTER, SIM_PROCEDURES, procedures
+from angr import options as o
+from angr.codenode import BlockNode
+from angr.engines.procedure import ProcedureEngine
+from angr.exploration_techniques.loop_seer import LoopSeer
+from angr.exploration_techniques.slicecutor import Slicecutor
+from angr.exploration_techniques.explorer import Explorer
+from angr.exploration_techniques.lengthlimiter import LengthLimiter
+from angr.errors import (
     AngrCFGError,
     AngrError,
     AngrSkipJobNotice,
@@ -34,15 +34,15 @@ from ...errors import (
     AngrExitError,
     SimEmptyCallStackError,
 )
-from ...sim_state import SimState
-from ...state_plugins.callstack import CallStack
-from ...state_plugins.sim_action import SimActionData
-from ...knowledge_plugins.cfg import CFGENode, IndirectJump
-from ...utils.constants import DEFAULT_STATEMENT
-from ..cdg import CDG
-from ..ddg import DDG
-from ..backward_slice import BackwardSlice
-from ..loopfinder import LoopFinder, Loop
+from angr.sim_state import SimState
+from angr.state_plugins.callstack import CallStack
+from angr.state_plugins.sim_action import SimActionData
+from angr.knowledge_plugins.cfg import CFGENode, IndirectJump
+from angr.utils.constants import DEFAULT_STATEMENT
+from angr.analyses.cdg import CDG
+from angr.analyses.ddg import DDG
+from angr.analyses.backward_slice import BackwardSlice
+from angr.analyses.loopfinder import LoopFinder, Loop
 from .cfg_base import CFGBase
 from .cfg_job_base import BlockID, CFGJobBase
 import contextlib

angr/analyses/cfg/cfg_fast.py

@@ -3450,7 +3450,7 @@ class CFGFast(ForwardAnalysis[CFGNode, CFGNode, CFGJob, int], CFGBase):  # pylin
 
                 # next case - if b is directly from function prologue detection, or a basic block that is a successor of
                 # a wrongly identified basic block, we might be totally misdecoding b
-                if b.instruction_addrs[0] not in a.instruction_addrs and b in self.graph:
+                if (not b.instruction_addrs or b.instruction_addrs[0] not in a.instruction_addrs) and b in self.graph:
                     # use a, truncate b
 
                     new_b_addr = a.addr + a.size  # b starts right after a terminates

angr/analyses/cfg/cfg_fast_soot.py

@@ -8,11 +8,11 @@ from copy import copy
 
 from archinfo.arch_soot import SootMethodDescriptor, SootAddressDescriptor
 
-from ...utils.constants import DEFAULT_STATEMENT
-from ...errors import AngrCFGError, SimMemoryError, SimEngineError
-from ...codenode import HookNode, SootBlockNode
-from ...knowledge_plugins.cfg import CFGNode
-from .. import register_analysis
+from angr.utils.constants import DEFAULT_STATEMENT
+from angr.errors import AngrCFGError, SimMemoryError, SimEngineError
+from angr.codenode import HookNode, SootBlockNode
+from angr.knowledge_plugins.cfg import CFGNode
+from angr.analyses import register_analysis
 from .cfg_fast import CFGFast, CFGJob, PendingJobs, FunctionTransitionEdge
 
 l = logging.getLogger(name=__name__)

angr/analyses/cfg/cfg_job_base.py

@@ -4,11 +4,11 @@ from typing import TYPE_CHECKING
 
 from archinfo.arch_soot import SootAddressDescriptor
 
-from ...errors import SimValueError, SimSolverModeError
-from ...state_plugins.callstack import CallStack
+from angr.errors import SimValueError, SimSolverModeError
+from angr.state_plugins.callstack import CallStack
 
 if TYPE_CHECKING:
-    from ...sim_state import SimState
+    from angr.sim_state import SimState
 l = logging.getLogger(name=__name__)
 
 # TODO: Make callsite an object and use it in BlockID and FunctionKey

angr/analyses/cfg/indirect_jump_resolvers/__init__.py

@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 from .mips_elf_fast import MipsElfFastResolver
 from .x86_elf_pic_plt import X86ElfPicPltResolver
 from .jumptable import JumpTableResolver
@@ -7,3 +8,15 @@ from .amd64_elf_got import AMD64ElfGotResolver
 from .arm_elf_fast import ArmElfFastResolver
 from .const_resolver import ConstantResolver
 from .amd64_pe_iat import AMD64PeIatResolver
+
+
+__all__ = (
+    "MipsElfFastResolver",
+    "X86ElfPicPltResolver",
+    "JumpTableResolver",
+    "X86PeIatResolver",
+    "AMD64ElfGotResolver",
+    "ArmElfFastResolver",
+    "ConstantResolver",
+    "AMD64PeIatResolver",
+)

angr/analyses/cfg/indirect_jump_resolvers/amd64_pe_iat.py

@@ -3,7 +3,7 @@ import logging
 
 from capstone.x86_const import X86_OP_MEM, X86_REG_RIP
 
-from ....simos import SimWindows
+from angr.simos import SimWindows
 from .resolver import IndirectJumpResolver
 
 l = logging.getLogger(name=__name__)

angr/analyses/cfg/indirect_jump_resolvers/arm_elf_fast.py

@@ -4,8 +4,8 @@ import logging
 import archinfo
 import pyvex
 
-from ....blade import Blade
-from ....utils.constants import DEFAULT_STATEMENT
+from angr.blade import Blade
+from angr.utils.constants import DEFAULT_STATEMENT
 from .resolver import IndirectJumpResolver
 
 _l = logging.getLogger(name=__name__)

angr/analyses/cfg/indirect_jump_resolvers/const_resolver.py

@@ -5,10 +5,10 @@ import logging
 import claripy
 import pyvex
 
-from ....utils.constants import DEFAULT_STATEMENT
-from ....code_location import CodeLocation
-from ....blade import Blade
-from ...propagator import vex_vars
+from angr.utils.constants import DEFAULT_STATEMENT
+from angr.code_location import CodeLocation
+from angr.blade import Blade
+from angr.analyses.propagator import vex_vars
 from .resolver import IndirectJumpResolver
 from .propagator_utils import PropagatorLoadCallback
 

angr/analyses/cfg/indirect_jump_resolvers/jumptable.py

@@ -11,27 +11,27 @@ import pyvex
 import claripy
 from archinfo.arch_arm import is_arm_arch
 
-from .... import sim_options as o
-from .... import BP, BP_BEFORE, BP_AFTER
-from ....misc.ux import once
-from ....code_location import CodeLocation
-from ....concretization_strategies import SimConcretizationStrategyAny
-from ....knowledge_plugins.cfg import IndirectJump, IndirectJumpType
-from ....engines.vex.claripy import ccall
-from ....engines.light import SimEngineLightVEXMixin, SimEngineLight, SpOffset, RegisterOffset
-from ....errors import AngrError, SimError
-from ....blade import Blade
-from ....annocfg import AnnotatedCFG
-from ....exploration_techniques.slicecutor import Slicecutor
-from ....exploration_techniques.local_loop_seer import LocalLoopSeer
-from ....exploration_techniques.explorer import Explorer
-from ....utils.constants import DEFAULT_STATEMENT
-from ...propagator.vex_vars import VEXReg
+from angr import sim_options as o
+from angr import BP, BP_BEFORE, BP_AFTER
+from angr.misc.ux import once
+from angr.code_location import CodeLocation
+from angr.concretization_strategies import SimConcretizationStrategyAny
+from angr.knowledge_plugins.cfg import IndirectJump, IndirectJumpType
+from angr.engines.vex.claripy import ccall
+from angr.engines.light import SimEngineLightVEXMixin, SimEngineLight, SpOffset, RegisterOffset
+from angr.errors import AngrError, SimError
+from angr.blade import Blade
+from angr.annocfg import AnnotatedCFG
+from angr.exploration_techniques.slicecutor import Slicecutor
+from angr.exploration_techniques.local_loop_seer import LocalLoopSeer
+from angr.exploration_techniques.explorer import Explorer
+from angr.utils.constants import DEFAULT_STATEMENT
+from angr.analyses.propagator.vex_vars import VEXReg
 from .resolver import IndirectJumpResolver
 from .propagator_utils import PropagatorLoadCallback
 
 try:
-    from ....engines import pcode
+    from angr.engines import pcode
 except ImportError:
     pcode = None
 
@@ -1723,7 +1723,10 @@ class JumpTableResolver(IndirectJumpResolver):
         all_targets = []
         jump_table = []
 
-        jumptable_si = claripy.SI(bits=project.arch.bits, to_conv=jumptable_addr)
+        try:
+            jumptable_si = claripy.SI(bits=project.arch.bits, to_conv=jumptable_addr)
+        except claripy.errors.BackendError:
+            return None
 
         # we may resolve a vtable (in C, e.g., the IO_JUMPS_FUNC in libc), but the stride of this load is usually 1
         # while the read statement reads a word size at a time.

angr/analyses/cfg/indirect_jump_resolvers/mips_elf_fast.py

@@ -8,11 +8,11 @@ import claripy
 import pyvex
 
 
-from .... import options, BP_BEFORE
-from ....blade import Blade
-from ....annocfg import AnnotatedCFG
-from ....exploration_techniques import Slicecutor
-from ....utils.constants import DEFAULT_STATEMENT
+from angr import options, BP_BEFORE
+from angr.blade import Blade
+from angr.annocfg import AnnotatedCFG
+from angr.exploration_techniques import Slicecutor
+from angr.utils.constants import DEFAULT_STATEMENT
 from .resolver import IndirectJumpResolver
 
 if TYPE_CHECKING:

angr/analyses/cfg/indirect_jump_resolvers/resolver.py

@@ -1,10 +1,10 @@
 from __future__ import annotations
 import typing
 
-from ....errors import SimMemoryError
+from angr.errors import SimMemoryError
 
 if typing.TYPE_CHECKING:
-    from .... import Project
+    from angr import Project
 
 
 class IndirectJumpResolver:

angr/analyses/cfg/indirect_jump_resolvers/x86_pe_iat.py

@@ -3,7 +3,7 @@ import logging
 
 from capstone.x86_const import X86_OP_MEM
 
-from ....simos import SimWindows
+from angr.simos import SimWindows
 from .resolver import IndirectJumpResolver
 
 l = logging.getLogger(name=__name__)

angr/analyses/cfg_slice_to_sink/__init__.py

@@ -1,3 +1,11 @@
 from __future__ import annotations
+
 from .graph import slice_callgraph, slice_cfg_graph, slice_function_graph
 from .cfg_slice_to_sink import CFGSliceToSink
+
+__all__ = (
+    "CFGSliceToSink",
+    "slice_callgraph",
+    "slice_cfg_graph",
+    "slice_function_graph",
+)

angr/analyses/class_identifier.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
-from ..sim_type import SimCppClass, SimTypeCppFunction
-from ..analyses import AnalysesHub
+from angr.sim_type import SimCppClass, SimTypeCppFunction
+from angr.analyses import AnalysesHub
 from . import Analysis, CFGFast, VtableFinder
 
 

angr/analyses/code_tagging.py

@@ -1,8 +1,8 @@
 from __future__ import annotations
 import pyvex
 
-from ..utils import looks_like_sql
-from ..knowledge_plugins.xrefs import XRef
+from angr.utils import looks_like_sql
+from angr.knowledge_plugins.xrefs import XRef
 from . import Analysis, AnalysesHub
 
 

angr/analyses/complete_calling_conventions.py

@@ -14,8 +14,8 @@ import claripy
 
 from angr.utils.graph import GraphUtils
 from angr.simos import SimWindows
-from ..utils.mp import mp_context, Initializer
-from ..knowledge_plugins.cfg import CFGModel
+from angr.utils.mp import mp_context, Initializer
+from angr.knowledge_plugins.cfg import CFGModel
 from . import Analysis, register_analysis, VariableRecoveryFast, CallingConventionAnalysis
 
 if TYPE_CHECKING:
@@ -185,7 +185,7 @@ class CompleteCallingConventionsAnalysis(Analysis):
                 if self._cc_callback is not None:
                     self._cc_callback(func_addr)
 
-                percentage = idx + 1 / total_funcs * 100.0
+                percentage = (idx + 1) / total_funcs * 100.0
                 self._update_progress(percentage, text=f"{idx + 1}/{total_funcs} - {func.demangled_name}")
                 if self._low_priority:
                     self._release_gil(idx + 1, 10, 0.000001)

angr/analyses/congruency_check.py

@@ -6,7 +6,6 @@ import claripy
 from . import Analysis
 
 l = logging.getLogger(name=__name__)
-# l.setLevel(logging.DEBUG)
 
 
 class CongruencyCheck(Analysis):
@@ -373,7 +372,7 @@ class CongruencyCheck(Analysis):
         return True
 
 
-from ..errors import AngrIncongruencyError
+from angr.errors import AngrIncongruencyError
 from angr.analyses import AnalysesHub
 
 AnalysesHub.register_default("CongruencyCheck", CongruencyCheck)

angr/analyses/data_dep/__init__.py

@@ -1,3 +1,16 @@
 from __future__ import annotations
+
 from .data_dependency_analysis import DataDependencyGraphAnalysis
 from .dep_nodes import DepNodeTypes, BaseDepNode, VarDepNode, MemDepNode, ConstantDepNode, TmpDepNode, RegDepNode
+
+
+__all__ = (
+    "DataDependencyGraphAnalysis",
+    "DepNodeTypes",
+    "BaseDepNode",
+    "VarDepNode",
+    "MemDepNode",
+    "ConstantDepNode",
+    "TmpDepNode",
+    "RegDepNode",
+)

angr/analyses/data_dep/data_dependency_analysis.py

@@ -12,11 +12,11 @@ import claripy
 from claripy.ast.bv import BV
 from .dep_nodes import DepNodeTypes, ConstantDepNode, MemDepNode, VarDepNode, RegDepNode, TmpDepNode
 from .sim_act_location import SimActLocation, DEFAULT_LOCATION, ParsedInstruction
-from .. import Analysis
-from ...analyses import AnalysesHub
-from ...errors import AngrDDGError, AngrAnalysisError, SimValueError
-from ...state_plugins import SimActionData
-from ...storage import DefaultMemory
+from angr.analyses import Analysis
+from angr.analyses import AnalysesHub
+from angr.errors import AngrDDGError, AngrAnalysisError, SimValueError
+from angr.state_plugins import SimActionData
+from angr.storage import DefaultMemory
 
 if TYPE_CHECKING:
     from .dep_nodes import BaseDepNode

angr/analyses/datagraph_meta.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 import logging
 
-from ..sim_procedure import SimProcedure
+from angr.sim_procedure import SimProcedure
 
 l = logging.getLogger(name=__name__)
 

angr/analyses/ddg.py

@@ -6,9 +6,9 @@ import networkx
 import pyvex
 from . import Analysis
 
-from ..code_location import CodeLocation
-from ..errors import SimSolverModeError, SimUnsatError, AngrDDGError
-from ..sim_variable import (
+from angr.code_location import CodeLocation
+from angr.errors import SimSolverModeError, SimUnsatError, AngrDDGError
+from angr.sim_variable import (
     SimRegisterVariable,
     SimMemoryVariable,
     SimTemporaryVariable,

angr/analyses/decompiler/__init__.py

@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 from .region_identifier import RegionIdentifier
 from .structured_codegen import CStructuredCodeGenerator, ImportSourceCode
 from .clinic import Clinic
@@ -10,7 +11,31 @@ from .callsite_maker import CallSiteMaker
 from .ail_simplifier import AILSimplifier
 from .ssailification import Ssailification
 from .dephication import GraphDephication, SeqNodeDephication
+from .presets import DECOMPILATION_PRESETS
 from . import structuring
 from . import optimization_passes
 
+
 StructuredCodeGenerator = CStructuredCodeGenerator
+
+
+__all__ = (
+    "RegionIdentifier",
+    "CStructuredCodeGenerator",
+    "ImportSourceCode",
+    "Clinic",
+    "RegionSimplifier",
+    "Decompiler",
+    "options",
+    "options_by_category",
+    "BlockSimplifier",
+    "CallSiteMaker",
+    "AILSimplifier",
+    "Ssailification",
+    "GraphDephication",
+    "SeqNodeDephication",
+    "DECOMPILATION_PRESETS",
+    "structuring",
+    "optimization_passes",
+    "StructuredCodeGenerator",
+)

angr/analyses/decompiler/ail_simplifier.py

@@ -27,14 +27,14 @@ from ailment.expression import (
 
 from angr.analyses.s_reaching_definitions import SRDAModel
 from angr.utils.ail import is_phi_assignment, HasExprWalker
-from ...code_location import CodeLocation, ExternalCodeLocation
-from ...sim_variable import SimStackVariable, SimMemoryVariable, SimVariable
-from ...knowledge_plugins.propagations.states import Equivalence
-from ...knowledge_plugins.key_definitions import atoms
-from ...knowledge_plugins.key_definitions.definition import Definition
-from ...knowledge_plugins.key_definitions.constants import OP_BEFORE
-from ...errors import AngrRuntimeError
-from .. import Analysis, AnalysesHub
+from angr.code_location import CodeLocation, ExternalCodeLocation
+from angr.sim_variable import SimStackVariable, SimMemoryVariable, SimVariable
+from angr.knowledge_plugins.propagations.states import Equivalence
+from angr.knowledge_plugins.key_definitions import atoms
+from angr.knowledge_plugins.key_definitions.definition import Definition
+from angr.knowledge_plugins.key_definitions.constants import OP_BEFORE
+from angr.errors import AngrRuntimeError
+from angr.analyses import Analysis, AnalysesHub
 from .ailgraph_walker import AILGraphWalker
 from .expression_narrower import ExpressionNarrowingWalker
 from .block_simplifier import BlockSimplifier

angr/analyses/decompiler/block_simplifier.py

@@ -10,9 +10,9 @@ from ailment import AILBlockWalkerBase
 
 from angr.code_location import ExternalCodeLocation, CodeLocation
 
-from ...analyses.s_propagator import SPropagatorAnalysis
-from ...analyses.s_reaching_definitions import SReachingDefinitionsAnalysis, SRDAModel
-from .. import Analysis, register_analysis
+from angr.analyses.s_propagator import SPropagatorAnalysis
+from angr.analyses.s_reaching_definitions import SReachingDefinitionsAnalysis, SRDAModel
+from angr.analyses import Analysis, register_analysis
 from .peephole_optimizations import (
     MULTI_STMT_OPTS,
     STMT_OPTS,

angr/analyses/decompiler/callsite_maker.py

@@ -11,7 +11,7 @@ from angr.sim_type import SimTypeBottom, SimTypePointer, SimTypeChar, SimTypeInt
 from angr.calling_conventions import SimRegArg, SimStackArg, SimCC, SimStructArg
 from angr.knowledge_plugins.key_definitions.constants import OP_BEFORE
 from angr.analyses import Analysis, register_analysis
-from angr.analyses.s_reaching_definitions.s_rda import SRDAView
+from angr.analyses.s_reaching_definitions import SRDAView
 from angr import SIM_LIBRARIES, SIM_TYPE_COLLECTIONS
 
 if TYPE_CHECKING:
@@ -284,7 +284,9 @@ class CallSiteMaker(Analysis):
 
             if vvar is not None:
                 vvar_value = view.get_vvar_value(vvar)
-                return vvar_value, vvar
+                if not isinstance(vvar_value, Expr.Phi):
+                    return vvar_value, vvar
+                return None, vvar
 
         return None
 
@@ -311,7 +313,7 @@ class CallSiteMaker(Analysis):
                 )
                 if vvar is not None:
                     value = view.get_vvar_value(vvar)
-                    if value is not None:
+                    if value is not None and not isinstance(value, Expr.Phi):
                         return None, value
                     return None, Expr.VirtualVariable(
                         self._atom_idx(),

angr/analyses/decompiler/clinic.py

@@ -13,13 +13,13 @@ import capstone
 import ailment
 
 from angr.errors import AngrDecompilationError
-from ...knowledge_base import KnowledgeBase
-from ...knowledge_plugins.functions import Function
-from ...knowledge_plugins.cfg.memory_data import MemoryDataSort
-from ...codenode import BlockNode
-from ...utils import timethis
-from ...calling_conventions import SimRegArg, SimStackArg, SimFunctionArgument
-from ...sim_type import (
+from angr.knowledge_base import KnowledgeBase
+from angr.knowledge_plugins.functions import Function
+from angr.knowledge_plugins.cfg.memory_data import MemoryDataSort
+from angr.codenode import BlockNode
+from angr.utils import timethis
+from angr.calling_conventions import SimRegArg, SimStackArg, SimFunctionArgument
+from angr.sim_type import (
     SimTypeChar,
     SimTypeInt,
     SimTypeLongLong,
@@ -29,17 +29,16 @@ from ...sim_type import (
     SimTypeFloat,
     SimTypePointer,
 )
-from ..stack_pointer_tracker import Register, OffsetVal
-from ...sim_variable import SimVariable, SimStackVariable, SimRegisterVariable, SimMemoryVariable
-from ...procedures.stubs.UnresolvableCallTarget import UnresolvableCallTarget
-from ...procedures.stubs.UnresolvableJumpTarget import UnresolvableJumpTarget
-from .. import Analysis, register_analysis
-from ..cfg.cfg_base import CFGBase
-from ..reaching_definitions import ReachingDefinitionsAnalysis
+from angr.analyses.stack_pointer_tracker import Register, OffsetVal
+from angr.sim_variable import SimVariable, SimStackVariable, SimRegisterVariable, SimMemoryVariable
+from angr.procedures.stubs.UnresolvableCallTarget import UnresolvableCallTarget
+from angr.procedures.stubs.UnresolvableJumpTarget import UnresolvableJumpTarget
+from angr.analyses import Analysis, register_analysis
+from angr.analyses.cfg.cfg_base import CFGBase
+from angr.analyses.reaching_definitions import ReachingDefinitionsAnalysis
 from .return_maker import ReturnMaker
 from .ailgraph_walker import AILGraphWalker, RemoveNodeNotice
 from .optimization_passes import (
-    get_default_optimization_passes,
     OptimizationPassStage,
     RegisterSaveAreaSimplifier,
     StackCanarySimplifier,
@@ -129,7 +128,7 @@ class Clinic(Analysis):
         self._func_graph: networkx.DiGraph | None = None
         self._ail_manager = None
         self._blocks_by_addr_and_size = {}
-        self._entry_node_addr: tuple[int, int | None] = self.function.addr, None
+        self.entry_node_addr: tuple[int, int | None] = self.function.addr, None
 
         self._fold_callexprs_into_conditions = fold_callexprs_into_conditions
         self._insert_labels = insert_labels
@@ -165,8 +164,7 @@ class Clinic(Analysis):
         if optimization_passes is not None:
             self._optimization_passes = optimization_passes
         else:
-            self._optimization_passes = get_default_optimization_passes(self.project.arch, self.project.simos.name)
-            l.debug("Get %d optimization passes for the current binary.", len(self._optimization_passes))
+            self._optimization_passes = []
 
         if self._mode == ClinicMode.DECOMPILE:
             self._analyze_for_decompiling()
@@ -713,11 +711,11 @@ class Clinic(Analysis):
             if self._func_graph.in_degree(node) == 0 and CFGBase._is_noop_block(
                 self.project.arch, self.project.factory.block(node.addr, node.size)
             ):
-                if (node.addr, None) == self._entry_node_addr:
+                if (node.addr, None) == self.entry_node_addr:
                     # this is the entry node. after removing this node, the new entry node will be its successor
                     if self._func_graph.out_degree[node] == 1:
                         succ = next(iter(self._func_graph.successors(node)))
-                        self._entry_node_addr = succ.addr, None
+                        self.entry_node_addr = succ.addr, None
                     else:
                         # we just don't remove this node...
                         continue
@@ -1219,6 +1217,7 @@ class Clinic(Analysis):
                 graph=ail_graph,
                 variable_kb=variable_kb,
                 vvar_id_start=self.vvar_id_start,
+                entry_node_addr=self.entry_node_addr,
                 **kwargs,
             )
             if a.out_graph:
@@ -1240,7 +1239,7 @@ class Clinic(Analysis):
         ail_graph: networkx.DiGraph,
         arg_vvars: dict[int, tuple[ailment.Expr.VirtualVariable, SimVariable]],
     ) -> networkx.DiGraph:
-        entrypoint = next(iter(bb for bb in ail_graph if (bb.addr, bb.idx) == self._entry_node_addr))
+        entrypoint = next(iter(bb for bb in ail_graph if (bb.addr, bb.idx) == self.entry_node_addr))
         new_stmts = []
         for arg in arg_list:
             if not isinstance(arg, SimRegisterVariable):
@@ -1298,7 +1297,7 @@ class Clinic(Analysis):
         ssailification = self.project.analyses.Ssailification(
             self.function,
             ail_graph,
-            entry=next(iter(bb for bb in ail_graph if (bb.addr, bb.idx) == self._entry_node_addr)),
+            entry=next(iter(bb for bb in ail_graph if (bb.addr, bb.idx) == self.entry_node_addr)),
             ail_manager=self._ail_manager,
             ssa_stackvars=False,
             vvar_id_start=self.vvar_id_start,
@@ -1311,7 +1310,7 @@ class Clinic(Analysis):
         ssailification = self.project.analyses.Ssailification(
             self.function,
             ail_graph,
-            entry=next(iter(bb for bb in ail_graph if (bb.addr, bb.idx) == self._entry_node_addr)),
+            entry=next(iter(bb for bb in ail_graph if (bb.addr, bb.idx) == self.entry_node_addr)),
             ail_manager=self._ail_manager,
             ssa_stackvars=True,
             vvar_id_start=self.vvar_id_start,
@@ -1324,7 +1323,7 @@ class Clinic(Analysis):
         dephication = self.project.analyses.GraphDephicationVVarMapping(
             self.function,
             ail_graph,
-            entry=next(iter(bb for bb in ail_graph if (bb.addr, bb.idx) == self._entry_node_addr)),
+            entry=next(iter(bb for bb in ail_graph if (bb.addr, bb.idx) == self.entry_node_addr)),
             vvar_id_start=self.vvar_id_start,
         )
         self.vvar_id_start = dephication.vvar_id_start + 1
@@ -1798,10 +1797,10 @@ class Clinic(Analysis):
 
         graph = networkx.DiGraph()
 
-        entry_node = next(iter(node for node in func_graph if node.addr == self._entry_node_addr[0]), None)
+        entry_node = next(iter(node for node in func_graph if node.addr == self.entry_node_addr[0]), None)
         if entry_node is None:
             raise AngrDecompilationError(
-                f"Entry node with address {self._entry_node_addr[0]:#x} not found in the function graph"
+                f"Entry node with address {self.entry_node_addr[0]:#x} not found in the function graph"
             )
 
         # add the entry node into the graph

angr/analyses/decompiler/condition_processor.py

@@ -12,11 +12,11 @@ from unique_log_filter import UniqueLogFilter
 
 
 from angr.utils.graph import GraphUtils
-from ...utils.lazy_import import lazy_import
-from ...utils import is_pyinstaller
-from ...utils.graph import dominates, inverted_idoms
-from ...block import Block, BlockNode
-from ...errors import AngrRuntimeError
+from angr.utils.lazy_import import lazy_import
+from angr.utils import is_pyinstaller
+from angr.utils.graph import dominates, inverted_idoms
+from angr.block import Block, BlockNode
+from angr.errors import AngrRuntimeError
 from .peephole_optimizations import InvertNegatedLogicalConjunctionsAndDisjunctions
 from .structuring.structurer_nodes import (
     MultiNode,
@@ -158,6 +158,8 @@ _ail2claripy_op_mapping = {
     "ExpCmpNE": lambda expr, _, m: _dummy_bools(expr, m),
     "CmpORD": lambda expr, _, m: _dummy_bvs(expr, m),  # in case CmpORDRewriter fails
     "GetMSBs": lambda expr, _, m: _dummy_bvs(expr, m),
+    "InterleaveLOV": lambda expr, _, m: _dummy_bvs(expr, m),
+    "InterleaveHIV": lambda expr, _, m: _dummy_bvs(expr, m),
 }
 
 #