angr 9.2.175__cp310-abi3-macosx_11_0_arm64.whl → 9.2.177__cp310-abi3-macosx_11_0_arm64.whl

angr/procedures/posix/pthread.py

@@ -52,20 +52,20 @@ class pthread_cond_signal(angr.SimProcedure):
 
 class pthread_mutex_lock(angr.SimProcedure):
     """
-    A no-op.
+    Always returns 0 (SUCCESS).
     """
 
     def run(self, arg):
-        pass
+        return 0
 
 
 class pthread_mutex_unlock(angr.SimProcedure):
     """
-    A no-op.
+    Always returns 0 (SUCCESS).
     """
 
     def run(self, arg):
-        pass
+        return 0
 
 
 class pthread_once(angr.SimProcedure):

angr/procedures/stubs/format_parser.py

@@ -99,11 +99,11 @@ class FormatString:
                     elif fmt_spec.spec_type == b"c":
                         s_val = chr(c_val & 0xFF)
                     elif fmt_spec.spec_type == b"x":
-                        s_val = hex(c_val)[2:]
+                        s_val = f"{c_val:x}"[2:]
                     elif fmt_spec.spec_type == b"o":
-                        s_val = oct(c_val)[2:]
+                        s_val = f"{c_val:o}"[2:]
                     elif fmt_spec.spec_type == b"p":
-                        s_val = hex(c_val)
+                        s_val = f"{c_val:x}"
                     else:
                         raise SimProcedureError(f"Unimplemented format specifier '{fmt_spec.spec_type}'")
 

angr/sim_type.py

@@ -872,6 +872,8 @@ class SimTypePointer(SimTypeReg):
         self, name=None, full=0, memo=None, indent=0, name_parens: bool = True
     ):  # pylint: disable=unused-argument
         # if pts_to is SimTypeBottom, we return a void*
+        if self.label is not None and name is not None:
+            return super().c_repr(name=name, full=full, memo=memo, indent=indent, name_parens=name_parens)
         if isinstance(self.pts_to, SimTypeBottom):
             out = "void*"
             if name is None:
@@ -2192,10 +2194,10 @@ class SimTypeRef(SimType):
     ) -> str:  # pylint: disable=unused-argument
         prefix = "unknown"
         if self.original_type is SimStruct:
-            prefix = "struct"
+            prefix = "struct "
         if name is None:
             name = ""
-        return f"{prefix}{name} {self.name}"
+        return f"{prefix}{self.label} {name}"
 
     def _init_str(self) -> str:
         original_type_name = self.original_type.__name__.split(".")[-1]
@@ -3752,7 +3754,7 @@ def _cpp_decl_to_type(
         for idx, param in enumerate(the_func.parameters):
             arg_type = param.type
             args.append(_cpp_decl_to_type(arg_type, extra_types, opaque_classes=opaque_classes))
-            arg_name = param.name if param.name is not None else f"unknown_{idx}"
+            arg_name = param.name if param.name is not None else f"arg_{idx}"
             arg_names.append(arg_name)
 
         args = tuple(args)
@@ -3799,7 +3801,7 @@ def _cpp_decl_to_type(
         for idx, param in enumerate(the_func.parameters):
             arg_type = param.type
             args.append(_cpp_decl_to_type(arg_type, extra_types, opaque_classes=opaque_classes))
-            arg_name = param.name if param.name is not None else f"unknown_{idx}"
+            arg_name = param.name if param.name is not None else f"arg_{idx}"
             arg_names.append(arg_name)
 
         args = tuple(args)
@@ -3821,8 +3823,11 @@ def _cpp_decl_to_type(
         elif lbl in ALL_TYPES:
             t = ALL_TYPES[lbl]
         elif opaque_classes is True:
-            # create a class without knowing the internal members
-            t = SimCppClass(unique_name=lbl, name=lbl, members={}, size=32)
+            # create a struct or a class without knowing the internal members
+            if decl.typename.classkey == "struct":
+                t = SimTypeRef(lbl.removeprefix("struct "), SimStruct)
+            else:
+                t = SimCppClass(unique_name=lbl, name=lbl, members={}, size=32)
         else:
             raise TypeError(f'Unknown type "{lbl}"')
 

angr/simos/windows.py

@@ -440,7 +440,7 @@ class SimWindows(SimOS):
         :param state:               The state to get the syscall number from
         :param allow_unsupported:   Whether to return a "dummy" sycall instead of raising an unsupported exception
         """
-        if state.block(state.history.jump_source).bytes.hex() == "cd29":  # int 29h
+        if state.history.jump_source and state.block(state.history.jump_source).bytes.hex() == "cd29":  # int 29h
             return self.fastfail
         return None
 

angr/storage/memory_mixins/paged_memory/page_backer_mixins.py

@@ -192,7 +192,7 @@ class ConcreteBackerMixin(ClemoryBackerMixin):
 
         try:
             backer_iter = self._clemory_backer.backers(addr)
-            backer_start, backer = next(backer_iter)
+            backer_start, _backer = next(backer_iter)
         except StopIteration:
             return super()._initialize_page(pageno, permissions=permissions, **kwargs)
 

angr/utils/constants.py

@@ -6,4 +6,4 @@ MAX_POINTSTO_BITS = -1330 * 8
 
 
 def is_alignment_mask(n):
-    return n in {0xFFFFFFFFFFFFFFE0, 0xFFFFFFFFFFFFFFF0, 0xFFFFFFE0, 0xFFFFFFF0, 0xFFFFFFFC, 0xFFFFFFF8}
+    return n in {0xFFFFFFFFFFFFFFE0, 0xFFFFFFFFFFFFFFF0, 0xFFFFFFC0, 0xFFFFFFE0, 0xFFFFFFF0, 0xFFFFFFFC, 0xFFFFFFF8}

angr/utils/strings.py

@@ -0,0 +1,20 @@
+from __future__ import annotations
+
+
+def decode_utf16_string(data: bytes) -> str:
+    """
+    Decode a UTF-16 encoded string from a bytes object in a resilient manner.
+
+    :param data: The bytes object containing the UTF-16 encoded string.
+    :param errors: The error handling scheme. Default is 'strict'.
+                   Other options include 'ignore', 'replace', etc.
+    :return: The decoded string.
+    """
+    if len(data) % 2 == 1:
+        data = data[:-1]  # Trim off the last byte if the length is odd
+
+    # If no BOM, try to decode as little-endian first
+    try:
+        return data.decode("utf-16-le")
+    except UnicodeDecodeError:
+        return "<utf16-decode-error>"

{angr-9.2.175.dist-info → angr-9.2.177.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: angr
-Version: 9.2.175
+Version: 9.2.177
 Summary: A multi-architecture binary analysis toolkit, with the ability to perform dynamic symbolic execution and various static analyses on binaries
 License: BSD-2-Clause
 Project-URL: Homepage, https://angr.io/
@@ -16,12 +16,12 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: cxxheaderparser
 Requires-Dist: GitPython
-Requires-Dist: archinfo==9.2.175
+Requires-Dist: archinfo==9.2.177
 Requires-Dist: cachetools
 Requires-Dist: capstone==5.0.3
 Requires-Dist: cffi>=1.14.0
-Requires-Dist: claripy==9.2.175
-Requires-Dist: cle==9.2.175
+Requires-Dist: claripy==9.2.177
+Requires-Dist: cle==9.2.177
 Requires-Dist: msgspec
 Requires-Dist: mulpyplexer
 Requires-Dist: networkx!=2.8.1,>=2.0
@@ -31,7 +31,7 @@ Requires-Dist: pycparser>=2.18
 Requires-Dist: pydemumble
 Requires-Dist: pyformlang
 Requires-Dist: pypcode<4.0,>=3.2.1
-Requires-Dist: pyvex==9.2.175
+Requires-Dist: pyvex==9.2.177
 Requires-Dist: rich>=13.1.0
 Requires-Dist: sortedcontainers
 Requires-Dist: sympy

{angr-9.2.175.dist-info → angr-9.2.177.dist-info}/RECORD

@@ -1,23 +1,23 @@
-angr-9.2.175.dist-info/RECORD,,
-angr-9.2.175.dist-info/WHEEL,sha256=kFn0Fg1gyV9Pk02-Hr4CbqbhAvYPyosBpF5pwZB07jU,135
-angr-9.2.175.dist-info/entry_points.txt,sha256=Vjh1C8PMyr5dZFMnik5WkEP01Uwr2T73I3a6N32sgQU,44
-angr-9.2.175.dist-info/top_level.txt,sha256=dKw0KWTbwLXytFvv15oAAG4sUs3ey47tt6DorJG9-hw,5
-angr-9.2.175.dist-info/METADATA,sha256=mebKSVkG14DWy-syxp7TYRdR7oNAWUPi3I-ytwHpHIM,4366
-angr-9.2.175.dist-info/licenses/LICENSE,sha256=PmWf0IlSz6Jjp9n7nyyBQA79Q5C2ma68LRykY1V3GF0,1456
+angr-9.2.177.dist-info/RECORD,,
+angr-9.2.177.dist-info/WHEEL,sha256=kFn0Fg1gyV9Pk02-Hr4CbqbhAvYPyosBpF5pwZB07jU,135
+angr-9.2.177.dist-info/entry_points.txt,sha256=Vjh1C8PMyr5dZFMnik5WkEP01Uwr2T73I3a6N32sgQU,44
+angr-9.2.177.dist-info/top_level.txt,sha256=dKw0KWTbwLXytFvv15oAAG4sUs3ey47tt6DorJG9-hw,5
+angr-9.2.177.dist-info/METADATA,sha256=nSqVeQ_B1EMMDD_YHtcBhdpPcIoiE-1rh_ekW4aiSFs,4366
+angr-9.2.177.dist-info/licenses/LICENSE,sha256=PmWf0IlSz6Jjp9n7nyyBQA79Q5C2ma68LRykY1V3GF0,1456
 angr/vaults.py,sha256=D_gkDegCyPlZMKGC5E8zINYAaZfSXNWbmhX0rXCYpvM,9718
-angr/unicornlib.dylib,sha256=1mDztYjv0WMCv-JbH9IPmkSbYxiOh-OuFV0pSiMLynU,234064
+angr/unicornlib.dylib,sha256=J-Pq_MLBdri_wUoTGGajWX7XliBS5OWjaVAbeR65s9g,234064
 angr/state_hierarchy.py,sha256=qDQCUGXmQm3vOxE3CSoiqTH4OAFFOWZZt9BLhNpeOhA,8484
 angr/callable.py,sha256=j9Orwd4H4fPqOYylcEt5GuLGPV7ZOqyA_OYO2bp5PAA,6437
-angr/sim_type.py,sha256=Hb2USgXG8alwjKF2PORFEpUvo55rVOcWyLeTEXiiZ0k,144401
+angr/sim_type.py,sha256=8AJjzu_hp4GvgXogz8KnLiPXSnxBGUy-D3G8w4wEicQ,144714
 angr/knowledge_base.py,sha256=hRoSLuLaOXmddTSF9FN5TVs7liftpBGq_IICz5AaYBk,4533
-angr/emulator.py,sha256=572e9l-N4VUzUzLKylqpv3JmBvVC5VExi1tLy6MZSoU,4633
-angr/rustylib.abi3.so,sha256=NJJLtUZvVTzx9fFXhjBUDhrzBPJQ7tqK_8_Mpgv8WbU,4790512
+angr/emulator.py,sha256=aZXi8-jQ_9uelN2zvlecR2ZYXPey4PHyju6yVJIWDAk,4708
+angr/rustylib.abi3.so,sha256=aGZvJI_y93xVD7WXHapKlqJf6uqBfzecs3-7EjPzkWQ,4790512
 angr/codenode.py,sha256=hCrQRp4Ebb2X6JicNmY1PXo3_Pm8GDxVivVW0Pwe84k,3918
 angr/graph_utils.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 angr/sim_manager.py,sha256=w7yTfWR-P9yoN5x85eeiNpj9dTrnjpJ3o5aoFpDAPnc,39396
 angr/serializable.py,sha256=l908phj_KcqopEEL_oCufbP_H6cm3Wc9v-5xdux1-6g,1533
 angr/code_location.py,sha256=kXNJDEMge9VRHadrK4E6HQ8wDdCaHSXNqyAZuHDEGuM,5397
-angr/__init__.py,sha256=FXSXRAhoObjfB2A_U0cDvr9i4x_JLD-93PunqXYtijM,9246
+angr/__init__.py,sha256=aC71aVWcBP7xns-lX1-sgjw1ZhoYMyYpT71RqZaJHsc,9246
 angr/blade.py,sha256=OGGW-oggqI9_LvgZhiQuh9Ktkvf3vhRBmH0XviNyZ6o,15801
 angr/factory.py,sha256=PPNWvTiWaIgzxzyoTr8ObSF-TXp1hCdbY2e-0xBePNc,17815
 angr/sim_state_options.py,sha256=dsMY3UefvL7yZKXloubMhzUET3N2Crw-Fpw2Vd1ouZQ,12468
@@ -66,7 +66,7 @@ angr/procedures/stubs/ReturnUnconstrained.py,sha256=FFrZAdUViFi-8yzWuUwpmvJapj0q
 angr/procedures/stubs/UserHook.py,sha256=muRdWND98X2Eg3F7k-_D-yqb8jLjp1VrnM2sxCwCYuU,604
 angr/procedures/stubs/UnresolvableCallTarget.py,sha256=Q8LPW3xiySQjUUVUQyDA6NndyLEdtye1bieC8dm9tZY,188
 angr/procedures/stubs/Redirect.py,sha256=gZBhMcayajSMAS4im9ED638XP5euFd7m-pv9uBmUxoI,482
-angr/procedures/stubs/format_parser.py,sha256=6P027c6qhCmOffC7x861W-KRJn6ANxXj7kv8Wvjx9zM,27669
+angr/procedures/stubs/format_parser.py,sha256=chwn-spkRefyf83V9JM9X1JQZIwSIyNLlA2ZyNQjZ_U,27675
 angr/procedures/stubs/__init__.py,sha256=44m1-NIxNEwXtyCkYnHnH1jYw5Mp53ObHGzw1bTdXVc,67
 angr/procedures/stubs/syscall_stub.py,sha256=XaxmYrO4T0anV3c0r7DKrGHY8D5mBRBrc-J_m7I6BVA,826
 angr/procedures/stubs/PathTerminator.py,sha256=d4WzGNwKtcUZygeub0iaEfD0PW6amYHCZ7G9CRBAAL0,143
@@ -85,7 +85,7 @@ angr/procedures/posix/getsockopt.py,sha256=EM169ORkFGkGyqLKZoLJCJiA2H5_LVVln_Kui
 angr/procedures/posix/sigaction.py,sha256=E3SM6BhpuKufaAityNstPUiigTfAPOtOoT1zTtvuWsI,821
 angr/procedures/posix/send.py,sha256=suypMy-ismXqf17TmDfv8gc4D7ZlAeFk198E3NvNVl4,725
 angr/procedures/posix/sim_time.py,sha256=71PvgIxfh9xKBkHbvnruaLGFmGP5eJrO4_h7vGnYKJI,1691
-angr/procedures/posix/pthread.py,sha256=PrSgAx1ygixmEwIaYW-on1EZBSf8hWq3HwLnYLWlXkE,2426
+angr/procedures/posix/pthread.py,sha256=6Uxl68HxcUWedYe8HwSol7-EtVjU6NaPDvrwK_DNH6M,2472
 angr/procedures/posix/fork.py,sha256=j49y7IVmMvYlex2HRwv21z4nY_m_O_sr-zkOzFM_HNg,303
 angr/procedures/posix/__init__.py,sha256=yg0t_r5-yU38GbJmr2QhhNupgoicttNLkuxFfu13_FY,66
 angr/procedures/posix/usleep.py,sha256=lXo-DT5YEhD9368n7HRwkjQMrs9zC7gj5MThSNy-wQw,175
@@ -310,8 +310,8 @@ angr/procedures/definitions/cgc.py,sha256=Jrb74dNzy05h_nmsC3GjN5Yr5_jWIjpZ24ZsVk
 angr/procedures/definitions/gnulib.py,sha256=GK4eVXFxwgwhJ9cr47PiTUS4fKYrqPfMtIvwM464Oyo,1107
 angr/procedures/definitions/linux_kernel.py,sha256=xPpfHkfaA_5jS6mPX1YDCPLHEAirAmeGW6mLDBKIlC8,239128
 angr/procedures/definitions/parse_glibc.py,sha256=-vmm4hKO2GnBVXmk6Nq4fxGHuLxesRbF52UIrPk4a6Q,2092
-angr/procedures/definitions/parse_win32json.py,sha256=z4Rjr3L9HTSWsKtKImUynpcvMUJCinG4fIii-o7dPXw,109101
-angr/procedures/definitions/__init__.py,sha256=_0icfYOL57Jz4yUNZ0hVemX-CaUfKe93f_rWG-_8oso,43342
+angr/procedures/definitions/parse_win32json.py,sha256=LzvSZC5u6Jkbe-tx9L7swZmJ0DOm26BjTmJWZGiMhBw,109413
+angr/procedures/definitions/__init__.py,sha256=wYoWkHRSh6wjWE-9wPgNJbTfyeHaqkN2zDWOtHJMdF8,43644
 angr/procedures/definitions/msvcr.py,sha256=CQgWXrKcEjx9xfPf2BZOOPaQJ5AUqwdNtN_5FdYtRzg,651
 angr/procedures/definitions/parse_syscalls_from_local_system.py,sha256=ssyMjeyuPVYHnbmArwDPO0XXMW1n5Odv__n17cdLVcY,1823
 angr/procedures/definitions/linux_loader.py,sha256=uEeMktLesh0NzHmRfgP76IuSzL4YMssR_SSjBRSqA9c,267
@@ -328,7 +328,7 @@ angr/procedures/definitions/wdk/hal.json,sha256=RxvRTa5sumqXXPJai2YrdssJD5fbWeTQ
 angr/procedures/definitions/wdk/api-ms-win-dx-d3dkmt-l1-1-6.json,sha256=W4md-By6xMbKPnSvDQG4Sqh5C6HSrl_61NHY9GWGbQM,460
 angr/procedures/definitions/wdk/gdi32.json,sha256=YByprF-byACUskCT17vLClW6P0b3BfA53HRgCYxPGTk,44925
 angr/procedures/definitions/wdk/fwpuclnt.json,sha256=EYx_oyvbqFnSvI6LeiPy1BbAEnc-WMyn_7aOr3qxP_M,69854
-angr/procedures/definitions/wdk/ntoskrnl.json,sha256=YpUmEfHaIMctYyqWoNauhnnnK-fe-NpA6Hb7FQLm3Ic,680493
+angr/procedures/definitions/wdk/ntoskrnl.json,sha256=Y7NWnwB-Yg4_ecbz9yZwmwH2UofZcNB1D8T-3keJpEg,680550
 angr/procedures/definitions/wdk/fwpkclnt.json,sha256=W_0xXafBO0bheqpLGXOO0tVORvx2KXMwrhPaoBUJTko,1225
 angr/procedures/definitions/wdk/ksecdd.json,sha256=xYYdocSCK8LBeQYFlhZ7ZKiTK-ju26KDWRIQiw7rBKQ,13262
 angr/procedures/definitions/wdk/secur32.json,sha256=M9aMvWxz7zzLtZU4X7Ue5tNJOuNtHvHWHz81e7DvTNs,3432
@@ -758,7 +758,7 @@ angr/utils/env.py,sha256=aO4N2h7DUsUQtTgnC5J_oPHvMxJRur20m5UFSkmy4XU,398
 angr/utils/library.py,sha256=N8-7DTJhbBFe9f-Yvx0--dHs43nAEDcTXhqm4aUBOj0,7386
 angr/utils/ail.py,sha256=-N59ISc-k-0jHFu0Bg5FIhvhBY8HT6zK3OYSVhXawWo,2838
 angr/utils/graph.py,sha256=-8cipOvaBeD4owh2cksAwBgcIx2jOeKZa-zcFk73WeM,34787
-angr/utils/constants.py,sha256=8tQ1QnFw9U1kM9Q8YQ7StWxXHiqQHbWvrZanQK0eY2A,269
+angr/utils/constants.py,sha256=kY8SvX3475AT7JWD2uKHiLKuFEAMxn6OFVtnfbIJzaE,281
 angr/utils/cowdict.py,sha256=qx2iO1rrCDTQUGX9dqi9ZAly2Dgm6bCEgdSAQw9MxRM,2159
 angr/utils/__init__.py,sha256=kBUIJCp9WSgzb62zMg4puUUeheMSl9U4RFqkfiL3en8,1159
 angr/utils/types.py,sha256=688trvR0_j93sfeRgFT1npcmjNGSx99m_IPe9Xyy9WY,4967
@@ -775,6 +775,7 @@ angr/utils/funcid.py,sha256=Rd4r8juv2IpeMtCpPp4wxJoEZTnZZ1NsxdT42tvrKVA,6353
 angr/utils/algo.py,sha256=4TaEFE4tU-59KyRVFASqXeoiwH01ZMj5fZd_JVcpdOY,1038
 angr/utils/enums_conv.py,sha256=fA6qeoRZ6Cj6gCIS_PZbP4PX7E8IybnYQ90OZGnBVrc,2746
 angr/utils/endness.py,sha256=PDpDNbiIbaSx1DGH1z16nU2B5GMrTqONGivGeVNiGyU,506
+angr/utils/strings.py,sha256=iv3Mg_KCyyPx9dkIw-O0ZidWyGl8mqPDkyNJwZYQr_U,688
 angr/utils/vex.py,sha256=epcrCexi_NjKnPGM2gfpiRsUea_Scd-71UMuF32ZAQo,306
 angr/utils/ssa/tmp_uses_collector.py,sha256=digAUQpYoFR1VYfwoXlF3T1pYdDi6Pdq_ck54SjMabQ,813
 angr/utils/ssa/vvar_uses_collector.py,sha256=HewqUQluNE9EsaiLeFo7LaBvws_DDBDYNt9RBExy464,1367
@@ -811,7 +812,7 @@ angr/simos/simos.py,sha256=L43oFMGRWiVEpfMWhb_Y_iawsaxm7qw_fG-sfKF344M,18464
 angr/simos/javavm.py,sha256=8WatgrjfiSPyUyHmRhrKWvKxYCvUG3F3xh3LSJDpxhQ,20566
 angr/simos/userland.py,sha256=jvHdMocEJAlwrTjupubdGfD6snt_DpQ_pyHrIZyV7NE,7354
 angr/simos/xbox.py,sha256=f0IL9ZTgYX8feEck5nBu87bYcehbdmYKQVoze6wsmY0,971
-angr/simos/windows.py,sha256=EneZrucxYgw5wII0FNYIEPjiLnhv0ju_nAEOpk8ssME,27878
+angr/simos/windows.py,sha256=aiay_aqwIbUYXvTWJIWh5YAq3QT4csPGNI6DhAon_mU,27908
 angr/simos/linux.py,sha256=ShLsqFIut1jGuo6NGQSlT7ymoaEEwgTNkloJNN0pDDI,23204
 angr/simos/snimmuc_nxp.py,sha256=kMBcgEJ1gyYRXtgYD8H4edQ2rKGIc2rGysnwTY9HaXw,5592
 angr/storage/memory_object.py,sha256=EyRSgADKDt0IMNfUoDfu-uE1ycpK7U30ORduxPUgk6w,6242
@@ -855,7 +856,7 @@ angr/storage/memory_mixins/paged_memory/__init__.py,sha256=47DEQpj8HBSa-_TImW-5J
 angr/storage/memory_mixins/paged_memory/paged_memory_mixin.py,sha256=E2LNktW8ln2e5ofMfhQlyUjB4XVChkkqVwit32NWamY,29386
 angr/storage/memory_mixins/paged_memory/paged_memory_multivalue_mixin.py,sha256=9kaf0ULBMwdC7vQobp1yjAQZ6Me4UvmTR3alje_PQ5A,2265
 angr/storage/memory_mixins/paged_memory/privileged_mixin.py,sha256=YYFxpXsf9-ALl1x86_Gm71H45jqtdkkgLWPf0twqefU,1578
-angr/storage/memory_mixins/paged_memory/page_backer_mixins.py,sha256=7DSOkDioqJOqmEgWXO974uD3Ogmhm7m9c4zQ8druZOs,10520
+angr/storage/memory_mixins/paged_memory/page_backer_mixins.py,sha256=77Wx5vLXr4sMX2eVdQNZz2AYTEZ09YWySyKHAQMXlnw,10521
 angr/storage/memory_mixins/paged_memory/stack_allocation_mixin.py,sha256=AxzHQwf1f5J5W8jnMzgTzMdAYhw2UIKpp31OQDMESak,3320
 angr/storage/memory_mixins/paged_memory/pages/permissions_mixin.py,sha256=1RKRsZE2xn4hta1kTT0p6n4WTduQJKiPqhipN0Xi8p8,1002
 angr/storage/memory_mixins/paged_memory/pages/refcount_mixin.py,sha256=8sAIQgcZrMefCT9_DmToiF71SGFe1YkTEW5rJ6fZ7qI,1728
@@ -913,15 +914,15 @@ angr/knowledge_plugins/functions/soot_function.py,sha256=OzCvQPWxnjbwPWTW0JXrQey
 angr/knowledge_plugins/functions/function_parser.py,sha256=DTdVwYt6nXLMc0EOh-V_GhvZYQ947UNBaA77qn7Y6Vo,12379
 angr/knowledge_plugins/functions/function_manager.py,sha256=StsK3biTFRRA2ugrmeQLuHiN894p789Tlw1CIKlE0PY,23462
 angr/knowledge_plugins/functions/__init__.py,sha256=asiLNiT6sHbjP6eU-kDpawIoVxv4J35cwz5yQHtQ2E0,167
-angr/knowledge_plugins/functions/function.py,sha256=6pFpPcFTiz8kSHZW87TIAajLlMVCx9fyMvi6rBBmei8,71669
+angr/knowledge_plugins/functions/function.py,sha256=orSBM5R073Tf-PDWw8NcvKl_iUgCnnk1SyFFMPZP6VE,72303
 angr/knowledge_plugins/xrefs/xref.py,sha256=U2H1rfffp5EXoh0awlGxMBxA4K5MIwl3CXjV3Uih3tA,4856
 angr/knowledge_plugins/xrefs/xref_manager.py,sha256=1n373rtV91xicAfSUresRigsZ6qCBhPOaJKrN_SW3QY,4157
 angr/knowledge_plugins/xrefs/__init__.py,sha256=5PhqVOtTZ27lCjJ9wp7akUeJydqILbyCBZK0gP7BGQs,193
 angr/knowledge_plugins/xrefs/xref_types.py,sha256=LcQ9pD4E4XlC51Us49xiqAoGAFGpnCrpYO4mOzILiKI,308
 angr/engines/unicorn.py,sha256=fq2akQ4dVFAWqek0Yr4JTaTJWwp5vICiSQ7Sg4wuDJE,24533
 angr/engines/concrete.py,sha256=kEt6Dyp8QAIaOP3oW5lRcDs_2UMP2vbiNzylGiqvf7g,2143
-angr/engines/icicle.py,sha256=8mAL_YEumoP95C3p0r7yoGdi68Xq2sz9-qpGjAu5ffE,10333
-angr/engines/hook.py,sha256=lAEYYAXQY_GDOpsz3JZ7IswxrBccZnZ6EaQwyNBb4W8,2590
+angr/engines/icicle.py,sha256=JSbHnTJePV1l6dmF5WPhlzYjm6ZApQfjCUrgJ4jewOg,11033
+angr/engines/hook.py,sha256=YMCUWs-cC3fQCN9xlYAy7vaMPKWDNJkl9KtCMYUyMP0,2569
 angr/engines/__init__.py,sha256=_3oRkiTrPO7QPiCg3qXymt4o9ZAOrAHt5pdfjkp3W9k,1661
 angr/engines/procedure.py,sha256=8kgFH56nkqSWm0p1apuGBaFngl-4BnAzE0bXhq9mc6Y,2561
 angr/engines/engine.py,sha256=2kwOT-sbxKXAVX2PmsPTr8Ax36Vxq6hkRdDKaITBQNc,657
@@ -975,7 +976,7 @@ angr/engines/soot/expressions/base.py,sha256=7y6a_euE8TNsrCA1jZfyjHjh7TH91nKaP_Z
 angr/engines/soot/expressions/phi.py,sha256=XS44tYMD-70WCL0EH0BdVcLIfYXLEHgSW9Tywl67uIk,1227
 angr/engines/vex/lifter.py,sha256=BqeajzzpLL32nmGaszWASBPDhluhTec2m3ods1ZTIIo,17207
 angr/engines/vex/__init__.py,sha256=k8cIQpJO2Wv6erLCOa4boEywRcwlFOTgAgGP6wNQcwM,525
-angr/engines/vex/claripy/ccall.py,sha256=1ozZd6hLoFFcbREohzqJPu8zc34QVrYomnjwtgM40JI,82955
+angr/engines/vex/claripy/ccall.py,sha256=sxWkTmCFwVto9dqTW74sCSgl47kn8HV3NSTU0LCcxts,82962
 angr/engines/vex/claripy/datalayer.py,sha256=kb-QSvwRzc6Mufwsv012Tgg_PNJPUTec8ElSuJcFzNQ,4971
 angr/engines/vex/claripy/irop.py,sha256=_xiVGT5YbguTm8c0DaAqHnPUVrD2lp3ELtiBJTPwTOA,46240
 angr/engines/vex/claripy/__init__.py,sha256=4B8H1VOHrrKJMjAXZkZ0r_02issFP_bxDJJMw50yVe4,109
@@ -1051,7 +1052,7 @@ angr/analyses/analysis.py,sha256=2ABUppMZr97ZEAmxOQuXo-eyw5aF0ZASAii8SuuncNo,156
 angr/analyses/init_finder.py,sha256=lSiBfmKExmhK7wsLGsBaJYQKjW9t7S5mlcH3U--B6CI,9259
 angr/analyses/boyscout.py,sha256=KIxl1chV_hQV2Unn-vnoYne1dmFVy1WTUdoidkUpQ8I,2469
 angr/analyses/congruency_check.py,sha256=QeYRrdrs_iluLLnKz3KUHkCTPRVl5PgM2T0ZXd786HA,16165
-angr/analyses/stack_pointer_tracker.py,sha256=MX4wcvmTpV9HsCybYofYdkSt3aaCwXL94RSJJ1tPD5o,38082
+angr/analyses/stack_pointer_tracker.py,sha256=tsiA8VHyrUsR9sCFh6CL0BS1Ubunv2pat6D3DLanDgI,38151
 angr/analyses/binary_optimizer.py,sha256=xFDv8c1s5nQUKY_EWYRCuVroSXFkMiSLl5LngPiysDA,26145
 angr/analyses/proximity_graph.py,sha256=KoRvdQswRrDygotrY_6hPnrzUf1U5c5mht-b7lowyFM,16087
 angr/analyses/vtable.py,sha256=1Ed7jzr99rk9VgOGzcxBw_6GFqby5mIdSTGPqQPhcZM,3872
@@ -1060,7 +1061,7 @@ angr/analyses/__init__.py,sha256=KFu0Otm7bqAcjX8dsnQzphJmkUVxMLssjFIJJOci32U,347
 angr/analyses/ddg.py,sha256=AWPPsL2bfTAua5meuQfPFL6b29PLpCLZzw-LGCv5iVo,63214
 angr/analyses/dominance_frontier.py,sha256=kRoOCr3EaIUW1YnvtjmKFJW65zYsJHNe-HtVx2LR15s,2002
 angr/analyses/smc.py,sha256=DC4l7fTmoOybD_lSQaLjcUdeLUifQhhsSu1nx8Ax6pM,5176
-angr/analyses/complete_calling_conventions.py,sha256=nVrDHhCV3cawD_KxkAYj2fsszAskkFUHC1677rI6xEM,20490
+angr/analyses/complete_calling_conventions.py,sha256=a-hJQ6yRusDhRADGcLxjY6ETlD1vN_QsHd2c0VZlo7I,21079
 angr/analyses/callee_cleanup_finder.py,sha256=lQRn5rHS6mGNOqDh-UsxX-gs4cDpwQ6KNjvzQFVCdio,2800
 angr/analyses/static_hooker.py,sha256=AYJXoHtdq2m-MgpJbx4eur7wy7llrKXvsVM5NdPcKHU,1852
 angr/analyses/code_tagging.py,sha256=Gj7Ms24RnmhC9OD57gw7R6_c-pLfqSug-LVUMw_JmXE,3510
@@ -1072,14 +1073,14 @@ angr/analyses/xrefs.py,sha256=vs6cpVmwXHOmxrI9lJUwCRMYbPSqvIQXS5_fINMaOGI,10290
 angr/analyses/loop_analysis.py,sha256=up6N3SZzya6N6OlKldo_MP36DqiY_tMbVdFWSM8fByU,9311
 angr/analyses/class_identifier.py,sha256=7zOIryNL_DrXW11GGzZjp6TPwv--2VZ5ZuSzYpXirmQ,2951
 angr/analyses/disassembly_utils.py,sha256=Pj9vnyji9fBDL3a3vAo2D3H4CfB-XrvVDLIsNXrp9pU,2877
-angr/analyses/typehoon/lifter.py,sha256=hxYJmM_A0Kl6YgY7NyWBtA3ieaY49Ey3ESCHC61lMys,4000
+angr/analyses/typehoon/lifter.py,sha256=FGu990mwsMRvPwiRIcu7pHtfXQ54sZ6bVGxwtb8W9EQ,4523
 angr/analyses/typehoon/__init__.py,sha256=KjKBUZadAd3grXUy48_qO0L4Me-riSqPGteVDcTL59M,92
 angr/analyses/typehoon/variance.py,sha256=3wYw3of8uoar-MQ7gD6arALiwlJRW990t0BUqMarXIY,193
-angr/analyses/typehoon/simple_solver.py,sha256=CCGsuxzcRwPxh3S3fU_CJNQ7KVJaTP_SzH5ZImuPhDw,67609
-angr/analyses/typehoon/typevars.py,sha256=ZDnKaGEwBTzYWUPQzacQkJ4rMpUDlnLzzJuKyQuEEtA,17839
+angr/analyses/typehoon/simple_solver.py,sha256=F34YE16C80Q8p5u_MPvJ-kPcVvm9_PQ-YMIBkjqKwOQ,73163
+angr/analyses/typehoon/typevars.py,sha256=oFRDzN9JoznJ8MPTNNla_0OA6OeBQOfZZYMTeAufW9s,18090
 angr/analyses/typehoon/dfa.py,sha256=41lzhE-QmkC342SjfaaPI41lr4Au5XROTu_7oenvg7g,3823
-angr/analyses/typehoon/translator.py,sha256=_UE1JC4KNDXXl4plula9OApK1ee07z9BFdX9HKa5uqw,10568
-angr/analyses/typehoon/typeconsts.py,sha256=5xyZakTTra4K4-8icVqT5JMM__ZfnBVEBV_1kydQn50,8028
+angr/analyses/typehoon/translator.py,sha256=4gbgKg7ZGK_-97OCVnzaRjDrS2ZSl6WGbcR0E7OC_7Q,10615
+angr/analyses/typehoon/typeconsts.py,sha256=1By-4oluuW00kDJPrKlugpAHxpSNB_GB3rbbZVtV2eI,8890
 angr/analyses/typehoon/typehoon.py,sha256=qj5MBJdzVB-5f73N_Da0gs5fG-eIFN272VNfsdYn7lo,12777
 angr/analyses/forward_analysis/job_info.py,sha256=5iYthtygg22taqFTR9oFhmB2FX6z2rCuoXfBULHhFsU,1592
 angr/analyses/forward_analysis/__init__.py,sha256=Du2Ng6EzDQzQYcRCffkOKjLztqa5GBNhiLSgErIPnHE,319
@@ -1098,17 +1099,17 @@ angr/analyses/cfg_slice_to_sink/graph.py,sha256=80erWbctYEpsLjpw2TNjntDLDGQFdYRo
 angr/analyses/cfg_slice_to_sink/__init__.py,sha256=YaWvUc-iQ--9tnsCgHYy1lbe6M7cQJljppMPkJ0ZK_o,267
 angr/analyses/cfg_slice_to_sink/transitions.py,sha256=9Y1qG789dsAcv73FwgYtppUzPWXbKdV5qIfIZHfhfmg,888
 angr/analyses/variable_recovery/irsb_scanner.py,sha256=1dL2IC7fZGuRrhmcpa2Q-G666aMPmbM8zSzmIRpLNSY,5141
-angr/analyses/variable_recovery/variable_recovery_fast.py,sha256=xahVegmxq0jl_mSu0EuoQLO_-GHtARPFPwoLyppBnHY,27910
+angr/analyses/variable_recovery/variable_recovery_fast.py,sha256=OeSnBVpcNlZU-miBlIrbyaPt2IHtExtnpBoACnWNs_Q,27996
 angr/analyses/variable_recovery/__init__.py,sha256=eA1SHzfSx8aPufUdkvgMmBnbI6VDYKKMJklcOoCO7Ao,208
-angr/analyses/variable_recovery/engine_ail.py,sha256=8yqrl_qfO_DCvaIxwsa_eits5rIbly4rBEFh5W_U2O4,33709
+angr/analyses/variable_recovery/engine_ail.py,sha256=N9sEHMUT9qVMJCm1h4da3vLnSLPDp3oY9fE3WN60ioc,35652
 angr/analyses/variable_recovery/variable_recovery.py,sha256=I45eVUpOOcSobA_QyXl3aRNa0kppJH_7YOj95fPPTdE,22272
 angr/analyses/variable_recovery/engine_vex.py,sha256=Sjh3bZZfnEaich7PLTitaZITSMW7agqgyxck4gWKDbQ,21465
 angr/analyses/variable_recovery/variable_recovery_base.py,sha256=Ewd0TzNdZ_gRYXtXjVrJfODNABMMPjnuvMy9-Nnyui0,16813
 angr/analyses/variable_recovery/annotations.py,sha256=2va7cXnRHYqVqXeVt00QanxfAo3zanL4BkAcC0-Bk20,1438
-angr/analyses/variable_recovery/engine_base.py,sha256=MJ6h-dq_0r-3I3ZOhR8E4So2VqxlyudNeSrAHyQCNRg,53171
+angr/analyses/variable_recovery/engine_base.py,sha256=S3-CynLxRXlZ-hDXDZnru_wzApjR8a7hBiJOHquzBjk,53389
 angr/analyses/calling_convention/fact_collector.py,sha256=9qx3jvBBrhKvRoZrCir61KZBqFtduiFzhbHAtWFvMic,28762
 angr/analyses/calling_convention/__init__.py,sha256=bK5VS6AxT5l86LAhTL7l1HUT9IuvXG9x9ikbIohIFoE,194
-angr/analyses/calling_convention/calling_convention.py,sha256=vdGqrv7SQDnO6Rg9rgDuQSUPxHYGRgEeneTEQhGM-2M,46762
+angr/analyses/calling_convention/calling_convention.py,sha256=UfMXXoa51UvqHS5XGyFY09Vs_OVFvro51vfCtaYw7aw,47496
 angr/analyses/calling_convention/utils.py,sha256=twkO073RvkkFXnOTc-KYQT1GKUtz0OPjxh0N6AWIriQ,2110
 angr/analyses/propagator/values.py,sha256=L41ue9PjPpA_tEe8YlTwv3ly9o3Sbo8uQESALfbUr4c,2026
 angr/analyses/propagator/__init__.py,sha256=lxvNUfUJYOPqO8se8Nej_NNCObLt90QFIrZhzgt5a_o,114
@@ -1214,24 +1215,24 @@ angr/analyses/decompiler/region_identifier.py,sha256=kQJ_KCd3Qx9LWStTM_iUNBG10bD
 angr/analyses/decompiler/empty_node_remover.py,sha256=4CdxTM1AVmRoEdRIwJg1YEy10AgkEoRmJ8SU7xGbKnM,7424
 angr/analyses/decompiler/seq_to_blocks.py,sha256=4-tqstendHHO2J0WD3JHQkm8c4c2KG3AO3mYWrn4xvg,569
 angr/analyses/decompiler/__init__.py,sha256=eyxt2UKvPkbuS_l_1GPb0CJ6hrj2wTavh-mVf23wwiQ,1162
-angr/analyses/decompiler/clinic.py,sha256=IK8wY6JuQw7wwBxmvo57M-N6cvnb4FAm6NnIQLo02Ho,151535
+angr/analyses/decompiler/clinic.py,sha256=LIsOw2U3P72AQ0GMK5DSn8JyQ7uY-cLcJPNpTcCERNo,151635
 angr/analyses/decompiler/decompilation_cache.py,sha256=06oiG299mVpGOTL54Xy1CUxz5s8QLgYJn5XIvKFLYkU,1566
 angr/analyses/decompiler/block_simplifier.py,sha256=vjlugXCB3xFYBDBn3LPxOtU1dDc76PpYtVEoju3i9-4,15513
 angr/analyses/decompiler/node_replacer.py,sha256=jJd3XkIwFE07bIbLriJ6_mQEvfhm90C8lqlrL5Mz1Xg,1450
 angr/analyses/decompiler/decompilation_options.py,sha256=bs6CNpU3UxepgBB_9eUH4jriNpGoryyPP0sR1hDWpTk,8477
 angr/analyses/decompiler/region_walker.py,sha256=u0hR0bEX1hSwkv-vejIM1gS-hcX2F2DLsDqpKhQ5_pQ,752
 angr/analyses/decompiler/graph_region.py,sha256=uSDdCLXfLZJVcb0wMdgBh-KtBJUUhLGHQ-Ap4dNs8wo,18186
-angr/analyses/decompiler/utils.py,sha256=slKEGEpWBN7X1ACbMDbd3e4Zs9txgDYeGBFqnFGCpD4,42705
+angr/analyses/decompiler/utils.py,sha256=B7YwnEBF6AZ5DG3E7zHK0TF7zOLeiMWEcc18YL_eUyA,43074
 angr/analyses/decompiler/decompiler.py,sha256=adX2UJv6s4JAF7Qf6HTgwPo28QQ6yCzrrQrtlqDZyfE,31864
 angr/analyses/decompiler/goto_manager.py,sha256=wVoeXJcadIda84LloGgqW-rL0QHLv3fx4vZHLhmz-_o,4027
 angr/analyses/decompiler/block_similarity.py,sha256=S1lTlXFyOmJlQa7I3y7xgLsENLS4XGET7tdD55k_6Vg,6859
-angr/analyses/decompiler/ail_simplifier.py,sha256=s9hFXhNwU8fBKDOkw4vtSWhSWy9xBdF9p1463cO5930,93071
+angr/analyses/decompiler/ail_simplifier.py,sha256=NdPdj7IpmltxdPuhxdwHnd6qG2xHrA5ZPlDLvDyaH8U,93303
 angr/analyses/decompiler/jump_target_collector.py,sha256=CucT99luxIVrioM-keMMjyNKWE5QaXEFQOFphtyU8b4,1189
 angr/analyses/decompiler/label_collector.py,sha256=fsCkldy8ZKH4FjkREByg-NDmfCd7Pmuz2K1Dks9oVjM,814
 angr/analyses/decompiler/jumptable_entry_condition_rewriter.py,sha256=f_JyNiSZfoudElfl2kIzONoYCiosR4xYFOe8Q5SkvLg,2176
 angr/analyses/decompiler/structured_codegen/__init__.py,sha256=mxG4yruPAab8735wVgXZ1zu8qFPz-njKe0m5UcywE3o,633
 angr/analyses/decompiler/structured_codegen/dwarf_import.py,sha256=J6V40RuIyKXN7r6ESftIYfoREgmgFavnUL5m3lyTzlM,7072
-angr/analyses/decompiler/structured_codegen/c.py,sha256=sFizu2EWABRhv_yaBXd85rPhoRIEZNZ6zdLp5Q4XHa8,150180
+angr/analyses/decompiler/structured_codegen/c.py,sha256=7rcmoqzbUa_Cv9Dnab1Vs72gVAOb2gGYR17G33BoQ98,150245
 angr/analyses/decompiler/structured_codegen/dummy.py,sha256=JZLeovXE-8C-unp2hbejxCG30l-yCx4sWFh7JMF_iRM,570
 angr/analyses/decompiler/structured_codegen/base.py,sha256=mb5d5iQO1N2wMl7QySvfHemXM-e0yQBhjtlmnLsVSgE,5134
 angr/analyses/decompiler/ssailification/rewriting.py,sha256=aIYuFGlroEXqxaf6lZCfodLD2B53Sb8UJgl2nNb4lg8,15076
@@ -1241,10 +1242,10 @@ angr/analyses/decompiler/ssailification/__init__.py,sha256=zcHoI7e2El2RSU_bHTpQR
 angr/analyses/decompiler/ssailification/traversal_state.py,sha256=RDs2mTc6GYnbMom2gBfNfNMcazKMSkhemEmse8uELTY,1558
 angr/analyses/decompiler/ssailification/ssailification.py,sha256=LGRFDz6tQmKeJKomSQlxTTr3ILdJaI0iYBaizE5BNCI,11288
 angr/analyses/decompiler/ssailification/rewriting_state.py,sha256=NAwVcBYh-BQo9K7nfnUlNDBAYflfFMgBYzsVD3BwiN8,1898
-angr/analyses/decompiler/ssailification/rewriting_engine.py,sha256=IrEznHKUlzuAufysLgQ1fyoEt_f25pMvNXdONzmQ1n4,40925
+angr/analyses/decompiler/ssailification/rewriting_engine.py,sha256=wGUdybrGWTlE73hwS3gzyRiTtXL03tq8FL7-qYNl_X8,41486
 angr/analyses/decompiler/ccall_rewriters/x86_ccalls.py,sha256=dvdiAXWGte_4xcDZnP7h980DVZqpxMgQt-fTC1nxChQ,13437
 angr/analyses/decompiler/ccall_rewriters/__init__.py,sha256=TrnykR5cGCXy85f8OApJBjWSQ8WQSzjrnpND2fODWG8,207
-angr/analyses/decompiler/ccall_rewriters/rewriter_base.py,sha256=9BiexqY0fgB_UTmjcql71tg9HALx2mFhQMP1IVYAJpw,512
+angr/analyses/decompiler/ccall_rewriters/rewriter_base.py,sha256=c7-GxWZbFfJvmg4DPdjYgLXyiasmfgmiQ6IY4fjOVWs,727
 angr/analyses/decompiler/ccall_rewriters/amd64_ccalls.py,sha256=8LA05CKwFzoNAloOJ3KF4AkFM3bDTQdstr1_46WauxM,24958
 angr/analyses/decompiler/dephication/seqnode_dephication.py,sha256=kigkzU78eNe-zD16hUI2YMNt_jHvixpohHpnLhAHMlw,5437
 angr/analyses/decompiler/dephication/graph_rewriting.py,sha256=cRMrYJgGV57H5TzWY70S8tl3D9GVkrzOetkxCUevyW4,3502
@@ -1270,7 +1271,7 @@ angr/analyses/decompiler/region_simplifiers/cascading_ifs.py,sha256=kPWajH8__ap-
 angr/analyses/decompiler/region_simplifiers/expr_folding.py,sha256=naCgnDUjdiDsh6dvoNO-VARfbTfaEYpu3EX9HkJ1cqE,31790
 angr/analyses/decompiler/peephole_optimizations/basepointeroffset_and_mask.py,sha256=2Tb4zGnFA5hZH8oI6t1hoRstGDmOBsOoQxf6fU5Ct7A,1105
 angr/analyses/decompiler/peephole_optimizations/tidy_stack_addr.py,sha256=8gPWhFTcezgO7pZ_v0pxR7pweds4_GrrY82ur6Nrlf8,4796
-angr/analyses/decompiler/peephole_optimizations/cas_intrinsics.py,sha256=2A7NZIzZpDCq3i8e72l7c7KHfEwfJvzi5NffoXU_NNE,4559
+angr/analyses/decompiler/peephole_optimizations/cas_intrinsics.py,sha256=lzlyhe1RP020ezYN77QRFu5p7zNaH4XSMkpBhxRP7ms,7959
 angr/analyses/decompiler/peephole_optimizations/remove_redundant_nots.py,sha256=V5Vm1zUGjsauyOYXbUgDfZEgmChLbY8wnvmcRbfdMk0,1278
 angr/analyses/decompiler/peephole_optimizations/bool_expr_xor_1.py,sha256=vLXt0ekjRep4SgaNq1wyxVkBTzOMTa03d3rgkjUOcUg,995
 angr/analyses/decompiler/peephole_optimizations/bswap.py,sha256=fXV_a58W2X30KCanYeSHdZ2yPcfDlyZq_OkYNMkglrg,6420
@@ -1287,7 +1288,7 @@ angr/analyses/decompiler/peephole_optimizations/a_mul_const_sub_a.py,sha256=5Gsq
 angr/analyses/decompiler/peephole_optimizations/remove_redundant_shifts.py,sha256=0R_ja5u2fO_BMSpfSk68sDMfhwpvBpyCBKahQh-SB4w,3997
 angr/analyses/decompiler/peephole_optimizations/rewrite_mips_gp_loads.py,sha256=YMfsqffIzsB7YslHVohBOeOWeNJydsrBowJ_6oD1QyY,1909
 angr/analyses/decompiler/peephole_optimizations/remove_noop_conversions.py,sha256=KRjv1VUMmzkmax_s1ZM3nz24iqz1wqInMgJn3NR9kd4,1788
-angr/analyses/decompiler/peephole_optimizations/__init__.py,sha256=EbnjFKVoLce23AbmF-06EdW-TzAeoZjn_NHDkqNWATQ,5034
+angr/analyses/decompiler/peephole_optimizations/__init__.py,sha256=tfBb_Pi-GBcrOxChotrwk9h28Qo85okQLP7LKGC5c8s,5028
 angr/analyses/decompiler/peephole_optimizations/remove_redundant_ite_branch.py,sha256=1pbXLE65KwREUoB9GqCXBgz-BeUrzXxoIRFUYZAnBVA,1133
 angr/analyses/decompiler/peephole_optimizations/remove_redundant_reinterprets.py,sha256=NpjPio84lBFY76hPyvOWChRo1jgFEj9XKmSh_A3A-bg,1430
 angr/analyses/decompiler/peephole_optimizations/rewrite_conv_mul.py,sha256=nhV4URuLjH_G-te15cJJ3O2-9VJvpOnkRJjdHSBRoko,1481
@@ -1303,6 +1304,7 @@ angr/analyses/decompiler/peephole_optimizations/utils.py,sha256=KYDiAt0PUA4PcOlB
 angr/analyses/decompiler/peephole_optimizations/remove_empty_if_body.py,sha256=lq41TsLU8kSEduzt66i-Jva_HB5Pqlg4Q6acO-nGAYw,1612
 angr/analyses/decompiler/peephole_optimizations/cmpord_rewriter.py,sha256=sJV-8aP9KUx5Kt7pZmb3M28K3z2bGD3NWJFZOdYaBYc,2662
 angr/analyses/decompiler/peephole_optimizations/a_sub_a_div.py,sha256=XuR33qLQRVD_fX1kqyAdG2NNi4o6bJGvvxXD8uzfzmw,963
+angr/analyses/decompiler/peephole_optimizations/inlined_wcscpy.py,sha256=_2Fdny7z31G22edctem0ySFpek2HT5tk-T9F8dQ5p1M,10122
 angr/analyses/decompiler/peephole_optimizations/one_sub_bool.py,sha256=zljXiUnoH6AwgAoXVRwz9dXEedW7RiUTkHvBMZIA-o8,1140
 angr/analyses/decompiler/peephole_optimizations/a_mul_const_div_shr_const.py,sha256=-V60wMaBKz1Ld1NcaQ8Dl0T4Xo9Qq6nfAQpXJ-MNsDI,1379
 angr/analyses/decompiler/peephole_optimizations/a_sub_a_sub_n.py,sha256=3ByEh3bbqaIeWcniCtKqzWFQqsULfeVEJlcEopN9iq0,667
@@ -1313,12 +1315,11 @@ angr/analyses/decompiler/peephole_optimizations/invert_negated_logical_conjuctio
 angr/analyses/decompiler/peephole_optimizations/rol_ror.py,sha256=hrtAJaWTZgphP6Wex50uz9vHIBeXy1ie5M5CBSruY7Y,5144
 angr/analyses/decompiler/peephole_optimizations/conv_a_sub0_shr_and.py,sha256=4fZUQGdEY2qVANb6xQWZJRf5N7X78R_gyECxzhC_5vU,2384
 angr/analyses/decompiler/peephole_optimizations/coalesce_same_cascading_ifs.py,sha256=--C1JQluHt8ltdfUPBHvRD3SjW_ZcBU3oWdFwpCtpuw,1072
-angr/analyses/decompiler/peephole_optimizations/inlined_wstrcpy.py,sha256=rR3eC_pjCVBuc8GuWzJJkn6h8c964ODf-5uiwlncwVE,9896
 angr/analyses/decompiler/peephole_optimizations/coalesce_adjacent_shrs.py,sha256=fXq-qFe7JUdD5LdtUhoA9AF3LnY-3Jrmo4t3ZRJIIiQ,1414
 angr/analyses/decompiler/peephole_optimizations/remove_redundant_bitmasks.py,sha256=FUf1bg9nADlwT1upwTKcVhhPcvZ98C-8PlmkWoHqwZ4,4787
-angr/analyses/decompiler/peephole_optimizations/inlined_wstrcpy_consolidation.py,sha256=TsQEpHhyVr7MdiSFkijR6GFMHsuKlmmy9qvSCo32c2U,5409
 angr/analyses/decompiler/peephole_optimizations/remove_redundant_shifts_around_comparators.py,sha256=pMdKsNJtAIPqyWsR8cUEyujdF7e7kbqqvVgelVmKtqY,1610
 angr/analyses/decompiler/peephole_optimizations/optimized_div_simplifier.py,sha256=M4GxEWKs6V9aEYejGluZ8w8QpvPKpaESeFFzid88HjE,14208
+angr/analyses/decompiler/peephole_optimizations/inlined_wcscpy_consolidation.py,sha256=TfimMI0FwpRBrWVQZy4m9XAf_BBPInu0zfywQ9CoGgs,12712
 angr/analyses/decompiler/peephole_optimizations/a_div_const_add_a_mul_n_div_const.py,sha256=HY6EQkThiyMaahz3bodJUqLBKWY2n4aKGbKyspMXN50,1641
 angr/analyses/decompiler/peephole_optimizations/rewrite_bit_extractions.py,sha256=tezg1gsxxH-iMmo_346NYO0YHwJz_Gpb8Ztm526o0G4,3300
 angr/analyses/decompiler/peephole_optimizations/single_bit_cond_to_boolexpr.py,sha256=3eQSTFUNRDWz0No90GzxM_TaIYa7-xouf8afytds5Dk,2967
@@ -1328,13 +1329,13 @@ angr/analyses/decompiler/peephole_optimizations/remove_cascading_conversions.py,
 angr/analyses/decompiler/structuring/sailr.py,sha256=aJCES4r5HaLs-l1tXagIPtXpWnqY_uTlJn7wCYKnwTg,6127
 angr/analyses/decompiler/structuring/recursive_structurer.py,sha256=iWFZdM54C1q2ezL7ouhH6rygJiGO2OCUH5JKXKgrf6w,7422
 angr/analyses/decompiler/structuring/__init__.py,sha256=kEFP-zv9CZrhJtLTKwT9-9cGVTls71wLYaLDUuYorBU,711
-angr/analyses/decompiler/structuring/dream.py,sha256=_4JrXwF32UKoUOak_matUa81MwRptyXvEmOfygt-ix0,48736
+angr/analyses/decompiler/structuring/dream.py,sha256=QNZ8dKk79Uq0urUEpwmBgX2Ak3ZQLhiydcSKJTx968c,48738
 angr/analyses/decompiler/structuring/structurer_nodes.py,sha256=3T6QPeD1KlLkcjMDBblQCb1Cf50VF36C-hlFhiKi9nc,12823
-angr/analyses/decompiler/structuring/phoenix.py,sha256=ietKstjp1OkSeONaTWxh5-nbe38pxZtQ9llPkQsqFWI,159757
+angr/analyses/decompiler/structuring/phoenix.py,sha256=-yGUKZt37N0tbqTJoRI4Pk_ohZhYaxT22wWEWsblzZ4,164692
 angr/analyses/decompiler/structuring/structurer_base.py,sha256=xzQMYBInNyeRYibbiuk6EYbvPO235El3guT1yh1qAxw,50690
 angr/analyses/decompiler/optimization_passes/win_stack_canary_simplifier.py,sha256=FBz1UGl5rj13GYSF2tYWaQR135q4VQUxCBPW6SgdQ2w,19485
 angr/analyses/decompiler/optimization_passes/optimization_pass.py,sha256=VGpCQmx8H2w3HoVFGdqwYYZ0z_IdHrFjOhz37yvxxTQ,28169
-angr/analyses/decompiler/optimization_passes/lowered_switch_simplifier.py,sha256=_p9puK2bvp055mqSW28QIqXWpZD-OpsunWPQrOWmT9Q,42130
+angr/analyses/decompiler/optimization_passes/lowered_switch_simplifier.py,sha256=RkZdMPJ_JKDkywVYp0MrCf6PK95GWT7Q0K7jsCVk_cE,42132
 angr/analyses/decompiler/optimization_passes/const_derefs.py,sha256=-vvd0QvLCmnRREmvN5LCLeKpUqisyPWj0yw1CHY8TwQ,10505
 angr/analyses/decompiler/optimization_passes/call_stmt_rewriter.py,sha256=INLmzfGDMsVzyQF2S6uwiQSoNcxM7DUBJrdWlL2gqlY,1325
 angr/analyses/decompiler/optimization_passes/flip_boolean_cmp.py,sha256=ez0tzV2MqNVBW7hhvNyJWQpJQUntLA4etK606hXixJM,5206
@@ -1356,7 +1357,7 @@ angr/analyses/decompiler/optimization_passes/const_prop_reverter.py,sha256=uccjV
 angr/analyses/decompiler/optimization_passes/deadblock_remover.py,sha256=RMvKYw0aWrisO6DB_g3BTY9CgIgAJ6JZXpOnOOm7fpo,2737
 angr/analyses/decompiler/optimization_passes/div_simplifier.py,sha256=di_yaOo_cBzau7tNZHmozCwNNkNou1LH99cUrsU2AKg,18744
 angr/analyses/decompiler/optimization_passes/cross_jump_reverter.py,sha256=DzvgsAhU4GqvS0yN0Q2JezkJAuo2KInCgZ7fsB-ibz4,4021
-angr/analyses/decompiler/optimization_passes/ite_region_converter.py,sha256=8Q2Yh7QcKuoO51zfEa0abnTPES_QQRWbjiu3ZUntwvQ,13792
+angr/analyses/decompiler/optimization_passes/ite_region_converter.py,sha256=O7b5hVV8UV7Q5nzEPovQZB4z8UsyYKvPkOTp2pljXiY,13774
 angr/analyses/decompiler/optimization_passes/eager_std_string_concatenation.py,sha256=O5EVUgJxPnRXBaReF8gxQlWFeFr3V1V313qe_QFS7bY,7087
 angr/analyses/decompiler/optimization_passes/return_duplicator_low.py,sha256=YHmS48Wyegq6Hb9pI9OKybFy9MWAo9r0ujDYJgykKk8,6866
 angr/analyses/decompiler/optimization_passes/code_motion.py,sha256=fdUvRseuFiH6ehpk9uWWMityDuBs_kqmIjYMi92dDkw,15353
@@ -1388,7 +1389,7 @@ angr/analyses/s_reaching_definitions/s_rda_model.py,sha256=FJSge_31FFzyzBJA1xm7d
 angr/analyses/s_reaching_definitions/s_rda_view.py,sha256=7o-llkMUJP_ZhnQ4tkCDrzYok4cAOA7PLt2tX9DY8Mo,13929
 angr/analyses/fcp/__init__.py,sha256=E9dxFckDM9DijfU4RRg9SGL6xDKCz7yBBP-XSkS-S9U,115
 angr/analyses/fcp/fcp.py,sha256=djkJsvSja_De7ptNwllmTHjvVl62BFcH_haBhwhzFtw,16373
-angr/analyses/flirt/flirt.py,sha256=UNXtUBs11WafKeMAW2BwqKJLFhOyObqmRhfCqYdsJpc,10762
+angr/analyses/flirt/flirt.py,sha256=fZ0BvmJnx6ve1j76lMvKFHM2y3g17wg00fU8hWvSl14,10829
 angr/analyses/flirt/flirt_sig.py,sha256=9cWSXqFBEIpui7pluMTaskfD0mVMomNt1mPXN6pIdjg,11574
 angr/analyses/flirt/__init__.py,sha256=1jKkwUDhwwnxG5BRcYtwogLHLBvtZApXgvcAcHrJrdw,1293
 angr/analyses/flirt/consts.py,sha256=9ldvicgtJZa8Hw8cWOKxGkCYtc09I2q5ZWxctXcg20w,4861

angr/analyses/decompiler/peephole_optimizations/inlined_wstrcpy_consolidation.py

@@ -1,113 +0,0 @@
-# pylint:disable=arguments-differ
-from __future__ import annotations
-
-from angr.ailment.expression import Expression, BinaryOp, Const, Register, StackBaseOffset, UnaryOp, VirtualVariable
-from angr.ailment.statement import Call, Store
-
-from angr.sim_type import SimTypePointer, SimTypeWideChar
-from .base import PeepholeOptimizationMultiStmtBase
-from .inlined_wstrcpy import InlinedWstrcpy
-
-
-class InlinedWstrcpyConsolidation(PeepholeOptimizationMultiStmtBase):
-    """
-    Consolidate multiple inlined wstrcpy/wstrncpy calls.
-    """
-
-    __slots__ = ()
-
-    NAME = "Consolidate multiple inlined wstrncpy calls"
-    stmt_classes = ((Call, Call), (Call, Store))
-
-    def optimize(  # type:ignore
-        self, stmts: list[Call], stmt_idx: int | None = None, block=None, **kwargs
-    ):  # pylint:disable=unused-argument
-        last_stmt, stmt = stmts
-        if InlinedWstrcpy.is_inlined_wstrncpy(last_stmt):
-            assert last_stmt.args is not None
-            assert self.kb is not None
-            s_last: bytes = self.kb.custom_strings[last_stmt.args[1].value]
-            addr_last = last_stmt.args[0]
-            new_str = None  # will be set if consolidation should happen
-
-            if isinstance(stmt, Call) and InlinedWstrcpy.is_inlined_wstrncpy(stmt):
-                assert stmt.args is not None
-                # consolidating two calls
-                s_curr: bytes = self.kb.custom_strings[stmt.args[1].value]
-                addr_curr = stmt.args[0]
-                # determine if the two addresses are consecutive
-                delta = self._get_delta(addr_last, addr_curr)
-                if delta is not None and delta == len(s_last):
-                    # consolidate both calls!
-                    new_str = s_last + s_curr
-            elif isinstance(stmt, Store) and isinstance(stmt.data, Const) and isinstance(stmt.data.value, int):
-                # consolidating a call and a store, in case the store statement is storing the suffix of a string (but
-                # the suffix is too short to qualify an inlined strcpy optimization)
-                addr_curr = stmt.addr
-                delta = self._get_delta(addr_last, addr_curr)
-                if delta is not None and delta == len(s_last):
-                    if stmt.size == 2 and stmt.data.value == 0:
-                        # it's probably the terminating null byte
-                        r, s = True, b"\x00\x00"
-                    else:
-                        r, s = InlinedWstrcpy.is_integer_likely_a_wide_string(
-                            stmt.data.value, stmt.size, stmt.endness, min_length=1  # type:ignore
-                        )
-                    if r and s is not None:
-                        new_str = s_last + s
-
-            if new_str is not None:
-                assert self.project is not None
-                wstr_type = SimTypePointer(SimTypeWideChar()).with_arch(self.project.arch)
-                if new_str.endswith(b"\x00\x00"):
-                    call_name = "wstrcpy"
-                    new_str_idx = self.kb.custom_strings.allocate(new_str[:-2])
-                    args = [
-                        last_stmt.args[0],
-                        Const(None, None, new_str_idx, last_stmt.args[0].bits, custom_string=True, type=wstr_type),
-                    ]
-                    prototype = None
-                else:
-                    call_name = "wstrncpy"
-                    new_str_idx = self.kb.custom_strings.allocate(new_str)
-                    args = [
-                        last_stmt.args[0],
-                        Const(None, None, new_str_idx, last_stmt.args[0].bits, custom_string=True, type=wstr_type),
-                        Const(None, None, len(new_str) // 2, self.project.arch.bits),
-                    ]
-                    prototype = None
-
-                return [Call(stmt.idx, call_name, args=args, prototype=prototype, **stmt.tags)]
-
-        return None
-
-    @staticmethod
-    def _parse_addr(addr: Expression) -> tuple[Expression, int]:
-        if isinstance(addr, Register):
-            return addr, 0
-        if isinstance(addr, StackBaseOffset):
-            return StackBaseOffset(None, addr.bits, 0), addr.offset
-        if (
-            isinstance(addr, UnaryOp)
-            and addr.op == "Reference"
-            and isinstance(addr.operand, VirtualVariable)
-            and addr.operand.was_stack
-        ):
-            return StackBaseOffset(None, addr.bits, 0), addr.operand.stack_offset
-        if isinstance(addr, BinaryOp):
-            if addr.op == "Add" and isinstance(addr.operands[1], Const) and isinstance(addr.operands[1].value, int):
-                base_0, offset_0 = InlinedWstrcpyConsolidation._parse_addr(addr.operands[0])
-                return base_0, offset_0 + addr.operands[1].value
-            if addr.op == "Sub" and isinstance(addr.operands[1], Const) and isinstance(addr.operands[1].value, int):
-                base_0, offset_0 = InlinedWstrcpyConsolidation._parse_addr(addr.operands[0])
-                return base_0, offset_0 - addr.operands[1].value
-
-        return addr, 0
-
-    @staticmethod
-    def _get_delta(addr_0: Expression, addr_1: Expression) -> int | None:
-        base_0, offset_0 = InlinedWstrcpyConsolidation._parse_addr(addr_0)
-        base_1, offset_1 = InlinedWstrcpyConsolidation._parse_addr(addr_1)
-        if base_0.likes(base_1):
-            return offset_1 - offset_0
-        return None