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

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

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

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

@@ -4,13 +4,13 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "unidecompiler-plugin-dotnet-cli"
-version = "0.1.1"
+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.1,<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"

{unidecompiler_plugin_dotnet_cli-0.1.1 → 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.1 → 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,
@@ -551,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.1 → unidecompiler_plugin_dotnet_cli-0.1.2}/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.2
 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.2
 Requires-Dist: dnfile<1,>=0.15
 
 # unidecompiler-plugin-dotnet-cli

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.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