clanker-assisted refactor to remove static state

Author: Xpl0itR

Cpp2IL.Core.Tests/Cpp2IlApiTests.cs

@@ -1,5 +1,3 @@
-using NUnit.Framework;
-
 namespace Cpp2IL.Core.Tests;
 
 public class Cpp2IlApiTests

Cpp2IL.Core/Api/Cpp2IlPlugin.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using Cpp2IL.Core.Logging;
 using LibCpp2IL;
 
 namespace Cpp2IL.Core.Api;

Cpp2IL.Core/Cpp2IlApi.cs

@@ -51,7 +51,7 @@ public static void ConfigureLib(bool allowUserToInputAddresses)
         LibCpp2IlMain.Settings.MetadataFixupFunc = Cpp2IlPluginManager.MetadataFixupFuncs is { } funcs ? (originalBytes, version) =>
         {
             Logger.InfoNewline("Received request for metadata fixup from LibCpp2Il. Calling registered plugin fixup functions...");
-            
+
             foreach (var func in funcs)
             {
                 try
@@ -68,7 +68,7 @@ public static void ConfigureLib(bool allowUserToInputAddresses)
                     Logger.ErrorNewline($"Metadata fixup function threw an exception: {e}. Ignoring and trying next fixup function, if any...");
                 }
             }
-            
+
             //only get here if every fixup function returns null or throws.
             return null;
         } : null;
@@ -85,20 +85,16 @@ public static void InitializeLibCpp2Il(string assemblyPath, string metadataPath,
 
         ConfigureLib(allowUserToInputAddresses);
 
-#if !DEBUG
-            try
-            {
-#endif
-        if (!LibCpp2IlMain.LoadFromFile(assemblyPath, metadataPath, unityVersion))
-            throw new Exception("Initialization with LibCpp2Il failed");
-#if !DEBUG
-            }
-            catch (Exception e)
-            {
-                throw new LibCpp2ILInitializationException("Fatal Exception initializing LibCpp2IL!", e);
-            }
-#endif
-        OnLibInitialized();
+        try
+        {
+            var context = LibCpp2IlMain.LoadFromFileAsContext(assemblyPath, metadataPath, unityVersion);
+            OnLibInitialized(context);
+        }
+        catch (Exception e)
+        {
+            throw new LibCpp2ILInitializationException("Fatal Exception initializing LibCpp2IL!", e);
+        }
+
     }
 
     [MemberNotNull(nameof(CurrentAppContext))]
@@ -112,27 +108,24 @@ public static void InitializeLibCpp2Il(byte[] assemblyData, byte[] metadataData,
 
         try
         {
-            if (!LibCpp2IlMain.Initialize(assemblyData, metadataData, unityVersion))
-                throw new Exception("Initialization with LibCpp2Il failed");
+            var context = LibCpp2IlMain.InitializeAsContext(assemblyData, metadataData, unityVersion);
+            OnLibInitialized(context);
         }
         catch (Exception e)
         {
             throw new LibCpp2ILInitializationException("Fatal Exception initializing LibCpp2IL!", e);
         }
-
-        OnLibInitialized();
     }
 
     [MemberNotNull(nameof(CurrentAppContext))]
-    private static void OnLibInitialized()
+    private static void OnLibInitialized(LibCpp2IlContext libContext)
     {
-        MiscUtils.Init();
-        LibCpp2IlMain.Binary!.AllCustomAttributeGenerators.ToList()
+        libContext.Binary.AllCustomAttributeGenerators.ToList()
             .ForEach(ptr => SharedState.AttributeGeneratorStarts.Add(ptr));
 
         var start = DateTime.Now;
         Logger.InfoNewline("Creating application model...");
-        CurrentAppContext = new(LibCpp2IlMain.Binary, LibCpp2IlMain.TheMetadata!);
+        CurrentAppContext = new(libContext);
         Logger.InfoNewline($"Application model created in {(DateTime.Now - start).TotalMilliseconds}ms");
     }
 
@@ -144,8 +137,6 @@ public static void ResetInternalState()
 
         AsmResolverUtils.Reset();
 
-        LibCpp2IlMain.Reset();
-
         CurrentAppContext = null;
     }
 
@@ -176,6 +167,6 @@ public static void ResetInternalState()
 
     private static bool IsLibInitialized()
     {
-        return LibCpp2IlMain.Binary != null && LibCpp2IlMain.TheMetadata != null;
+        return CurrentAppContext != null;
     }
 }

Cpp2IL.Core/Exceptions/UnsupportedInstructionSetException.cs

@@ -1,9 +1,8 @@
-using System;
-using LibCpp2IL;
+using System;
 
 namespace Cpp2IL.Core.Exceptions;
 
-public class UnsupportedInstructionSetException : Exception
+public class UnsupportedInstructionSetException(string? instructionSetId = null) : Exception
 {
-    public override string Message => $"This action is not supported on the {LibCpp2IlMain.Binary?.InstructionSetId} instruction set yet. If running the CLI, try adding the --skip-analysis argument.";
+    public override string Message => $"This action is not supported on the {instructionSetId ?? "unknown"} instruction set yet. If running the CLI, try adding the --skip-analysis argument.";
 }

Cpp2IL.Core/Graphs/ISILControlFlowGraph.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using System.Text;
 using Cpp2IL.Core.ISIL;
 
 namespace Cpp2IL.Core.Graphs;

Cpp2IL.Core/Graphs/Processors/CallProcessor.cs

@@ -1,4 +1,3 @@
-using System.Linq;
 using Cpp2IL.Core.Il2CppApiFunctions;
 using Cpp2IL.Core.ISIL;
 using Cpp2IL.Core.Model.Contexts;

Cpp2IL.Core/Graphs/Processors/MetadataProcessor.cs

@@ -1,8 +1,6 @@
-using System.Linq;
 using Cpp2IL.Core.ISIL;
 using Cpp2IL.Core.Model.Contexts;
 using Cpp2IL.Core.Utils;
-using LibCpp2IL;
 
 namespace Cpp2IL.Core.Graphs.Processors;
 
@@ -26,11 +24,11 @@ public void Process(MethodAnalysisContext methodAnalysisContext, Block block)
             var memoryOp = (IsilMemoryOperand)instruction.Operands[1].Data;
             if (memoryOp.Base == null && memoryOp.Index == null && memoryOp.Scale == 0)
             {
-                var val = LibCpp2IlMain.GetLiteralByAddress((ulong)memoryOp.Addend);
+                var val = methodAnalysisContext.AppContext.LibCpp2IlContext.GetLiteralByAddress((ulong)memoryOp.Addend);
                 if (val == null)
                 {
                     // Try instead check if its type metadata usage
-                    var metadataUsage = LibCpp2IlMain.GetTypeGlobalByAddress((ulong)memoryOp.Addend);
+                    var metadataUsage = methodAnalysisContext.AppContext.LibCpp2IlContext.GetTypeGlobalByAddress((ulong)memoryOp.Addend);
                     if (metadataUsage != null && methodAnalysisContext.DeclaringType is not null)
                     {
                         var typeAnalysisContext = metadataUsage.ToContext(methodAnalysisContext.DeclaringType!.DeclaringAssembly);

Cpp2IL.Core/ISIL/InstructionSetIndependentInstruction.cs

@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-
 namespace Cpp2IL.Core.ISIL;
 
 public class InstructionSetIndependentInstruction : IsilOperandData

Cpp2IL.Core/ISIL/InstructionSetIndependentOpCode.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Linq;
 using Cpp2IL.Core.Extensions;
 

Cpp2IL.Core/ISIL/IsilBuilder.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Cpp2IL.Core.Exceptions;
 
 namespace Cpp2IL.Core.ISIL;