unidecompiler-plugin-python-pyc 0.1.5__tar.gz → 0.2.0__tar.gz

{unidecompiler_plugin_python_pyc-0.1.5 → unidecompiler_plugin_python_pyc-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: unidecompiler-plugin-python-pyc
-Version: 0.1.5
+Version: 0.2.0
 Summary: Python bytecode frontend plugin for unidecompiler
 Author-email: Wker <1670133844@qq.com>
 License-Expression: AGPL-3.0-or-later
@@ -9,7 +9,7 @@ Project-URL: Repository, https://github.com/Wker666/unidecompiler
 Project-URL: Issues, https://github.com/Wker666/unidecompiler/issues
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
-Requires-Dist: unidecompiler<0.2.0,>=0.1.10
+Requires-Dist: unidecompiler<0.3.0,>=0.2.0
 
 # unidecompiler-plugin-python-pyc
 

{unidecompiler_plugin_python_pyc-0.1.5 → unidecompiler_plugin_python_pyc-0.2.0}/pyproject.toml

@@ -4,13 +4,13 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "unidecompiler-plugin-python-pyc"
-version = "0.1.5"
+version = "0.2.0"
 description = "Python bytecode frontend plugin for unidecompiler"
 readme = "README.md"
 license = "AGPL-3.0-or-later"
 authors = [{ name = "Wker", email = "1670133844@qq.com" }]
 requires-python = ">=3.11"
-dependencies = ["unidecompiler>=0.1.10,<0.2.0"]
+dependencies = ["unidecompiler>=0.2.0,<0.3.0"]
 
 [project.urls]
 Homepage = "https://github.com/Wker666/unidecompiler"

{unidecompiler_plugin_python_pyc-0.1.5 → unidecompiler_plugin_python_pyc-0.2.0}/src/unidecompiler_plugin_python_pyc/lifter.py

@@ -42,6 +42,7 @@ from unidecompiler.core.effects import (
     RaiseTop,
     RaiseWithCause,
     ReraiseTop,
+    RewriteException,
     ResumeValue,
     ReturnTop,
     ReturnVoid,
@@ -96,6 +97,7 @@ from unidecompiler.core.vm_region import (
     build_hint_region_profile,
     lift_control_region as lift_vm_control_region,
 )
+from unidecompiler.progress import ProgressReporter, report_progress
 from unidecompiler_plugin_python_pyc.pyc import PycCodeObject, PycExceptionRegion, PycModule
 
 
@@ -261,7 +263,29 @@ def _load_from_dict_or_globals(_context, instruction, source: SourceRef) -> tupl
 
 
 def _call_intrinsic_1(_context, instruction, source: SourceRef) -> tuple[Effect, ...]:
-    return (CallTopAs(source=source, callee_name=str(instruction.argval or instruction.argrepr or "intrinsic")),)
+    name = str(instruction.argrepr or instruction.argval or "intrinsic")
+    if name == "INTRINSIC_STOPITERATION_ERROR":
+        # CPython conditionally replaces StopIteration-family exceptions and
+        # retains the original as cause/context.  This remains a generic
+        # value rewrite; core owns its stack lift and conservative rendering.
+        return (
+            RewriteException(
+                source=source,
+                predicate=Const(value="stop-iteration-family", source=source),
+                replacement=Const(value="runtime-error-from-input", source=source),
+                retain_input_as_cause=True,
+            ),
+        )
+    # ``arg``/``argval`` is an implementation ordinal.  The decoded text is
+    # the only presentation-safe identity for an opaque intrinsic operation;
+    # retain it as data and leave any execution semantics outside this thin
+    # effect table.
+    return (
+        CallTopAs(
+            source=source,
+            callee_name=name,
+        ),
+    )
 
 
 def _before_with(_context, instruction, source: SourceRef) -> tuple[Effect, ...]:
@@ -527,6 +551,17 @@ def _raise_varargs(_context, instruction, source: SourceRef) -> tuple[Effect, ..
     return (RaiseTop(source=source),)
 
 
+def _reraise(_context, instruction, source: SourceRef) -> tuple[Effect, ...]:
+    count = _instruction_count(instruction)
+    return (
+        ReraiseTop(
+            source=source,
+            consume_stack_exception=True,
+            resume_slot_count=count,
+        ),
+    )
+
+
 def _yield_value(_context, instruction, source: SourceRef) -> tuple[Effect, ...]:
     if instruction.arg in {1, 2}:
         return ()
@@ -704,7 +739,7 @@ PYTHON_EFFECT_TABLE = VMEffectTable(
         "RETURN_CONST": _return_const,
         "INSTRUMENTED_RETURN_CONST": _return_const,
         "RAISE_VARARGS": _raise_varargs,
-        "RERAISE": lambda _context, _instruction, source: (ReraiseTop(source=source),),
+        "RERAISE": _reraise,
         "YIELD_VALUE": _yield_value,
         "INSTRUMENTED_YIELD_VALUE": _yield_value,
         "SEND": _send,
@@ -722,8 +757,15 @@ PYTHON_EFFECT_TABLE = VMEffectTable(
 )
 
 
-def lift_pyc_module(pyc_module: PycModule, metadata: dict) -> ModuleIR:
-    functions = list(_lift_code_object_tree(pyc_module.code))
+def lift_pyc_module(
+    pyc_module: PycModule,
+    metadata: dict,
+    *,
+    reporter: ProgressReporter | None = None,
+) -> ModuleIR:
+    total = _code_object_count(pyc_module.code)
+    report_progress(reporter, phase="lift", status="started", completed=0, total=total, unit="function", message="lifting Python code objects")
+    functions = list(_lift_code_object_tree(pyc_module.code, reporter=reporter, total=total, progress=[0]))
     return assemble_vm_module(
         name=pyc_module.filename or "<python-pyc>",
         source_language="python",
@@ -750,7 +792,13 @@ def lift_code_object(code: PycCodeObject) -> FunctionIR:
     return function
 
 
-def _lift_code_object_tree(code: PycCodeObject) -> tuple[FunctionIR, ...]:
+def _lift_code_object_tree(
+    code: PycCodeObject,
+    *,
+    reporter: ProgressReporter | None = None,
+    total: int | None = None,
+    progress: list[int] | None = None,
+) -> tuple[FunctionIR, ...]:
     spec = _python_function_spec(code)
     functions = [
         recover_vm_function(
@@ -759,11 +807,25 @@ def _lift_code_object_tree(code: PycCodeObject) -> tuple[FunctionIR, ...]:
             raw=tuple(_raw_instruction_line(instruction) for instruction in code.instructions),
         )
     ]
+    if reporter is not None and total is not None and progress is not None:
+        progress[0] += 1
+        report_progress(reporter, phase="lift", completed=progress[0], total=total, unit="function", message=f"lifting code object {progress[0]}/{total}")
     for child in code.children:
-        functions.extend(_lift_code_object_tree(child))
+        functions.extend(
+            _lift_code_object_tree(
+                child,
+                reporter=reporter,
+                total=total,
+                progress=progress,
+            )
+        )
     return tuple(functions)
 
 
+def _code_object_count(code: PycCodeObject) -> int:
+    return 1 + sum(_code_object_count(child) for child in code.children)
+
+
 def _python_low_effects(instruction, source: SourceRef) -> tuple[Effect, ...] | None:
     return PYTHON_EFFECT_TABLE.effects_for(None, instruction, source)
 
@@ -808,6 +870,14 @@ def _python_bytecode_steps(
                     "target": region.target,
                     "depth": region.depth,
                     "lasti": region.lasti,
+                    # The exception table declares the handler's input stack
+                    # layout.  These are VM-neutral stack facts; core owns
+                    # all CFG construction and recovery decisions.
+                    "stack_depth": region.depth,
+                    "stack_suffix": (
+                        *(("resume-position",) if region.lasti else ()),
+                        "exception",
+                    ),
                 },
                 label="protected-region",
             )

{unidecompiler_plugin_python_pyc-0.1.5 → unidecompiler_plugin_python_pyc-0.2.0}/src/unidecompiler_plugin_python_pyc/plugin.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 from unidecompiler.core.ir import ModuleIR
 from unidecompiler.plugins import FrontendModule
+from unidecompiler.progress import ProgressReporter
 from unidecompiler_plugin_python_pyc.lifter import lift_pyc_module
 from unidecompiler_plugin_python_pyc.pyc import decode_pyc, looks_like_pyc
 from unidecompiler_plugin_python_pyc.simulation import PythonPycSimulationAdapter
@@ -45,3 +46,8 @@ class PythonPycFrontendPlugin:
             )
 
         return lift_pyc_module(module.payload, module.metadata)
+
+    def lift_with_progress(self, module: FrontendModule, reporter: ProgressReporter) -> ModuleIR:
+        if module.frontend_id != self.id:
+            raise TypeError(f"Python pyc frontend cannot lift module from {module.frontend_id!r}")
+        return lift_pyc_module(module.payload, module.metadata, reporter=reporter)

{unidecompiler_plugin_python_pyc-0.1.5 → unidecompiler_plugin_python_pyc-0.2.0}/src/unidecompiler_plugin_python_pyc.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: unidecompiler-plugin-python-pyc
-Version: 0.1.5
+Version: 0.2.0
 Summary: Python bytecode frontend plugin for unidecompiler
 Author-email: Wker <1670133844@qq.com>
 License-Expression: AGPL-3.0-or-later
@@ -9,7 +9,7 @@ Project-URL: Repository, https://github.com/Wker666/unidecompiler
 Project-URL: Issues, https://github.com/Wker666/unidecompiler/issues
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
-Requires-Dist: unidecompiler<0.2.0,>=0.1.10
+Requires-Dist: unidecompiler<0.3.0,>=0.2.0
 
 # unidecompiler-plugin-python-pyc
 

unidecompiler_plugin_python_pyc-0.2.0/src/unidecompiler_plugin_python_pyc.egg-info/requires.txt

@@ -0,0 +1 @@
+unidecompiler<0.3.0,>=0.2.0

unidecompiler_plugin_python_pyc-0.1.5/src/unidecompiler_plugin_python_pyc.egg-info/requires.txt

@@ -1 +0,0 @@
-unidecompiler<0.2.0,>=0.1.10