core: Finish actually removing static state

Author: SamboyCoding

Cpp2IL.Core/Analysis/WriteBarrierRecovery.cs

@@ -138,7 +138,7 @@ private static ulong FindBarrierFlagAddress(ApplicationAnalysisContext appContex
 
         try
         {
-            foreach (var instruction in X86Utils.GetMethodBodyAtVirtAddressNew(barrier, false, appContext.Binary))
+            foreach (var instruction in X86Utils.GetMethodBodyAtVirtAddressNew(barrier, false, appContext))
             {
                 if (instruction is { Mnemonic: Iced.Intel.Mnemonic.Cmp, Op0Kind: Iced.Intel.OpKind.Memory }
                     && instruction.MemoryIndex == Iced.Intel.Register.None

Cpp2IL.Core/Cpp2IL.Core.csproj

@@ -49,7 +49,7 @@
         <!--For X86/X64 disassembly-->
         <PackageReference Include="Iced" Version="1.21.0" />
 
-        <!--For ARM64 and ARMv7 disassembly. Future: Remove once disarm is stable and move ARMv7 to CapstoneSharp by 6pak-->
+        <!--For ARMv7 disassembly only. Future: replace with a disarm equivalent-->
         <PackageReference Include="AssetRipper.Gee.External.Capstone" Version="2.3.2" />
 
         <!--Not used at runtime, but needed for the build-->

Cpp2IL.Core/Cpp2IlApi.cs

@@ -1,14 +1,11 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
-using System.Linq;
 using System.Runtime.CompilerServices;
 using AssetRipper.Primitives;
 using Cpp2IL.Core.Exceptions;
 using Cpp2IL.Core.Logging;
 using Cpp2IL.Core.Model.Contexts;
-using Cpp2IL.Core.Utils;
-using Cpp2IL.Core.Utils.AsmResolver;
 using LibCpp2IL;
 using LibCpp2IL.Logging;
 
@@ -124,9 +121,6 @@ public static void InitializeLibCpp2Il(byte[] assemblyData, byte[] metadataData,
     [MemberNotNull(nameof(CurrentAppContext))]
     private static void OnLibInitialized(LibCpp2IlContext libContext)
     {
-        libContext.Binary.AllCustomAttributeGenerators.ToList()
-            .ForEach(ptr => SharedState.AttributeGeneratorStarts.Add(ptr));
-
         var start = DateTime.Now;
         Logger.InfoNewline("Creating application model...");
         CurrentAppContext = new(libContext);
@@ -135,40 +129,9 @@ private static void OnLibInitialized(LibCpp2IlContext libContext)
 
     public static void ResetInternalState()
     {
-        SharedState.Clear();
-
-        MiscUtils.Reset();
-
-        AsmResolverUtils.Reset();
-
         CurrentAppContext = null;
     }
 
-    // public static void PopulateConcreteImplementations()
-    // {
-    //     CheckLibInitialized();
-    //
-    //     Logger.InfoNewline("Populating Concrete Implementation Table...");
-    //
-    //     foreach (var def in LibCpp2IlMain.TheMetadata!.typeDefs)
-    //     {
-    //         if (def.IsAbstract)
-    //             continue;
-    //
-    //         var baseTypeReflectionData = def.BaseType;
-    //         while (baseTypeReflectionData != null)
-    //         {
-    //             if (baseTypeReflectionData.baseType == null)
-    //                 break;
-    //
-    //             if (baseTypeReflectionData.isType && baseTypeReflectionData.baseType.IsAbstract && !SharedState.ConcreteImplementations.ContainsKey(baseTypeReflectionData.baseType))
-    //                 SharedState.ConcreteImplementations[baseTypeReflectionData.baseType] = def;
-    //
-    //             baseTypeReflectionData = baseTypeReflectionData.baseType.BaseType;
-    //         }
-    //     }
-    // }
-
     private static bool IsLibInitialized()
     {
         return CurrentAppContext != null;

Cpp2IL.Core/Cpp2IlCorePlugin.cs

@@ -30,10 +30,7 @@ public override void OnLoad()
         InstructionSetRegistry.RegisterInstructionSet<WasmInstructionSet>(DefaultInstructionSets.WASM);
         InstructionSetRegistry.RegisterInstructionSet<ArmV7InstructionSet>(DefaultInstructionSets.ARM_V7);
 
-        if (Environment.GetEnvironmentVariable("CPP2IL_LEGACY_ARM64") != null)
-            InstructionSetRegistry.RegisterInstructionSet<Arm64InstructionSet>(DefaultInstructionSets.ARM_V8);
-        else
-            InstructionSetRegistry.RegisterInstructionSet<NewArmV8InstructionSet>(DefaultInstructionSets.ARM_V8);
+        InstructionSetRegistry.RegisterInstructionSet<NewArmV8InstructionSet>(DefaultInstructionSets.ARM_V8);
 
         Logger.VerboseNewline("\tRegistering built-in binary parsers...", "Core Plugin");
 

Cpp2IL.Core/Extensions/MiscExtensions.cs

@@ -4,7 +4,6 @@
 using System.Linq;
 using System.Text;
 using Gee.External.Capstone.Arm;
-using Gee.External.Capstone.Arm64;
 using Iced.Intel;
 using Instruction = Iced.Intel.Instruction;
 
@@ -29,16 +28,6 @@ public static class MiscExtensions
     public static ArmRegister? MemoryIndex(this ArmInstruction instruction) => MemoryOperand(instruction)?.Memory.Index;
     public static int MemoryOffset(this ArmInstruction instruction) => MemoryOperand(instruction)?.Memory.Displacement ?? 0;
 
-    //Arm64 Extensions
-    public static Arm64Register? RegisterSafe(this Arm64Operand operand) => operand.Type != Arm64OperandType.Register ? null : operand.Register;
-    public static bool IsImmediate(this Arm64Operand operand) => operand.Type is Arm64OperandType.CImmediate or Arm64OperandType.Immediate;
-    public static long ImmediateSafe(this Arm64Operand operand) => operand.IsImmediate() ? operand.Immediate : 0;
-    internal static Arm64Operand? MemoryOperand(this Arm64Instruction instruction) => instruction.Details.Operands.FirstOrDefault(a => a.Type == Arm64OperandType.Memory);
-
-    public static Arm64Register? MemoryBase(this Arm64Instruction instruction) => instruction.MemoryOperand()?.Memory.Base;
-    public static Arm64Register? MemoryIndex(this Arm64Instruction instruction) => instruction.MemoryOperand()?.Memory.Index;
-    public static int MemoryOffset(this Arm64Instruction instruction) => instruction.MemoryOperand()?.Memory.Displacement ?? 0;
-
     public static bool IsConditionalMove(this Instruction instruction)
     {
         switch (instruction.Mnemonic)