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

angr/protos/variables_pb2.py

@@ -1,126 +1,50 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
 # source: protos/variables.proto
+# Protobuf Python Version: 5.28.2
 """Generated protocol buffer code."""
+
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool
-from google.protobuf import message as _message
-from google.protobuf import reflection as _reflection
+from google.protobuf import runtime_version as _runtime_version
 from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
+
+_runtime_version.ValidateProtobufRuntimeVersion(_runtime_version.Domain.PUBLIC, 5, 28, 2, "", "protos/variables.proto")
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
 
 
-
-
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x16protos/variables.proto\x12\x0b\x61ngr.protos\"\x90\x01\n\x0cVariableBase\x12\r\n\x05ident\x18\x01 \x01(\t\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x13\n\x06region\x18\x03 \x01(\x04H\x00\x88\x01\x01\x12\x15\n\x08\x63\x61tegory\x18\x04 \x01(\tH\x01\x88\x01\x01\x12\x0f\n\x07renamed\x18\x05 \x01(\x08\x12\x0e\n\x06is_phi\x18\x06 \x01(\x08\x42\t\n\x07_regionB\x0b\n\t_category\"L\n\x11TemporaryVariable\x12\'\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x19.angr.protos.VariableBase\x12\x0e\n\x06tmp_id\x18\x02 \x01(\r\"V\n\x10RegisterVariable\x12\'\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x19.angr.protos.VariableBase\x12\x0b\n\x03reg\x18\x02 \x01(\r\x12\x0c\n\x04size\x18\x03 \x01(\r\"U\n\x0eMemoryVariable\x12\'\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x19.angr.protos.VariableBase\x12\x0c\n\x04\x61\x64\x64r\x18\x02 \x01(\x04\x12\x0c\n\x04size\x18\x03 \x01(\r\"u\n\rStackVariable\x12\'\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x19.angr.protos.VariableBase\x12\x0c\n\x04\x61\x64\x64r\x18\x02 \x01(\x04\x12\x0c\n\x04size\x18\x03 \x01(\r\x12\x0f\n\x07sp_base\x18\x04 \x01(\x08\x12\x0e\n\x06offset\x18\x05 \x01(\x05\"\x9c\x02\n\x0eVariableAccess\x12\r\n\x05ident\x18\x01 \x01(\t\x12\x12\n\nblock_addr\x18\x02 \x01(\x04\x12\x10\n\x08stmt_idx\x18\x03 \x01(\x05\x12\x10\n\x08ins_addr\x18\x04 \x01(\x04\x12\x13\n\x06offset\x18\x05 \x01(\x03H\x00\x88\x01\x01\x12\x43\n\x0b\x61\x63\x63\x65ss_type\x18\x06 \x01(\x0e\x32..angr.protos.VariableAccess.VariableAccessSort\x12\x16\n\tatom_hash\x18\x07 \x01(\rH\x01\x88\x01\x01\"8\n\x12VariableAccessSort\x12\t\n\x05WRITE\x10\x00\x12\x08\n\x04READ\x10\x01\x12\r\n\tREFERENCE\x10\x02\x42\t\n\x07_offsetB\x0c\n\n_atom_hash\"/\n\x0cVariableType\x12\r\n\x05ident\x18\x01 \x01(\t\x12\x10\n\x08var_type\x18\x02 \x01(\t\";\n\x0bVar2Unified\x12\x11\n\tvar_ident\x18\x01 \x01(\t\x12\x19\n\x11unified_var_ident\x18\x02 \x01(\t\"/\n\x07Phi2Var\x12\x11\n\tphi_ident\x18\x01 \x01(\t\x12\x11\n\tvar_ident\x18\x02 \x01(\t\"\xe6\x04\n\x17VariableManagerInternal\x12\x30\n\x08tempvars\x18\x01 \x03(\x0b\x32\x1e.angr.protos.TemporaryVariable\x12.\n\x07regvars\x18\x02 \x03(\x0b\x32\x1d.angr.protos.RegisterVariable\x12,\n\x07memvars\x18\x03 \x03(\x0b\x32\x1b.angr.protos.MemoryVariable\x12-\n\tstackvars\x18\x04 \x03(\x0b\x32\x1a.angr.protos.StackVariable\x12-\n\x08\x61\x63\x63\x65sses\x18\x05 \x03(\x0b\x32\x1b.angr.protos.VariableAccess\x12\x38\n\x10unified_tempvars\x18\x06 \x03(\x0b\x32\x1e.angr.protos.TemporaryVariable\x12\x36\n\x0funified_regvars\x18\x07 \x03(\x0b\x32\x1d.angr.protos.RegisterVariable\x12\x34\n\x0funified_memvars\x18\x08 \x03(\x0b\x32\x1b.angr.protos.MemoryVariable\x12\x35\n\x11unified_stackvars\x18\t \x03(\x0b\x32\x1a.angr.protos.StackVariable\x12-\n\x0bvar2unified\x18\n \x03(\x0b\x32\x18.angr.protos.Var2Unified\x12(\n\x05types\x18\x0b \x03(\x0b\x32\x19.angr.protos.VariableType\x12%\n\x07phi2var\x18\x0c \x03(\x0b\x32\x14.angr.protos.Phi2Varb\x06proto3')
-
-
-
-_VARIABLEBASE = DESCRIPTOR.message_types_by_name['VariableBase']
-_TEMPORARYVARIABLE = DESCRIPTOR.message_types_by_name['TemporaryVariable']
-_REGISTERVARIABLE = DESCRIPTOR.message_types_by_name['RegisterVariable']
-_MEMORYVARIABLE = DESCRIPTOR.message_types_by_name['MemoryVariable']
-_STACKVARIABLE = DESCRIPTOR.message_types_by_name['StackVariable']
-_VARIABLEACCESS = DESCRIPTOR.message_types_by_name['VariableAccess']
-_VARIABLETYPE = DESCRIPTOR.message_types_by_name['VariableType']
-_VAR2UNIFIED = DESCRIPTOR.message_types_by_name['Var2Unified']
-_PHI2VAR = DESCRIPTOR.message_types_by_name['Phi2Var']
-_VARIABLEMANAGERINTERNAL = DESCRIPTOR.message_types_by_name['VariableManagerInternal']
-_VARIABLEACCESS_VARIABLEACCESSSORT = _VARIABLEACCESS.enum_types_by_name['VariableAccessSort']
-VariableBase = _reflection.GeneratedProtocolMessageType('VariableBase', (_message.Message,), {
-  'DESCRIPTOR' : _VARIABLEBASE,
-  '__module__' : 'protos.variables_pb2'
-  # @@protoc_insertion_point(class_scope:angr.protos.VariableBase)
-  })
-_sym_db.RegisterMessage(VariableBase)
-
-TemporaryVariable = _reflection.GeneratedProtocolMessageType('TemporaryVariable', (_message.Message,), {
-  'DESCRIPTOR' : _TEMPORARYVARIABLE,
-  '__module__' : 'protos.variables_pb2'
-  # @@protoc_insertion_point(class_scope:angr.protos.TemporaryVariable)
-  })
-_sym_db.RegisterMessage(TemporaryVariable)
-
-RegisterVariable = _reflection.GeneratedProtocolMessageType('RegisterVariable', (_message.Message,), {
-  'DESCRIPTOR' : _REGISTERVARIABLE,
-  '__module__' : 'protos.variables_pb2'
-  # @@protoc_insertion_point(class_scope:angr.protos.RegisterVariable)
-  })
-_sym_db.RegisterMessage(RegisterVariable)
-
-MemoryVariable = _reflection.GeneratedProtocolMessageType('MemoryVariable', (_message.Message,), {
-  'DESCRIPTOR' : _MEMORYVARIABLE,
-  '__module__' : 'protos.variables_pb2'
-  # @@protoc_insertion_point(class_scope:angr.protos.MemoryVariable)
-  })
-_sym_db.RegisterMessage(MemoryVariable)
-
-StackVariable = _reflection.GeneratedProtocolMessageType('StackVariable', (_message.Message,), {
-  'DESCRIPTOR' : _STACKVARIABLE,
-  '__module__' : 'protos.variables_pb2'
-  # @@protoc_insertion_point(class_scope:angr.protos.StackVariable)
-  })
-_sym_db.RegisterMessage(StackVariable)
-
-VariableAccess = _reflection.GeneratedProtocolMessageType('VariableAccess', (_message.Message,), {
-  'DESCRIPTOR' : _VARIABLEACCESS,
-  '__module__' : 'protos.variables_pb2'
-  # @@protoc_insertion_point(class_scope:angr.protos.VariableAccess)
-  })
-_sym_db.RegisterMessage(VariableAccess)
-
-VariableType = _reflection.GeneratedProtocolMessageType('VariableType', (_message.Message,), {
-  'DESCRIPTOR' : _VARIABLETYPE,
-  '__module__' : 'protos.variables_pb2'
-  # @@protoc_insertion_point(class_scope:angr.protos.VariableType)
-  })
-_sym_db.RegisterMessage(VariableType)
-
-Var2Unified = _reflection.GeneratedProtocolMessageType('Var2Unified', (_message.Message,), {
-  'DESCRIPTOR' : _VAR2UNIFIED,
-  '__module__' : 'protos.variables_pb2'
-  # @@protoc_insertion_point(class_scope:angr.protos.Var2Unified)
-  })
-_sym_db.RegisterMessage(Var2Unified)
-
-Phi2Var = _reflection.GeneratedProtocolMessageType('Phi2Var', (_message.Message,), {
-  'DESCRIPTOR' : _PHI2VAR,
-  '__module__' : 'protos.variables_pb2'
-  # @@protoc_insertion_point(class_scope:angr.protos.Phi2Var)
-  })
-_sym_db.RegisterMessage(Phi2Var)
-
-VariableManagerInternal = _reflection.GeneratedProtocolMessageType('VariableManagerInternal', (_message.Message,), {
-  'DESCRIPTOR' : _VARIABLEMANAGERINTERNAL,
-  '__module__' : 'protos.variables_pb2'
-  # @@protoc_insertion_point(class_scope:angr.protos.VariableManagerInternal)
-  })
-_sym_db.RegisterMessage(VariableManagerInternal)
-
-if _descriptor._USE_C_DESCRIPTORS == False:
-
-  DESCRIPTOR._options = None
-  _VARIABLEBASE._serialized_start=40
-  _VARIABLEBASE._serialized_end=184
-  _TEMPORARYVARIABLE._serialized_start=186
-  _TEMPORARYVARIABLE._serialized_end=262
-  _REGISTERVARIABLE._serialized_start=264
-  _REGISTERVARIABLE._serialized_end=350
-  _MEMORYVARIABLE._serialized_start=352
-  _MEMORYVARIABLE._serialized_end=437
-  _STACKVARIABLE._serialized_start=439
-  _STACKVARIABLE._serialized_end=556
-  _VARIABLEACCESS._serialized_start=559
-  _VARIABLEACCESS._serialized_end=843
-  _VARIABLEACCESS_VARIABLEACCESSSORT._serialized_start=762
-  _VARIABLEACCESS_VARIABLEACCESSSORT._serialized_end=818
-  _VARIABLETYPE._serialized_start=845
-  _VARIABLETYPE._serialized_end=892
-  _VAR2UNIFIED._serialized_start=894
-  _VAR2UNIFIED._serialized_end=953
-  _PHI2VAR._serialized_start=955
-  _PHI2VAR._serialized_end=1002
-  _VARIABLEMANAGERINTERNAL._serialized_start=1005
-  _VARIABLEMANAGERINTERNAL._serialized_end=1619
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(
+    b'\n\x16protos/variables.proto\x12\x0b\x61ngr.protos"\x90\x01\n\x0cVariableBase\x12\r\n\x05ident\x18\x01 \x01(\t\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x13\n\x06region\x18\x03 \x01(\x04H\x00\x88\x01\x01\x12\x15\n\x08\x63\x61tegory\x18\x04 \x01(\tH\x01\x88\x01\x01\x12\x0f\n\x07renamed\x18\x05 \x01(\x08\x12\x0e\n\x06is_phi\x18\x06 \x01(\x08\x42\t\n\x07_regionB\x0b\n\t_category"L\n\x11TemporaryVariable\x12\'\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x19.angr.protos.VariableBase\x12\x0e\n\x06tmp_id\x18\x02 \x01(\r"V\n\x10RegisterVariable\x12\'\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x19.angr.protos.VariableBase\x12\x0b\n\x03reg\x18\x02 \x01(\r\x12\x0c\n\x04size\x18\x03 \x01(\r"U\n\x0eMemoryVariable\x12\'\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x19.angr.protos.VariableBase\x12\x0c\n\x04\x61\x64\x64r\x18\x02 \x01(\x04\x12\x0c\n\x04size\x18\x03 \x01(\r"u\n\rStackVariable\x12\'\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x19.angr.protos.VariableBase\x12\x0c\n\x04\x61\x64\x64r\x18\x02 \x01(\x04\x12\x0c\n\x04size\x18\x03 \x01(\r\x12\x0f\n\x07sp_base\x18\x04 \x01(\x08\x12\x0e\n\x06offset\x18\x05 \x01(\x05"\x9c\x02\n\x0eVariableAccess\x12\r\n\x05ident\x18\x01 \x01(\t\x12\x12\n\nblock_addr\x18\x02 \x01(\x04\x12\x10\n\x08stmt_idx\x18\x03 \x01(\x05\x12\x10\n\x08ins_addr\x18\x04 \x01(\x04\x12\x13\n\x06offset\x18\x05 \x01(\x03H\x00\x88\x01\x01\x12\x43\n\x0b\x61\x63\x63\x65ss_type\x18\x06 \x01(\x0e\x32..angr.protos.VariableAccess.VariableAccessSort\x12\x16\n\tatom_hash\x18\x07 \x01(\rH\x01\x88\x01\x01"8\n\x12VariableAccessSort\x12\t\n\x05WRITE\x10\x00\x12\x08\n\x04READ\x10\x01\x12\r\n\tREFERENCE\x10\x02\x42\t\n\x07_offsetB\x0c\n\n_atom_hash"/\n\x0cVariableType\x12\r\n\x05ident\x18\x01 \x01(\t\x12\x10\n\x08var_type\x18\x02 \x01(\t";\n\x0bVar2Unified\x12\x11\n\tvar_ident\x18\x01 \x01(\t\x12\x19\n\x11unified_var_ident\x18\x02 \x01(\t"/\n\x07Phi2Var\x12\x11\n\tphi_ident\x18\x01 \x01(\t\x12\x11\n\tvar_ident\x18\x02 \x01(\t"\xe6\x04\n\x17VariableManagerInternal\x12\x30\n\x08tempvars\x18\x01 \x03(\x0b\x32\x1e.angr.protos.TemporaryVariable\x12.\n\x07regvars\x18\x02 \x03(\x0b\x32\x1d.angr.protos.RegisterVariable\x12,\n\x07memvars\x18\x03 \x03(\x0b\x32\x1b.angr.protos.MemoryVariable\x12-\n\tstackvars\x18\x04 \x03(\x0b\x32\x1a.angr.protos.StackVariable\x12-\n\x08\x61\x63\x63\x65sses\x18\x05 \x03(\x0b\x32\x1b.angr.protos.VariableAccess\x12\x38\n\x10unified_tempvars\x18\x06 \x03(\x0b\x32\x1e.angr.protos.TemporaryVariable\x12\x36\n\x0funified_regvars\x18\x07 \x03(\x0b\x32\x1d.angr.protos.RegisterVariable\x12\x34\n\x0funified_memvars\x18\x08 \x03(\x0b\x32\x1b.angr.protos.MemoryVariable\x12\x35\n\x11unified_stackvars\x18\t \x03(\x0b\x32\x1a.angr.protos.StackVariable\x12-\n\x0bvar2unified\x18\n \x03(\x0b\x32\x18.angr.protos.Var2Unified\x12(\n\x05types\x18\x0b \x03(\x0b\x32\x19.angr.protos.VariableType\x12%\n\x07phi2var\x18\x0c \x03(\x0b\x32\x14.angr.protos.Phi2Varb\x06proto3'
+)
+
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, "protos.variables_pb2", _globals)
+if not _descriptor._USE_C_DESCRIPTORS:
+    DESCRIPTOR._loaded_options = None
+    _globals["_VARIABLEBASE"]._serialized_start = 40
+    _globals["_VARIABLEBASE"]._serialized_end = 184
+    _globals["_TEMPORARYVARIABLE"]._serialized_start = 186
+    _globals["_TEMPORARYVARIABLE"]._serialized_end = 262
+    _globals["_REGISTERVARIABLE"]._serialized_start = 264
+    _globals["_REGISTERVARIABLE"]._serialized_end = 350
+    _globals["_MEMORYVARIABLE"]._serialized_start = 352
+    _globals["_MEMORYVARIABLE"]._serialized_end = 437
+    _globals["_STACKVARIABLE"]._serialized_start = 439
+    _globals["_STACKVARIABLE"]._serialized_end = 556
+    _globals["_VARIABLEACCESS"]._serialized_start = 559
+    _globals["_VARIABLEACCESS"]._serialized_end = 843
+    _globals["_VARIABLEACCESS_VARIABLEACCESSSORT"]._serialized_start = 762
+    _globals["_VARIABLEACCESS_VARIABLEACCESSSORT"]._serialized_end = 818
+    _globals["_VARIABLETYPE"]._serialized_start = 845
+    _globals["_VARIABLETYPE"]._serialized_end = 892
+    _globals["_VAR2UNIFIED"]._serialized_start = 894
+    _globals["_VAR2UNIFIED"]._serialized_end = 953
+    _globals["_PHI2VAR"]._serialized_start = 955
+    _globals["_PHI2VAR"]._serialized_end = 1002
+    _globals["_VARIABLEMANAGERINTERNAL"]._serialized_start = 1005
+    _globals["_VARIABLEMANAGERINTERNAL"]._serialized_end = 1619
 # @@protoc_insertion_point(module_scope)

angr/protos/xrefs_pb2.py

@@ -1,11 +1,16 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
 # source: protos/xrefs.proto
+# Protobuf Python Version: 5.28.2
 """Generated protocol buffer code."""
+
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool
-from google.protobuf import message as _message
-from google.protobuf import reflection as _reflection
+from google.protobuf import runtime_version as _runtime_version
 from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
+
+_runtime_version.ValidateProtobufRuntimeVersion(_runtime_version.Domain.PUBLIC, 5, 28, 2, "", "protos/xrefs.proto")
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
@@ -14,21 +19,15 @@ _sym_db = _symbol_database.Default()
 from . import primitives_pb2 as protos_dot_primitives__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x12protos/xrefs.proto\x12\x0b\x61ngr.protos\x1a\x17protos/primitives.proto\"2\n\x05XRefs\x12)\n\x05xrefs\x18\x01 \x03(\x0b\x32\x1a.angr.protos.CodeReferenceb\x06proto3')
-
-
-
-_XREFS = DESCRIPTOR.message_types_by_name['XRefs']
-XRefs = _reflection.GeneratedProtocolMessageType('XRefs', (_message.Message,), {
-  'DESCRIPTOR' : _XREFS,
-  '__module__' : 'protos.xrefs_pb2'
-  # @@protoc_insertion_point(class_scope:angr.protos.XRefs)
-  })
-_sym_db.RegisterMessage(XRefs)
-
-if _descriptor._USE_C_DESCRIPTORS == False:
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(
+    b'\n\x12protos/xrefs.proto\x12\x0b\x61ngr.protos\x1a\x17protos/primitives.proto"2\n\x05XRefs\x12)\n\x05xrefs\x18\x01 \x03(\x0b\x32\x1a.angr.protos.CodeReferenceb\x06proto3'
+)
 
-  DESCRIPTOR._options = None
-  _XREFS._serialized_start=60
-  _XREFS._serialized_end=110
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, "protos.xrefs_pb2", _globals)
+if not _descriptor._USE_C_DESCRIPTORS:
+    DESCRIPTOR._loaded_options = None
+    _globals["_XREFS"]._serialized_start = 60
+    _globals["_XREFS"]._serialized_end = 110
 # @@protoc_insertion_point(module_scope)

angr/sim_state.py

@@ -485,92 +485,18 @@ class SimState(PluginHub):
         """
         return self.solver.simplify(*args)
 
-    def add_constraints(self, *args, **kwargs):
+    def add_constraints(self, *constraints):
         """
         Add some constraints to the state.
 
         You may pass in any number of symbolic booleans as variadic positional arguments.
         """
-        if len(args) > 0 and isinstance(args[0], (list, tuple)):
-            raise Exception("Tuple or list passed to add_constraints!")
-
-        if o.TRACK_CONSTRAINTS in self.options and len(args) > 0:
-            constraints = [self.simplify(a) for a in args] if o.SIMPLIFY_CONSTRAINTS in self.options else args
-
-            self._inspect("constraints", BP_BEFORE, added_constraints=constraints)
-            constraints = self._inspect_getattr("added_constraints", constraints)
-            added = self.solver.add(*constraints)
-            self._inspect("constraints", BP_AFTER)
-
-            # add actions for the added constraints
-            if o.TRACK_CONSTRAINT_ACTIONS in self.options:
-                for c in added:
-                    sac = SimActionConstraint(self, c)
-                    self.history.add_action(sac)
-        else:
-            # preserve the old action logic for when we don't track constraints (why?)
-            if "action" in kwargs and kwargs["action"] and o.TRACK_CONSTRAINT_ACTIONS in self.options and len(args) > 0:
-                for arg in args:
-                    if self.solver.symbolic(arg):
-                        sac = SimActionConstraint(self, arg)
-                        self.history.add_action(sac)
-
-        if o.ABSTRACT_SOLVER in self.options and len(args) > 0:
-            for arg in args:
-                if self.solver.is_false(arg):
-                    self._satisfiable = False
-                    return
-
-                if self.solver.is_true(arg):
-                    continue
-
-                # It's neither True or False. Let's try to apply the condition
-
-                # We take the argument, extract a list of constrained SIs out of it (if we could, of course), and
-                # then replace each original SI the intersection of original SI and the constrained one.
-
-                _, converted = claripy.constraint_to_si(arg)
-
-                for original_expr, constrained_si in converted:
-                    if not original_expr.variables:
-                        l.error(
-                            "Incorrect original_expression to replace in add_constraints(). "
-                            "This is due to defects in VSA logics inside claripy. Please report "
-                            "to Fish and he will fix it if he's free."
-                        )
-                        continue
-
-                    new_expr = constrained_si
-                    self.registers.replace_all(original_expr, new_expr)
-                    self.memory.replace_all(original_expr, new_expr)
-                    # tmps
-                    temps = self.scratch.temps
-                    for idx in range(len(temps)):  # pylint:disable=consider-using-enumerate
-                        t = temps[idx]
-                        if t is None:
-                            continue
-                        if t.variables.intersection(original_expr.variables):
-                            # replace
-                            temps[idx] = t.replace(original_expr, new_expr)
-
-                    l.debug("SimState.add_constraints: Applied to final state.")
-        elif o.SYMBOLIC not in self.options and len(args) > 0:
-            for arg in args:
-                if self.solver.is_false(arg):
-                    self._satisfiable = False
-                    return
+        return self.solver.add(*constraints)
 
     def satisfiable(self, **kwargs):
         """
         Whether the state's constraints are satisfiable
         """
-        if o.ABSTRACT_SOLVER in self.options or o.SYMBOLIC not in self.options:
-            extra_constraints = kwargs.pop("extra_constraints", ())
-            for e in extra_constraints:
-                if self.solver.is_false(e):
-                    return False
-
-            return self._satisfiable
         return self.solver.satisfiable(**kwargs)
 
     def downsize(self):
@@ -975,5 +901,3 @@ default_state_plugin_preset = PluginPreset()
 SimState.register_preset("default", default_state_plugin_preset)
 
 from .state_plugins.history import SimStateHistory
-from .state_plugins.inspect import BP_AFTER, BP_BEFORE
-from .state_plugins.sim_action import SimActionConstraint

angr/state_plugins/solver.py

@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import functools
 import time
 import logging
@@ -10,8 +11,10 @@ import claripy
 from angr import sim_options as o
 from angr.errors import SimValueError, SimUnsatError, SimSolverModeError, SimSolverOptionError
 from angr.sim_state import SimState
+from .inspect import BP_AFTER, BP_BEFORE
 from .plugin import SimStatePlugin
 from .sim_action_object import ast_stripping_decorator, SimActionObject
+from .sim_action import SimActionConstraint
 
 l = logging.getLogger(name=__name__)
 
@@ -407,26 +410,18 @@ class SimSolver(SimStatePlugin):
         if key is not None and eternal and key in self.eternal_tracked_variables:
             r = self.eternal_tracked_variables[key]
             # pylint: disable=too-many-boolean-expressions
-            if (
-                size != r.length
-                or min != r.args[1]
-                or max != r.args[2]
-                or stride != r.args[3]
-                or uninitialized != r.uninitialized
-                or bool(explicit_name) ^ (r.args[0] == name)
-            ):
+            if size != r.length or uninitialized != r.uninitialized or bool(explicit_name) ^ (r.args[0] == name):
                 l.warning("Variable %s being retrieved with different settings than it was tracked with", name)
         else:
             r = claripy.BVS(
                 name,
                 size,
-                min=min,
-                max=max,
-                stride=stride,
                 uninitialized=uninitialized,
                 explicit_name=explicit_name,
                 **kwargs,
             )
+            if any(x is not None for x in (min, max, stride)):
+                r = r.annotate(claripy.annotation.StridedIntervalAnnotation(stride, min, max))
             if key is not None:
                 self.register_variable(r, key, eternal)
 
@@ -692,6 +687,9 @@ class SimSolver(SimStatePlugin):
 
         :return:                    True if sat, otherwise false
         """
+        if o.ABSTRACT_SOLVER in self.state.options or o.SYMBOLIC not in self.state.options:
+            return all(not self.is_false(e) for e in extra_constraints)
+
         if exact is False and o.VALIDATE_APPROXIMATIONS in self.state.options:
             er = self._solver.satisfiable(extra_constraints=self._adjust_constraint_list(extra_constraints))
             ar = self._solver.satisfiable(
@@ -711,8 +709,69 @@ class SimSolver(SimStatePlugin):
 
         :param constraints:     Pass any constraints that you want to add (ASTs) as varargs.
         """
-        cc = self._adjust_constraint_list(constraints)
-        return self._solver.add(cc)
+        if len(constraints) > 0 and isinstance(constraints[0], (list, tuple)):
+            raise Exception("Tuple or list passed to add!")
+
+        if o.TRACK_CONSTRAINTS in self.state.options and len(constraints) > 0:
+            constraints = (
+                [self.simplify(a) for a in constraints] if o.SIMPLIFY_CONSTRAINTS in self.state.options else constraints
+            )
+
+            self.state._inspect("constraints", BP_BEFORE, added_constraints=constraints)
+            constraints = self.state._inspect_getattr("added_constraints", constraints)
+            cc = self._adjust_constraint_list(constraints)
+            added = self._solver.add(cc)
+            self.state._inspect("constraints", BP_AFTER)
+
+            # add actions for the added constraints
+            if o.TRACK_CONSTRAINT_ACTIONS in self.state.options:
+                for c in added:
+                    sac = SimActionConstraint(self.state, c)
+                    self.state.history.add_action(sac)
+
+        if o.ABSTRACT_SOLVER in self.state.options and len(constraints) > 0:
+            for arg in constraints:
+                if self.is_false(arg):
+                    return
+
+                if self.is_true(arg):
+                    continue
+
+                # It's neither True or False. Let's try to apply the condition
+
+                # We take the argument, extract a list of constrained SIs out of
+                # it (if we could, of course), and then replace each original SI
+                # the intersection of original SI and the constrained one.
+
+                _, converted = claripy.constraint_to_si(arg)
+
+                for original_expr, constrained_si in converted:
+                    if not original_expr.variables:
+                        l.error(
+                            "Incorrect original_expression to replace in add(). "
+                            "This is due to defects in VSA logics inside claripy. "
+                            "Please report to Fish and he will fix it if he's free."
+                        )
+                        continue
+
+                    new_expr = constrained_si
+                    self.state.registers.replace_all(original_expr, new_expr)
+                    self.state.memory.replace_all(original_expr, new_expr)
+                    # tmps
+                    temps = self.state.scratch.temps
+                    for idx in range(len(temps)):  # pylint:disable=consider-using-enumerate
+                        t = temps[idx]
+                        if t is None:
+                            continue
+                        if t.variables.intersection(original_expr.variables):
+                            # replace
+                            temps[idx] = claripy.replace(t, original_expr, new_expr)
+
+                    l.debug("SimSolver.add: Applied to final state.")
+        elif o.SYMBOLIC not in self.state.options and len(constraints) > 0:
+            for arg in constraints:
+                if self.is_false(arg):
+                    return
 
     #
     # And some convenience stuff
@@ -1063,5 +1122,3 @@ class SimSolver(SimStatePlugin):
 
 
 SimState.register_default("solver", SimSolver)
-
-from .inspect import BP_AFTER

angr/storage/__init__.py

@@ -4,13 +4,12 @@ DUMMY_SYMBOLIC_READ_VALUE = 0xC0DEB4BE
 
 from .file import SimFile
 from .memory_object import SimMemoryObject
-from .memory_mixins import MemoryMixin, DefaultMemory
+from .memory_mixins import DefaultMemory
 
 
 __all__ = (
     "DUMMY_SYMBOLIC_READ_VALUE",
     "SimFile",
     "SimMemoryObject",
-    "MemoryMixin",
     "DefaultMemory",
 )