angr 9.2.147__py3-none-macosx_11_0_arm64.whl → 9.2.148__py3-none-macosx_11_0_arm64.whl

angr/knowledge_plugins/functions/function_parser.py

@@ -36,6 +36,10 @@ class FunctionParser:
         obj.alignment = function.is_alignment
         obj.binary_name = function.binary_name or ""
         obj.normalized = function.normalized
+        obj.calling_convention = pickle.dumps(function.calling_convention)
+        obj.prototype = pickle.dumps(function.prototype)
+        obj.prototype_libname = (function.prototype_libname or "").encode()
+        obj.is_prototype_guessed = function.is_prototype_guessed
 
         # signature matched?
         if not function.from_signature:
@@ -107,6 +111,10 @@ class FunctionParser:
             returning=cmsg.returning,
             alignment=cmsg.alignment,
             binary_name=None if not cmsg.binary_name else cmsg.binary_name,
+            calling_convention=pickle.loads(cmsg.calling_convention),
+            prototype=pickle.loads(cmsg.prototype),
+            prototype_libname=cmsg.prototype_libname if cmsg.prototype_libname else None,
+            is_prototype_guessed=cmsg.is_prototype_guessed,
         )
         obj._project = project
         obj.normalized = cmsg.normalized
@@ -209,7 +217,7 @@ class FunctionParser:
                     stmt_idx=stmt_idx,
                     is_exception=edge_type == "exception",
                 )
-            elif edge_type == "call":
+            elif edge_type in ("call", "syscall"):
                 # find the corresponding fake_ret edge
                 fake_ret_edge = next(
                     iter(edge_ for edge_ in fake_return_edges[src_addr] if edge_[1].addr == src.addr + src.size), None

angr/knowledge_plugins/functions/soot_function.py

@@ -83,7 +83,7 @@ class SootFunction(Function):
         # Whether this function returns or not. `None` means it's not determined yet
         self._returning = None
 
-        self.alignment = None
+        self.is_alignment = None
 
         # Determine returning status for SimProcedures and Syscalls
         hooker = None

angr/knowledge_plugins/key_definitions/key_definition_manager.py

@@ -51,7 +51,7 @@ class KeyDefinitionManager(KnowledgeBasePlugin):
             if not self._kb.functions.contains_addr(func_addr):
                 return None
             func = self._kb.functions[func_addr]
-            if func.is_simprocedure or func.is_plt or func.alignment:
+            if func.is_simprocedure or func.is_plt or func.is_alignment:
                 return None
             callsites = list(func.get_call_sites())
             if not callsites:

angr/procedures/definitions/__init__.py

@@ -25,7 +25,7 @@ if TYPE_CHECKING:
 
 
 l = logging.getLogger(name=__name__)
-SIM_LIBRARIES: dict[str, SimLibrary] = {}
+SIM_LIBRARIES: dict[str, list[SimLibrary]] = {}
 SIM_TYPE_COLLECTIONS: dict[str, SimTypeCollection] = {}
 
 
@@ -38,8 +38,8 @@ class SimTypeCollection:
         self.names: list[str] | None = None
         self.types: dict[str, SimType] = {}
 
-    def set_names(self, *names):
-        self.names = names
+    def set_names(self, *names: str):
+        self.names = list(names)
         for name in names:
             SIM_TYPE_COLLECTIONS[name] = self
 
@@ -121,7 +121,7 @@ class SimLibrary:
         o.names = list(self.names)
         return o
 
-    def update(self, other):
+    def update(self, other: SimLibrary):
         """
         Augment this SimLibrary with the information from another SimLibrary
 
@@ -147,7 +147,10 @@ class SimLibrary:
         """
         for name in names:
             self.names.append(name)
-            SIM_LIBRARIES[name] = self
+            if name in SIM_LIBRARIES:
+                SIM_LIBRARIES[name].append(self)
+            else:
+                SIM_LIBRARIES[name] = [self]
 
     def set_default_cc(self, arch_name, cc_cls):
         """
@@ -252,7 +255,7 @@ class SimLibrary:
             proc.guessed_prototype = False
             if proc.prototype.arg_names is None:
                 # Use inspect to extract the parameters from the run python function
-                proc.prototype.arg_names = inspect.getfullargspec(proc.run).args[1:]
+                proc.prototype.arg_names = tuple(inspect.getfullargspec(proc.run).args[1:])
             if not proc.ARGS_MISMATCH:
                 proc.num_args = len(proc.prototype.args)
         if proc.display_name in self.non_returning:
@@ -400,7 +403,6 @@ class SimCppLibrary(SimLibrary):
                 stub.prototype = stub.prototype.with_arch(arch)
                 stub.guessed_prototype = False
                 if not stub.ARGS_MISMATCH:
-                    stub.cc.num_args = len(stub.prototype.args)
                     stub.num_args = len(stub.prototype.args)
         return stub
 
@@ -482,9 +484,10 @@ class SimSyscallLibrary(SimLibrary):
 
     def update(self, other):
         super().update(other)
-        self.syscall_number_mapping.update(other.syscall_number_mapping)
-        self.syscall_name_mapping.update(other.syscall_name_mapping)
-        self.default_cc_mapping.update(other.default_cc_mapping)
+        if isinstance(other, SimSyscallLibrary):
+            self.syscall_number_mapping.update(other.syscall_number_mapping)
+            self.syscall_name_mapping.update(other.syscall_name_mapping)
+            self.default_cc_mapping.update(other.default_cc_mapping)
 
     def minimum_syscall_number(self, abi):
         """
@@ -523,7 +526,7 @@ class SimSyscallLibrary(SimLibrary):
         :param mapping: A dict mapping syscall numbers to function names
         """
         self.syscall_number_mapping[abi].update(mapping)
-        self.syscall_name_mapping[abi].update(dict(reversed(i) for i in mapping.items()))
+        self.syscall_name_mapping[abi].update({b: a for a, b in mapping.items()})
 
     def set_abi_cc(self, abi, cc_cls):
         """

angr/procedures/stubs/format_parser.py

@@ -164,7 +164,7 @@ class FormatString:
                     negative = claripy.SLT(target_variable, 0)
 
                     # how many digits does it take to represent this variable fully?
-                    max_digits = int(math.ceil(math.log(2**bits, base)))
+                    max_digits = math.ceil(math.log(2**bits, base))
 
                     # how many digits does the format specify?
                     spec_digits = component.length_spec

angr/project.py

@@ -14,7 +14,6 @@ from archinfo.arch_soot import SootAddressDescriptor, ArchSoot
 import cle
 from .sim_procedure import SimProcedure
 
-from .misc.ux import deprecated
 from .errors import AngrNoPluginError
 
 l = logging.getLogger(name=__name__)
@@ -300,16 +299,17 @@ class Project:
         missing_libs = []
         for lib_name in self.loader.missing_dependencies:
             try:
-                missing_libs.append(SIM_LIBRARIES[lib_name])
+                missing_libs.extend(SIM_LIBRARIES[lib_name])
             except KeyError:
                 l.info("There are no simprocedures for missing library %s :(", lib_name)
         # additionally provide libraries we _have_ loaded as a fallback fallback
         # this helps in the case that e.g. CLE picked up a linux arm libc to satisfy an android arm binary
         for lib in self.loader.all_objects:
             if lib.provides is not None and lib.provides in SIM_LIBRARIES:
-                simlib = SIM_LIBRARIES[lib.provides]
-                if simlib not in missing_libs:
-                    missing_libs.append(simlib)
+                simlibs = SIM_LIBRARIES[lib.provides]
+                for simlib in simlibs:
+                    if simlib not in missing_libs:
+                        missing_libs.append(simlib)
 
         # Step 2: Categorize every "import" symbol in each object.
         # If it's IGNORED, mark it for stubbing
@@ -362,11 +362,13 @@ class Project:
                     owner_name = owner_name.lower()
                 if owner_name not in SIM_LIBRARIES:
                     continue
-                sim_lib = SIM_LIBRARIES[owner_name]
-                if not sim_lib.has_implementation(export.name):
-                    continue
-                l.info("Using builtin SimProcedure for %s from %s", export.name, sim_lib.name)
-                self.hook_symbol(export.rebased_addr, sim_lib.get(export.name, sim_proc_arch))
+                sim_libs = SIM_LIBRARIES[owner_name]
+                for sim_lib in sim_libs:
+                    if not sim_lib.has_implementation(export.name):
+                        continue
+                    l.info("Using builtin SimProcedure for %s from %s", export.name, sim_lib.name)
+                    self.hook_symbol(export.rebased_addr, sim_lib.get(export.name, sim_proc_arch))
+                    break
 
             # Step 2.3: If 2.2 didn't work, check if the symbol wants to be resolved
             # by a library we already know something about. Resolve it appropriately.
@@ -375,7 +377,7 @@ class Project:
             # we still want to try as hard as we can to figure out where it comes from
             # so we can get the calling convention as close to right as possible.
             elif reloc.resolvewith is not None and reloc.resolvewith in SIM_LIBRARIES:
-                sim_lib = SIM_LIBRARIES[reloc.resolvewith]
+                sim_lib = sorted(SIM_LIBRARIES[reloc.resolvewith], key=lambda lib: lib.has_prototype(export.name))[-1]
                 if self._check_user_blacklists(export.name):
                     if not func.is_weak:
                         l.info("Using stub SimProcedure for unresolved %s from %s", func.name, sim_lib.name)
@@ -407,7 +409,7 @@ class Project:
                         if export.name and export.name.startswith("_Z"):
                             # GNU C++ name. Use a C++ library to create the stub
                             if "libstdc++.so" in SIM_LIBRARIES:
-                                the_lib = SIM_LIBRARIES["libstdc++.so"]
+                                the_lib = SIM_LIBRARIES["libstdc++.so"][0]
                             else:
                                 l.critical(
                                     "Does not find any C++ library in SIM_LIBRARIES. We may not correctly "
@@ -437,16 +439,17 @@ class Project:
         """
         # First, filter the SIM_LIBRARIES to a reasonable subset based on the hint
         if hint == "win":
-            hinted_libs = filter(lambda lib: lib if lib.endswith(".dll") else None, SIM_LIBRARIES)
+            hinted_libs = [lib for lib in SIM_LIBRARIES if lib.endswith(".dll")]
         else:
-            hinted_libs = filter(lambda lib: lib if ".so" in lib else None, SIM_LIBRARIES)
+            hinted_libs = [lib for lib in SIM_LIBRARIES if ".so" in lib]
 
         for lib in hinted_libs:
-            if SIM_LIBRARIES[lib].has_implementation(f.name):
-                l.debug("Found implementation for %s in %s", f, lib)
-                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
+            for simlib in SIM_LIBRARIES[lib]:
+                if simlib.has_implementation(f.name):
+                    l.debug("Found implementation for %s in %s", f, lib)
+                    hook_at = f.resolvedby.rebased_addr if f.resolvedby else f.relative_addr  # ????
+                    self.hook_symbol(hook_at, (simlib.get(f.name, self.arch)))
+                    return True
 
         l.debug("Could not find matching SimProcedure for %s, ignoring.", f.name)
         return False
@@ -826,18 +829,9 @@ class Project:
     def __repr__(self):
         return "<Project %s>" % (self.filename if self.filename is not None else "loaded from stream")
 
-    #
-    # Compatibility
-    #
-
-    @property
-    @deprecated(replacement="simos")
-    def _simos(self):
-        return self.simos
-
 
 from .factory import AngrObjectFactory
-from angr.simos import SimOS, os_mapping
+from .simos import SimOS, os_mapping
 from .analyses.analysis import AnalysesHub, AnalysesHubWithDefault
 from .knowledge_base import KnowledgeBase
 from .procedures import SIM_PROCEDURES, SIM_LIBRARIES

angr/protos/cfg_pb2.py

@@ -1,21 +1,10 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
-# NO CHECKED-IN PROTOBUF GENCODE
 # source: angr/protos/cfg.proto
-# Protobuf Python Version: 5.28.2
 """Generated protocol buffer code."""
+from google.protobuf.internal import builder as _builder
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool
-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,
-    '',
-    'angr/protos/cfg.proto'
-)
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
@@ -26,17 +15,17 @@ from angr.protos import primitives_pb2 as angr_dot_protos_dot_primitives__pb2
 
 DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x15\x61ngr/protos/cfg.proto\x12\x0b\x61ngr.protos\x1a\x1c\x61ngr/protos/primitives.proto\"]\n\x07\x43\x46GNode\x12\n\n\x02\x65\x61\x18\x01 \x01(\x04\x12\x0c\n\x04size\x18\x02 \x01(\r\x12\x10\n\x08\x62lock_id\x18\x03 \x03(\x03\x12\x11\n\treturning\x18\x04 \x01(\x08\x12\x13\n\x0binstr_addrs\x18\x05 \x03(\x04\"\x9d\x01\n\x03\x43\x46G\x12\r\n\x05ident\x18\x01 \x01(\t\x12#\n\x05nodes\x18\x02 \x03(\x0b\x32\x14.angr.protos.CFGNode\x12 \n\x05\x65\x64ges\x18\x03 \x03(\x0b\x32\x11.angr.protos.Edge\x12,\n\x0bmemory_data\x18\x04 \x03(\x0b\x32\x17.angr.protos.MemoryData\x12\x12\n\nnormalized\x18\x05 \x01(\x08\"\xfb\x02\n\nMemoryData\x12\n\n\x02\x65\x61\x18\x01 \x01(\x04\x12\x11\n\x04size\x18\x02 \x01(\rH\x00\x88\x01\x01\x12\x34\n\x04type\x18\x03 \x01(\x0e\x32&.angr.protos.MemoryData.MemoryDataType\x12\x1b\n\x0ereference_size\x18\x04 \x01(\rH\x01\x88\x01\x01\"\xde\x01\n\x0eMemoryDataType\x12\x13\n\x0fUnknownDataType\x10\x00\x12\x0f\n\x0bUnspecified\x10\x01\x12\x0b\n\x07Integer\x10\x02\x12\x10\n\x0cPointerArray\x10\x03\x12\n\n\x06String\x10\x04\x12\x11\n\rUnicodeString\x10\x05\x12\x13\n\x0fSegmentBoundary\x10\x06\x12\x11\n\rCodeReference\x10\x07\x12\x0f\n\x0bGOTPLTEntry\x10\x08\x12\r\n\tELFHeader\x10\t\x12\x11\n\rFloatingPoint\x10\n\x12\r\n\tAlignment\x10\x0b\x42\x07\n\x05_sizeB\x11\n\x0f_reference_sizeb\x06proto3')
 
-_globals = globals()
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'angr.protos.cfg_pb2', _globals)
-if not _descriptor._USE_C_DESCRIPTORS:
-  DESCRIPTOR._loaded_options = None
-  _globals['_CFGNODE']._serialized_start=68
-  _globals['_CFGNODE']._serialized_end=161
-  _globals['_CFG']._serialized_start=164
-  _globals['_CFG']._serialized_end=321
-  _globals['_MEMORYDATA']._serialized_start=324
-  _globals['_MEMORYDATA']._serialized_end=703
-  _globals['_MEMORYDATA_MEMORYDATATYPE']._serialized_start=453
-  _globals['_MEMORYDATA_MEMORYDATATYPE']._serialized_end=675
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'angr.protos.cfg_pb2', globals())
+if _descriptor._USE_C_DESCRIPTORS == False:
+
+  DESCRIPTOR._options = None
+  _CFGNODE._serialized_start=68
+  _CFGNODE._serialized_end=161
+  _CFG._serialized_start=164
+  _CFG._serialized_end=321
+  _MEMORYDATA._serialized_start=324
+  _MEMORYDATA._serialized_end=703
+  _MEMORYDATA_MEMORYDATATYPE._serialized_start=453
+  _MEMORYDATA_MEMORYDATATYPE._serialized_end=675
 # @@protoc_insertion_point(module_scope)

angr/protos/function_pb2.py

@@ -1,21 +1,10 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
-# NO CHECKED-IN PROTOBUF GENCODE
 # source: angr/protos/function.proto
-# Protobuf Python Version: 5.28.2
 """Generated protocol buffer code."""
+from google.protobuf.internal import builder as _builder
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool
-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,
-    '',
-    'angr/protos/function.proto'
-)
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
@@ -24,15 +13,15 @@ _sym_db = _symbol_database.Default()
 from angr.protos import primitives_pb2 as angr_dot_protos_dot_primitives__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1a\x61ngr/protos/function.proto\x12\x0b\x61ngr.protos\x1a\x1c\x61ngr/protos/primitives.proto\"\x99\x03\n\x08\x46unction\x12\n\n\x02\x65\x61\x18\x01 \x01(\x04\x12\x15\n\ris_entrypoint\x18\x03 \x01(\x08\x12\"\n\x06\x62locks\x18\x02 \x03(\x0b\x32\x12.angr.protos.Block\x12\x0c\n\x04name\x18\x04 \x01(\t\x12\x0e\n\x06is_plt\x18\x07 \x01(\x08\x12\x12\n\nis_syscall\x18\x08 \x01(\x08\x12\x17\n\x0fis_simprocedure\x18\t \x01(\x08\x12\x11\n\treturning\x18\n \x01(\x08\x12\x13\n\x0b\x62inary_name\x18\x0b \x01(\t\x12&\n\x05graph\x18\x0c \x01(\x0b\x32\x17.angr.protos.BlockGraph\x12\x1a\n\x12\x65xternal_functions\x18\r \x03(\x04\x12\x11\n\talignment\x18\x0e \x01(\x08\x12\x12\n\nnormalized\x18\x0f \x01(\x08\x12;\n\x0cmatched_from\x18\x10 \x01(\x0e\x32%.angr.protos.Function.SignatureSource\"+\n\x0fSignatureSource\x12\r\n\tUNMATCHED\x10\x00\x12\t\n\x05\x46LIRT\x10\x01\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1a\x61ngr/protos/function.proto\x12\x0b\x61ngr.protos\x1a\x1c\x61ngr/protos/primitives.proto\"\x81\x04\n\x08\x46unction\x12\n\n\x02\x65\x61\x18\x01 \x01(\x04\x12\x15\n\ris_entrypoint\x18\x03 \x01(\x08\x12\"\n\x06\x62locks\x18\x02 \x03(\x0b\x32\x12.angr.protos.Block\x12\x0c\n\x04name\x18\x04 \x01(\t\x12\x0e\n\x06is_plt\x18\x07 \x01(\x08\x12\x12\n\nis_syscall\x18\x08 \x01(\x08\x12\x17\n\x0fis_simprocedure\x18\t \x01(\x08\x12\x11\n\treturning\x18\n \x01(\x08\x12\x13\n\x0b\x62inary_name\x18\x0b \x01(\t\x12&\n\x05graph\x18\x0c \x01(\x0b\x32\x17.angr.protos.BlockGraph\x12\x1a\n\x12\x65xternal_functions\x18\r \x03(\x04\x12\x11\n\talignment\x18\x0e \x01(\x08\x12\x12\n\nnormalized\x18\x0f \x01(\x08\x12;\n\x0cmatched_from\x18\x10 \x01(\x0e\x32%.angr.protos.Function.SignatureSource\x12\x11\n\tprototype\x18\x11 \x01(\x0c\x12\x1a\n\x12\x63\x61lling_convention\x18\x12 \x01(\x0c\x12\x19\n\x11prototype_libname\x18\x13 \x01(\t\x12\x1c\n\x14is_prototype_guessed\x18\x14 \x01(\x08\"+\n\x0fSignatureSource\x12\r\n\tUNMATCHED\x10\x00\x12\t\n\x05\x46LIRT\x10\x01\x62\x06proto3')
+
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'angr.protos.function_pb2', globals())
+if _descriptor._USE_C_DESCRIPTORS == False:
 
-_globals = globals()
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'angr.protos.function_pb2', _globals)
-if not _descriptor._USE_C_DESCRIPTORS:
-  DESCRIPTOR._loaded_options = None
-  _globals['_FUNCTION']._serialized_start=74
-  _globals['_FUNCTION']._serialized_end=483
-  _globals['_FUNCTION_SIGNATURESOURCE']._serialized_start=440
-  _globals['_FUNCTION_SIGNATURESOURCE']._serialized_end=483
+  DESCRIPTOR._options = None
+  _FUNCTION._serialized_start=74
+  _FUNCTION._serialized_end=587
+  _FUNCTION_SIGNATURESOURCE._serialized_start=544
+  _FUNCTION_SIGNATURESOURCE._serialized_end=587
 # @@protoc_insertion_point(module_scope)

angr/protos/primitives_pb2.py

@@ -1,21 +1,10 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
-# NO CHECKED-IN PROTOBUF GENCODE
 # source: angr/protos/primitives.proto
-# Protobuf Python Version: 5.28.2
 """Generated protocol buffer code."""
+from google.protobuf.internal import builder as _builder
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool
-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,
-    '',
-    'angr/protos/primitives.proto'
-)
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
@@ -25,39 +14,39 @@ _sym_db = _symbol_database.Default()
 
 DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1c\x61ngr/protos/primitives.proto\x12\x0b\x61ngr.protos\"\x87\x05\n\rCodeReference\x12:\n\x0btarget_type\x18\x01 \x01(\x0e\x32%.angr.protos.CodeReference.TargetType\x12<\n\x0coperand_type\x18\x02 \x01(\x0e\x32&.angr.protos.CodeReference.OperandType\x12\x35\n\x08location\x18\x03 \x01(\x0e\x32#.angr.protos.CodeReference.Location\x12\n\n\x02\x65\x61\x18\x04 \x01(\x04\x12\x0c\n\x04mask\x18\x05 \x01(\x04\x12\x0c\n\x04name\x18\x06 \x01(\t\x12\x0f\n\x07\x64\x61ta_ea\x18\x07 \x01(\x04\x12\x10\n\x08\x62lock_ea\x18\x08 \x01(\x04\x12\x10\n\x08stmt_idx\x18\t \x01(\x05\x12\x13\n\x0boperand_idx\x18\n \x01(\x05\x12:\n\x08ref_type\x18\x0b \x01(\x0e\x32(.angr.protos.CodeReference.ReferenceType\"=\n\nTargetType\x12\x0e\n\nCodeTarget\x10\x00\x12\x0e\n\nDataTarget\x10\x01\x12\x0f\n\x0bStackTarget\x10\x02\"~\n\x0bOperandType\x12\x14\n\x10ImmediateOperand\x10\x00\x12\x11\n\rMemoryOperand\x10\x01\x12\x1d\n\x19MemoryDisplacementOperand\x10\x02\x12\x16\n\x12\x43ontrolFlowOperand\x10\x03\x12\x0f\n\x0bOffsetTable\x10\x04\"&\n\x08Location\x12\x0c\n\x08Internal\x10\x00\x12\x0c\n\x08\x45xternal\x10\x01\"0\n\rReferenceType\x12\n\n\x06offset\x10\x00\x12\x08\n\x04read\x10\x01\x12\t\n\x05write\x10\x02\"k\n\x0bInstruction\x12\n\n\x02\x65\x61\x18\x01 \x01(\x04\x12\r\n\x05\x62ytes\x18\x02 \x01(\x0c\x12)\n\x05xrefs\x18\x03 \x01(\x0b\x32\x1a.angr.protos.CodeReference\x12\x16\n\x0elocal_noreturn\x18\x04 \x01(\x08\"`\n\x05\x42lock\x12\n\n\x02\x65\x61\x18\x01 \x01(\x04\x12.\n\x0cinstructions\x18\x02 \x01(\x0b\x32\x18.angr.protos.Instruction\x12\x0c\n\x04size\x18\x04 \x01(\r\x12\r\n\x05\x62ytes\x18\x05 \x01(\x0c\"\x95\x02\n\x10\x45xternalFunction\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\n\n\x02\x65\x61\x18\x02 \x01(\x04\x12;\n\x02\x63\x63\x18\x03 \x01(\x0e\x32/.angr.protos.ExternalFunction.CallingConvention\x12\x12\n\nhas_return\x18\x04 \x01(\x08\x12\x11\n\tno_return\x18\x05 \x01(\x08\x12\x16\n\x0e\x61rgument_count\x18\x06 \x01(\x05\x12\x0f\n\x07is_weak\x18\x07 \x01(\x08\x12\x11\n\tprototype\x18\x08 \x01(\t\"G\n\x11\x43\x61llingConvention\x12\x11\n\rCallerCleanup\x10\x00\x12\x11\n\rCalleeCleanup\x10\x01\x12\x0c\n\x08\x46\x61stCall\x10\x02\"d\n\x10\x45xternalVariable\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\n\n\x02\x65\x61\x18\x02 \x01(\x04\x12\x0c\n\x04size\x18\x03 \x01(\r\x12\x0f\n\x07is_weak\x18\x04 \x01(\x08\x12\x17\n\x0fis_thread_local\x18\x05 \x01(\x08\"\xdf\x05\n\x04\x45\x64ge\x12\x0e\n\x06src_ea\x18\x01 \x01(\x04\x12\x0e\n\x06\x64st_ea\x18\x02 \x01(\x04\x12,\n\x08jumpkind\x18\x03 \x01(\x0e\x32\x1a.angr.protos.Edge.JumpKind\x12\x12\n\nis_outside\x18\x04 \x01(\x08\x12\x10\n\x08ins_addr\x18\x05 \x01(\x04\x12\x10\n\x08stmt_idx\x18\x06 \x01(\x03\x12)\n\x04\x64\x61ta\x18\x07 \x03(\x0b\x32\x1b.angr.protos.Edge.DataEntry\x1a+\n\tDataEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x0c:\x02\x38\x01\"\xf8\x03\n\x08JumpKind\x12\x13\n\x0fUnknownJumpkind\x10\x00\x12\n\n\x06\x42oring\x10\x01\x12\x08\n\x04\x43\x61ll\x10\x02\x12\n\n\x06Return\x10\x03\x12\x0e\n\nFakeReturn\x10\x04\x12\x0b\n\x07Syscall\x10\x05\x12\x0f\n\x0bSys_syscall\x10\x06\x12\x0e\n\nSys_int128\x10\x07\x12\x0c\n\x08NoDecode\x10\x08\x12\n\n\x06\x45mWarn\x10\t\x12\x11\n\rSigFPE_IntDiv\x10\n\x12\x0b\n\x07SigTRAP\x10\x0b\x12\x0b\n\x07SigSEGV\x10\x0c\x12\x0b\n\x07MapFail\x10\r\x12\x0b\n\x07NoRedir\x10\x0e\x12\r\n\tClientReq\x10\x0f\x12\r\n\tException\x10\x10\x12\n\n\x06_8jzf8\x10\x11\x12\n\n\x06\x45mFail\x10\x12\x12\x0f\n\x0b\x46lushDCache\x10\x13\x12\x0f\n\x0bInvalICache\x10\x14\x12\x0e\n\nPrivileged\x10\x15\x12\n\n\x06SigBUS\x10\x16\x12\x11\n\rSigFPE_IntOvf\x10\x17\x12\n\n\x06SigILL\x10\x18\x12\x0e\n\nSys_int129\x10\x19\x12\x0e\n\nSys_int130\x10\x1a\x12\x0e\n\nSys_int145\x10\x1b\x12\x0e\n\nSys_int210\x10\x1c\x12\r\n\tSys_int32\x10\x1d\x12\x10\n\x0cSys_sysenter\x10\x1e\x12\t\n\x05Yield\x10\x1f\x12\n\n\x06SigFPE\x10 \x12\x0b\n\x07Sys_int\x10!\".\n\nBlockGraph\x12 \n\x05\x65\x64ges\x18\x01 \x03(\x0b\x32\x11.angr.protos.Edgeb\x06proto3')
 
-_globals = globals()
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'angr.protos.primitives_pb2', _globals)
-if not _descriptor._USE_C_DESCRIPTORS:
-  DESCRIPTOR._loaded_options = None
-  _globals['_EDGE_DATAENTRY']._loaded_options = None
-  _globals['_EDGE_DATAENTRY']._serialized_options = b'8\001'
-  _globals['_CODEREFERENCE']._serialized_start=46
-  _globals['_CODEREFERENCE']._serialized_end=693
-  _globals['_CODEREFERENCE_TARGETTYPE']._serialized_start=414
-  _globals['_CODEREFERENCE_TARGETTYPE']._serialized_end=475
-  _globals['_CODEREFERENCE_OPERANDTYPE']._serialized_start=477
-  _globals['_CODEREFERENCE_OPERANDTYPE']._serialized_end=603
-  _globals['_CODEREFERENCE_LOCATION']._serialized_start=605
-  _globals['_CODEREFERENCE_LOCATION']._serialized_end=643
-  _globals['_CODEREFERENCE_REFERENCETYPE']._serialized_start=645
-  _globals['_CODEREFERENCE_REFERENCETYPE']._serialized_end=693
-  _globals['_INSTRUCTION']._serialized_start=695
-  _globals['_INSTRUCTION']._serialized_end=802
-  _globals['_BLOCK']._serialized_start=804
-  _globals['_BLOCK']._serialized_end=900
-  _globals['_EXTERNALFUNCTION']._serialized_start=903
-  _globals['_EXTERNALFUNCTION']._serialized_end=1180
-  _globals['_EXTERNALFUNCTION_CALLINGCONVENTION']._serialized_start=1109
-  _globals['_EXTERNALFUNCTION_CALLINGCONVENTION']._serialized_end=1180
-  _globals['_EXTERNALVARIABLE']._serialized_start=1182
-  _globals['_EXTERNALVARIABLE']._serialized_end=1282
-  _globals['_EDGE']._serialized_start=1285
-  _globals['_EDGE']._serialized_end=2020
-  _globals['_EDGE_DATAENTRY']._serialized_start=1470
-  _globals['_EDGE_DATAENTRY']._serialized_end=1513
-  _globals['_EDGE_JUMPKIND']._serialized_start=1516
-  _globals['_EDGE_JUMPKIND']._serialized_end=2020
-  _globals['_BLOCKGRAPH']._serialized_start=2022
-  _globals['_BLOCKGRAPH']._serialized_end=2068
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'angr.protos.primitives_pb2', globals())
+if _descriptor._USE_C_DESCRIPTORS == False:
+
+  DESCRIPTOR._options = None
+  _EDGE_DATAENTRY._options = None
+  _EDGE_DATAENTRY._serialized_options = b'8\001'
+  _CODEREFERENCE._serialized_start=46
+  _CODEREFERENCE._serialized_end=693
+  _CODEREFERENCE_TARGETTYPE._serialized_start=414
+  _CODEREFERENCE_TARGETTYPE._serialized_end=475
+  _CODEREFERENCE_OPERANDTYPE._serialized_start=477
+  _CODEREFERENCE_OPERANDTYPE._serialized_end=603
+  _CODEREFERENCE_LOCATION._serialized_start=605
+  _CODEREFERENCE_LOCATION._serialized_end=643
+  _CODEREFERENCE_REFERENCETYPE._serialized_start=645
+  _CODEREFERENCE_REFERENCETYPE._serialized_end=693
+  _INSTRUCTION._serialized_start=695
+  _INSTRUCTION._serialized_end=802
+  _BLOCK._serialized_start=804
+  _BLOCK._serialized_end=900
+  _EXTERNALFUNCTION._serialized_start=903
+  _EXTERNALFUNCTION._serialized_end=1180
+  _EXTERNALFUNCTION_CALLINGCONVENTION._serialized_start=1109
+  _EXTERNALFUNCTION_CALLINGCONVENTION._serialized_end=1180
+  _EXTERNALVARIABLE._serialized_start=1182
+  _EXTERNALVARIABLE._serialized_end=1282
+  _EDGE._serialized_start=1285
+  _EDGE._serialized_end=2020
+  _EDGE_DATAENTRY._serialized_start=1470
+  _EDGE_DATAENTRY._serialized_end=1513
+  _EDGE_JUMPKIND._serialized_start=1516
+  _EDGE_JUMPKIND._serialized_end=2020
+  _BLOCKGRAPH._serialized_start=2022
+  _BLOCKGRAPH._serialized_end=2068
 # @@protoc_insertion_point(module_scope)

angr/protos/variables_pb2.py

@@ -1,21 +1,10 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
-# NO CHECKED-IN PROTOBUF GENCODE
 # source: angr/protos/variables.proto
-# Protobuf Python Version: 5.28.2
 """Generated protocol buffer code."""
+from google.protobuf.internal import builder as _builder
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool
-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,
-    '',
-    'angr/protos/variables.proto'
-)
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
@@ -25,31 +14,31 @@ _sym_db = _symbol_database.Default()
 
 DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1b\x61ngr/protos/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, 'angr.protos.variables_pb2', _globals)
-if not _descriptor._USE_C_DESCRIPTORS:
-  DESCRIPTOR._loaded_options = None
-  _globals['_VARIABLEBASE']._serialized_start=45
-  _globals['_VARIABLEBASE']._serialized_end=189
-  _globals['_TEMPORARYVARIABLE']._serialized_start=191
-  _globals['_TEMPORARYVARIABLE']._serialized_end=267
-  _globals['_REGISTERVARIABLE']._serialized_start=269
-  _globals['_REGISTERVARIABLE']._serialized_end=355
-  _globals['_MEMORYVARIABLE']._serialized_start=357
-  _globals['_MEMORYVARIABLE']._serialized_end=442
-  _globals['_STACKVARIABLE']._serialized_start=444
-  _globals['_STACKVARIABLE']._serialized_end=561
-  _globals['_VARIABLEACCESS']._serialized_start=564
-  _globals['_VARIABLEACCESS']._serialized_end=848
-  _globals['_VARIABLEACCESS_VARIABLEACCESSSORT']._serialized_start=767
-  _globals['_VARIABLEACCESS_VARIABLEACCESSSORT']._serialized_end=823
-  _globals['_VARIABLETYPE']._serialized_start=850
-  _globals['_VARIABLETYPE']._serialized_end=897
-  _globals['_VAR2UNIFIED']._serialized_start=899
-  _globals['_VAR2UNIFIED']._serialized_end=958
-  _globals['_PHI2VAR']._serialized_start=960
-  _globals['_PHI2VAR']._serialized_end=1007
-  _globals['_VARIABLEMANAGERINTERNAL']._serialized_start=1010
-  _globals['_VARIABLEMANAGERINTERNAL']._serialized_end=1624
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'angr.protos.variables_pb2', globals())
+if _descriptor._USE_C_DESCRIPTORS == False:
+
+  DESCRIPTOR._options = None
+  _VARIABLEBASE._serialized_start=45
+  _VARIABLEBASE._serialized_end=189
+  _TEMPORARYVARIABLE._serialized_start=191
+  _TEMPORARYVARIABLE._serialized_end=267
+  _REGISTERVARIABLE._serialized_start=269
+  _REGISTERVARIABLE._serialized_end=355
+  _MEMORYVARIABLE._serialized_start=357
+  _MEMORYVARIABLE._serialized_end=442
+  _STACKVARIABLE._serialized_start=444
+  _STACKVARIABLE._serialized_end=561
+  _VARIABLEACCESS._serialized_start=564
+  _VARIABLEACCESS._serialized_end=848
+  _VARIABLEACCESS_VARIABLEACCESSSORT._serialized_start=767
+  _VARIABLEACCESS_VARIABLEACCESSSORT._serialized_end=823
+  _VARIABLETYPE._serialized_start=850
+  _VARIABLETYPE._serialized_end=897
+  _VAR2UNIFIED._serialized_start=899
+  _VAR2UNIFIED._serialized_end=958
+  _PHI2VAR._serialized_start=960
+  _PHI2VAR._serialized_end=1007
+  _VARIABLEMANAGERINTERNAL._serialized_start=1010
+  _VARIABLEMANAGERINTERNAL._serialized_end=1624
 # @@protoc_insertion_point(module_scope)

angr/protos/xrefs_pb2.py

@@ -1,21 +1,10 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
-# NO CHECKED-IN PROTOBUF GENCODE
 # source: angr/protos/xrefs.proto
-# Protobuf Python Version: 5.28.2
 """Generated protocol buffer code."""
+from google.protobuf.internal import builder as _builder
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool
-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,
-    '',
-    'angr/protos/xrefs.proto'
-)
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
@@ -26,11 +15,11 @@ from angr.protos import primitives_pb2 as angr_dot_protos_dot_primitives__pb2
 
 DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x17\x61ngr/protos/xrefs.proto\x12\x0b\x61ngr.protos\x1a\x1c\x61ngr/protos/primitives.proto\"2\n\x05XRefs\x12)\n\x05xrefs\x18\x01 \x03(\x0b\x32\x1a.angr.protos.CodeReferenceb\x06proto3')
 
-_globals = globals()
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'angr.protos.xrefs_pb2', _globals)
-if not _descriptor._USE_C_DESCRIPTORS:
-  DESCRIPTOR._loaded_options = None
-  _globals['_XREFS']._serialized_start=70
-  _globals['_XREFS']._serialized_end=120
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'angr.protos.xrefs_pb2', globals())
+if _descriptor._USE_C_DESCRIPTORS == False:
+
+  DESCRIPTOR._options = None
+  _XREFS._serialized_start=70
+  _XREFS._serialized_end=120
 # @@protoc_insertion_point(module_scope)

angr/sim_type.py

@@ -16,7 +16,6 @@ import pycparser
 
 from angr.errors import AngrMissingTypeError, AngrTypeError
 from angr.sim_state import SimState
-from .misc.ux import deprecated
 
 if TYPE_CHECKING:
     from angr.procedures.definitions import SimTypeCollection
@@ -2997,21 +2996,6 @@ def _make_scope(predefined_types=None):
     return [scope]
 
 
-@deprecated(replacement="register_types(parse_type(struct_expr))")
-def define_struct(defn):
-    """
-    Register a struct definition globally
-
-    >>> define_struct('struct abcd {int x; int y;}')
-    """
-    struct = parse_type(defn)
-    if not isinstance(struct, SimStruct):
-        raise AngrTypeError("Passed a non-struct type to define_struct")
-    ALL_TYPES[struct.name] = struct
-    ALL_TYPES["struct " + struct.name] = struct
-    return struct
-
-
 def register_types(types):
     """
     Pass in some types and they will be registered to the global type store.

angr/simos/cgc.py

@@ -18,7 +18,7 @@ class SimCGC(SimUserland):
     """
 
     def __init__(self, project, **kwargs):
-        super().__init__(project, syscall_library=L["cgcabi"], syscall_addr_alignment=1, name="CGC", **kwargs)
+        super().__init__(project, syscall_library=L["cgcabi"][0], syscall_addr_alignment=1, name="CGC", **kwargs)
 
     # pylint: disable=arguments-differ
     def state_blank(self, flag_page=None, allocate_stack_page_count=0x100, **kwargs):