unidecompiler-plugin-dotnet-cli 0.1.0__tar.gz → 0.1.2__tar.gz

{unidecompiler_plugin_dotnet_cli-0.1.0 → unidecompiler_plugin_dotnet_cli-0.1.2}/PKG-INFO

@@ -1,10 +1,15 @@
 Metadata-Version: 2.4
 Name: unidecompiler-plugin-dotnet-cli
-Version: 0.1.0
+Version: 0.1.2
 Summary: .NET CLI assembly frontend plugin for unidecompiler
+Author-email: Wker <1670133844@qq.com>
+License-Expression: AGPL-3.0-or-later
+Project-URL: Homepage, https://github.com/Wker666/unidecompiler
+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.0
+Requires-Dist: unidecompiler<0.2.0,>=0.1.2
 Requires-Dist: dnfile<1,>=0.15
 
 # unidecompiler-plugin-dotnet-cli

{unidecompiler_plugin_dotnet_cli-0.1.0 → unidecompiler_plugin_dotnet_cli-0.1.2}/pyproject.toml

@@ -4,11 +4,18 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "unidecompiler-plugin-dotnet-cli"
-version = "0.1.0"
+version = "0.1.2"
 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.0,<0.2.0", "dnfile>=0.15,<1"]
+dependencies = ["unidecompiler>=0.1.2,<0.2.0", "dnfile>=0.15,<1"]
+
+[project.urls]
+Homepage = "https://github.com/Wker666/unidecompiler"
+Repository = "https://github.com/Wker666/unidecompiler"
+Issues = "https://github.com/Wker666/unidecompiler/issues"
 
 [project.entry-points."unidecompiler.frontends"]
 dotnet-cli = "unidecompiler_plugin_dotnet_cli.plugin:DotNetFrontendPlugin"

{unidecompiler_plugin_dotnet_cli-0.1.0 → unidecompiler_plugin_dotnet_cli-0.1.2}/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.0 → unidecompiler_plugin_dotnet_cli-0.1.2}/src/unidecompiler_plugin_dotnet_cli/lifter.py

@@ -30,6 +30,7 @@ from unidecompiler.core.vm_function import VMFunctionSpec, lift_steps, lift_vm_s
 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,
@@ -199,16 +200,40 @@ def _dotnet_unknown_opcode_effect(
     return (UnknownOpcode(source=source, opcode=instruction.opcode, raw=_dotnet_raw_instruction_line(instruction)),)
 
 
-def _dotnet_binary(op: str):
+def _dotnet_numeric_facts(opcode: str) -> tuple[str, int | None]:
+    if opcode.endswith(".un") or opcode == "shr.un":
+        return "unsigned", 32
+    return "default", None
+
+
+def _dotnet_binary(opcode: str, op: str):
     def factory(_method: DotNetMethodListing, _instruction: DotNetInstruction, source: SourceRef) -> tuple:
-        return (Binary(source=source, op=op, semantics="static"),)
+        numeric_domain, bit_width = _dotnet_numeric_facts(opcode)
+        return (
+            Binary(
+                source=source,
+                op=op,
+                semantics="static",
+                numeric_domain=numeric_domain,
+                bit_width=bit_width,
+            ),
+        )
 
     return factory
 
 
-def _dotnet_compare(op: str):
+def _dotnet_compare(opcode: str, op: str):
     def factory(_method: DotNetMethodListing, _instruction: DotNetInstruction, source: SourceRef) -> tuple:
-        return (Binary(source=source, op=op, semantics="static"),)
+        numeric_domain, bit_width = _dotnet_numeric_facts(opcode)
+        return (
+            Binary(
+                source=source,
+                op=op,
+                semantics="static",
+                numeric_domain=numeric_domain,
+                bit_width=bit_width,
+            ),
+        )
 
     return factory
 
@@ -304,8 +329,8 @@ DOTNET_EFFECT_TABLE = VMEffectTable(
     opcode_attr="opcode",
     ignored=frozenset(IGNORED_OPS),
     exact={
-        **{opcode: _dotnet_binary(op) for opcode, op in BINARY_OPS.items()},
-        **{opcode: _dotnet_compare(op) for opcode, op in COMPARE_OPS.items()},
+        **{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)),),
         "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),),
@@ -527,6 +552,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.0 → unidecompiler_plugin_dotnet_cli-0.1.2}/src/unidecompiler_plugin_dotnet_cli/plugin.py

@@ -8,6 +8,7 @@ from unidecompiler_plugin_dotnet_cli.assembly import (
     looks_like_dotnet,
 )
 from unidecompiler_plugin_dotnet_cli.lifter import lift_dotnet_assembly
+from unidecompiler_plugin_dotnet_cli.simulation import DotNetSimulationAdapter
 from unidecompiler_plugin_dotnet_cli.support import DOTNET_CLI_VERSION_SUPPORT
 
 
@@ -16,6 +17,7 @@ class DotNetFrontendPlugin:
     display_name = ".NET CLI assembly"
     supported_inputs = (".dll", ".exe")
     version_support = DOTNET_CLI_VERSION_SUPPORT
+    simulation_adapter = DotNetSimulationAdapter
 
     def __init__(self, decoder: DotNetAssemblyDecoder | None = None) -> None:
         self.decoder = decoder or DnfileAssemblyDecoder()

unidecompiler_plugin_dotnet_cli-0.1.2/src/unidecompiler_plugin_dotnet_cli/simulation.py

@@ -0,0 +1,53 @@
+"""Optional .NET method lookup for the decoupled generic IR simulator."""
+
+from __future__ import annotations
+
+
+class DotNetSimulationAdapter:
+    frontend_id = "dotnet-cli"
+
+    def resolve_function(self, query, decoded_module, lifted_module):
+        from unidecompiler_simulator import NotHandled, ResolvedFunction
+
+        if not isinstance(query, str):
+            return NotHandled
+        method_name = query.rsplit(".", 1)[-1]
+        context = self._function_context(lifted_module.functions)
+        matches = context.get(method_name, ())
+        if len(matches) != 1:
+            return NotHandled
+        return ResolvedFunction(matches[0], context=context, identifier=query)
+
+    def resolve_global(self, name, context):
+        from unidecompiler_simulator import NotHandled, ResolvedFunction
+
+        if not isinstance(context, dict):
+            return NotHandled
+        matches = context.get(name.rsplit(".", 1)[-1], ())
+        if len(matches) != 1:
+            return NotHandled
+        return ResolvedFunction(matches[0], context=context, identifier=name)
+
+    def list_simulation_targets(self, decoded_module, lifted_module):
+        from unidecompiler_simulator import SimulationTargetCandidate
+
+        context = self._function_context(lifted_module.functions)
+        return tuple(
+            SimulationTargetCandidate(name, name)
+            for name, matches in context.items()
+            if len(matches) == 1
+        )
+
+    def get_attr(self, obj, attr, context):
+        from unidecompiler_simulator import NotHandled
+
+        if attr == "length" and isinstance(obj, (list, tuple, str, bytes)):
+            return len(obj)
+        return NotHandled
+
+    @staticmethod
+    def _function_context(functions):
+        context = {}
+        for function in functions:
+            context.setdefault(function.name, []).append(function)
+        return {name: tuple(matches) for name, matches in context.items()}

{unidecompiler_plugin_dotnet_cli-0.1.0 → unidecompiler_plugin_dotnet_cli-0.1.2}/src/unidecompiler_plugin_dotnet_cli.egg-info/PKG-INFO

@@ -1,10 +1,15 @@
 Metadata-Version: 2.4
 Name: unidecompiler-plugin-dotnet-cli
-Version: 0.1.0
+Version: 0.1.2
 Summary: .NET CLI assembly frontend plugin for unidecompiler
+Author-email: Wker <1670133844@qq.com>
+License-Expression: AGPL-3.0-or-later
+Project-URL: Homepage, https://github.com/Wker666/unidecompiler
+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.0
+Requires-Dist: unidecompiler<0.2.0,>=0.1.2
 Requires-Dist: dnfile<1,>=0.15
 
 # unidecompiler-plugin-dotnet-cli

{unidecompiler_plugin_dotnet_cli-0.1.0 → unidecompiler_plugin_dotnet_cli-0.1.2}/src/unidecompiler_plugin_dotnet_cli.egg-info/SOURCES.txt

@@ -4,6 +4,7 @@ src/unidecompiler_plugin_dotnet_cli/__init__.py
 src/unidecompiler_plugin_dotnet_cli/assembly.py
 src/unidecompiler_plugin_dotnet_cli/lifter.py
 src/unidecompiler_plugin_dotnet_cli/plugin.py
+src/unidecompiler_plugin_dotnet_cli/simulation.py
 src/unidecompiler_plugin_dotnet_cli/support.py
 src/unidecompiler_plugin_dotnet_cli.egg-info/PKG-INFO
 src/unidecompiler_plugin_dotnet_cli.egg-info/SOURCES.txt

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

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

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

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