unidecompiler-plugin-dotnet-cli 0.1.1__tar.gz → 0.1.3__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: unidecompiler-plugin-dotnet-cli
-Version: 0.1.1
+Version: 0.1.3
 Summary: .NET CLI assembly 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
 Requires-Dist: dnfile<1,>=0.15
 
 # unidecompiler-plugin-dotnet-cli

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

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

{unidecompiler_plugin_dotnet_cli-0.1.1 → unidecompiler_plugin_dotnet_cli-0.1.3}/src/unidecompiler_plugin_dotnet_cli/assembly.py

@@ -26,6 +26,8 @@ class DotNetInstruction:
     arg_count: int | None = None
     returns_void: bool | None = None
     is_static: bool | None = None
+    artifact_offset: int | None = None
+    size: int | None = None
 
 
 @dataclass(frozen=True)
@@ -132,7 +134,7 @@ def _method_listing(pe, row_index: int, row) -> DotNetMethodListing:
         param_count=_signature_param_count(row.Signature),
         max_stack=None if body is None else body.max_stack,
         code_size=0 if body is None else len(body.code),
-        instructions=() if body is None else _decode_il(pe, body.code),
+        instructions=() if body is None else _decode_il(pe, body.code, body.artifact_offset),
     )
 
 
@@ -140,6 +142,7 @@ def _method_listing(pe, row_index: int, row) -> DotNetMethodListing:
 class _MethodBody:
     max_stack: int
     code: bytes
+    artifact_offset: int | None
 
 
 def _read_method_body(pe, rva: int) -> _MethodBody | None:
@@ -150,7 +153,7 @@ def _read_method_body(pe, rva: int) -> _MethodBody | None:
     kind = first & 0x3
     if kind == 0x2:
         code_size = first >> 2
-        return _MethodBody(max_stack=8, code=pe.get_data(rva + 1, code_size))
+        return _MethodBody(max_stack=8, code=pe.get_data(rva + 1, code_size), artifact_offset=_artifact_offset(pe, rva + 1))
     if kind == 0x3:
         header = pe.get_data(rva, 12)
         if len(header) < 12:
@@ -159,7 +162,7 @@ def _read_method_body(pe, rva: int) -> _MethodBody | None:
         header_size = (_flags_size >> 12) * 4
         if header_size < 12:
             return None
-        return _MethodBody(max_stack=max_stack, code=pe.get_data(rva + header_size, code_size))
+        return _MethodBody(max_stack=max_stack, code=pe.get_data(rva + header_size, code_size), artifact_offset=_artifact_offset(pe, rva + header_size))
     return None
 
 
@@ -428,7 +431,14 @@ _TWO_BYTE_OPCODES = {
 }
 
 
-def _decode_il(pe, code: bytes) -> tuple[DotNetInstruction, ...]:
+def _artifact_offset(pe, rva: int) -> int | None:
+    try:
+        return int(pe.get_offset_from_rva(rva))
+    except Exception:
+        return None
+
+
+def _decode_il(pe, code: bytes, artifact_offset: int | None = None) -> tuple[DotNetInstruction, ...]:
     instructions: list[DotNetInstruction] = []
     offset = 0
     while offset < len(code):
@@ -454,6 +464,8 @@ def _decode_il(pe, code: bytes) -> tuple[DotNetInstruction, ...]:
                 arg_count=operand.arg_count,
                 returns_void=operand.returns_void,
                 is_static=operand.is_static,
+                artifact_offset=None if artifact_offset is None else artifact_offset + start,
+                size=offset - start,
             )
         )
     return tuple(instructions)

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

@@ -6,6 +6,7 @@ from unidecompiler.core.effects import (
     BuildCall,
     CallTopAs,
     DuplicateTop,
+    Emit,
     InvokeMember,
     LoadIndirect,
     LoadAttr,
@@ -15,6 +16,7 @@ from unidecompiler.core.effects import (
     Pop,
     Push,
     RaiseTop,
+    ReraiseTop,
     ReturnTop,
     StoreAttr,
     StoreIndirect,
@@ -23,13 +25,14 @@ from unidecompiler.core.effects import (
     StoreStaticMember,
     UnknownOpcode,
 )
-from unidecompiler.core.ir import BinaryOp, Const, Expr, Global, IndirectRef, SourceRef, Var
+from unidecompiler.core.ir import BinaryOp, Const, Expr, Global, IndirectRef, SourceRef, Unsupported, Var
 from unidecompiler.core.vm_bytecode import VMBytecodeStep
 from unidecompiler.core.vm_effect_table import VMEffectRule, VMEffectTable
 from unidecompiler.core.vm_function import VMFunctionSpec, lift_steps, lift_vm_step_function, recover_vm_function
 from unidecompiler.core.vm_hints import VMHint
 from unidecompiler.core.vm_module import assemble_vm_module
 from unidecompiler.core.vm_operands import VMDecodedInstruction, VMOperand
+from unidecompiler.provenance import ByteRange
 from unidecompiler.core.vm_region import (
     VMLinearState,
     VMRegionOpcodeClasses,
@@ -151,38 +154,7 @@ IGNORED_OPS = {
     "volatile.",
     "unaligned.",
     "prefix",
-    "castclass",
-    "box",
-    "unbox",
-    "unbox.any",
-    "conv.i",
-    "conv.i1",
-    "conv.i2",
-    "conv.i4",
-    "conv.i8",
-    "conv.u",
-    "conv.u1",
-    "conv.u2",
-    "conv.u4",
-    "conv.u8",
-    "conv.r4",
-    "conv.r8",
-    "conv.r.un",
-    "conv.ovf.i",
-    "conv.ovf.i.un",
-    "conv.ovf.i1.un",
-    "conv.ovf.i2.un",
-    "conv.ovf.i4.un",
-    "conv.ovf.i8.un",
-    "conv.ovf.u",
-    "conv.ovf.u.un",
-    "conv.ovf.u1.un",
-    "conv.ovf.u2.un",
-    "conv.ovf.u4.un",
-    "conv.ovf.u8.un",
     "endfinally",
-    "endfilter",
-    "rethrow",
     *CONTROL_OPS,
 }
 
@@ -249,6 +221,13 @@ def _dotnet_load_local_effect(method: DotNetMethodListing, instruction: DotNetIn
     if index is None:
         return None
     name = _local_name(method, index)
+    if instruction.opcode.startswith("ldloca"):
+        return (
+            Push(
+                source=source,
+                value=IndirectRef(source=source, target=Var(name=name, source=source)),
+            ),
+        )
     return (LoadLocal(source=source, name=name, fallback=Var(name=name, source=source)),)
 
 
@@ -324,6 +303,36 @@ def _dotnet_call(_method: DotNetMethodListing, instruction: DotNetInstruction, s
     )
 
 
+def _dotnet_operation_call(arg_count: int, *, returns: int = 0):
+    def factory(
+        _method: DotNetMethodListing,
+        instruction: DotNetInstruction,
+        source: SourceRef,
+    ) -> tuple:
+        suffix = f"<{instruction.operands}>" if instruction.operands else ""
+        return (
+            BuildCall(
+                source=source,
+                callee=Global(name=f"{instruction.opcode}{suffix}", source=source),
+                arg_count=arg_count,
+                returns=returns,
+            ),
+        )
+
+    return factory
+
+
+def _dotnet_unary_operation(_method, instruction, source: SourceRef) -> tuple:
+    # Keep the CLI operation name neutral and readable.  Operand metadata is
+    # already retained on the decoded instruction; embedding the Python tuple
+    # representation in the callee name prevents generic intrinsic handling.
+    return (CallTopAs(source=source, callee_name=instruction.opcode),)
+
+
+def _dotnet_unsupported_operation(_method, instruction, source: SourceRef) -> tuple:
+    return (Emit(source=source, statement=Unsupported(source=source, message="unsupported CLI control operation", detail=instruction.opcode, raw=(_dotnet_raw_instruction_line(instruction),))),)
+
+
 DOTNET_EFFECT_TABLE = VMEffectTable(
     opcode_attr="opcode",
     ignored=frozenset(IGNORED_OPS),
@@ -331,6 +340,12 @@ DOTNET_EFFECT_TABLE = VMEffectTable(
         **{opcode: _dotnet_binary(opcode, op) for opcode, op in BINARY_OPS.items()},
         **{opcode: _dotnet_compare(opcode, op) for opcode, op in COMPARE_OPS.items()},
         "ldnull": lambda _method, _instruction, source: (Push(source=source, value=Const(value=None, source=source)),),
+        **{opcode: _dotnet_unary_operation for opcode in {
+            "castclass", "box", "unbox", "unbox.any", "conv.i", "conv.i1", "conv.i2", "conv.i4", "conv.i8",
+            "conv.u", "conv.u1", "conv.u2", "conv.u4", "conv.u8", "conv.r4", "conv.r8", "conv.r.un",
+            "conv.ovf.i", "conv.ovf.i.un", "conv.ovf.i1.un", "conv.ovf.i2.un", "conv.ovf.i4.un", "conv.ovf.i8.un",
+            "conv.ovf.u", "conv.ovf.u.un", "conv.ovf.u1.un", "conv.ovf.u2.un", "conv.ovf.u4.un", "conv.ovf.u8.un",
+        }},
         "dup": lambda _method, instruction, source: (DuplicateTop(source=source, materialized_name=f"local_stack_{instruction.offset}"),),
         "pop": lambda _method, _instruction, source: (Pop(source=source, count=1, emit_calls=True),),
         "neg": lambda _method, _instruction, source: (CallTopAs(source=source, callee_name="neg"),),
@@ -341,12 +356,12 @@ DOTNET_EFFECT_TABLE = VMEffectTable(
         "jmp": _dotnet_call,
         "ldftn": lambda _method, instruction, source: (Push(source=source, value=Global(name=_member_token_name(instruction.operands), source=source)),),
         "ldvirtftn": lambda _method, instruction, source: (Push(source=source, value=Global(name=_member_token_name(instruction.operands), source=source)),),
-        "initobj": lambda _method, _instruction, source: (Pop(source=source, count=1, allow_missing=True),),
+        "initobj": _dotnet_operation_call(1),
         "arglist": lambda _method, _instruction, source: (Push(source=source, value=Global(name="arglist", source=source)),),
         "ckfinite": lambda _method, _instruction, source: (CallTopAs(source=source, callee_name="check_finite"),),
-        "cpblk": lambda _method, _instruction, source: (Pop(source=source, count=3, allow_missing=True),),
-        "cpobj": lambda _method, _instruction, source: (Pop(source=source, count=2, allow_missing=True),),
-        "initblk": lambda _method, _instruction, source: (Pop(source=source, count=3, allow_missing=True),),
+        "cpblk": _dotnet_operation_call(3),
+        "cpobj": _dotnet_operation_call(2),
+        "initblk": _dotnet_operation_call(3),
         "localloc": lambda _method, _instruction, source: (BuildCall(source=source, callee=Global(name="localloc", source=source), arg_count=1),),
         "mkrefany": lambda _method, instruction, source: (BuildCall(source=source, callee=Global(name=f"mkrefany<{instruction.operands or 'type'}>", source=source), arg_count=1),),
         "refanytype": lambda _method, _instruction, source: (CallTopAs(source=source, callee_name="refanytype"),),
@@ -355,7 +370,7 @@ DOTNET_EFFECT_TABLE = VMEffectTable(
         "ldstr": lambda _method, instruction, source: (Push(source=source, value=Const(value=instruction.operands, source=source)),),
         "ldtoken": lambda _method, instruction, source: (Push(source=source, value=Global(name=instruction.operands, source=source)),),
         "isinst": lambda _method, instruction, source: (BuildCall(source=source, callee=Global(name="instanceof", source=source), arg_count=1, returns=1),),
-        "ldobj": lambda _method, instruction, source: (Pop(source=source, count=1, allow_missing=True), Push(source=source, value=Global(name=_member_token_name(instruction.operands), source=source))),
+        "ldobj": _dotnet_operation_call(1, returns=1),
         "ldfld": lambda _method, instruction, source: (LoadAttr(source=source, attr=_member_name(instruction)),),
         "ldflda": lambda _method, instruction, source: (LoadAttr(source=source, attr=_member_name(instruction)),),
         "stfld": lambda _method, instruction, source: (StoreAttr(source=source, attr=_member_name(instruction)),),
@@ -371,6 +386,8 @@ DOTNET_EFFECT_TABLE = VMEffectTable(
         "ldlen": lambda _method, _instruction, source: (LoadAttr(source=source, attr="length"),),
         "newarr": lambda _method, instruction, source: (BuildArrayCall(source=source, kind=instruction.operands or "array"),),
         "throw": lambda _method, _instruction, source: (RaiseTop(source=source),),
+        "rethrow": lambda _method, _instruction, source: (ReraiseTop(source=source),),
+        "endfilter": _dotnet_unsupported_operation,
         "ret": lambda _method, _instruction, source: (ReturnTop(source=source, empty_is_void=True),),
     },
     rules=(
@@ -551,6 +568,7 @@ def _dotnet_decoded_instruction(instruction: DotNetInstruction, source: SourceRe
         source=source,
         operands=operands,
         raw=_dotnet_raw_instruction_line(instruction),
+        artifact_range=(None if instruction.artifact_offset is None or instruction.size is None else ByteRange(instruction.artifact_offset, instruction.size)),
     )
 
 

{unidecompiler_plugin_dotnet_cli-0.1.1 → unidecompiler_plugin_dotnet_cli-0.1.3}/src/unidecompiler_plugin_dotnet_cli/simulation.py

@@ -19,7 +19,12 @@ class DotNetSimulationAdapter:
         return ResolvedFunction(matches[0], context=context, identifier=query)
 
     def resolve_global(self, name, context):
-        from unidecompiler_simulator import NotHandled, ResolvedFunction
+        from unidecompiler_simulator import IntrinsicCall, NotHandled, ResolvedFunction
+
+        # Conversion and unary operation names emitted by the generic lifter
+        # are pure value intrinsics, not methods in the lifted module.
+        if name.startswith(("conv.", "castclass", "box", "unbox", "neg", "bitnot", "check_finite", "refanytype")):
+            return IntrinsicCall(name)
 
         if not isinstance(context, dict):
             return NotHandled

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: unidecompiler-plugin-dotnet-cli
-Version: 0.1.1
+Version: 0.1.3
 Summary: .NET CLI assembly 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
 Requires-Dist: dnfile<1,>=0.15
 
 # unidecompiler-plugin-dotnet-cli

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

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

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

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