angr 9.2.102__py3-none-manylinux2014_x86_64.whl → 9.2.104__py3-none-manylinux2014_x86_64.whl

angr/calling_conventions.py

@@ -1,6 +1,6 @@
 # pylint:disable=line-too-long,missing-class-docstring,no-self-use
 import logging
-from typing import Optional, List, Dict, Type, Union
+from typing import Optional, Union
 from collections import defaultdict
 
 import claripy
@@ -116,7 +116,7 @@ class AllocHelper:
 
 
 def refine_locs_with_struct_type(
-    arch: archinfo.Arch, locs: List, arg_type: SimType, offset: int = 0, treat_bot_as_int=True
+    arch: archinfo.Arch, locs: list, arg_type: SimType, offset: int = 0, treat_bot_as_int=True
 ):
     # CONTRACT FOR USING THIS METHOD: locs must be a list of locs which are all wordsize
     # ADDITIONAL NUANCE: this will not respect the need for big-endian integers to be stored at the end of words.
@@ -265,7 +265,7 @@ class SimFunctionArgument:
     def refine(self, size, arch=None, offset=None, is_fp=None):
         raise NotImplementedError
 
-    def get_footprint(self) -> List[Union["SimRegArg", "SimStackArg"]]:
+    def get_footprint(self) -> list[Union["SimRegArg", "SimStackArg"]]:
         """
         Return a list of SimRegArg and SimStackArgs that are the base components used for this location
         """
@@ -424,7 +424,7 @@ class SimStructArg(SimFunctionArgument):
     :ivar locs:     The storage locations to use
     """
 
-    def __init__(self, struct: SimStruct, locs: Dict[str, SimFunctionArgument]):
+    def __init__(self, struct: SimStruct, locs: dict[str, SimFunctionArgument]):
         super().__init__(sum(loc.size for loc in locs.values()))
         self.struct = struct
         self.locs = locs
@@ -557,18 +557,18 @@ class SimCC:
     # Here are all the things a subclass needs to specify!
     #
 
-    ARG_REGS: List[str] = []  # A list of all the registers used for integral args, in order (names or offsets)
-    FP_ARG_REGS: List[str] = []  # A list of all the registers used for floating point args, in order
+    ARG_REGS: list[str] = []  # A list of all the registers used for integral args, in order (names or offsets)
+    FP_ARG_REGS: list[str] = []  # A list of all the registers used for floating point args, in order
     STACKARG_SP_BUFF = 0  # The amount of stack space reserved between the saved return address
     # (if applicable) and the arguments. Probably zero.
     STACKARG_SP_DIFF = 0  # The amount of stack space reserved for the return address
-    CALLER_SAVED_REGS: List[str] = []  # Caller-saved registers
+    CALLER_SAVED_REGS: list[str] = []  # Caller-saved registers
     RETURN_ADDR: SimFunctionArgument = None  # The location where the return address is stored, as a SimFunctionArgument
     RETURN_VAL: SimFunctionArgument = None  # The location where the return value is stored, as a SimFunctionArgument
-    OVERFLOW_RETURN_VAL: Optional[SimFunctionArgument] = (
+    OVERFLOW_RETURN_VAL: SimFunctionArgument | None = (
         None  # The second half of the location where a double-length return value is stored
     )
-    FP_RETURN_VAL: Optional[SimFunctionArgument] = (
+    FP_RETURN_VAL: SimFunctionArgument | None = (
         None  # The location where floating-point argument return values are stored
     )
     ARCH = None  # The archinfo.Arch class that this CC must be used for, if relevant
@@ -629,7 +629,7 @@ class SimCC:
 
     ArgSession = ArgSession  # import this from global scope so SimCC subclasses can subclass it if they like
 
-    def arg_session(self, ret_ty: Optional[SimType]):
+    def arg_session(self, ret_ty: SimType | None):
         """
         Return an arg session.
 
@@ -785,7 +785,7 @@ class SimCC:
 
         return result
 
-    def arg_locs(self, prototype) -> List[SimFunctionArgument]:
+    def arg_locs(self, prototype) -> list[SimFunctionArgument]:
         if prototype._arch is None:
             prototype = prototype.with_arch(self.arch)
         session = self.arg_session(prototype.returnty)
@@ -1073,7 +1073,7 @@ class SimCC:
         return isinstance(other, self.__class__)
 
     @classmethod
-    def _match(cls, arch, args: List, sp_delta):
+    def _match(cls, arch, args: list, sp_delta):
         if cls.ARCH is not None and not isinstance(
             arch, cls.ARCH
         ):  # pylint:disable=isinstance-second-argument-not-valid-type
@@ -1103,7 +1103,7 @@ class SimCC:
 
     @staticmethod
     def find_cc(
-        arch: "archinfo.Arch", args: List[SimFunctionArgument], sp_delta: int, platform: str = "Linux"
+        arch: "archinfo.Arch", args: list[SimFunctionArgument], sp_delta: int, platform: str = "Linux"
     ) -> Optional["SimCC"]:
         """
         Pinpoint the best-fit calling convention and return the corresponding SimCC instance, or None if no fit is
@@ -1472,7 +1472,7 @@ class SimCCSystemVAMD64(SimCC):
 
         return refine_locs_with_struct_type(self.arch, mapped_classes, arg_type)
 
-    def return_val(self, ty: Optional[SimType], perspective_returned=False):
+    def return_val(self, ty: SimType | None, perspective_returned=False):
         if ty is None:
             return None
         if ty._arch is None:
@@ -1552,8 +1552,8 @@ class SimCCSystemVAMD64(SimCC):
         else:
             raise NotImplementedError("Ummmmm... not sure what goes here. report bug to @rhelmot")
 
-    def _flatten(self, ty) -> Optional[Dict[int, List[SimType]]]:
-        result: Dict[int, List[SimType]] = defaultdict(list)
+    def _flatten(self, ty) -> dict[int, list[SimType]] | None:
+        result: dict[int, list[SimType]] = defaultdict(list)
         if isinstance(ty, SimStruct):
             if ty.packed:
                 return None
@@ -1733,8 +1733,8 @@ class SimCCARM(SimCC):
             return "INTEGER"
         return "SSE"
 
-    def _flatten(self, ty) -> Optional[Dict[int, List[SimType]]]:
-        result: Dict[int, List[SimType]] = defaultdict(list)
+    def _flatten(self, ty) -> dict[int, list[SimType]] | None:
+        result: dict[int, list[SimType]] = defaultdict(list)
         if isinstance(ty, SimStruct):
             if ty.packed:
                 return None
@@ -1957,8 +1957,8 @@ class SimCCO32(SimCC):
             return "INTEGER"
         return "SSE"
 
-    def _flatten(self, ty) -> Optional[Dict[int, List[SimType]]]:
-        result: Dict[int, List[SimType]] = defaultdict(list)
+    def _flatten(self, ty) -> dict[int, list[SimType]] | None:
+        result: dict[int, list[SimType]] = defaultdict(list)
         if isinstance(ty, SimStruct):
             if ty.packed:
                 return None
@@ -2049,6 +2049,7 @@ class SimCCPowerPC(SimCC):
     STACKARG_SP_BUFF = 8
     RETURN_ADDR = SimRegArg("lr", 4)
     RETURN_VAL = SimRegArg("r3", 4)
+    OVERFLOW_RETURN_VAL = SimRegArg("r4", 4)
     ARCH = archinfo.ArchPPC32
 
 
@@ -2156,7 +2157,7 @@ class SimCCS390XLinuxSyscall(SimCCSyscall):
         return state.regs.r1
 
 
-CC: Dict[str, Dict[str, List[Type[SimCC]]]] = {
+CC: dict[str, dict[str, list[type[SimCC]]]] = {
     "AMD64": {
         "default": [SimCCSystemVAMD64],
         "Linux": [SimCCSystemVAMD64],
@@ -2207,7 +2208,7 @@ CC: Dict[str, Dict[str, List[Type[SimCC]]]] = {
 }
 
 
-DEFAULT_CC: Dict[str, Dict[str, Type[SimCC]]] = {
+DEFAULT_CC: dict[str, dict[str, type[SimCC]]] = {
     "AMD64": {"Linux": SimCCSystemVAMD64, "Win32": SimCCMicrosoftAMD64},
     "X86": {"Linux": SimCCCdecl, "CGC": SimCCCdecl, "Win32": SimCCMicrosoftCdecl},
     "ARMEL": {"Linux": SimCCARM},
@@ -2225,7 +2226,7 @@ DEFAULT_CC: Dict[str, Dict[str, Type[SimCC]]] = {
 }
 
 
-def register_default_cc(arch: str, cc: Type[SimCC], platform: str = "Linux"):
+def register_default_cc(arch: str, cc: type[SimCC], platform: str = "Linux"):
     DEFAULT_CC[arch] = {platform: cc}
     if arch not in CC:
         CC[arch] = {}
@@ -2263,11 +2264,11 @@ for k, vs in ARCH_NAME_ALIASES.items():
 
 def default_cc(  # pylint:disable=unused-argument
     arch: str,
-    platform: Optional[str] = "Linux",
-    language: Optional[str] = None,
+    platform: str | None = "Linux",
+    language: str | None = None,
     syscall: bool = False,
     **kwargs,
-) -> Optional[Type[SimCC]]:
+) -> type[SimCC] | None:
     """
     Return the default calling convention for a given architecture, platform, and language combination.
 
@@ -2318,7 +2319,7 @@ def unify_arch_name(arch: str) -> str:
     return ALIAS_TO_ARCH_NAME.get(arch, arch)
 
 
-SYSCALL_CC: Dict[str, Dict[str, Type[SimCCSyscall]]] = {
+SYSCALL_CC: dict[str, dict[str, type[SimCCSyscall]]] = {
     "X86": {
         "default": SimCCX86LinuxSyscall,
         "Linux": SimCCX86LinuxSyscall,

angr/code_location.py

@@ -1,4 +1,4 @@
-from typing import Optional, Dict, Tuple, Any
+from typing import Any
 
 
 class CodeLocation:
@@ -21,9 +21,9 @@ class CodeLocation:
     def __init__(
         self,
         block_addr: int,
-        stmt_idx: Optional[int],
+        stmt_idx: int | None,
         sim_procedure=None,
-        ins_addr: Optional[int] = None,
+        ins_addr: int | None = None,
         context: Any = None,
         block_idx: int = None,
         **kwargs,
@@ -42,14 +42,14 @@ class CodeLocation:
         """
 
         self.block_addr: int = block_addr
-        self.stmt_idx: Optional[int] = stmt_idx
+        self.stmt_idx: int | None = stmt_idx
         self.sim_procedure = sim_procedure
-        self.ins_addr: Optional[int] = ins_addr
-        self.context: Optional[Tuple[int]] = context
+        self.ins_addr: int | None = ins_addr
+        self.context: tuple[int] | None = context
         self.block_idx = block_idx
         self._hash = None
 
-        self.info: Optional[Dict] = None
+        self.info: dict | None = None
 
         if kwargs:
             self._store_kwargs(**kwargs)
@@ -152,7 +152,7 @@ class ExternalCodeLocation(CodeLocation):
 
     __slots__ = ("call_string",)
 
-    def __init__(self, call_string: Optional[Tuple[int, ...]] = None):
+    def __init__(self, call_string: tuple[int, ...] | None = None):
         super().__init__(0, None)
         self.call_string = call_string if call_string is not None else ()
 

angr/codenode.py

@@ -1,5 +1,4 @@
 import logging
-from typing import List
 
 l = logging.getLogger(name=__name__)
 
@@ -46,7 +45,7 @@ class CodeNode:
             self._hash = hash((self.addr, self.size))
         return self._hash
 
-    def successors(self) -> List["CodeNode"]:
+    def successors(self) -> list["CodeNode"]:
         if self._graph is None:
             raise ValueError("Cannot calculate successors for graphless node")
         return list(self._graph.successors(self))

angr/concretization_strategies/max.py

@@ -1,5 +1,3 @@
-from typing import Optional
-
 from ..errors import SimSolverError
 from . import SimConcretizationStrategy
 
@@ -9,7 +7,7 @@ class SimConcretizationStrategyMax(SimConcretizationStrategy):
     Concretization strategy that returns the maximum address.
     """
 
-    def __init__(self, max_addr: Optional[int] = None):
+    def __init__(self, max_addr: int | None = None):
         super().__init__()
         self._max_addr = max_addr
 

angr/distributed/server.py

@@ -1,5 +1,3 @@
-from typing import Dict, Tuple
-
 import logging
 import time
 import os
@@ -63,7 +61,7 @@ class Server:
         self._recursion_limit = recursion_limit
 
         self._worker_exit_args_lock = None
-        self._worker_exit_args: Dict[int, Tuple] = None
+        self._worker_exit_args: dict[int, tuple] = None
 
         # the following will not be pickled
         self._worker_exit_callback = worker_exit_callback

angr/distributed/worker.py

@@ -1,4 +1,3 @@
-from typing import Dict
 import time
 import multiprocessing
 import logging
@@ -42,7 +41,7 @@ class ExplorationStatusNotifier(ExplorationTechnique):
     Force the exploration to stop if the server.stop is True.
     """
 
-    def __init__(self, server_state: Dict):
+    def __init__(self, server_state: dict):
         super().__init__()
         self.server_state = server_state
 

angr/engines/engine.py

@@ -3,7 +3,6 @@
 import abc
 import logging
 import threading
-from typing import Optional
 import angr
 
 from archinfo.arch_soot import SootAddressDescriptor
@@ -20,7 +19,7 @@ class SimEngineBase:
     def __init__(self, project=None, **kwargs):
         if kwargs:
             raise TypeError("Unused initializer args: " + ", ".join(kwargs.keys()))
-        self.project: Optional[angr.Project] = project
+        self.project: angr.Project | None = project
         self.state = None
 
     __tls = ("state",)
@@ -107,7 +106,7 @@ class SuccessorsMixin(SimEngine):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
-        self.successors: Optional[SimSuccessors] = None
+        self.successors: SimSuccessors | None = None
 
     __tls = ("successors",)
 

angr/engines/light/engine.py

@@ -1,5 +1,5 @@
 # pylint:disable=no-self-use,isinstance-second-argument-not-valid-type,unused-argument
-from typing import Tuple, Optional, Union, Any
+from typing import Any
 import struct
 import re
 import logging
@@ -23,7 +23,7 @@ class SimEngineLightMixin:
     """
 
     def __init__(self, *args, logger=None, **kwargs):
-        self.arch: Optional[archinfo.Arch] = None
+        self.arch: archinfo.Arch | None = None
         self.l = logger
         super().__init__(*args, **kwargs)
 
@@ -53,7 +53,7 @@ class SimEngineLightMixin:
         return base
 
     @staticmethod
-    def extract_offset_to_sp(spoffset_expr: claripy.ast.Base) -> Optional[int]:
+    def extract_offset_to_sp(spoffset_expr: claripy.ast.Base) -> int | None:
         """
         Extract the offset to the original stack pointer.
 
@@ -485,7 +485,7 @@ class SimEngineLightVEXMixin(SimEngineLightMixin):
     # Binary operation handlers
     #
 
-    def _binop_get_args(self, expr) -> Union[Optional[Tuple[Any, Any]], Optional[Any]]:
+    def _binop_get_args(self, expr) -> tuple[Any, Any] | None | Any | None:
         arg0, arg1 = expr.args
         expr_0 = self._expr(arg0)
         if expr_0 is None:

angr/engines/pcode/behavior.py

@@ -1,5 +1,5 @@
 import operator
-from typing import Callable, Iterable, Tuple
+from collections.abc import Callable, Iterable
 
 import claripy
 from claripy.ast.bv import BV
@@ -14,7 +14,7 @@ except ImportError:
 # pylint:disable=abstract-method
 
 
-def make_bv_sizes_equal(bv1: BV, bv2: BV) -> Tuple[BV, BV]:
+def make_bv_sizes_equal(bv1: BV, bv2: BV) -> tuple[BV, BV]:
     """
     Makes two BVs equal in length through sign extension.
     """
@@ -886,6 +886,23 @@ class OpBehaviorPopcount(OpBehavior):
         return expr
 
 
+class OpBehaviorLzcount(OpBehavior):
+    """
+    Behavior for the LZCOUNT operation.
+    """
+
+    def __init__(self):
+        super().__init__(OpCode.LZCOUNT, True)
+
+    def evaluate_unary(self, size_out: int, size_in: int, in1: BV) -> BV:
+        expr = claripy.BVV(len(in1), size_out * 8)
+        for pos in range(len(in1)):
+            expr = claripy.If(
+                claripy.Extract(pos, pos, in1) == claripy.BVV(1, 1), claripy.BVV(len(in1) - pos - 1, size_out * 8), expr
+            )
+        return expr
+
+
 class BehaviorFactory:
     """
     Returns the behavior object for a given opcode.
@@ -973,5 +990,6 @@ class BehaviorFactory:
                 OpCode.INSERT: OpBehavior(OpCode.INSERT, False, True),
                 OpCode.EXTRACT: OpBehavior(OpCode.EXTRACT, False, True),
                 OpCode.POPCOUNT: OpBehaviorPopcount(),
+                OpCode.LZCOUNT: OpBehaviorLzcount(),
             }
         )

angr/engines/pcode/emulate.py

@@ -27,7 +27,7 @@ class PcodeEmulatorMixin(SimEngineBase):
 
     _current_op: Optional["PcodeOp"]
     _current_op_idx: int
-    _current_behavior: Optional[OpBehavior]
+    _current_behavior: OpBehavior | None
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)

angr/engines/pcode/engine.py

@@ -1,4 +1,4 @@
-from typing import Optional, Iterable
+from collections.abc import Iterable
 
 import claripy
 import logging
@@ -50,13 +50,13 @@ class HeavyPcodeMixin(
     def process_successors(
         self,
         successors: SimSuccessors,
-        irsb: Optional[IRSB] = None,
-        insn_text: Optional[str] = None,
-        insn_bytes: Optional[bytes] = None,
+        irsb: IRSB | None = None,
+        insn_text: str | None = None,
+        insn_bytes: bytes | None = None,
         thumb: bool = False,
-        size: Optional[int] = None,
-        num_inst: Optional[int] = None,
-        extra_stop_points: Optional[Iterable[int]] = None,
+        size: int | None = None,
+        num_inst: int | None = None,
+        extra_stop_points: Iterable[int] | None = None,
         **kwargs,
     ) -> None:
         # pylint:disable=arguments-differ