angr 9.2.128__py3-none-manylinux2014_x86_64.whl → 9.2.130__py3-none-manylinux2014_x86_64.whl

angr/__init__.py

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

angr/analyses/decompiler/ail_simplifier.py

@@ -1317,7 +1317,7 @@ class AILSimplifier(Analysis):
                             continue
                     uses = rd.get_vvar_uses(def_.atom)
 
-                elif def_.atom.was_reg or def_.atom.was_parameter:
+                elif def_.atom.was_tmp or def_.atom.was_reg or def_.atom.was_parameter:
                     uses = rd.get_vvar_uses(def_.atom)
 
                 else:

angr/analyses/decompiler/region_identifier.py

@@ -220,7 +220,10 @@ class RegionIdentifier(Analysis):
                 type_ = data.get("type", None)
                 if type_ == "fake_return":
                     if len(list(graph.successors(src))) == 1 and len(list(graph.predecessors(dst))) == 1:
-                        self._merge_nodes(graph, src, dst, force_multinode=True)
+                        merged_node = self._merge_nodes(graph, src, dst, force_multinode=True)
+                        # update the entry_node if necessary
+                        if entry_node is not None and entry_node is src:
+                            entry_node = merged_node
                         break
                 elif type_ == "call":
                     graph.remove_node(dst)
@@ -1059,6 +1062,8 @@ class RegionIdentifier(Analysis):
         assert node_a not in graph
         assert node_b not in graph
 
+        return new_node
+
     def _absorb_node(
         self, graph: networkx.DiGraph, node_mommy, node_kiddie, force_multinode=False
     ):  # pylint:disable=no-self-use

angr/analyses/decompiler/ssailification/rewriting_engine.py

@@ -160,12 +160,14 @@ class SimEngineSSARewriting(
 
     def _handle_Store(self, stmt: Store) -> Store | Assignment | None:
         new_data = self._expr(stmt.data)
-        vvar = self._replace_def_store(self.block.addr, self.block.idx, self.stmt_idx, stmt)
-        if vvar is not None:
-            return Assignment(stmt.idx, vvar, stmt.data if new_data is None else new_data, **stmt.tags)
+        if stmt.guard is None:
+            vvar = self._replace_def_store(self.block.addr, self.block.idx, self.stmt_idx, stmt)
+            if vvar is not None:
+                return Assignment(stmt.idx, vvar, stmt.data if new_data is None else new_data, **stmt.tags)
 
         # fall back to Store
         new_addr = self._expr(stmt.addr)
+        new_guard = self._expr(stmt.guard) if stmt.guard is not None else None
 
         if new_addr is not None or new_data is not None:
             return Store(
@@ -174,7 +176,7 @@ class SimEngineSSARewriting(
                 stmt.data if new_data is None else new_data,
                 stmt.size,
                 stmt.endness,
-                guard=stmt.guard,
+                guard=new_guard,
                 **stmt.tags,
             )
 

angr/analyses/decompiler/ssailification/traversal_engine.py

@@ -60,6 +60,8 @@ class SimEngineSSATraversal(
     def _handle_Store(self, stmt: Store):
         self._expr(stmt.addr)
         self._expr(stmt.data)
+        if stmt.guard is not None:
+            self._expr(stmt.guard)
 
         if self.stackvars and isinstance(stmt.addr, StackBaseOffset) and isinstance(stmt.addr.offset, int):
             codeloc = self._codeloc()

angr/analyses/decompiler/structuring/phoenix.py

@@ -20,6 +20,7 @@ from angr.utils.graph import dominates, to_acyclic_graph, dfs_back_edges
 from angr.analyses.decompiler.sequence_walker import SequenceWalker
 from angr.analyses.decompiler.utils import (
     remove_last_statement,
+    remove_last_statements,
     extract_jump_targets,
     switch_extract_cmp_bounds,
     is_empty_or_label_only_node,
@@ -1538,7 +1539,7 @@ class PhoenixStructurer(StructurerBase):
 
         if node_a is not None:
             # remove the last statement in node_a
-            remove_last_statement(node_a)
+            remove_last_statements(node_a)
 
         return True
 
@@ -2308,7 +2309,7 @@ class PhoenixStructurer(StructurerBase):
             if new_src is not None:
                 self.replace_nodes(full_graph, src, new_src)
         if remove_src_last_stmt:
-            remove_last_statement(src)
+            remove_last_statements(src)
 
     def _should_use_multistmtexprs(self, node: Block | BaseNode) -> bool:
         """

angr/analyses/decompiler/utils.py

@@ -45,6 +45,33 @@ def remove_last_statement(node):
     return stmt
 
 
+def remove_last_statements(node) -> bool:
+    if type(node) is CodeNode:
+        return remove_last_statements(node.node)
+    if type(node) is ailment.Block:
+        if not node.statements:
+            return False
+        node.statements = node.statements[:-1]
+        return True
+    if type(node) is MultiNode or type(node) is SequenceNode:
+        if node.nodes:
+            remove_last_statements(node.nodes[-1])
+            if BaseNode.test_empty_node(node.nodes[-1]):
+                node.nodes = node.nodes[:-1]
+            return True
+        return False
+    if type(node) is ConditionNode:
+        r = False
+        if node.true_node is None and node.false_node is not None:
+            r |= remove_last_statements(node.false_node)
+        if node.true_node is not None and node.false_node is None:
+            r |= remove_last_statements(node.true_node)
+        return r
+    if type(node) is LoopNode:
+        return remove_last_statements(node.sequence_node)
+    raise NotImplementedError
+
+
 def append_statement(node, stmt):
     if type(node) is CodeNode:
         append_statement(node.node, stmt)

angr/analyses/variable_recovery/engine_vex.py

@@ -214,8 +214,23 @@ class SimEngineVRVEX(
         for target_func in self.call_info.get(current_addr, []):
             self._handle_function_concrete(target_func)
 
-        # handles return statements
-        if self.block.vex.jumpkind == "Ijk_Ret":
+        if self.block.vex.jumpkind == "Ijk_Call":
+            # emulates return values from calls
+            cc = None
+            for target_func in self.call_info.get(self.state.block_addr, []):
+                if target_func.calling_convention is not None:
+                    cc = target_func.calling_convention
+                    break
+            if cc is None:
+                cc = default_cc(self.arch.name, platform=self.project.simos.name)(self.arch)
+            if isinstance(cc.RETURN_VAL, SimRegArg):
+                reg_offset, reg_size = self.arch.registers[cc.RETURN_VAL.reg_name]
+                data = self._top(reg_size * self.arch.byte_width)
+                self._assign_to_register(reg_offset, data, reg_size, create_variable=False)
+
+        elif self.block.vex.jumpkind == "Ijk_Ret":
+            # handles return statements
+
             # determine the size of the return register
             # TODO: Handle multiple return registers
             cc = self.state.function.calling_convention

angr/engines/light/engine.py

@@ -1272,19 +1272,21 @@ class SimEngineLightAILMixin(SimEngineLightMixin):
         if expr_1 is None:
             expr_1 = arg1
 
-        try:
-            return expr_0 * expr_1
-        except TypeError:
-            return ailment.Expr.BinaryOp(
-                expr.idx,
-                "Mull",
-                [expr_0, expr_1],
-                expr.signed,
-                bits=expr.bits,
-                floating_point=expr.floating_point,
-                rounding_mode=expr.rounding_mode,
-                **expr.tags,
-            )
+        if isinstance(expr_0, claripy.ast.Bits) and isinstance(expr_1, claripy.ast.Bits):
+            expr0_ext = claripy.ZeroExt(expr_0.size(), expr_0)
+            expr1_ext = claripy.ZeroExt(expr_1.size(), expr_1)
+            return expr0_ext * expr1_ext
+
+        return ailment.Expr.BinaryOp(
+            expr.idx,
+            "Mull",
+            [expr_0, expr_1],
+            expr.signed,
+            bits=expr.bits * 2,
+            floating_point=expr.floating_point,
+            rounding_mode=expr.rounding_mode,
+            **expr.tags,
+        )
 
     def _ail_handle_And(self, expr):
         arg0, arg1 = expr.operands

{angr-9.2.128.dist-info → angr-9.2.130.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: angr
-Version: 9.2.128
+Version: 9.2.130
 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.128
-Requires-Dist: archinfo==9.2.128
+Requires-Dist: ailment==9.2.130
+Requires-Dist: archinfo==9.2.130
 Requires-Dist: cachetools
 Requires-Dist: capstone==5.0.3
 Requires-Dist: cffi>=1.14.0
-Requires-Dist: claripy==9.2.128
-Requires-Dist: cle==9.2.128
+Requires-Dist: claripy==9.2.130
+Requires-Dist: cle==9.2.130
 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.128
+Requires-Dist: pyvex==9.2.130
 Requires-Dist: rich>=13.1.0
 Requires-Dist: sortedcontainers
 Requires-Dist: sympy

{angr-9.2.128.dist-info → angr-9.2.130.dist-info}/RECORD

@@ -1,4 +1,4 @@
-angr/__init__.py,sha256=ytV3MRTukLbYI2A4Ge6uSfkOLZka9s_y8R41PJE1kJs,9153
+angr/__init__.py,sha256=YLYzgmZmPOpGiJzrPC7iulriZ9MaWKOa_5apsQpeWyo,9153
 angr/__main__.py,sha256=XeawhF6Cco9eWcfMTDWzYYggLB3qjnQ87IIeFOplaHM,2873
 angr/annocfg.py,sha256=5fiS9TPt5r1_8g_qSfD2XkETlBdm5MTClBIQKqhm040,10624
 angr/blade.py,sha256=GpbEumxMsb_6qD7TbtfZuW2CMzV7W1iwqYzQWYlXnxM,15394
@@ -96,7 +96,7 @@ angr/analyses/data_dep/data_dependency_analysis.py,sha256=QN_m2yDyOWnRHg1l4n6dKD
 angr/analyses/data_dep/dep_nodes.py,sha256=LcNcxeuKXMMc0GkmvKqqFwNlAk3GhzBR8ixM4CD305k,4640
 angr/analyses/data_dep/sim_act_location.py,sha256=EXmfFF3lV9XogcB2gFRMUoJCbjpDYiSKNyfafkBfiY8,1564
 angr/analyses/decompiler/__init__.py,sha256=JAHy5toHIzNxlRnht8geYexKueYhhCGHs7GM4E11AN4,1162
-angr/analyses/decompiler/ail_simplifier.py,sha256=dFoUJPeJF6cx03cdNG6NMGFvNfZJrCXAsDY1ncppiCI,71855
+angr/analyses/decompiler/ail_simplifier.py,sha256=AI2GwIISIyNWCNRvUbTcpqqle4lD-uZpZq6YN8DBq1E,71876
 angr/analyses/decompiler/ailgraph_walker.py,sha256=m71HCthOr9J8PZoMxJzCPskay8yfCZ2j8esWT4Ka3KI,1630
 angr/analyses/decompiler/block_io_finder.py,sha256=xMwG8Bi69OGNYVs0U0F4yxM8kEsnyrsMrf0gEr8dOEw,10923
 angr/analyses/decompiler/block_similarity.py,sha256=ISMoOm-TGJ_1wD2i_4m8IYTletgnP66gReQESJnfvS0,6873
@@ -115,12 +115,12 @@ angr/analyses/decompiler/jump_target_collector.py,sha256=qR11VsIp6H1N-19xCdXMRs1
 angr/analyses/decompiler/jumptable_entry_condition_rewriter.py,sha256=f_JyNiSZfoudElfl2kIzONoYCiosR4xYFOe8Q5SkvLg,2176
 angr/analyses/decompiler/label_collector.py,sha256=JLaGuSZu-DdJMBTYOPt4QpWJ6UigOpsC5bgNANrSao4,798
 angr/analyses/decompiler/redundant_label_remover.py,sha256=J9hpP3C_P08v84FjVU0q5Rmj5M1N9q3HKWSWsA2u7Yg,5879
-angr/analyses/decompiler/region_identifier.py,sha256=DGxaIc3cy-NYxKeZgMO_BuybQvI86XXxNX88Ya6elAw,47396
+angr/analyses/decompiler/region_identifier.py,sha256=x3O9lvmJbO3rydE1Aw8eRMOFNXUkAGaJZv5dYz4a0X0,47622
 angr/analyses/decompiler/region_walker.py,sha256=u0hR0bEX1hSwkv-vejIM1gS-hcX2F2DLsDqpKhQ5_pQ,752
 angr/analyses/decompiler/return_maker.py,sha256=pKn9_y5VXqTeJnD5uzLLd9sH_Dp_9wkPcWPiJPTV-7A,2550
 angr/analyses/decompiler/seq_to_blocks.py,sha256=bB-1m8oBO59AlAp6izAROks3BBxFW8zigLlrIMt6Yfs,564
 angr/analyses/decompiler/sequence_walker.py,sha256=ODDPnChZ3Li0JyIXDR41JW9zvCsfPF5JvGYDL52wAYI,9375
-angr/analyses/decompiler/utils.py,sha256=ldej1mpMKsWYgENa5qG4VTeoCrID-9JudTaaFLTQEco,30456
+angr/analyses/decompiler/utils.py,sha256=ylsc9wMtoNo5uL2qm1egYH-3DqU-cpBCFu0Hh3Du9DQ,31460
 angr/analyses/decompiler/ccall_rewriters/__init__.py,sha256=pTCBcuro4f8bnK7N6D48Y7Dh-2QwyzgVY33LlUBHcZE,137
 angr/analyses/decompiler/ccall_rewriters/amd64_ccalls.py,sha256=5yFpxu2U9ySRGx0F5NOOgHKpYlZ57Bswe-uIOTc-du4,23422
 angr/analyses/decompiler/ccall_rewriters/rewriter_base.py,sha256=8UyvC5BfQmYWJ_WPn7Vrt3c6YlEr0PdSzd8sPOvwlds,496
@@ -239,11 +239,11 @@ angr/analyses/decompiler/region_simplifiers/switch_cluster_simplifier.py,sha256=
 angr/analyses/decompiler/region_simplifiers/switch_expr_simplifier.py,sha256=CngQ_LSACeEVIjuU6kIW2Y0ZSMJWFBwpL95Yh_7w3O4,3335
 angr/analyses/decompiler/ssailification/__init__.py,sha256=zcHoI7e2El2RSU_bHTpQRd1XRLHOfFScG6f3cm5y_lQ,108
 angr/analyses/decompiler/ssailification/rewriting.py,sha256=-3jNGbtTH8-Yznoy0BguKlwoLTh9kqihT1tG0XfXX7E,12328
-angr/analyses/decompiler/ssailification/rewriting_engine.py,sha256=IUQOrEJDxvCZ0iKpPfj-0lod8ejnTke629JMw1dGG_Q,27204
+angr/analyses/decompiler/ssailification/rewriting_engine.py,sha256=K41p7z0O9YOjBokdb8QMJPA964kY5ufgYk4U1It9qNs,27325
 angr/analyses/decompiler/ssailification/rewriting_state.py,sha256=L7apDXQLPiItuLdQFoQdut5RMUE8MRV1zRc3CsnuH6E,1883
 angr/analyses/decompiler/ssailification/ssailification.py,sha256=bTMTwS4auYQCnY9cNwqbgdYksFym0Iro5e7qRIDmlME,8711
 angr/analyses/decompiler/ssailification/traversal.py,sha256=75QzMIAC5RY_RcxMmqUTNeoEgGJwuTnR2KXIc8hnaMI,2981
-angr/analyses/decompiler/ssailification/traversal_engine.py,sha256=qVkx9fevkqxXy6PO1Yu2esPholvoaUOzqB1zmLKW9Os,5877
+angr/analyses/decompiler/ssailification/traversal_engine.py,sha256=eSC6wnsLTvXXI0CGOLufV7L9yc8lpc8hJooALrC2mto,5947
 angr/analyses/decompiler/ssailification/traversal_state.py,sha256=_AsCnLiI2HFdM6WrPyAudhc0X4aU_PziznbOgmzpDzQ,1313
 angr/analyses/decompiler/structured_codegen/__init__.py,sha256=unzkTPhZbpjf5J3GWg1iAFkW17aHFHzuByZCMKE4onQ,633
 angr/analyses/decompiler/structured_codegen/base.py,sha256=9Zfp2d8Oqp6TAgLJyu7v214YDBtdy3Qx8rs801wIsv0,3796
@@ -252,7 +252,7 @@ angr/analyses/decompiler/structured_codegen/dummy.py,sha256=JZLeovXE-8C-unp2hbej
 angr/analyses/decompiler/structured_codegen/dwarf_import.py,sha256=J6V40RuIyKXN7r6ESftIYfoREgmgFavnUL5m3lyTzlM,7072
 angr/analyses/decompiler/structuring/__init__.py,sha256=u2SGBezMdqQF_2ixo8wr66vCMedAMY-cSjQyq2m-nR8,711
 angr/analyses/decompiler/structuring/dream.py,sha256=mPNNsNvNb-LoDcoU_HjUejRytIFY_ZyCAbK4tNq_5lM,48254
-angr/analyses/decompiler/structuring/phoenix.py,sha256=-DkejyxETWXqGGdDw2-HBqlMgNUkVpApyyMpPforhSA,125114
+angr/analyses/decompiler/structuring/phoenix.py,sha256=4I8Vuhz4uQK7tZVvpP-UwiaE54iPWplGmjbgWzTp1Fc,125144
 angr/analyses/decompiler/structuring/recursive_structurer.py,sha256=wxMiixVpmao1Rpuo3wN-gxkPh2YrgTTW4usgtdjdY9E,7150
 angr/analyses/decompiler/structuring/sailr.py,sha256=6lM9cK3iU1kQ_eki7v1Z2VxTiX5OwQzIRF_BbEsw67Q,5721
 angr/analyses/decompiler/structuring/structurer_base.py,sha256=b2fGaDOYy_XdgbOHsKIalJWVTXEt4zDK7w3IO-ZgIjI,43276
@@ -350,7 +350,7 @@ angr/analyses/variable_recovery/__init__.py,sha256=eA1SHzfSx8aPufUdkvgMmBnbI6VDY
 angr/analyses/variable_recovery/annotations.py,sha256=2va7cXnRHYqVqXeVt00QanxfAo3zanL4BkAcC0-Bk20,1438
 angr/analyses/variable_recovery/engine_ail.py,sha256=oOlvhYyU9FkAcWcpRE9G_simBdDMrsCEyZRasr9TzlI,28546
 angr/analyses/variable_recovery/engine_base.py,sha256=PKPz2OOmEYUNKiiXHZIS1LA3jBG03d-TwfdGaHfKu3Q,50374
-angr/analyses/variable_recovery/engine_vex.py,sha256=iC9FB_wYLxJAdTsOQ8QBtIN_SXKnIDrW8eNGZgv-0-Q,18835
+angr/analyses/variable_recovery/engine_vex.py,sha256=LmUzvlKIyW0NawOfGoKvOq-AoiTtvREOmNdxL8y1cp4,19600
 angr/analyses/variable_recovery/irsb_scanner.py,sha256=HlH_Hd6z5i3MTBHRoWq1k4tGudz8PewiM76hYv8d3ZQ,4913
 angr/analyses/variable_recovery/variable_recovery.py,sha256=pBXY1fb3jR2pDpLMtOjL8rH_tkjyvatObW12gYb-r1g,21742
 angr/analyses/variable_recovery/variable_recovery_base.py,sha256=_WX6Qa6HIFUJkZnMIj_wdE9UZo0otYk-oKNEZCA-OvI,15025
@@ -398,7 +398,7 @@ angr/engines/syscall.py,sha256=HPAygXTIb8e4_j2DBS4LCCaAz9DNyji5mucfoYck_Dc,2162
 angr/engines/unicorn.py,sha256=8ggDUXdEQl1EMiY-Tp4CnyzzMK0zZrkGObLvBwPU9uU,24496
 angr/engines/light/__init__.py,sha256=3arK8vMsnu6TRxa1_sVWBfD7fRDHFL5kBbl9q-ui9Zw,435
 angr/engines/light/data.py,sha256=W4g-RZcLyhqXMiyrQBhNYaf8a3NIemq4iQpbPsl_Cdg,21243
-angr/engines/light/engine.py,sha256=wJiS2i5TMN4cuHXZbJhJvT3MjcOlhGX8OHI1hEQuBiY,46031
+angr/engines/light/engine.py,sha256=wIpMB3DkdsWsrefTdS9_lkqpbLmywbz9HTij2hmx8b4,46179
 angr/engines/pcode/__init__.py,sha256=aoEeroPopUOmSplbB9XMz9ke9LXO6jtFMmI_e8X4i28,195
 angr/engines/pcode/behavior.py,sha256=UZHWTPyRnWN28i8I6o6YgnsIa4CaN_yP36fyNu45heg,29406
 angr/engines/pcode/cc.py,sha256=vPT7FA2tmlPUVA2ptHDNVqhAZEuZZaJYajBEIctXH54,3180
@@ -1353,9 +1353,9 @@ angr/utils/timing.py,sha256=ELuRPzdRSHzOATgtAzTFByMlVr021ypMrsvtpopreLg,1481
 angr/utils/ssa/__init__.py,sha256=Sz9zQVnvtmCbJJYeTG_k2JxcZtgxvIxap-KqzvRnIFQ,8015
 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.128.dist-info/LICENSE,sha256=cgL_ho5B1NH8UxwtBuqThRWdjear8b7hktycaS1sz6g,1327
-angr-9.2.128.dist-info/METADATA,sha256=qLTnp41VD0korlbNqTSgjVkP62Lb2u4d8BdQ5DZUIyI,4762
-angr-9.2.128.dist-info/WHEEL,sha256=L_zGGHECouaTzi1DQiLm3Q4SaYnxpIo58ROhs3b4s8E,108
-angr-9.2.128.dist-info/entry_points.txt,sha256=Vjh1C8PMyr5dZFMnik5WkEP01Uwr2T73I3a6N32sgQU,44
-angr-9.2.128.dist-info/top_level.txt,sha256=dKw0KWTbwLXytFvv15oAAG4sUs3ey47tt6DorJG9-hw,5
-angr-9.2.128.dist-info/RECORD,,
+angr-9.2.130.dist-info/LICENSE,sha256=cgL_ho5B1NH8UxwtBuqThRWdjear8b7hktycaS1sz6g,1327
+angr-9.2.130.dist-info/METADATA,sha256=HreKfogB28SUxqGpV3d6OAJVB8yUY5PlGZXK_dSaaKo,4762
+angr-9.2.130.dist-info/WHEEL,sha256=6wjWQKm6476oiIGK7Nz3VYcMJ7MesN87-fuc75zAHtU,108
+angr-9.2.130.dist-info/entry_points.txt,sha256=Vjh1C8PMyr5dZFMnik5WkEP01Uwr2T73I3a6N32sgQU,44
+angr-9.2.130.dist-info/top_level.txt,sha256=dKw0KWTbwLXytFvv15oAAG4sUs3ey47tt6DorJG9-hw,5
+angr-9.2.130.dist-info/RECORD,,

{angr-9.2.128.dist-info → angr-9.2.130.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.4.0)
+Generator: setuptools (75.6.0)
 Root-Is-Purelib: true
 Tag: py3-none-manylinux2014_x86_64