angr 9.2.64__py3-none-manylinux2014_x86_64.whl → 9.2.66__py3-none-manylinux2014_x86_64.whl

angr/knowledge_plugins/key_definitions/live_definitions.py

@@ -1,6 +1,7 @@
+from typing import Optional, Iterable, Dict, Set, Generator, Tuple, Union, Any, TYPE_CHECKING, overload, Type
 import weakref
-from typing import Optional, Iterable, Dict, Set, Generator, Tuple, Union, Any, TYPE_CHECKING
 import logging
+from enum import Enum, auto
 
 from collections import defaultdict
 
@@ -8,23 +9,36 @@ import claripy
 from claripy.annotation import Annotation
 import archinfo
 
-from ...errors import SimMemoryMissingError, SimMemoryError
-from ...storage.memory_mixins import MultiValuedMemory
-from ...storage.memory_mixins.paged_memory.pages.multi_values import MultiValues
-from ...engines.light import SpOffset
-from ...code_location import CodeLocation
+from angr.misc.ux import deprecated
+from angr.errors import SimMemoryMissingError, SimMemoryError
+from angr.storage.memory_mixins import MultiValuedMemory
+from angr.storage.memory_mixins.paged_memory.pages.multi_values import MultiValues
+from angr.engines.light import SpOffset
+from angr.code_location import CodeLocation, ExternalCodeLocation
 from .atoms import Atom, Register, MemoryLocation, Tmp, ConstantSrc
 from .definition import Definition, Tag
 from .heap_address import HeapAddress
 from .uses import Uses
 
 if TYPE_CHECKING:
+    from angr.project import Project
     from angr.storage import SimMemoryObject
 
 
 l = logging.getLogger(name=__name__)
 
 
+class DerefSize(Enum):
+    """
+    An enum for specialized kinds of dereferences
+
+    NULL_TERMINATE -    Dereference until the first byte which could be a literal null. Return a value including the
+                        terminator.
+    """
+
+    NULL_TERMINATE = auto()
+
+
 #
 # Annotations
 #
@@ -81,11 +95,13 @@ class LiveDefinitions:
         "project",
         "arch",
         "track_tmps",
-        "register_definitions",
-        "stack_definitions",
-        "heap_definitions",
-        "memory_definitions",
+        "registers",
+        "stack",
+        "heap",
+        "memory",
         "tmps",
+        "others",
+        "other_uses",
         "register_uses",
         "stack_uses",
         "heap_uses",
@@ -101,23 +117,25 @@ class LiveDefinitions:
         arch: archinfo.Arch,
         track_tmps: bool = False,
         canonical_size=8,
-        register_definitions=None,
-        stack_definitions=None,
-        memory_definitions=None,
-        heap_definitions=None,
+        registers=None,
+        stack=None,
+        memory=None,
+        heap=None,
         tmps=None,
+        others=None,
         register_uses=None,
         stack_uses=None,
         heap_uses=None,
         memory_uses=None,
         tmp_uses=None,
+        other_uses=None,
     ):
-        self.project = None
+        self.project: Optional["Project"] = None
         self.arch = arch
         self.track_tmps = track_tmps
         self._canonical_size: int = canonical_size  # TODO: Drop canonical_size
 
-        self.register_definitions: MultiValuedMemory = (
+        self.registers: MultiValuedMemory = (
             MultiValuedMemory(
                 memory_id="reg",
                 top_func=self.top,
@@ -125,70 +143,76 @@ class LiveDefinitions:
                 page_kwargs={"mo_cmp": self._mo_cmp},
                 endness=self.arch.register_endness,
             )
-            if register_definitions is None
-            else register_definitions
+            if registers is None
+            else registers
         )
-        self.stack_definitions: MultiValuedMemory = (
+        self.stack: MultiValuedMemory = (
             MultiValuedMemory(
                 memory_id="mem",
                 top_func=self.top,
                 skip_missing_values_during_merging=False,
                 page_kwargs={"mo_cmp": self._mo_cmp},
             )
-            if stack_definitions is None
-            else stack_definitions
+            if stack is None
+            else stack
         )
-        self.memory_definitions: MultiValuedMemory = (
+        self.memory: MultiValuedMemory = (
             MultiValuedMemory(
                 memory_id="mem",
                 top_func=self.top,
                 skip_missing_values_during_merging=False,
                 page_kwargs={"mo_cmp": self._mo_cmp},
             )
-            if memory_definitions is None
-            else memory_definitions
+            if memory is None
+            else memory
         )
-        self.heap_definitions: MultiValuedMemory = (
+        self.heap: MultiValuedMemory = (
             MultiValuedMemory(
                 memory_id="mem",
                 top_func=self.top,
                 skip_missing_values_during_merging=False,
                 page_kwargs={"mo_cmp": self._mo_cmp},
             )
-            if heap_definitions is None
-            else heap_definitions
+            if heap is None
+            else heap
         )
         self.tmps: Dict[int, Set[Definition]] = {} if tmps is None else tmps
+        self.others: Dict[Atom, MultiValues] = others if others is not None else {}
 
         # set state
-        self.register_definitions.set_state(self)
-        self.stack_definitions.set_state(self)
-        self.memory_definitions.set_state(self)
-        self.heap_definitions.set_state(self)
+        self.registers.set_state(self)
+        self.stack.set_state(self)
+        self.memory.set_state(self)
+        self.heap.set_state(self)
 
         self.register_uses = Uses() if register_uses is None else register_uses
         self.stack_uses = Uses() if stack_uses is None else stack_uses
         self.heap_uses = Uses() if heap_uses is None else heap_uses
         self.memory_uses = Uses() if memory_uses is None else memory_uses
         self.tmp_uses: Dict[int, Set[CodeLocation]] = defaultdict(set) if tmp_uses is None else tmp_uses
+        self.other_uses = Uses() if other_uses is None else other_uses
 
         self.uses_by_codeloc: Dict[CodeLocation, Set[Definition]] = defaultdict(set)
 
     @property
-    def registers(self) -> MultiValuedMemory:
-        return self.register_definitions
+    @deprecated("registers")
+    def register_definitions(self) -> MultiValuedMemory:
+        return self.registers
 
     @property
-    def stack(self) -> MultiValuedMemory:
-        return self.stack_definitions
+    @deprecated("stack")
+    def stack_definitions(self) -> MultiValuedMemory:
+        return self.stack
 
     @property
-    def memory(self) -> MultiValuedMemory:
-        return self.memory_definitions
+    @deprecated("memory")
+    def memory_definitions(self) -> MultiValuedMemory:
+        return self.memory
 
     @property
-    def heap(self) -> MultiValuedMemory:
-        return self.heap_definitions
+    @deprecated("heap")
+    def heap_definitions(self) -> MultiValuedMemory:
+        return self.heap
 
     def __repr__(self):
         ctnt = "LiveDefs"
@@ -201,18 +225,21 @@ class LiveDefinitions:
             self.arch,
             track_tmps=self.track_tmps,
             canonical_size=self._canonical_size,
-            register_definitions=self.register_definitions.copy(),
-            stack_definitions=self.stack_definitions.copy(),
-            heap_definitions=self.heap_definitions.copy(),
-            memory_definitions=self.memory_definitions.copy(),
+            registers=self.registers.copy(),
+            stack=self.stack.copy(),
+            heap=self.heap.copy(),
+            memory=self.memory.copy(),
             tmps=self.tmps.copy() if not discard_tmpdefs else None,
+            others=dict(self.others),
             register_uses=self.register_uses.copy(),
             stack_uses=self.stack_uses.copy(),
             heap_uses=self.heap_uses.copy(),
             memory_uses=self.memory_uses.copy(),
             tmp_uses=self.tmp_uses.copy() if not discard_tmpdefs else None,
+            other_uses=self.other_uses.copy(),
         )
 
+        rd.project = self.project
         return rd
 
     def reset_uses(self):
@@ -220,6 +247,7 @@ class LiveDefinitions:
         self.register_uses = Uses()
         self.memory_uses = Uses()
         self.heap_uses = Uses()
+        self.other_uses = Uses()
 
     def _get_weakref(self):
         return weakref.proxy(self)
@@ -283,7 +311,7 @@ class LiveDefinitions:
                 return True
         return False
 
-    def stack_address(self, offset: int) -> claripy.ast.Base:
+    def stack_address(self, offset: int) -> Optional[claripy.ast.bv.BV]:
         base = claripy.BVS("stack_base", self.arch.bits, explicit_name=True)
         if offset:
             return base + offset
@@ -353,7 +381,7 @@ class LiveDefinitions:
         Return the concrete value contained by the stack pointer.
         """
         assert self.arch.sp_offset is not None
-        sp_values: MultiValues = self.register_definitions.load(self.arch.sp_offset, size=self.arch.bytes)
+        sp_values: MultiValues = self.registers.load(self.arch.sp_offset, size=self.arch.bytes)
         sp_v = sp_values.one_value()
         if sp_v is None:
             # multiple values of sp exists. still return a value if there is only one value (maybe with different
@@ -373,7 +401,7 @@ class LiveDefinitions:
         Return the offset of the stack pointer.
         """
         assert self.arch.sp_offset is not None
-        sp_values: MultiValues = self.register_definitions.load(self.arch.sp_offset, size=self.arch.bytes)
+        sp_values: MultiValues = self.registers.load(self.arch.sp_offset, size=self.arch.bytes)
         sp_v = sp_values.one_value()
         if sp_v is None:
             values = [v for v in next(iter(sp_values.values())) if self.get_stack_offset(v) is not None]
@@ -401,21 +429,30 @@ class LiveDefinitions:
             raise ValueError("Unsupported architecture word size %d" % self.arch.bits)
         return (base_v + offset) & mask
 
-    def merge(self, *others) -> Tuple["LiveDefinitions", bool]:
+    def merge(self, *others: "LiveDefinitions") -> Tuple["LiveDefinitions", bool]:
         state = self.copy()
 
-        merge_occurred = state.register_definitions.merge([other.register_definitions for other in others], None)
-        merge_occurred |= state.heap_definitions.merge([other.heap_definitions for other in others], None)
-        merge_occurred |= state.memory_definitions.merge([other.memory_definitions for other in others], None)
-        merge_occurred |= state.stack_definitions.merge([other.stack_definitions for other in others], None)
+        merge_occurred = state.registers.merge([other.registers for other in others], None)
+        merge_occurred |= state.heap.merge([other.heap for other in others], None)
+        merge_occurred |= state.memory.merge([other.memory for other in others], None)
+        merge_occurred |= state.stack.merge([other.stack for other in others], None)
 
         for other in others:
-            other: LiveDefinitions
+            for k in other.others:
+                if k in self.others:
+                    thing = self.others[k].merge(other.others[k])
+                    if thing != self.others[k]:
+                        merge_occurred = True
+                        self.others[k] = thing
+                else:
+                    self.others[k] = other.others[k]
+                    merge_occurred = True
 
             merge_occurred |= state.register_uses.merge(other.register_uses)
             merge_occurred |= state.stack_uses.merge(other.stack_uses)
             merge_occurred |= state.heap_uses.merge(other.heap_uses)
             merge_occurred |= state.memory_uses.merge(other.memory_uses)
+            merge_occurred |= state.other_uses.merge(other.other_uses)
 
         return state, merge_occurred
 
@@ -429,21 +466,21 @@ class LiveDefinitions:
         """
 
         if isinstance(atom, Register):
-            self.register_definitions.erase(atom.reg_offset, size=atom.size)
+            self.registers.erase(atom.reg_offset, size=atom.size)
         elif isinstance(atom, MemoryLocation):
             if isinstance(atom.addr, SpOffset):
                 if atom.addr.offset is not None:
                     stack_addr = self.stack_offset_to_stack_addr(atom.addr.offset)
-                    self.stack_definitions.erase(stack_addr, size=atom.size)
+                    self.stack.erase(stack_addr, size=atom.size)
                 else:
                     l.warning("Skip stack storing since the stack offset is None.")
             elif isinstance(atom.addr, HeapAddress):
-                self.heap_definitions.erase(atom.addr.value, size=atom.size)
+                self.heap.erase(atom.addr.value, size=atom.size)
             elif isinstance(atom.addr, int):
-                self.memory_definitions.erase(atom.addr, size=atom.size)
+                self.memory.erase(atom.addr, size=atom.size)
             elif isinstance(atom.addr, claripy.ast.Base):
                 if atom.addr.concrete:
-                    self.memory_definitions.erase(atom.addr._model_concrete.value, size=atom.size)
+                    self.memory.erase(atom.addr._model_concrete.value, size=atom.size)
                 elif self.is_stack_address(atom.addr):
                     stack_addr = self.get_stack_address(atom.addr)
                     if stack_addr is None:
@@ -451,7 +488,7 @@ class LiveDefinitions:
                             "Failed to convert stack address %s to a concrete stack address. Skip the store.", atom.addr
                         )
                     else:
-                        self.stack_definitions.erase(stack_addr, size=atom.size)
+                        self.stack.erase(stack_addr, size=atom.size)
                 else:
                     return
             else:
@@ -459,7 +496,7 @@ class LiveDefinitions:
         elif isinstance(atom, Tmp):
             del self.tmps[atom.tmp_idx]
         else:
-            raise NotImplementedError()
+            del self.others[atom]
 
     def kill_and_add_definition(
         self,
@@ -486,7 +523,7 @@ class LiveDefinitions:
         # set_object() replaces kill (not implemented) and add (add) in one step
         if isinstance(atom, Register):
             try:
-                self.register_definitions.store(
+                self.registers.store(
                     atom.reg_offset,
                     d,
                     size=atom.size,
@@ -501,16 +538,16 @@ class LiveDefinitions:
             if isinstance(atom.addr, SpOffset):
                 if atom.addr.offset is not None:
                     stack_addr = self.stack_offset_to_stack_addr(atom.addr.offset)
-                    self.stack_definitions.store(stack_addr, d, size=atom.size, endness=endness)
+                    self.stack.store(stack_addr, d, size=atom.size, endness=endness)
                 else:
                     l.warning("Skip stack storing since the stack offset is None.")
             elif isinstance(atom.addr, HeapAddress):
-                self.heap_definitions.store(atom.addr.value, d, size=atom.size, endness=endness)
+                self.heap.store(atom.addr.value, d, size=atom.size, endness=endness)
             elif isinstance(atom.addr, int):
-                self.memory_definitions.store(atom.addr, d, size=atom.size, endness=endness)
+                self.memory.store(atom.addr, d, size=atom.size, endness=endness)
             elif isinstance(atom.addr, claripy.ast.Base):
                 if atom.addr.concrete:
-                    self.memory_definitions.store(atom.addr.concrete_value, d, size=atom.size, endness=endness)
+                    self.memory.store(atom.addr.concrete_value, d, size=atom.size, endness=endness)
                 elif self.is_stack_address(atom.addr):
                     stack_addr = self.get_stack_address(atom.addr)
                     if stack_addr is None:
@@ -518,7 +555,7 @@ class LiveDefinitions:
                             "Failed to convert stack address %s to a concrete stack address. Skip the store.", atom.addr
                         )
                     else:
-                        self.stack_definitions.store(stack_addr, d, size=atom.size, endness=endness)
+                        self.stack.store(stack_addr, d, size=atom.size, endness=endness)
                 else:
                     return None
             else:
@@ -530,7 +567,7 @@ class LiveDefinitions:
                 self.tmps[atom.tmp_idx] = self.uses_by_codeloc[code_loc]
                 return None
         else:
-            raise NotImplementedError()
+            self.others[atom] = d
 
         return d
 
@@ -550,7 +587,9 @@ class LiveDefinitions:
         elif isinstance(atom, Tmp):
             self.add_tmp_use(atom, code_loc)
         else:
-            raise TypeError("Unsupported atom type %s." % type(atom))
+            for defn in self.get_definitions(atom):
+                self.other_uses.add_use(defn, code_loc, expr)
+                self.uses_by_codeloc[code_loc].add(defn)
 
     def add_use_by_def(self, definition: Definition, code_loc: CodeLocation, expr: Any = None) -> None:
         if isinstance(definition.atom, Register):
@@ -571,24 +610,44 @@ class LiveDefinitions:
             # ignore constants
             pass
         else:
-            raise TypeError("Unsupported atom type %s." % type(definition.atom))
+            self.other_uses.add_use(definition, code_loc, expr)
 
-    def get_definitions(self, atom: Atom) -> Iterable[Definition]:
-        if isinstance(atom, Register):
-            yield from self.get_register_definitions(atom.reg_offset, atom.size)
-        elif isinstance(atom, MemoryLocation):
-            if isinstance(atom.addr, SpOffset):
-                yield from self.get_stack_definitions(atom.addr.offset, atom.size, atom.endness)
-            elif isinstance(atom.addr, HeapAddress):
-                yield from self.get_heap_definitions(atom.addr.value, size=atom.size, endness=atom.endness)
-            elif isinstance(atom.addr, int):
-                yield from self.get_memory_definitions(atom.addr, atom.size, atom.endness)
+    def get_definitions(
+        self, thing: Union[Atom, Definition[Atom], Iterable[Atom], Iterable[Definition[Atom]], MultiValues]
+    ) -> Iterable[Definition[Atom]]:
+        if isinstance(thing, MultiValues):
+            for vs in thing.values():
+                for v in vs:
+                    for anno in v.annotations:
+                        if isinstance(anno, DefinitionAnnotation):
+                            yield anno.definition
+            return
+        elif isinstance(thing, Atom):
+            pass
+        elif isinstance(thing, Definition):
+            thing = thing.atom
+        else:
+            for atom2 in thing:
+                yield from self.get_definitions(atom2)
+            return
+
+        if isinstance(thing, Register):
+            yield from self.get_register_definitions(thing.reg_offset, thing.size)
+        elif isinstance(thing, MemoryLocation):
+            if isinstance(thing.addr, SpOffset):
+                yield from self.get_stack_definitions(thing.addr.offset, thing.size, thing.endness)
+            elif isinstance(thing.addr, HeapAddress):
+                yield from self.get_heap_definitions(thing.addr.value, size=thing.size, endness=thing.endness)
+            elif isinstance(thing.addr, int):
+                yield from self.get_memory_definitions(thing.addr, thing.size, thing.endness)
             else:
                 return
-        elif isinstance(atom, Tmp):
-            yield from self.get_tmp_definitions(atom.tmp_idx)
+        elif isinstance(thing, Tmp):
+            yield from self.get_tmp_definitions(thing.tmp_idx)
         else:
-            raise TypeError("Unsupported atom type %s." % type(atom))
+            for mvs in self.others.get(thing, {}).values():
+                for mv in mvs:
+                    yield from self.get_definitions(mv)
 
     def get_tmp_definitions(self, tmp_idx: int) -> Iterable[Definition]:
         if tmp_idx in self.tmps:
@@ -598,7 +657,7 @@ class LiveDefinitions:
 
     def get_register_definitions(self, reg_offset: int, size: int, endness=None) -> Iterable[Definition]:
         try:
-            values: MultiValues = self.register_definitions.load(
+            values: MultiValues = self.registers.load(
                 reg_offset,
                 size=size,
                 endness=endness,
@@ -606,7 +665,7 @@ class LiveDefinitions:
         except SimMemoryMissingError as ex:
             # load values and stop at the missing location
             if ex.missing_addr > reg_offset:
-                values: MultiValues = self.register_definitions.load(
+                values: MultiValues = self.registers.load(
                     reg_offset, size=ex.missing_addr - reg_offset, endness=endness
                 )
             else:
@@ -617,7 +676,7 @@ class LiveDefinitions:
     def get_stack_values(self, stack_offset: int, size: int, endness: str) -> Optional[MultiValues]:
         stack_addr = self.stack_offset_to_stack_addr(stack_offset)
         try:
-            return self.stack_definitions.load(stack_addr, size=size, endness=endness)
+            return self.stack.load(stack_addr, size=size, endness=endness)
         except SimMemoryMissingError:
             return None
 
@@ -629,54 +688,59 @@ class LiveDefinitions:
 
     def get_heap_definitions(self, heap_addr: int, size: int, endness) -> Iterable[Definition]:
         try:
-            mv: MultiValues = self.heap_definitions.load(heap_addr, size=size, endness=endness)
+            mv: MultiValues = self.heap.load(heap_addr, size=size, endness=endness)
         except SimMemoryMissingError:
             return
         yield from LiveDefinitions.extract_defs_from_mv(mv)
 
     def get_memory_definitions(self, addr: int, size: int, endness) -> Iterable[Definition]:
         try:
-            values = self.memory_definitions.load(addr, size=size, endness=endness)
+            values = self.memory.load(addr, size=size, endness=endness)
         except SimMemoryMissingError:
             return
         yield from LiveDefinitions.extract_defs_from_mv(values)
 
+    @deprecated("get_definitions")
     def get_definitions_from_atoms(self, atoms: Iterable[Atom]) -> Iterable[Definition]:
         result = set()
         for atom in atoms:
             result |= set(self.get_definitions(atom))
         return result
 
+    @deprecated("get_values")
     def get_value_from_definition(self, definition: Definition) -> Optional[MultiValues]:
         return self.get_value_from_atom(definition.atom)
 
-    def get_one_value_from_definition(self, definition: Definition) -> Optional[claripy.ast.base.Base]:
+    @deprecated("get_one_value")
+    def get_one_value_from_definition(self, definition: Definition) -> Optional[claripy.ast.bv.BV]:
         return self.get_one_value_from_atom(definition.atom)
 
+    @deprecated("get_concrete_value")
     def get_concrete_value_from_definition(self, definition: Definition) -> Optional[int]:
         return self.get_concrete_value_from_atom(definition.atom)
 
+    @deprecated("get_values")
     def get_value_from_atom(self, atom: Atom) -> Optional[MultiValues]:
         if isinstance(atom, Register):
             try:
-                return self.register_definitions.load(atom.reg_offset, size=atom.size)
+                return self.registers.load(atom.reg_offset, size=atom.size)
             except SimMemoryMissingError:
                 return None
         elif isinstance(atom, MemoryLocation):
             if isinstance(atom.addr, SpOffset):
                 stack_addr = self.stack_offset_to_stack_addr(atom.addr.offset)
                 try:
-                    return self.stack_definitions.load(stack_addr, size=atom.size, endness=atom.endness)
+                    return self.stack.load(stack_addr, size=atom.size, endness=atom.endness)
                 except SimMemoryMissingError:
                     return None
             elif isinstance(atom.addr, HeapAddress):
                 try:
-                    return self.heap_definitions.load(atom.addr.value, size=atom.size, endness=atom.endness)
+                    return self.heap.load(atom.addr.value, size=atom.size, endness=atom.endness)
                 except SimMemoryMissingError:
                     return None
             elif isinstance(atom.addr, int):
                 try:
-                    return self.memory_definitions.load(atom.addr, size=atom.size, endness=atom.endness)
+                    return self.memory.load(atom.addr, size=atom.size, endness=atom.endness)
                 except SimMemoryMissingError:
                     return None
             else:
@@ -685,12 +749,14 @@ class LiveDefinitions:
         else:
             return None
 
-    def get_one_value_from_atom(self, atom: Atom) -> Optional[claripy.ast.BV]:
+    @deprecated("get_one_value")
+    def get_one_value_from_atom(self, atom: Atom) -> Optional[claripy.ast.bv.BV]:
         r = self.get_value_from_atom(atom)
         if r is None:
             return None
         return r.one_value()
 
+    @deprecated("get_concrete_value")
     def get_concrete_value_from_atom(self, atom: Atom) -> Optional[int]:
         r = self.get_one_value_from_atom(atom)
         if r is None:
@@ -699,28 +765,106 @@ class LiveDefinitions:
             return None
         return r.concrete_value
 
-    def get_values(self, spec: Union[Atom, Definition]) -> Optional[MultiValues]:
-        if isinstance(spec, Atom):
-            return self.get_value_from_atom(spec)
+    def get_values(
+        self, spec: Union[Atom, Definition[Atom], Iterable[Atom], Iterable[Definition[Atom]]]
+    ) -> Optional[MultiValues]:
+        if isinstance(spec, Definition):
+            atom = spec.atom
+        elif isinstance(spec, Atom):
+            atom = spec
         else:
-            return self.get_value_from_definition(spec)
+            result = None
+            for atom in spec:
+                r = self.get_values(atom)
+                if r is None:
+                    continue
+                if result is None:
+                    result = r
+                else:
+                    result = result.merge(r)
+            return result
 
-    def get_one_value(self, spec: Union[Atom, Definition]) -> Optional[claripy.ast.base.Base]:
-        if isinstance(spec, Atom):
-            return self.get_one_value_from_atom(spec)
+        if isinstance(atom, Register):
+            try:
+                return self.registers.load(atom.reg_offset, size=atom.size)
+            except SimMemoryMissingError:
+                return None
+        elif isinstance(atom, MemoryLocation):
+            if isinstance(atom.addr, SpOffset):
+                stack_addr = self.stack_offset_to_stack_addr(atom.addr.offset)
+                try:
+                    return self.stack.load(stack_addr, size=atom.size, endness=atom.endness)
+                except SimMemoryMissingError:
+                    return None
+            elif isinstance(atom.addr, HeapAddress):
+                try:
+                    return self.heap.load(atom.addr.value, size=atom.size, endness=atom.endness)
+                except SimMemoryMissingError:
+                    return None
+            elif isinstance(atom.addr, int):
+                try:
+                    return self.memory.load(atom.addr, size=atom.size, endness=atom.endness)
+                except SimMemoryMissingError:
+                    pass
+                if self.project is not None:
+                    try:
+                        bytestring = self.project.loader.memory.load(atom.addr, atom.size)
+                        if atom.endness == archinfo.Endness.LE:
+                            bytestring = bytes(reversed(bytestring))
+                        mv = MultiValues(
+                            self.annotate_with_def(claripy.BVV(bytestring), Definition(atom, ExternalCodeLocation()))
+                        )
+                        return mv
+                    except KeyError:
+                        pass
+                return None
+            else:
+                # ignore RegisterOffset
+                return None
         else:
-            return self.get_one_value_from_definition(spec)
+            return self.others.get(atom, None)
 
-    def get_concrete_value(self, spec: Union[Atom, Definition]) -> Optional[int]:
-        if isinstance(spec, Atom):
-            return self.get_concrete_value_from_atom(spec)
-        else:
-            return self.get_concrete_value_from_definition(spec)
+    def get_one_value(
+        self, spec: Union[Atom, Definition, Iterable[Atom], Iterable[Definition[Atom]]]
+    ) -> Optional[claripy.ast.bv.BV]:
+        r = self.get_values(spec)
+        if r is None:
+            return None
+        return r.one_value()
+
+    @overload
+    def get_concrete_value(
+        self, spec: Union[Atom, Definition[Atom], Iterable[Atom], Iterable[Definition[Atom]]], cast_to: Type[int] = ...
+    ) -> Optional[int]:
+        ...
+
+    @overload
+    def get_concrete_value(
+        self,
+        spec: Union[Atom, Definition[Atom], Iterable[Atom], Iterable[Definition[Atom]]],
+        cast_to: Type[bytes] = ...,
+    ) -> Optional[bytes]:
+        ...
+
+    def get_concrete_value(
+        self,
+        spec: Union[Atom, Definition[Atom], Iterable[Atom], Iterable[Definition[Atom]]],
+        cast_to: Union[Type[int], Type[bytes]] = int,
+    ) -> Union[int, bytes, None]:
+        r = self.get_one_value(spec)
+        if r is None:
+            return None
+        if r.symbolic:
+            return None
+        result = r.concrete_value
+        if issubclass(cast_to, bytes):
+            return result.to_bytes(len(r) // 8, "big")
+        return result
 
     def add_register_use(self, reg_offset: int, size: int, code_loc: CodeLocation, expr: Optional[Any] = None) -> None:
         # get all current definitions
         try:
-            mvs: MultiValues = self.register_definitions.load(reg_offset, size=size)
+            mvs: MultiValues = self.registers.load(reg_offset, size=size)
         except SimMemoryMissingError:
             return
 
@@ -787,3 +931,103 @@ class LiveDefinitions:
 
         self.tmp_uses[def_.atom.tmp_idx].add(code_loc)
         self.uses_by_codeloc[code_loc].add(def_)
+
+    @overload
+    def deref(
+        self,
+        pointer: Union[MultiValues, Atom, Definition, Iterable[Atom], Iterable[Definition]],
+        size: Union[int, DerefSize],
+        endness: archinfo.Endness = ...,
+    ) -> Set[MemoryLocation]:
+        ...
+
+    @overload
+    def deref(
+        self,
+        pointer: Union[int, claripy.ast.BV, HeapAddress, SpOffset],
+        size: Union[int, DerefSize],
+        endness: archinfo.Endness = ...,
+    ) -> Optional[MemoryLocation]:
+        ...
+
+    def deref(self, pointer, size, endness=archinfo.Endness.BE):
+        if isinstance(pointer, (Atom, Definition)):
+            pointer = self.get_values(pointer)
+            if pointer is None:
+                return set()
+
+        if isinstance(pointer, set):
+            result = set()
+            for ptr_atom in pointer:
+                result.update(self.deref(ptr_atom, size, endness))
+            return result
+
+        if isinstance(pointer, MultiValues):
+            result = set()
+            for vs in pointer.values():
+                for value in vs:
+                    atom = self.deref(value, size, endness)
+                    if atom is not None:
+                        result.add(atom)
+            return result
+
+        if isinstance(pointer, (HeapAddress, SpOffset, int)):
+            addr = pointer
+        else:
+            assert isinstance(pointer, claripy.ast.BV)
+            if self.is_top(pointer):
+                return None
+
+            # TODO this can be simplified with the walrus operator
+            stack_offset = self.get_stack_offset(pointer)
+            if stack_offset is not None:
+                addr = SpOffset(len(pointer), stack_offset)
+            else:
+                heap_offset = self.get_heap_offset(pointer)
+                if heap_offset is not None:
+                    addr = HeapAddress(heap_offset)
+                elif pointer.op == "BVV":
+                    addr = pointer.args[0]
+                else:
+                    # cannot resolve
+                    return None
+
+        if isinstance(size, DerefSize):
+            assert size == DerefSize.NULL_TERMINATE
+            for sz in range(4096):  # arbitrary
+                # truly evil that this is an abstraction we have to contend with
+                mv = self.get_values(MemoryLocation(addr + sz, 1, endness))
+                if mv is not None and 0 in mv and any(one.op == "BVV" and one.args[0] == 0 for one in mv[0]):
+                    size = sz + 1
+                    break
+            else:
+                l.warning(
+                    "Could not resolve cstring dereference at %s to a concrete size",
+                    hex(addr) if isinstance(addr, int) else addr,
+                )
+                size = 4096
+
+        return MemoryLocation(addr, size, endness)
+
+    @staticmethod
+    def is_heap_address(addr: claripy.ast.Base) -> bool:
+        return "heap_base" in addr.variables
+
+    @staticmethod
+    def get_heap_offset(addr: claripy.ast.Base) -> Optional[int]:
+        if "heap_base" in addr.variables:
+            if addr.op == "BVS":
+                return 0
+            elif addr.op == "__add__" and len(addr.args) == 2 and addr.args[1].op == "BVV":
+                return addr.args[1]._model_concrete.value
+        return None
+
+    def heap_address(self, offset: Union[int, HeapAddress]) -> claripy.ast.BV:
+        if isinstance(offset, HeapAddress):
+            if not isinstance(offset.value, int):
+                raise TypeError("TODO: what's this? contact @rhelmot")
+            offset = offset.value
+        base = claripy.BVS("heap_base", self.arch.bits, explicit_name=True)
+        if offset:
+            return base + offset
+        return base