ISIL -> CIL Decompiler

Cpp2IL.Core/Api/Cpp2IlInstructionSet.cs

@@ -3,6 +3,7 @@
 using Cpp2IL.Core.Il2CppApiFunctions;
 using Cpp2IL.Core.ISIL;
 using Cpp2IL.Core.Model.Contexts;
+using Cpp2IL.Decompiler.IL;
 using LibCpp2IL.Metadata;
 
 namespace Cpp2IL.Core.Api;
@@ -34,6 +35,8 @@ public abstract class Cpp2IlInstructionSet
     /// <returns>An array of <see cref="IsilInstructionStatement"/> structs representing the functionality of this method in an instruction-set-independent manner.</returns>
     public abstract List<InstructionSetIndependentInstruction> GetIsilFromMethod(MethodAnalysisContext context);
 
+    public abstract List<Instruction> GetDecompilerIlFromMethod(MethodAnalysisContext context, out List<object> ilParams);
+
     /// <summary>
     /// Create and populate a BaseKeyFunctionAddresses object which can then be populated.
     /// </summary>

Cpp2IL.Core/Cpp2IL.Core.csproj

@@ -65,7 +65,8 @@
 
     <ItemGroup>
         <ProjectReference Include="..\LibCpp2IL\LibCpp2IL.csproj" />
-
+        <ProjectReference Include="..\Cpp2IL.Decompiler\Cpp2IL.Decompiler.csproj"/>
+
         <!--Future: Consider moving to its own project and moving the impl in cpp2il to a plugin-->
         <ProjectReference Include="..\StableNameDotNet\StableNameDotNet.csproj" />
     </ItemGroup>

Cpp2IL.Core/Cpp2IlCorePlugin.cs

@@ -16,7 +16,8 @@ public class Cpp2IlCorePlugin : Cpp2IlPlugin
 {
     public override string Name => "Cpp2IL Built-In";
 
-    public override string Description => "Core Cpp2IL plugin containing built-in instruction sets, binaries, and other core functionality.";
+    public override string Description =>
+        "Core Cpp2IL plugin containing built-in instruction sets, binaries, and other core functionality.";
 
     public override void OnLoad()
     {
@@ -50,6 +51,7 @@ public override void OnLoad()
         OutputFormatRegistry.Register<IsilDumpOutputFormat>();
         OutputFormatRegistry.Register<WasmMappingOutputFormat>();
         OutputFormatRegistry.Register<WasmNameSectionOutputFormat>();
+        OutputFormatRegistry.Register<IlOutputFormat>();
 
         Logger.VerboseNewline("\tRegistering built-in processing layers", "Core Plugin");
 
@@ -61,7 +63,8 @@ public override void OnLoad()
         ProcessingLayerRegistry.Register<DeobfuscationMapProcessingLayer>();
 
         var elapsed = DateTime.Now - start;
-        Logger.VerboseNewline($"Core plugin loaded in {elapsed.Ticks} ticks ({elapsed.TotalMilliseconds}ms)", "Core Plugin");
+        Logger.VerboseNewline($"Core plugin loaded in {elapsed.Ticks} ticks ({elapsed.TotalMilliseconds}ms)",
+            "Core Plugin");
     }
 
     private sealed class AsmResolverDllOutputFormatLegacy : AsmResolverDllOutputFormatDefault

Cpp2IL.Core/InstructionSets/Arm64InstructionSet.cs

@@ -8,6 +8,7 @@
 using Cpp2IL.Core.ISIL;
 using Cpp2IL.Core.Model.Contexts;
 using Cpp2IL.Core.Utils;
+using Cpp2IL.Decompiler.IL;
 using LibCpp2IL;
 
 namespace Cpp2IL.Core.InstructionSets;
@@ -38,6 +39,12 @@ public override List<InstructionSetIndependentInstruction> GetIsilFromMethod(Met
         return [];
     }
 
+    public override List<Instruction> GetDecompilerIlFromMethod(MethodAnalysisContext context, out List<object> ilParams)
+    {
+        ilParams = [];
+        return [];
+    }
+
     public override BaseKeyFunctionAddresses CreateKeyFunctionAddressesInstance() => new Arm64KeyFunctionAddresses();
 
     public override string PrintAssembly(MethodAnalysisContext context)

Cpp2IL.Core/InstructionSets/ArmV7InstructionSet.cs

@@ -8,6 +8,7 @@
 using Cpp2IL.Core.ISIL;
 using Cpp2IL.Core.Model.Contexts;
 using Cpp2IL.Core.Utils;
+using Cpp2IL.Decompiler.IL;
 
 namespace Cpp2IL.Core.InstructionSets;
 
@@ -28,6 +29,12 @@ public override List<InstructionSetIndependentInstruction> GetIsilFromMethod(Met
         return [];
     }
 
+    public override List<Instruction> GetDecompilerIlFromMethod(MethodAnalysisContext context, out List<object> ilParams)
+    {
+        ilParams = [];
+        return [];
+    }
+
     public override BaseKeyFunctionAddresses CreateKeyFunctionAddressesInstance()
     {
         //TODO Fix

Cpp2IL.Core/InstructionSets/NewArmV8InstructionSet.cs

@@ -8,6 +8,7 @@
 using Cpp2IL.Core.ISIL;
 using Cpp2IL.Core.Model.Contexts;
 using Cpp2IL.Core.Utils;
+using Cpp2IL.Decompiler.IL;
 using Disarm.InternalDisassembly;
 using LibCpp2IL;
 
@@ -57,6 +58,12 @@ public override List<InstructionSetIndependentInstruction> GetIsilFromMethod(Met
         return builder.BackingStatementList;
     }
 
+    public override List<Instruction> GetDecompilerIlFromMethod(MethodAnalysisContext context, out List<object> ilParams)
+    {
+        ilParams = [];
+        return [];
+    }
+
     private void ConvertInstructionStatement(Arm64Instruction instruction, IsilBuilder builder, MethodAnalysisContext context)
     {
         switch (instruction.Mnemonic)

Cpp2IL.Core/InstructionSets/WasmInstructionSet.cs

@@ -6,6 +6,7 @@
 using Cpp2IL.Core.Logging;
 using Cpp2IL.Core.Model.Contexts;
 using Cpp2IL.Core.Utils;
+using Cpp2IL.Decompiler.IL;
 using WasmDisassembler;
 
 namespace Cpp2IL.Core.InstructionSets;
@@ -38,6 +39,12 @@ public override List<InstructionSetIndependentInstruction> GetIsilFromMethod(Met
         return [];
     }
 
+    public override List<Instruction> GetDecompilerIlFromMethod(MethodAnalysisContext context, out List<object> ilParams)
+    {
+        ilParams = [];
+        return [];
+    }
+
     public override BaseKeyFunctionAddresses CreateKeyFunctionAddressesInstance()
     {
         return new WasmKeyFunctionAddresses();