angr 9.2.133__py3-none-win_amd64.whl → 9.2.134__py3-none-win_amd64.whl

angr/__init__.py

@@ -2,7 +2,7 @@
 # pylint: disable=wrong-import-position
 from __future__ import annotations
 
-__version__ = "9.2.133"
+__version__ = "9.2.134"
 
 if bytes is str:
     raise Exception(

angr/analyses/cfg/indirect_jump_resolvers/jumptable.py

@@ -1639,7 +1639,7 @@ class JumpTableResolver(IndirectJumpResolver):
         # If we're just reading a constant, don't bother with the rest of this mess!
         if isinstance(load_stmt, pyvex.IRStmt.WrTmp):
             assert isinstance(load_stmt.data, pyvex.IRExpr.Load)
-            if type(load_stmt.data.addr) is pyvex.IRExpr.Const:
+            if isinstance(load_stmt.data.addr, pyvex.IRExpr.Const):
                 # It's directly loading from a constant address
                 # e.g.,
                 #  ldr r0, =main+1
@@ -1656,7 +1656,7 @@ class JumpTableResolver(IndirectJumpResolver):
                 l.info("Resolved constant indirect jump from %#08x to %#08x", addr, jump_target_addr)
                 return jump_target
 
-        elif isinstance(load_stmt, pyvex.IRStmt.LoadG) and type(load_stmt.addr) is pyvex.IRExpr.Const:
+        elif isinstance(load_stmt, pyvex.IRStmt.LoadG) and isinstance(load_stmt.addr, pyvex.IRExpr.Const):
             # It's directly loading from a constant address
             # e.g.,
             #  4352c     SUB     R1, R11, #0x1000
@@ -2269,9 +2269,9 @@ class JumpTableResolver(IndirectJumpResolver):
 
         if isinstance(load_stmt, pyvex.IRStmt.WrTmp):
             assert isinstance(load_stmt.data, pyvex.IRExpr.Load)
-            if type(load_stmt.data.addr) is pyvex.IRExpr.RdTmp:
+            if isinstance(load_stmt.data.addr, pyvex.IRExpr.RdTmp):
                 load_addr_tmp = load_stmt.data.addr.tmp
-            elif type(load_stmt.data.addr) is pyvex.IRExpr.Const:
+            elif isinstance(load_stmt.data.addr, pyvex.IRExpr.Const):
                 # It's directly loading from a constant address
                 # e.g.,
                 #  ldr r0, =main+1
@@ -2280,9 +2280,9 @@ class JumpTableResolver(IndirectJumpResolver):
                 jump_target_addr = load_stmt.data.addr.con.value
                 return claripy.BVV(jump_target_addr, state.arch.bits)
         elif isinstance(load_stmt, pyvex.IRStmt.LoadG):
-            if type(load_stmt.addr) is pyvex.IRExpr.RdTmp:
+            if isinstance(load_stmt.addr, pyvex.IRExpr.RdTmp):
                 load_addr_tmp = load_stmt.addr.tmp
-            elif type(load_stmt.addr) is pyvex.IRExpr.Const:
+            elif isinstance(load_stmt.addr, pyvex.IRExpr.Const):
                 # It's directly loading from a constant address
                 # e.g.,
                 #  4352c     SUB     R1, R11, #0x1000

angr/analyses/decompiler/structured_codegen/c.py

@@ -1221,20 +1221,30 @@ class CAssignment(CStatement):
             "Shl": "<<",
             "Sar": ">>",
         }
+        commutative_ops = {"Add", "Mul", "And", "Xor", "Or"}
 
+        compound_expr_rhs = None
         if (
             self.codegen.use_compound_assignments
             and isinstance(self.lhs, CVariable)
             and isinstance(self.rhs, CBinaryOp)
-            and isinstance(self.rhs.lhs, CVariable)
-            and self.lhs.unified_variable is not None
-            and self.rhs.lhs.unified_variable is not None
-            and self.lhs.unified_variable is self.rhs.lhs.unified_variable
             and self.rhs.op in compound_assignment_ops
+            and self.lhs.unified_variable is not None
         ):
+            if isinstance(self.rhs.lhs, CVariable) and self.lhs.unified_variable is self.rhs.lhs.unified_variable:
+                compound_expr_rhs = self.rhs.rhs
+            elif (
+                self.rhs.op in commutative_ops
+                and isinstance(self.rhs.rhs, CVariable)
+                and self.lhs.unified_variable is self.rhs.rhs.unified_variable
+            ):
+                compound_expr_rhs = self.rhs.lhs
+
+        if compound_expr_rhs is not None:
             # a = a + x  =>  a += x
+            # a = x + a  =>  a += x
             yield f" {compound_assignment_ops[self.rhs.op]}= ", self
-            yield from CExpression._try_c_repr_chunks(self.rhs.rhs)
+            yield from CExpression._try_c_repr_chunks(compound_expr_rhs)
         else:
             yield " = ", self
             yield from CExpression._try_c_repr_chunks(self.rhs)

angr/storage/memory_mixins/name_resolution_mixin.py

@@ -33,7 +33,7 @@ class NameResolutionMixin(MemoryMixin):
                         self.store("cc_dep1", _get_flags(self.state))  # constraints cannot be added by this
                     self.store("cc_op", 0)  # OP_COPY
                     return self.state.arch.registers["cc_dep1"]
-            if is_arm_arch(self.state.arch) and name == "flags":
+            if (is_arm_arch(self.state.arch) or self.state.arch.name == "AARCH64") and name == "flags":
                 if not is_write:
                     self.store("cc_dep1", _get_flags(self.state))
                 self.store("cc_op", 0)

{angr-9.2.133.dist-info → angr-9.2.134.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: angr
-Version: 9.2.133
+Version: 9.2.134
 Summary: A multi-architecture binary analysis toolkit, with the ability to perform dynamic symbolic execution and various static analyses on binaries
 Home-page: https://github.com/angr/angr
 License: BSD-2-Clause
@@ -16,13 +16,13 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: CppHeaderParser
 Requires-Dist: GitPython
-Requires-Dist: ailment==9.2.133
-Requires-Dist: archinfo==9.2.133
+Requires-Dist: ailment==9.2.134
+Requires-Dist: archinfo==9.2.134
 Requires-Dist: cachetools
 Requires-Dist: capstone==5.0.3
 Requires-Dist: cffi>=1.14.0
-Requires-Dist: claripy==9.2.133
-Requires-Dist: cle==9.2.133
+Requires-Dist: claripy==9.2.134
+Requires-Dist: cle==9.2.134
 Requires-Dist: itanium-demangler
 Requires-Dist: mulpyplexer
 Requires-Dist: nampa
@@ -31,7 +31,7 @@ Requires-Dist: protobuf>=5.28.2
 Requires-Dist: psutil
 Requires-Dist: pycparser>=2.18
 Requires-Dist: pyformlang
-Requires-Dist: pyvex==9.2.133
+Requires-Dist: pyvex==9.2.134
 Requires-Dist: rich>=13.1.0
 Requires-Dist: sortedcontainers
 Requires-Dist: sympy

{angr-9.2.133.dist-info → angr-9.2.134.dist-info}/RECORD

@@ -1,4 +1,4 @@
-angr/__init__.py,sha256=JLLKDRq6Vl_n1oe8kwqttTcVMSf_N4q7j84Pz1b0_Rg,9153
+angr/__init__.py,sha256=RdEZBtno9mn8PRTf_VSkaLK0AnqKMT1zIMQkRyqJAfI,9153
 angr/__main__.py,sha256=XeawhF6Cco9eWcfMTDWzYYggLB3qjnQ87IIeFOplaHM,2873
 angr/annocfg.py,sha256=0NIvcuCskwz45hbBzigUTAuCrYutjDMwEXtMJf0y0S0,10742
 angr/blade.py,sha256=NhesOPloKJC1DQJRv_HBT18X7oNxK16JwAfNz2Lc1o0,15384
@@ -80,7 +80,7 @@ angr/analyses/cfg/indirect_jump_resolvers/amd64_pe_iat.py,sha256=cE713VrHJdNZrB9
 angr/analyses/cfg/indirect_jump_resolvers/arm_elf_fast.py,sha256=AIA6YeWlzBAOwhdDolHfxoEWvSsvNPo73KDRIjbHdtY,5202
 angr/analyses/cfg/indirect_jump_resolvers/const_resolver.py,sha256=xD-iVlOmYljEwubiff5tNPvdEl7aQhzMQWWjA7l2C_s,5277
 angr/analyses/cfg/indirect_jump_resolvers/default_resolvers.py,sha256=v555keK0pfM451YzWbIC0pMG1pQu1wCme1moWaMPqGo,1541
-angr/analyses/cfg/indirect_jump_resolvers/jumptable.py,sha256=iml0bkjUitszQpA8nneHWj2VAy07E0qm5tlPF9j_sJw,104685
+angr/analyses/cfg/indirect_jump_resolvers/jumptable.py,sha256=KdCaHa4i0ZS3KleySPB46JIswoOid2MWlwgxnhWgkzE,104709
 angr/analyses/cfg/indirect_jump_resolvers/mips_elf_fast.py,sha256=SSwWVKCqMNxdqTeMkLqXk5UFmzgxJDm8H-xLNBr1Hnc,10173
 angr/analyses/cfg/indirect_jump_resolvers/mips_elf_got.py,sha256=DT1tomUTCXmhD8N_V4KMeyS-YecDlR7f4kOANiKyGeI,5213
 angr/analyses/cfg/indirect_jump_resolvers/propagator_utils.py,sha256=ppqn5vYGOD8HknweabD7NWgZmoBgjkOC6m9t-XD46T0,992
@@ -249,7 +249,7 @@ angr/analyses/decompiler/ssailification/traversal_engine.py,sha256=dczhUEuoBTg0w
 angr/analyses/decompiler/ssailification/traversal_state.py,sha256=_AsCnLiI2HFdM6WrPyAudhc0X4aU_PziznbOgmzpDzQ,1313
 angr/analyses/decompiler/structured_codegen/__init__.py,sha256=mxG4yruPAab8735wVgXZ1zu8qFPz-njKe0m5UcywE3o,633
 angr/analyses/decompiler/structured_codegen/base.py,sha256=DEeNrBOC8AAJb-qFyUoYeX8fpHSPmAsutCDF-0UhaQ4,3782
-angr/analyses/decompiler/structured_codegen/c.py,sha256=AogaRs4uQx79_LxrlNVuRTyMmiW_xkKmWeIh2FSrGQY,141010
+angr/analyses/decompiler/structured_codegen/c.py,sha256=MJk6QzT3V9xnAeHfvcruyFdrS7g8xXyktqJthp2QYxo,141432
 angr/analyses/decompiler/structured_codegen/dummy.py,sha256=JZLeovXE-8C-unp2hbejxCG30l-yCx4sWFh7JMF_iRM,570
 angr/analyses/decompiler/structured_codegen/dwarf_import.py,sha256=J6V40RuIyKXN7r6ESftIYfoREgmgFavnUL5m3lyTzlM,7072
 angr/analyses/decompiler/structuring/__init__.py,sha256=kEFP-zv9CZrhJtLTKwT9-9cGVTls71wLYaLDUuYorBU,711
@@ -548,7 +548,7 @@ angr/knowledge_plugins/xrefs/__init__.py,sha256=5PhqVOtTZ27lCjJ9wp7akUeJydqILbyC
 angr/knowledge_plugins/xrefs/xref.py,sha256=U2H1rfffp5EXoh0awlGxMBxA4K5MIwl3CXjV3Uih3tA,4856
 angr/knowledge_plugins/xrefs/xref_manager.py,sha256=Yb88z3L8Y26TfGeRHdsGWQlT9f6oWntjEg6s-kcVtUQ,4040
 angr/knowledge_plugins/xrefs/xref_types.py,sha256=LcQ9pD4E4XlC51Us49xiqAoGAFGpnCrpYO4mOzILiKI,308
-angr/lib/angr_native.dll,sha256=UPv4vmFFAjOXd-dRskcc13FJAwLf7nddnR3SBn5Ur7g,19319808
+angr/lib/angr_native.dll,sha256=sheMFMJemYLopeg_kzLQOp8xd5GZG38LUByWMjkfTAU,19319808
 angr/misc/__init__.py,sha256=FoUwjk1DhqlIsr2sBN0MlR8MnSOGQv9QJhxmq32RYuA,355
 angr/misc/ansi.py,sha256=nPJHC0SKfqasMQZ0LxdmmIYojjmk4nr5jI6FrzoTwS0,811
 angr/misc/autoimport.py,sha256=iZagpuPwZWczUTYIqs-JkDMQjftMqc_cchcm7OBFiEg,3450
@@ -1295,7 +1295,7 @@ angr/storage/memory_mixins/keyvalue_memory_mixin.py,sha256=tqjpvMaGyXeKIPTO669qM
 angr/storage/memory_mixins/label_merger_mixin.py,sha256=zPCM7I7zEgFzk3pwqeFKFs_clv5qMBaoPnuHxRKv4dY,897
 angr/storage/memory_mixins/memory_mixin.py,sha256=ccvxbjLMO98C-PPlRCtTKDrB53eWtq2VAkhSkcADOiM,6474
 angr/storage/memory_mixins/multi_value_merger_mixin.py,sha256=ubmdwqxuQVL9LheJ9u_fjfira9yRaRB-Ibv-YQbpbmU,3310
-angr/storage/memory_mixins/name_resolution_mixin.py,sha256=EfgcD9B0Ew-GnY3m1EjbAwhhqGw_bwRrja0tP3tPJgI,3395
+angr/storage/memory_mixins/name_resolution_mixin.py,sha256=xfqeZZ8DB6NdQawpDhWRdwR2jQcFgu1NWCgqhR7mYYQ,3434
 angr/storage/memory_mixins/simple_interface_mixin.py,sha256=isJ3_vuElWtLTW7MxweHs5WJOuawr1LmLlS7-yakWd4,2576
 angr/storage/memory_mixins/simplification_mixin.py,sha256=ajjiQ4ulbVQ1WgygR7WuM7vrOzsFGa4D-11R7ipmr1c,594
 angr/storage/memory_mixins/size_resolution_mixin.py,sha256=7LwcgsuJpwPlQ8LzX5q0bZj2PTkLs_cngrd3lDiHd2s,5728
@@ -1354,9 +1354,9 @@ angr/utils/timing.py,sha256=ELuRPzdRSHzOATgtAzTFByMlVr021ypMrsvtpopreLg,1481
 angr/utils/ssa/__init__.py,sha256=OD3eTWAiH9QXGpwliNBCTC3Z4bux9iBX3Sp50aUNHvI,8758
 angr/utils/ssa/tmp_uses_collector.py,sha256=rSpvMxBHzg-tmvhsfjn3iLyPEKzaZN-xpQrdslMq3J4,793
 angr/utils/ssa/vvar_uses_collector.py,sha256=8gfAWdRMz73Deh-ZshDM3GPAot9Lf-rHzCiaCil0hlE,1342
-angr-9.2.133.dist-info/LICENSE,sha256=cgL_ho5B1NH8UxwtBuqThRWdjear8b7hktycaS1sz6g,1327
-angr-9.2.133.dist-info/METADATA,sha256=ijxCOAoArSZQ_GTMBFWyVo1_Zl0wWEol5t6jx_93Zck,4882
-angr-9.2.133.dist-info/WHEEL,sha256=z8gukVdnGwjcwo0VnsfJMrhPu5QJT68VcMWmAgvAufw,97
-angr-9.2.133.dist-info/entry_points.txt,sha256=Vjh1C8PMyr5dZFMnik5WkEP01Uwr2T73I3a6N32sgQU,44
-angr-9.2.133.dist-info/top_level.txt,sha256=dKw0KWTbwLXytFvv15oAAG4sUs3ey47tt6DorJG9-hw,5
-angr-9.2.133.dist-info/RECORD,,
+angr-9.2.134.dist-info/LICENSE,sha256=cgL_ho5B1NH8UxwtBuqThRWdjear8b7hktycaS1sz6g,1327
+angr-9.2.134.dist-info/METADATA,sha256=IKFjsjKCZv9OxYMSldNSRRrLcVwKOhVkTyxynRJ6ml8,4882
+angr-9.2.134.dist-info/WHEEL,sha256=z8gukVdnGwjcwo0VnsfJMrhPu5QJT68VcMWmAgvAufw,97
+angr-9.2.134.dist-info/entry_points.txt,sha256=Vjh1C8PMyr5dZFMnik5WkEP01Uwr2T73I3a6N32sgQU,44
+angr-9.2.134.dist-info/top_level.txt,sha256=dKw0KWTbwLXytFvv15oAAG4sUs3ey47tt6DorJG9-hw,5
+angr-9.2.134.dist-info/RECORD,,