angr 9.2.116__py3-none-win_amd64.whl → 9.2.118__py3-none-win_amd64.whl

angr/procedures/win32/local_storage.py

@@ -1,3 +1,6 @@
+from __future__ import annotations
+import claripy
+
 import angr
 
 
@@ -19,7 +22,7 @@ class TlsAlloc(angr.SimProcedure):
     def run(self):
         d = mutate_dict(self.state, self.KEY)
         new_key = len(d) + 1
-        d[new_key] = self.state.solver.BVV(0, self.state.arch.bits)
+        d[new_key] = claripy.BVV(0, self.state.arch.bits)
         return new_key
 
 
@@ -27,10 +30,10 @@ class TlsSetValue(angr.SimProcedure):
     KEY = "win32_tls"
 
     def run(self, index, value):
-        conc_indexs = self.state.solver.eval_upto(index, 2)
-        if len(conc_indexs) != 1:
+        conc_indexes = self.state.solver.eval_upto(index, 2)
+        if len(conc_indexes) != 1:
             raise angr.errors.SimValueError("Can't handle symbolic index in TlsSetValue/FlsSetValue")
-        conc_index = conc_indexs[0]
+        conc_index = conc_indexes[0]
 
         if not has_index(self.state, conc_index, self.KEY):
             return 0
@@ -43,10 +46,10 @@ class TlsGetValue(angr.SimProcedure):
     KEY = "win32_tls"
 
     def run(self, index):
-        conc_indexs = self.state.solver.eval_upto(index, 2)
-        if len(conc_indexs) != 1:
+        conc_indexes = self.state.solver.eval_upto(index, 2)
+        if len(conc_indexes) != 1:
             raise angr.errors.SimValueError("Can't handle symbolic index in TlsGetValue/FlsGetValue")
-        conc_index = conc_indexs[0]
+        conc_index = conc_indexes[0]
 
         if not has_index(self.state, conc_index, self.KEY):
             return 0
@@ -59,7 +62,7 @@ class TlsFree(angr.SimProcedure):
     SETTER = TlsSetValue
 
     def run(self, index):
-        set_val = self.inline_call(self.SETTER, index, self.state.solver.BVV(0, self.state.arch.bits))
+        set_val = self.inline_call(self.SETTER, index, claripy.BVV(0, self.state.arch.bits))
         return set_val.ret_expr
 
 

angr/procedures/win32/mutex.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import angr
 
 

angr/procedures/win32/sim_time.py

@@ -1,8 +1,11 @@
-import angr
+from __future__ import annotations
 import datetime
 import time
 
 
+import angr
+
+
 class GetSystemTimeAsFileTime(angr.SimProcedure):
     timestamp = None
 
@@ -107,7 +110,7 @@ class GetLocalTime(angr.SimProcedure):
 class QueryPerformanceCounter(angr.SimProcedure):
     def run(self, ptr):
         if angr.options.USE_SYSTEM_TIMES in self.state.options:
-            val = int(time.clock() * 1000000) + 12345678
+            val = int(time.process_time() * 1000000) + 12345678
             self.state.mem[ptr].qword = val
         else:
             self.state.mem[ptr].qword = self.state.solver.BVS(
@@ -119,10 +122,8 @@ class QueryPerformanceCounter(angr.SimProcedure):
 class GetTickCount(angr.SimProcedure):
     def run(self):
         if angr.options.USE_SYSTEM_TIMES in self.state.options:
-            return int(time.clock() * 1000) + 12345
-        else:
-            val = self.state.solver.BVS("GetTickCount_result", 32, key=("api", "GetTickCount"))
-            return val
+            return int(time.process_time() * 1000) + 12345
+        return self.state.solver.BVS("GetTickCount_result", 32, key=("api", "GetTickCount"))
 
 
 class GetTickCount64(angr.SimProcedure):
@@ -130,6 +131,5 @@ class GetTickCount64(angr.SimProcedure):
 
     def run(self):
         if angr.options.USE_SYSTEM_TIMES in self.state.options:
-            return int(time.clock() * 1000) + 12345
-        else:
-            return self.state.solver.BVS("GetTickCount64_result", 64, key=("api", "GetTickCount64"))
+            return int(time.process_time() * 1000) + 12345
+        return self.state.solver.BVS("GetTickCount64_result", 64, key=("api", "GetTickCount64"))

angr/procedures/win32/system_paths.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import angr
 import claripy
 
@@ -8,8 +9,8 @@ class GetTempPathA(angr.SimProcedure):
     def run(self, nBufferLength, lpBuffer):
         try:
             length = self.state.solver.eval_one(nBufferLength)
-        except angr.errors.SimValueError:
-            raise angr.errors.SimProcedureError("Can't handle symbolic nBufferLength in GetTempPath")
+        except angr.errors.SimValueError as err:
+            raise angr.errors.SimProcedureError("Can't handle symbolic nBufferLength in GetTempPath") from err
 
         copy_len = min(self.RESULT.length // 8, length - 1)
         self.state.memory.store(
@@ -24,8 +25,8 @@ class GetWindowsDirectoryA(angr.SimProcedure):
     def run(self, lpBuffer, uSize):
         try:
             length = self.state.solver.eval_one(uSize)
-        except angr.errors.SimValueError:
-            raise angr.errors.SimProcedureError("Can't handle symbolic uSize in GetWindowsDirectory")
+        except angr.errors.SimValueError as err:
+            raise angr.errors.SimProcedureError("Can't handle symbolic uSize in GetWindowsDirectory") from err
 
         copy_len = min(self.RESULT.length // 8, length - 1)
         self.state.memory.store(

angr/procedures/win32_kernel/ExAllocatePool.py

@@ -1,4 +1,5 @@
 # pylint: disable=missing-class-docstring
+from __future__ import annotations
 import claripy
 
 import angr

angr/procedures/win32_kernel/ExFreePoolWithTag.py

@@ -1,4 +1,5 @@
 # pylint: disable=missing-class-docstring
+from __future__ import annotations
 from angr import SimProcedure
 
 

angr/procedures/win_user32/chars.py

@@ -1,12 +1,15 @@
+from __future__ import annotations
+import claripy
+
 import angr
 
 
 # these are NOT suitable for multibyte characters
 class CharNextA(angr.SimProcedure):
     def run(self, ptr):
-        return self.state.solver.If(self.state.mem[ptr].uint8_t.resolved == 0, ptr, ptr + 1)
+        return claripy.If(self.state.mem[ptr].uint8_t.resolved == 0, ptr, ptr + 1)
 
 
 class CharPrevA(angr.SimProcedure):
     def run(self, start, ptr):
-        return self.state.solver.If(start == ptr, start, ptr - 1)
+        return claripy.If(start == ptr, start, ptr - 1)

angr/procedures/win_user32/keyboard.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import angr
 
 

angr/procedures/win_user32/messagebox.py

@@ -1,15 +1,15 @@
+from __future__ import annotations
+import claripy
+
 import angr
 
 
 class MessageBoxA(angr.SimProcedure):
     def run(self, hWnd, lpText, lpCaption, uType):
         text = self.extract(lpText)
-        if not self.state.solver.is_true(lpCaption == 0):
-            caption = self.extract(lpCaption)
-        else:
-            caption = "Error"
+        caption = self.extract(lpCaption) if not self.state.solver.is_true(lpCaption == 0) else "Error"
 
-        result = self.state.solver.If(
+        result = claripy.If(
             uType & 0xF == 0, 1, self.state.solver.BVS("messagebox_button", 32, key=("api", "messagebox", "button"))
         )
         self.state.history.add_event("message_box", text=text, caption=caption, result=result)

angr/project.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import logging
 import os
 import types
@@ -139,7 +140,7 @@ class Project:
             self.filename = None
             self.loader = cle.Loader(thing, **load_options)
         elif not isinstance(thing, (str, Path)) or not os.path.exists(thing) or not os.path.isfile(thing):
-            raise Exception("Not a valid binary file: %s" % repr(thing))
+            raise Exception(f"Not a valid binary file: {thing!r}")
         else:
             # use angr's loader, provided by cle
             l.info("Loading binary %s", thing)
@@ -202,10 +203,9 @@ class Project:
             )
             self.selfmodifying_code = bool(support_selfmodifying_code)
 
-        if self.selfmodifying_code:
-            if self._translation_cache is True:
-                self._translation_cache = False
-                l.warning("Disabling IRSB translation cache because support for self-modifying code is enabled.")
+        if self.selfmodifying_code and self._translation_cache is True:
+            self._translation_cache = False
+            l.warning("Disabling IRSB translation cache because support for self-modifying code is enabled.")
 
         self.entry = self.loader.main_object.entry
         self.storage = defaultdict(list)
@@ -248,7 +248,7 @@ class Project:
             # If we execute a Java archive that includes native JNI libraries,
             # we need to use the arch of the native simos for all (native) sim
             # procedures.
-            sim_proc_arch = getattr(self.simos, "native_arch")
+            sim_proc_arch = self.simos.native_arch
         else:
             sim_proc_arch = self.arch
         for obj in self.loader.initial_load_objects:
@@ -258,14 +258,14 @@ class Project:
         self.simos.configure_project()
 
     @property
-    def analyses(self) -> "AnalysesHubWithDefault":
+    def analyses(self) -> AnalysesHubWithDefault:
         result = self._analyses
         if result is None:
             raise ValueError("Cannot access analyses this early in project lifecycle")
         return result
 
     @analyses.setter
-    def analyses(self, v: "AnalysesHubWithDefault"):
+    def analyses(self, v: AnalysesHubWithDefault):
         self._analyses = v
 
     def _initialize_analyses_hub(self):
@@ -428,11 +428,7 @@ class Project:
         for lib in hinted_libs:
             if SIM_LIBRARIES[lib].has_implementation(f.name):
                 l.debug("Found implementation for %s in %s", f, lib)
-                if f.resolvedby:
-                    hook_at = f.resolvedby.rebased_addr
-                else:
-                    # ????
-                    hook_at = f.relative_addr
+                hook_at = f.resolvedby.rebased_addr if f.resolvedby else f.relative_addr  # ????
                 self.hook_symbol(hook_at, (SIM_LIBRARIES[lib].get(f.name, self.arch)))
                 return True
 
@@ -453,7 +449,7 @@ class Project:
 
     @staticmethod
     def _addr_to_str(addr):
-        return "%s" % repr(addr) if isinstance(addr, SootAddressDescriptor) else "%#x" % addr
+        return f"{addr!r}" if isinstance(addr, SootAddressDescriptor) else f"{addr:#x}"
 
     #
     # Public methods
@@ -505,12 +501,12 @@ class Project:
                 l.warning(
                     "Address is already hooked, during hook(%s, %s). Not re-hooking.", self._addr_to_str(addr), hook
                 )
-                return
+                return None
             else:
                 l.warning("Address is already hooked, during hook(%s, %s). Re-hooking.", self._addr_to_str(addr), hook)
 
         if isinstance(hook, type):
-            raise TypeError("Please instanciate your SimProcedure before hooking with it")
+            raise TypeError("Please instantiate your SimProcedure before hooking with it")
 
         if callable(hook):
             hook = SIM_PROCEDURES["stubs"]["UserHook"](user_func=hook, length=length, **kwargs)
@@ -524,6 +520,7 @@ class Project:
         #    l.error("Consider also using angr.SIM_LIBRARIES instead of angr.SIM_PROCEDURES or angr.procedures.")
 
         self._sim_procedures[addr] = hook
+        return None
 
     def is_hooked(self, addr) -> bool:
         """
@@ -709,10 +706,7 @@ class Project:
         simulation manager.
         """
 
-        if args:
-            state = args[0]
-        else:
-            state = self.factory.full_init_state(**kwargs)
+        state = args[0] if args else self.factory.full_init_state(**kwargs)
 
         pg = self.factory.simulation_manager(state)
         self._executing = True
@@ -751,7 +745,7 @@ class Project:
             self.store_function, self.load_function = None, None
             # ignore analyses. we re-initialize analyses when restoring from pickling so that we do not lose any newly
             # added analyses classes
-            d = {
+            return {
                 k: v
                 for k, v in self.__dict__.items()
                 if k
@@ -759,7 +753,6 @@ class Project:
                     "analyses",
                 }
             }
-            return d
         finally:
             self.store_function, self.load_function = store_func, load_func
 

angr/protos/__init__.py

@@ -5,6 +5,7 @@
 #
 # Then you need to manually fix all _pb2 imports to be relative because of this unresolved issue:
 # https://github.com/protocolbuffers/protobuf/issues/1491
+from __future__ import annotations
 
 from . import primitives_pb2
 from . import function_pb2

angr/serializable.py

@@ -1,3 +1,6 @@
+from __future__ import annotations
+
+
 class Serializable:
     """
     The base class of all protobuf-serializable classes in angr.
@@ -13,7 +16,7 @@ class Serializable:
         :return:    The correct cmessage object.
         """
 
-        raise NotImplementedError()
+        raise NotImplementedError
 
     def serialize_to_cmessage(self):
         """
@@ -23,7 +26,7 @@ class Serializable:
         :rtype:     protobuf.cmessage
         """
 
-        raise NotImplementedError()
+        raise NotImplementedError
 
     def serialize(self):
         """
@@ -45,7 +48,7 @@ class Serializable:
         :rtype:         cls
         """
 
-        raise NotImplementedError()
+        raise NotImplementedError
 
     @classmethod
     def parse(cls, s, **kwargs):

angr/sim_manager.py

@@ -263,11 +263,11 @@ class SimulationManager:
         if not isinstance(tech, ExplorationTechnique):
             raise SimulationManagerError
 
-        def _is_overriden(name):
+        def _is_overridden(name):
             return getattr(tech, name).__code__ is not getattr(ExplorationTechnique, name).__code__
 
-        overriden = filter(_is_overriden, ("step", "filter", "selector", "step_state", "successors"))
-        hooks = {name: getattr(tech, name) for name in overriden}
+        overridden = filter(_is_overridden, ("step", "filter", "selector", "step_state", "successors"))
+        hooks = {name: getattr(tech, name) for name in overridden}
         HookSet.remove_hooks(self, **hooks)
 
         self._techniques.remove(tech)
@@ -323,7 +323,9 @@ class SimulationManager:
             if isinstance(t, Veritesting):
                 deviation_filter_saved = t.options.get("deviation_filter", None)
                 if deviation_filter_saved is not None:
-                    t.options["deviation_filter"] = lambda s: tech.find(s) or tech.avoid(s) or deviation_filter_saved(s)
+                    t.options["deviation_filter"] = (
+                        lambda s, dfs=deviation_filter_saved: tech.find(s) or tech.avoid(s) or dfs(s)
+                    )
                 else:
                     t.options["deviation_filter"] = lambda s: tech.find(s) or tech.avoid(s)
                 break
@@ -357,7 +359,7 @@ class SimulationManager:
         :return:            The simulation manager, for chaining.
         :rtype:             SimulationManager
         """
-        for _ in itertools.count() if n is None else range(0, n):
+        for _ in itertools.count() if n is None else range(n):
             if not self.complete() and self._stashes[stash]:
                 self.step(stash=stash, **kwargs)
                 if not (until and until(self)):
@@ -371,9 +373,9 @@ class SimulationManager:
         """
         if not self._techniques:
             return False
-        if not any(tech._is_overriden("complete") for tech in self._techniques):
+        if not any(tech._is_overridden("complete") for tech in self._techniques):
             return False
-        return self.completion_mode(tech.complete(self) for tech in self._techniques if tech._is_overriden("complete"))
+        return self.completion_mode(tech.complete(self) for tech in self._techniques if tech._is_overridden("complete"))
 
     def step(
         self,
@@ -779,7 +781,7 @@ class SimulationManager:
         :param merge_func:  If provided, instead of using state.merge, call this function with
                             the states as the argument. Should return the merged state.
         :param merge_key:   If provided, should be a function that takes a state and returns a key that will compare
-                            equal for all states that are allowed to be merged together, as a first aproximation.
+                            equal for all states that are allowed to be merged together, as a first approximation.
                             By default: uses PC, callstack, and open file descriptors.
         :param prune:       Whether to prune the stash prior to merging it
 
@@ -796,7 +798,7 @@ class SimulationManager:
         merge_groups = []
         while to_merge:
             base_key = merge_key(to_merge[0])
-            g, to_merge = self._filter_states(lambda s: base_key == merge_key(s), to_merge)
+            g, to_merge = self._filter_states(lambda s, base_key=base_key: base_key == merge_key(s), to_merge)
             if len(g) <= 1:
                 not_to_merge.extend(g)
             else:
@@ -832,16 +834,15 @@ class SimulationManager:
     def _fetch_states(self, stash):
         if stash in self._stashes:
             return self._stashes[stash]
-        elif stash == SimulationManager.ALL:
+        if stash == SimulationManager.ALL:
             return list(itertools.chain.from_iterable(self._stashes.values()))
-        elif stash == "mp_" + SimulationManager.ALL:
+        if stash == "mp_" + SimulationManager.ALL:
             return mulpyplexer.MP(self._fetch_states(stash=SimulationManager.ALL))
-        elif stash.startswith("mp_"):
+        if stash.startswith("mp_"):
             return mulpyplexer.MP(self._stashes.get(stash[3:], []))
-        elif stash.startswith("one_"):
+        if stash.startswith("one_"):
             return self._stashes.get(stash[4:], [None])[0]
-        else:
-            raise AttributeError("No such stash: %s" % stash)
+        raise AttributeError(f"No such stash: {stash}")
 
     def _filter_states(self, filter_func, states):  # pylint:disable=no-self-use
         match, nomatch = [], []
@@ -889,8 +890,7 @@ class SimulationManager:
         if len(others):
             others.append(m)
             return self._merge_states(others)
-        else:
-            return m
+        return m
 
     #
     #   ...
@@ -964,7 +964,7 @@ class ErrorRecord:
         raise self.error.with_traceback(self.traceback)
 
     def __repr__(self):
-        return '<State errored with "%s">' % self.error
+        return f'<State errored with "{self.error}">'
 
     def __eq__(self, other):
         return self is other or self.state is other

angr/sim_options.py

@@ -1,5 +1,6 @@
 # This module contains the analysis options.
 # All variables with names of all caps will be registered as a state option to SimStateOptions.
+from __future__ import annotations
 
 import string
 from .sim_state_options import SimStateOptions
@@ -44,12 +45,9 @@ NO_SYMBOLIC_JUMP_RESOLUTION = "NO_SYMBOLIC_JUMP_RESOLUTION"
 # This option prevents angr from doing hundreds of constraint solves when it hits a symbolic syscall
 NO_SYMBOLIC_SYSCALL_RESOLUTION = "NO_SYMBOLIC_SYSCALL_RESOLUTION"
 
-# The absense of this option causes the analysis to avoid reasoning about most symbolic values.
+# The absence of this option causes the analysis to avoid reasoning about most symbolic values.
 SYMBOLIC = "SYMBOLIC"
 
-# This variable causes claripy to use a string solver (CVC4)
-STRINGS_ANALYSIS = "STRINGS_ANALYSIS"
-
 # Generate symbolic values for non-existent values. The absence of this option causes Unconstrained() to return default
 # concrete values (like 0)
 SYMBOLIC_INITIAL_VALUES = "SYMBOLIC_INITIAL_VALUES"
@@ -73,7 +71,7 @@ CONCRETIZE_SYMBOLIC_FILE_READ_SIZES = "CONCRETIZE_SYMBOLIC_FILE_READ_SIZES"
 FILES_HAVE_EOF = "FILES_HAVE_EOF"
 UNKNOWN_FILES_HAVE_EOF = FILES_HAVE_EOF
 
-# Attempting to open an unkown file will result in creating it with a symbolic length
+# Attempting to open an unknown file will result in creating it with a symbolic length
 ALL_FILES_EXIST = "ALL_FILES_EXIST"
 
 # Unknown files might or might not exist
@@ -315,7 +313,7 @@ CGC_ENFORCE_FD = "CGC_ENFORCE_FD"
 CGC_NON_BLOCKING_FDS = "CGC_NON_BLOCKING_FDS"
 
 # Allows memory breakpoints to get more accurate sizes in case of reading large chunks
-# Sacrafice performance for more fine tune memory read size
+# Sacrifice performance for more fine tune memory read size
 MEMORY_CHUNK_INDIVIDUAL_READS = "MEMORY_CHUNK_INDIVIDUAL_READS"
 
 # Synchronize memory mapping reported by angr with the concrete process.
@@ -337,7 +335,7 @@ JAVA_TRACK_ATTRIBUTES = "JAVA_TRACK_ATTRIBUTES"
 
 _g = globals().copy()
 for k, v in _g.items():
-    if all([char in string.ascii_uppercase + "_" + string.digits for char in k]) and type(v) is str:
+    if all(char in string.ascii_uppercase + "_" + string.digits for char in k) and type(v) is str:
         if k in (
             "UNKNOWN_FILES_HAVE_EOF",
             "CGC_ZERO_FILL_UNCONSTRAINED_MEMORY",

angr/sim_procedure.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import inspect
 import copy
 import itertools
@@ -99,7 +100,7 @@ class SimProcedure:
 
     """
 
-    state: "SimState"
+    state: SimState
 
     def __init__(
         self,
@@ -168,7 +169,7 @@ class SimProcedure:
         self.arg_session: None | ArgSession | int = None
 
     def __repr__(self):
-        return "<SimProcedure %s%s%s%s%s>" % self._describe_me()
+        return "<SimProcedure {}{}{}{}{}>".format(*self._describe_me())
 
     def _describe_me(self):
         """
@@ -176,7 +177,7 @@ class SimProcedure:
         """
         return (
             self.display_name,
-            " (cont: %s)" % self.run_func if self.is_continuation else "",
+            f" (cont: {self.run_func})" if self.is_continuation else "",
             " (syscall)" if self.is_syscall else "",
             " (inline)" if not self.use_state_arguments else "",
             " (stub)" if self.is_stub else "",
@@ -206,8 +207,8 @@ class SimProcedure:
                 )(self.arch)
             else:
                 raise SimProcedureError(
-                    "There is no default calling convention for architecture %s."
-                    " You must specify a calling convention." % self.arch.name
+                    f"There is no default calling convention for architecture {self.arch.name}."
+                    " You must specify a calling convention."
                 )
         if self.prototype._arch is None:
             self.prototype = self.prototype.with_arch(self.arch)
@@ -274,7 +275,7 @@ class SimProcedure:
                     inst.arg_session = 0
 
             # run it
-            l.debug("Executing %s%s%s%s%s with %s, %s", *(inst._describe_me() + (sim_args, inst.kwargs)))
+            l.debug("Executing %s%s%s%s%s with %s, %s", *((*inst._describe_me(), sim_args, inst.kwargs)))
             r = getattr(inst, inst.run_func)(*sim_args, **inst.kwargs)
 
         state._inspect(
@@ -327,7 +328,7 @@ class SimProcedure:
         """
         Implement the actual procedure here!
         """
-        raise SimProcedureError("%s does not implement a run() method" % self.__class__.__name__)
+        raise SimProcedureError(f"{self.__class__.__name__} does not implement a run() method")
 
     def static_exits(self, blocks, **kwargs):  # pylint: disable=unused-argument
         """
@@ -340,7 +341,7 @@ class SimProcedure:
         """
 
         if self.ADDS_EXITS:
-            raise SimProcedureError("static_exits() is not implemented for %s" % self)
+            raise SimProcedureError(f"static_exits() is not implemented for {self}")
 
         # This SimProcedure does not add any new exit
         return []
@@ -410,9 +411,9 @@ class SimProcedure:
         :param arguments:       Any additional positional args will be used as arguments to the
                                 procedure call
         :param sim_kwargs:      Any additional keyword args will be passed as sim_kwargs to the
-                                procedure construtor
+                                procedure constructor
         """
-        e_args = [self.state.solver.BVV(a, self.state.arch.bits) if isinstance(a, int) else a for a in arguments]
+        e_args = [claripy.BVV(a, self.state.arch.bits) if isinstance(a, int) else a for a in arguments]
         p = procedure(project=self.project, **kwargs)
         return p.execute(self.state, None, arguments=e_args)
 
@@ -476,7 +477,7 @@ class SimProcedure:
         self._prepare_ret_state()
 
         self._exit_action(self.state, ret_addr)
-        self.successors.add_successor(self.state, ret_addr, self.state.solver.true, "Ijk_Ret")
+        self.successors.add_successor(self.state, ret_addr, claripy.true, "Ijk_Ret")
 
     def call(self, addr, args, continue_at, cc=None, prototype=None, jumpkind="Ijk_Call"):
         """
@@ -498,7 +499,7 @@ class SimProcedure:
 
         call_state = self.state.copy()
         ret_addr = self.make_continuation(continue_at)
-        saved_local_vars = list(zip(self.local_vars, map(lambda name: getattr(self, name), self.local_vars)))
+        saved_local_vars = list(zip(self.local_vars, (getattr(self, name) for name in self.local_vars)))
         simcallstack_entry = (
             self.state.regs.sp if hasattr(self.state.regs, "sp") else None,
             self.arguments,
@@ -519,7 +520,7 @@ class SimProcedure:
             call_state.regs.t9 = addr
 
         self._exit_action(call_state, addr)
-        self.successors.add_successor(call_state, addr, call_state.solver.true, jumpkind)
+        self.successors.add_successor(call_state, addr, claripy.true, jumpkind)
         if jumpkind != "Ijk_Call":
             call_state.callstack.call(
                 self.state.addr, addr, retn_target=ret_addr, stack_pointer=call_state.regs.sp.concrete_value
@@ -530,7 +531,7 @@ class SimProcedure:
             ret_state = self.state.copy()
             cc.setup_callsite(ret_state, ret_addr, args, prototype)
             ret_state.callstack.top.procedure_data = simcallstack_entry
-            guard = ret_state.solver.true if o.TRUE_RET_EMULATION_GUARD in ret_state.options else ret_state.solver.false
+            guard = claripy.true if o.TRUE_RET_EMULATION_GUARD in ret_state.options else claripy.false
             self.successors.add_successor(ret_state, ret_addr, guard, "Ijk_FakeRet")
 
     def jump(self, addr, jumpkind="Ijk_Boring"):
@@ -539,7 +540,7 @@ class SimProcedure:
         """
         self.inhibit_autoret = True
         self._exit_action(self.state, addr)
-        self.successors.add_successor(self.state, addr, self.state.solver.true, jumpkind)
+        self.successors.add_successor(self.state, addr, claripy.true, jumpkind)
 
     def exit(self, exit_code):
         """
@@ -550,9 +551,9 @@ class SimProcedure:
         self.state.options.discard(o.AUTO_REFS)
 
         if isinstance(exit_code, int):
-            exit_code = self.state.solver.BVV(exit_code, self.state.arch.bits)
+            exit_code = claripy.BVV(exit_code, self.state.arch.bits)
         self.state.history.add_event("terminate", exit_code=exit_code)
-        self.successors.add_successor(self.state, self.state.regs.ip, self.state.solver.true, "Ijk_Exit")
+        self.successors.add_successor(self.state, self.state.regs.ip, claripy.true, "Ijk_Exit")
 
     @staticmethod
     def _exit_action(state, addr):