unidecompiler-plugin-lua 0.1.1__tar.gz → 0.1.3__tar.gz

{unidecompiler_plugin_lua-0.1.1 → unidecompiler_plugin_lua-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: unidecompiler-plugin-lua
-Version: 0.1.1
+Version: 0.1.3
 Summary: Lua 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.1
+Requires-Dist: unidecompiler<0.2.0,>=0.1.9
 
 # unidecompiler-plugin-lua
 

{unidecompiler_plugin_lua-0.1.1 → unidecompiler_plugin_lua-0.1.3}/pyproject.toml

@@ -4,13 +4,13 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "unidecompiler-plugin-lua"
-version = "0.1.1"
+version = "0.1.3"
 description = "Lua 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.1,<0.2.0"]
+dependencies = ["unidecompiler>=0.1.9,<0.2.0"]
 
 [project.urls]
 Homepage = "https://github.com/Wker666/unidecompiler"

{unidecompiler_plugin_lua-0.1.1 → unidecompiler_plugin_lua-0.1.3}/src/unidecompiler_plugin_lua/chunk54.py

@@ -198,6 +198,7 @@ def _read_code(reader: _Reader) -> tuple[LuaInstructionListing, ...]:
     count = reader.varint()
     instructions: list[LuaInstructionListing] = []
     for pc in range(1, count + 1):
+        artifact_offset = reader.offset
         raw = reader.unpack("I")
         opcode = _OPCODES[raw & 0x7F]
         instructions.append(
@@ -206,6 +207,8 @@ def _read_code(reader: _Reader) -> tuple[LuaInstructionListing, ...]:
                 line=None,
                 opcode=opcode,
                 operands=_decode_operands(opcode, raw),
+                artifact_offset=artifact_offset,
+                size=4,
             )
         )
     return tuple(instructions)

{unidecompiler_plugin_lua-0.1.1 → unidecompiler_plugin_lua-0.1.3}/src/unidecompiler_plugin_lua/lifter.py

@@ -10,6 +10,7 @@ from unidecompiler.core.ir import (
     CapturedVar,
     Const,
     Expr,
+    ExprStmt,
     Global,
     GetItem,
     MapLiteral,
@@ -32,6 +33,7 @@ from unidecompiler.core.vm_function import (
 from unidecompiler.core.vm_bytecode import VMBytecodeStep
 from unidecompiler.core.vm_hints import VMHint
 from unidecompiler.core.vm_operands import VMDecodedInstruction, VMOperand
+from unidecompiler.provenance import ByteRange
 from unidecompiler.core.vm_region import (
     VMLinearState,
     VMRegionOpcodeClasses,
@@ -95,9 +97,6 @@ IGNORED_OPS = {
     "MMBINK",
     "VARARGPREP",
     "EXTRAARG",
-    "LFALSESKIP",
-    "CLOSE",
-    "TBC",
     *(CONTROL_OPS - frozenset({"FORPREP", "FORLOOP", "TESTSET", "TFORPREP", "TFORLOOP"})),
 }
 @dataclass(frozen=True)
@@ -500,7 +499,20 @@ def _lua_set_list(context: LuaEffectContext, instruction, source: SourceRef) ->
     base = int(operands[0])
     count = int(operands[1])
     if count <= 0:
-        return ()
+        return (
+            Emit(
+                source=source,
+                statement=ExprStmt(
+                    source=source,
+                    value=Call(
+                        source=source,
+                        callee=Global(name="lua_setlist", source=source),
+                        args=(Var(name=_read_register_name(context.listing, base, instruction.pc), source=source),),
+                        returns=0,
+                    ),
+                ),
+            ),
+        )
     table = Var(name=_read_register_name(context.listing, base, instruction.pc), source=source)
     return tuple(
         Emit(
@@ -600,7 +612,24 @@ def _lua_tforcall_effect(context: LuaEffectContext, instruction, source: SourceR
     base = int(operands[0])
     count = int(operands[2])
     if count <= 0:
-        return ()
+        base = int(operands[0])
+        return (
+            Emit(
+                source=source,
+                statement=ExprStmt(
+                    source=source,
+                    value=Call(
+                        source=source,
+                        callee=Global(name="lua_generic_for_next", source=source),
+                        args=tuple(
+                            Var(name=_read_register_name(context.listing, base + index, instruction.pc), source=source)
+                            for index in range(3)
+                        ),
+                        returns=0,
+                    ),
+                ),
+            ),
+        )
     names = tuple(
         _write_register_name(context.listing, register, instruction.pc)
         for register in range(base + 4, base + 4 + count)
@@ -628,6 +657,28 @@ def _lua_tforcall_effect(context: LuaEffectContext, instruction, source: SourceR
     )
 
 
+def _lua_runtime_marker(name: str):
+    """Represent a runtime-only Lua lifecycle operation without dropping stack values."""
+
+    def factory(_context: LuaEffectContext, _instruction, source: SourceRef) -> tuple:
+        return (
+            Emit(
+                source=source,
+                statement=ExprStmt(
+                    source=source,
+                    value=Call(
+                        source=source,
+                        callee=Global(name=name, source=source),
+                        args=(),
+                        returns=0,
+                    ),
+                ),
+            ),
+        )
+
+    return factory
+
+
 def _lua_tforloop_effect(context: LuaEffectContext, instruction, source: SourceRef) -> tuple | None:
     operands = instruction.operands
     if not operands:
@@ -850,6 +901,11 @@ LUA_EFFECT_TABLE = VMEffectTable(
         "FORLOOP": _lua_forloop_effect,
         "TFORPREP": _lua_no_effect,
         "TFORCALL": _lua_tforcall_effect,
+        "LFALSESKIP": lambda context, instruction, source: (
+            _lua_assign(context.listing, int(instruction.operands[0]), instruction.pc, Const(value=False, source=source), source),
+        ) if instruction.operands else (UnknownOpcode(source=source, opcode="LFALSESKIP", raw="missing register"),),
+        "CLOSE": _lua_runtime_marker("lua_close"),
+        "TBC": _lua_runtime_marker("lua_tbc"),
         "TFORLOOP": _lua_tforloop_effect,
         "TESTSET": _lua_testset_effect,
         "RETURN1": _lua_return1,
@@ -1105,6 +1161,7 @@ def _lua_decoded_instruction(instruction, source: SourceRef) -> VMDecodedInstruc
         source=source,
         operands=tuple(VMOperand(role=_lua_operand_role(operand), value=operand, text=operand) for operand in instruction.operands),
         raw=f"{instruction.pc}: {instruction.opcode} {' '.join(instruction.operands)}".strip(),
+        artifact_range=(None if instruction.artifact_offset is None or instruction.size is None else ByteRange(instruction.artifact_offset, instruction.size)),
     )
 
 
@@ -1117,6 +1174,20 @@ def _lua_operand_role(operand: str):
 
 
 def _lua_instruction_hints(listing: LuaFunctionListing, instruction, source: SourceRef) -> tuple[VMHint, ...]:
+    if instruction.opcode == "LFALSESKIP":
+        # Lua's skip instruction advances over the following instruction when
+        # the assigned false value is consumed. Preserve that edge as a
+        # neutral hint; core owns the actual CFG recovery.
+        return (
+            VMHint(
+                kind="branch-target",
+                source=source,
+                target=instruction.pc + 2,
+                label=instruction.opcode,
+                detail="target-if-false",
+                flow="unconditional",
+            ),
+        )
     if instruction.opcode in CONDITIONAL_OPS:
         return (
             VMHint(

{unidecompiler_plugin_lua-0.1.1 → unidecompiler_plugin_lua-0.1.3}/src/unidecompiler_plugin_lua/luac.py

@@ -54,6 +54,8 @@ class LuaInstructionListing:
     opcode: str
     operands: tuple[str, ...]
     comment: str | None = None
+    artifact_offset: int | None = None
+    size: int | None = None
 
 
 @dataclass(frozen=True)

{unidecompiler_plugin_lua-0.1.1 → unidecompiler_plugin_lua-0.1.3}/src/unidecompiler_plugin_lua.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: unidecompiler-plugin-lua
-Version: 0.1.1
+Version: 0.1.3
 Summary: Lua 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.1
+Requires-Dist: unidecompiler<0.2.0,>=0.1.9
 
 # unidecompiler-plugin-lua
 

unidecompiler_plugin_lua-0.1.3/src/unidecompiler_plugin_lua.egg-info/requires.txt

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

unidecompiler_plugin_lua-0.1.1/src/unidecompiler_plugin_lua.egg-info/requires.txt

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