Refactor Il2CppBinary and related components

Author: Xpl0itR

Cpp2IL.Core/Api/Cpp2IlInstructionSet.cs

@@ -15,7 +15,7 @@ public abstract class Cpp2IlInstructionSet
     /// <param name="context">The method to get the body for</param>
     /// <param name="isAttributeGenerator">True if this is an attribute generator function, false if it's a managed method</param>
     /// <returns>A byte array representing the method's body</returns>
-    public abstract Memory<byte> GetRawBytesForMethod(MethodAnalysisContext context, bool isAttributeGenerator);
+    public abstract ReadOnlyMemory<byte> GetRawBytesForMethod(MethodAnalysisContext context, bool isAttributeGenerator);
 
     /// <summary>
     /// Returns the virtual address from which the given method starts. By default, returns the <see cref="Il2CppMethodDefinition.MethodPointer"/> property, but

Cpp2IL.Core/Extensions/EnumerableExtensions.cs

@@ -17,18 +17,18 @@ public static IEnumerable<T> MaybeAppend<T>(this IEnumerable<T> enumerable, T? i
         return enumerable;
     }
 
-    public static MemoryEnumerable<T> AsEnumerable<T>(this Memory<T> memory) => new(memory);
+    public static MemoryEnumerable<T> AsEnumerable<T>(this ReadOnlyMemory<T> memory) => new(memory);
 
-    public static MemoryEnumerator<T> GetEnumerator<T>(this Memory<T> memory) => new(memory);
+    public static MemoryEnumerator<T> GetEnumerator<T>(this ReadOnlyMemory<T> memory) => new(memory);
 
-    public class MemoryEnumerable<T>(Memory<T> memory) : IEnumerable<T>
+    public class MemoryEnumerable<T>(ReadOnlyMemory<T> memory) : IEnumerable<T>
     {
         public IEnumerator<T> GetEnumerator() => new MemoryEnumerator<T>(memory);
 
         IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
     }
 
-    public class MemoryEnumerator<T>(Memory<T> memory) : IEnumerator<T>
+    public class MemoryEnumerator<T>(ReadOnlyMemory<T> memory) : IEnumerator<T>
     {
         private int _index = -1;
 

Cpp2IL.Core/Extensions/MiscExtensions.cs

@@ -161,7 +161,7 @@ public static IEnumerable<T> Peek<T>(this IEnumerable<T> enumerable, Action<T> a
         });
     }
 
-    public static unsafe uint ReadUInt(this Span<byte> span, int start)
+    public static unsafe uint ReadUInt(this ReadOnlySpan<byte> span, int start)
     {
         if (start >= span.Length)
             throw new ArgumentOutOfRangeException(nameof(start), $"start=[{start}], mem.Length=[{span.Length}]");

Cpp2IL.Core/Il2CppApiFunctions/Arm64KeyFunctionAddresses.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Cpp2IL.Core.Extensions;
@@ -47,7 +47,7 @@ protected override void Init(ApplicationAnalysisContext context)
                 var oldLength = primaryExecutableSection.Length;
 
                 var toRemove = (int)(attributeGeneratorList[^1] - primaryExecutableSectionVa);
-                primaryExecutableSection = primaryExecutableSection.Skip(toRemove).ToArray();
+                primaryExecutableSection = primaryExecutableSection.Slice(toRemove);
 
                 primaryExecutableSectionVa = attributeGeneratorList[^1];
 
@@ -80,7 +80,7 @@ protected override void Init(ApplicationAnalysisContext context)
                     oldLength = primaryExecutableSection.Length;
 
                     toRemove = (int)(startFrom - primaryExecutableSectionVa);
-                    primaryExecutableSection = primaryExecutableSection.Skip(toRemove).ToArray();
+                    primaryExecutableSection = primaryExecutableSection.Slice(toRemove);
 
                     primaryExecutableSectionVa = startFrom;
 
@@ -100,7 +100,7 @@ protected override void Init(ApplicationAnalysisContext context)
                     oldLength = primaryExecutableSection.Length;
 
                     toRemove = (int)(startFrom - primaryExecutableSectionVa);
-                    primaryExecutableSection = primaryExecutableSection.Skip(toRemove).ToArray();
+                    primaryExecutableSection = primaryExecutableSection.Slice(toRemove);
 
                     primaryExecutableSectionVa = startFrom;
 
@@ -116,7 +116,7 @@ protected override void Init(ApplicationAnalysisContext context)
                 var oldLength = primaryExecutableSection.Length;
 
                 var toKeep = (int)(attributeGeneratorList[^1] - primaryExecutableSectionVa);
-                primaryExecutableSection = primaryExecutableSection.SubArray(..toKeep);
+                primaryExecutableSection = primaryExecutableSection[..toKeep];
 
                 //This doesn't change, we've trimmed the end, not the beginning
                 // primaryExecutableSectionVa = primaryExecutableSectionVa;
@@ -125,7 +125,7 @@ protected override void Init(ApplicationAnalysisContext context)
             }
         }
 
-        _allInstructions = disassembler.Disassemble(primaryExecutableSection, (long)primaryExecutableSectionVa).ToList();
+        _allInstructions = disassembler.Disassemble(primaryExecutableSection.ToArray(), (long)primaryExecutableSectionVa).ToList();
     }
 
     protected override IEnumerable<ulong> FindAllThunkFunctions(ulong addr, uint maxBytesBack = 0, params ulong[] addressesToIgnore)

Cpp2IL.Core/InstructionSets/Arm64InstructionSet.cs

@@ -14,7 +14,7 @@ namespace Cpp2IL.Core.InstructionSets;
 
 public class Arm64InstructionSet : Cpp2IlInstructionSet
 {
-    public override Memory<byte> GetRawBytesForMethod(MethodAnalysisContext context, bool isAttributeGenerator)
+    public override ReadOnlyMemory<byte> GetRawBytesForMethod(MethodAnalysisContext context, bool isAttributeGenerator)
     {
         //Avoid use of capstone where possible
         if (true || context is not ConcreteGenericMethodAnalysisContext)
@@ -25,7 +25,7 @@ public override Memory<byte> GetRawBytesForMethod(MethodAnalysisContext context,
             var count = startOfNextFunction - ptrAsInt;
 
             if (startOfNextFunction > 0)
-                return LibCpp2IlMain.Binary!.GetRawBinaryContent().AsMemory(ptrAsInt, count);
+                return LibCpp2IlMain.Binary!.GetRawBinaryContent().Slice(ptrAsInt, count);
         }
 
         var instructions = Arm64Utils.GetArm64MethodBodyAtVirtualAddress(context.UnderlyingPointer);

Cpp2IL.Core/InstructionSets/ArmV7InstructionSet.cs

@@ -13,7 +13,7 @@ namespace Cpp2IL.Core.InstructionSets;
 
 public class ArmV7InstructionSet : Cpp2IlInstructionSet
 {
-    public override Memory<byte> GetRawBytesForMethod(MethodAnalysisContext context, bool isAttributeGenerator)
+    public override ReadOnlyMemory<byte> GetRawBytesForMethod(MethodAnalysisContext context, bool isAttributeGenerator)
     {
         if (ArmV7Utils.TryGetMethodBodyBytesFast(context.UnderlyingPointer, context is AttributeGeneratorMethodAnalysisContext) is { } ret)
             return ret;

Cpp2IL.Core/InstructionSets/NewArmV8InstructionSet.cs

@@ -18,7 +18,7 @@ public class NewArmV8InstructionSet : Cpp2IlInstructionSet
     [ThreadStatic]
     private static Dictionary<Arm64Register, ulong> adrpOffsets = new();
 
-    public override Memory<byte> GetRawBytesForMethod(MethodAnalysisContext context, bool isAttributeGenerator)
+    public override ReadOnlyMemory<byte> GetRawBytesForMethod(MethodAnalysisContext context, bool isAttributeGenerator)
     {
         if (context is not ConcreteGenericMethodAnalysisContext)
         {
@@ -28,7 +28,7 @@ public override Memory<byte> GetRawBytesForMethod(MethodAnalysisContext context,
             var count = startOfNextFunction - ptrAsInt;
 
             if (startOfNextFunction > 0)
-                return LibCpp2IlMain.Binary!.GetRawBinaryContent().AsMemory(ptrAsInt, count);
+                return LibCpp2IlMain.Binary!.GetRawBinaryContent().Slice(ptrAsInt, count);
         }
 
         var result = NewArm64Utils.GetArm64MethodBodyAtVirtualAddress(context.UnderlyingPointer);
@@ -43,7 +43,7 @@ public override Memory<byte> GetRawBytesForMethod(MethodAnalysisContext context,
         if (start < 0 || end < 0 || start >= context.AppContext.Binary.RawLength || end >= context.AppContext.Binary.RawLength)
             throw new Exception($"Failed to map virtual address 0x{context.UnderlyingPointer:X} to raw address for method {context!.DeclaringType?.FullName}/{context.Name} - start: 0x{start:X}, end: 0x{end:X} are out of bounds for length {context.AppContext.Binary.RawLength}.");
 
-        return context.AppContext.Binary.GetRawBinaryContent().AsMemory(start, end - start);
+        return context.AppContext.Binary.GetRawBinaryContent().Slice(start, end - start);
     }
 
     public override List<InstructionSetIndependentInstruction> GetIsilFromMethod(MethodAnalysisContext context)

Cpp2IL.Core/InstructionSets/WasmInstructionSet.cs

@@ -12,7 +12,7 @@ namespace Cpp2IL.Core.InstructionSets;
 
 public class WasmInstructionSet : Cpp2IlInstructionSet
 {
-    public override Memory<byte> GetRawBytesForMethod(MethodAnalysisContext context, bool isAttributeGenerator)
+    public override ReadOnlyMemory<byte> GetRawBytesForMethod(MethodAnalysisContext context, bool isAttributeGenerator)
     {
         if (context.Definition is { } methodDefinition)
         {

Cpp2IL.Core/InstructionSets/X86InstructionSet.cs

@@ -33,7 +33,7 @@ public static string FormatInstruction(Instruction instruction)
         }
     }
 
-    public override Memory<byte> GetRawBytesForMethod(MethodAnalysisContext context, bool isAttributeGenerator) => X86Utils.GetRawManagedOrCaCacheGenMethodBody(context.UnderlyingPointer, isAttributeGenerator);
+    public override ReadOnlyMemory<byte> GetRawBytesForMethod(MethodAnalysisContext context, bool isAttributeGenerator) => X86Utils.GetRawManagedOrCaCacheGenMethodBody(context.UnderlyingPointer, isAttributeGenerator);
 
     public override BaseKeyFunctionAddresses CreateKeyFunctionAddressesInstance() => new X86KeyFunctionAddresses();
 

Cpp2IL.Core/Model/Contexts/HasCustomAttributes.cs

@@ -25,7 +25,7 @@ public abstract class HasCustomAttributes(uint token, ApplicationAnalysisContext
     /// <summary>
     /// On V29, stores the custom attribute blob. Pre-29, stores the bytes for the custom attribute generator function.
     /// </summary>
-    public Memory<byte> RawIl2CppCustomAttributeData = Memory<byte>.Empty;
+    public ReadOnlyMemory<byte> RawIl2CppCustomAttributeData = ReadOnlyMemory<byte>.Empty;
 
     /// <summary>
     /// Stores the analyzed custom attribute data once analysis has actually run.