Rework metadata struct loading to use new struct versioning
This commit is contained in:
@@ -8,6 +8,7 @@
|
||||
using Il2CppInspector.Next;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Collections.Immutable;
|
||||
using System.Diagnostics;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
@@ -37,16 +38,16 @@ namespace Il2CppInspector
|
||||
public ulong CodeRegistrationPointer { get; private set; }
|
||||
public ulong MetadataRegistrationPointer { get; private set; }
|
||||
public ulong RegistrationFunctionPointer { get; private set; }
|
||||
public Dictionary<string, ulong> CodeGenModulePointers { get; } = new Dictionary<string, ulong>();
|
||||
public Dictionary<string, ulong> CodeGenModulePointers { get; } = new();
|
||||
|
||||
// Only for <=v24.1
|
||||
public ulong[] GlobalMethodPointers { get; set; }
|
||||
|
||||
// Only for >=v24.2
|
||||
public Dictionary<Il2CppCodeGenModule, ulong[]> ModuleMethodPointers { get; set; } = new Dictionary<Il2CppCodeGenModule, ulong[]>();
|
||||
public Dictionary<Il2CppCodeGenModule, ulong[]> ModuleMethodPointers { get; set; } = new();
|
||||
|
||||
// Only for >=v24.2. In earlier versions, invoker indices are stored in Il2CppMethodDefinition in the metadata file
|
||||
public Dictionary<Il2CppCodeGenModule, int[]> MethodInvokerIndices { get; set; } = new Dictionary<Il2CppCodeGenModule, int[]>();
|
||||
public Dictionary<Il2CppCodeGenModule, ImmutableArray<int>> MethodInvokerIndices { get; set; } = new();
|
||||
|
||||
// NOTE: In versions <21 and earlier releases of v21, use FieldOffsets:
|
||||
// global field index => field offset
|
||||
@@ -54,7 +55,7 @@ namespace Il2CppInspector
|
||||
// type index => RVA in image where the list of field offsets for the type start (4 bytes per field)
|
||||
|
||||
// Negative field offsets from start of each function
|
||||
public uint[] FieldOffsets { get; private set; }
|
||||
public ImmutableArray<uint> FieldOffsets { get; private set; }
|
||||
|
||||
// Pointers to field offsets
|
||||
public long[] FieldOffsetPointers { get; private set; }
|
||||
@@ -68,13 +69,13 @@ namespace Il2CppInspector
|
||||
public ulong[] MethodInvokePointers { get; private set; }
|
||||
|
||||
// Version 16 and below: method references for vtable
|
||||
public uint[] VTableMethodReferences { get; private set; }
|
||||
public ImmutableArray<uint> VTableMethodReferences { get; private set; }
|
||||
|
||||
// Generic method specs for vtables
|
||||
public Il2CppMethodSpec[] MethodSpecs { get; private set; }
|
||||
public ImmutableArray<Il2CppMethodSpec> MethodSpecs { get; private set; }
|
||||
|
||||
// List of run-time concrete generic class and method signatures
|
||||
public List<Il2CppGenericInst> GenericInstances { get; private set; }
|
||||
public ImmutableArray<Il2CppGenericInst> GenericInstances { get; private set; }
|
||||
|
||||
// List of constructed generic method function pointers corresponding to each possible method instantiation
|
||||
public Dictionary<Il2CppMethodSpec, ulong> GenericMethodPointers { get; } = new Dictionary<Il2CppMethodSpec, ulong>();
|
||||
@@ -83,7 +84,7 @@ namespace Il2CppInspector
|
||||
public Dictionary<Il2CppMethodSpec, int> GenericMethodInvokerIndices { get; } = new Dictionary<Il2CppMethodSpec, int>();
|
||||
|
||||
// Every type reference (TypeRef) sorted by index
|
||||
public List<Il2CppType> TypeReferences { get; private set; }
|
||||
public ImmutableArray<Il2CppType> TypeReferences { get; private set; }
|
||||
|
||||
// Every type reference index sorted by virtual address
|
||||
public Dictionary<ulong, int> TypeReferenceIndicesByAddress { get; private set; }
|
||||
@@ -92,7 +93,7 @@ namespace Il2CppInspector
|
||||
// One assembly may contain multiple modules
|
||||
public Dictionary<string, Il2CppCodeGenModule> Modules { get; private set; }
|
||||
|
||||
public List<Il2CppTypeDefinitionSizes> TypeDefinitionSizes { get; private set; }
|
||||
public ImmutableArray<Il2CppTypeDefinitionSizes> TypeDefinitionSizes { get; private set; }
|
||||
|
||||
// Status update callback
|
||||
private EventHandler<string> OnStatusUpdate { get; set; }
|
||||
@@ -280,30 +281,8 @@ namespace Il2CppInspector
|
||||
Console.WriteLine("MetadataRegistration struct found at 0x{0:X16} (file offset 0x{1:X8})", Image.Bits == 32 ? metadataRegistration & 0xffff_ffff : metadataRegistration, Image.MapVATR(metadataRegistration));
|
||||
|
||||
// Root structures from which we find everything else
|
||||
CodeRegistration = Image.ReadMappedObject<Il2CppCodeRegistration>(codeRegistration);
|
||||
MetadataRegistration = Image.ReadMappedObject<Il2CppMetadataRegistration>(metadataRegistration);
|
||||
|
||||
// genericAdjustorThunks was inserted before invokerPointersCount in 24.5 and 27.1
|
||||
// pointer expected if we need to bump version
|
||||
if (Image.Version == MetadataVersions.V244 && CodeRegistration.InvokerPointersCount > 0x50000)
|
||||
{
|
||||
Image.Version = MetadataVersions.V245;
|
||||
CodeRegistration = Image.ReadMappedObject<Il2CppCodeRegistration>(codeRegistration);
|
||||
}
|
||||
|
||||
if (Image.Version == MetadataVersions.V244 && CodeRegistration.ReversePInvokeWrapperCount > 0x50000) {
|
||||
Image.Version = MetadataVersions.V245;
|
||||
codeRegistration -= 1 * pointerSize;
|
||||
CodeRegistration = Image.ReadMappedObject<Il2CppCodeRegistration>(codeRegistration);
|
||||
}
|
||||
|
||||
if ((Image.Version == MetadataVersions.V290 || Image.Version == MetadataVersions.V310) &&
|
||||
(long)CodeRegistration.GenericMethodPointersCount - MetadataRegistration.GenericMethodTableCount > 0x10000)
|
||||
{
|
||||
Image.Version = new StructVersion(Image.Version.Major, 1, Image.Version.Tag);
|
||||
codeRegistration -= 2 * pointerSize;
|
||||
CodeRegistration = Image.ReadMappedObject<Il2CppCodeRegistration>(codeRegistration);
|
||||
}
|
||||
CodeRegistration = Image.ReadMappedVersionedObject<Il2CppCodeRegistration>(codeRegistration);
|
||||
MetadataRegistration = Image.ReadMappedVersionedObject<Il2CppMetadataRegistration>(metadataRegistration);
|
||||
|
||||
// Plugin hook to pre-process binary
|
||||
isModified |= PluginHooks.PreProcessBinary(this).IsStreamModified;
|
||||
@@ -326,7 +305,7 @@ namespace Il2CppInspector
|
||||
|
||||
// The global method pointer list was deprecated in v24.2 in favour of Il2CppCodeGenModule
|
||||
if (Image.Version <= MetadataVersions.V241)
|
||||
GlobalMethodPointers = Image.ReadMappedArray<ulong>(CodeRegistration.MethodPointers, (int) CodeRegistration.MethodPointersCount);
|
||||
GlobalMethodPointers = Image.ReadMappedUWordArray(CodeRegistration.MethodPointers, (int) CodeRegistration.MethodPointersCount);
|
||||
|
||||
// After v24 method pointers and RGCTX data were stored in Il2CppCodeGenModules
|
||||
if (Image.Version >= MetadataVersions.V242) {
|
||||
@@ -336,12 +315,12 @@ namespace Il2CppInspector
|
||||
// if this changes we'll have to get smarter about disambiguating these two.
|
||||
if (CodeRegistration.CodeGenModulesCount == 0) {
|
||||
Image.Version = MetadataVersions.V243;
|
||||
CodeRegistration = Image.ReadMappedObject<Il2CppCodeRegistration>(codeRegistration);
|
||||
CodeRegistration = Image.ReadMappedVersionedObject<Il2CppCodeRegistration>(codeRegistration);
|
||||
}
|
||||
|
||||
// Array of pointers to Il2CppCodeGenModule
|
||||
var codeGenModulePointers = Image.ReadMappedArray<ulong>(CodeRegistration.CodeGenModules, (int) CodeRegistration.CodeGenModulesCount);
|
||||
var modules = Image.ReadMappedObjectPointerArray<Il2CppCodeGenModule>(CodeRegistration.CodeGenModules, (int) CodeRegistration.CodeGenModulesCount);
|
||||
var codeGenModulePointers = Image.ReadMappedUWordArray(CodeRegistration.CodeGenModules, (int) CodeRegistration.CodeGenModulesCount);
|
||||
var modules = Image.ReadMappedVersionedObjectPointerArray<Il2CppCodeGenModule>(CodeRegistration.CodeGenModules, (int) CodeRegistration.CodeGenModulesCount);
|
||||
|
||||
foreach (var mp in modules.Zip(codeGenModulePointers, (m, p) => new { Module = m, Pointer = p })) {
|
||||
var module = mp.Module;
|
||||
@@ -355,13 +334,13 @@ namespace Il2CppInspector
|
||||
// the entire method pointer array will be NULL values, causing the methodPointer to be mapped to .bss
|
||||
// and therefore out of scope of the binary image
|
||||
try {
|
||||
ModuleMethodPointers.Add(module, Image.ReadMappedArray<ulong>(module.MethodPointers, (int) module.MethodPointerCount));
|
||||
ModuleMethodPointers.Add(module, Image.ReadMappedUWordArray(module.MethodPointers, (int) module.MethodPointerCount));
|
||||
} catch (InvalidOperationException) {
|
||||
ModuleMethodPointers.Add(module, new ulong[module.MethodPointerCount]);
|
||||
}
|
||||
|
||||
// Read method invoker pointer indices - one per method
|
||||
MethodInvokerIndices.Add(module, Image.ReadMappedArray<int>(module.InvokerIndices, (int) module.MethodPointerCount));
|
||||
MethodInvokerIndices.Add(module, Image.ReadMappedPrimitiveArray<int>(module.InvokerIndices, (int) module.MethodPointerCount));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -381,24 +360,24 @@ namespace Il2CppInspector
|
||||
|
||||
// All older versions use values directly in the array
|
||||
if (!fieldOffsetsArePointers)
|
||||
FieldOffsets = Image.ReadMappedArray<uint>(MetadataRegistration.FieldOffsets, (int)MetadataRegistration.FieldOffsetsCount);
|
||||
FieldOffsets = Image.ReadMappedPrimitiveArray<uint>(MetadataRegistration.FieldOffsets, (int)MetadataRegistration.FieldOffsetsCount);
|
||||
else
|
||||
FieldOffsetPointers = Image.ReadMappedWordArray(MetadataRegistration.FieldOffsets, (int)MetadataRegistration.FieldOffsetsCount);
|
||||
|
||||
// Type references (pointer array)
|
||||
var typeRefPointers = Image.ReadMappedArray<ulong>(MetadataRegistration.Types, (int) MetadataRegistration.TypesCount);
|
||||
var typeRefPointers = Image.ReadMappedUWordArray(MetadataRegistration.Types, (int) MetadataRegistration.TypesCount);
|
||||
TypeReferenceIndicesByAddress = typeRefPointers.Zip(Enumerable.Range(0, typeRefPointers.Length), (a, i) => new { a, i }).ToDictionary(x => x.a, x => x.i);
|
||||
|
||||
TypeReferences = Image.ReadMappedObjectPointerArray<Il2CppType>(MetadataRegistration.Types, (int)MetadataRegistration.TypesCount);
|
||||
TypeReferences = Image.ReadMappedVersionedObjectPointerArray<Il2CppType>(MetadataRegistration.Types, (int)MetadataRegistration.TypesCount);
|
||||
|
||||
// Custom attribute constructors (function pointers)
|
||||
// This is managed in Il2CppInspector for metadata >= 27
|
||||
if (Image.Version < MetadataVersions.V270) {
|
||||
CustomAttributeGenerators = Image.ReadMappedArray<ulong>(CodeRegistration.CustomAttributeGenerators, (int) CodeRegistration.CustomAttributeCount);
|
||||
CustomAttributeGenerators = Image.ReadMappedUWordArray(CodeRegistration.CustomAttributeGenerators, (int) CodeRegistration.CustomAttributeCount);
|
||||
}
|
||||
|
||||
// Method.Invoke function pointers
|
||||
MethodInvokePointers = Image.ReadMappedArray<ulong>(CodeRegistration.InvokerPointers, (int) CodeRegistration.InvokerPointersCount);
|
||||
MethodInvokePointers = Image.ReadMappedUWordArray(CodeRegistration.InvokerPointers, (int) CodeRegistration.InvokerPointersCount);
|
||||
|
||||
// TODO: Function pointers as shown below
|
||||
// reversePInvokeWrappers
|
||||
@@ -408,24 +387,24 @@ namespace Il2CppInspector
|
||||
// >=23: interopData
|
||||
|
||||
if (Image.Version < MetadataVersions.V190) {
|
||||
VTableMethodReferences = Image.ReadMappedArray<uint>(MetadataRegistration.MethodReferences, (int)MetadataRegistration.MethodReferencesCount);
|
||||
VTableMethodReferences = Image.ReadMappedPrimitiveArray<uint>(MetadataRegistration.MethodReferences, (int)MetadataRegistration.MethodReferencesCount);
|
||||
}
|
||||
|
||||
// Generic type and method specs (open and closed constructed types)
|
||||
MethodSpecs = Image.ReadMappedArray<Il2CppMethodSpec>(MetadataRegistration.MethodSpecs, (int) MetadataRegistration.MethodSpecsCount);
|
||||
MethodSpecs = Image.ReadMappedVersionedObjectArray<Il2CppMethodSpec>(MetadataRegistration.MethodSpecs, (int) MetadataRegistration.MethodSpecsCount);
|
||||
|
||||
// Concrete generic class and method signatures
|
||||
GenericInstances = Image.ReadMappedObjectPointerArray<Il2CppGenericInst>(MetadataRegistration.GenericInsts, (int) MetadataRegistration.GenericInstsCount);
|
||||
GenericInstances = Image.ReadMappedVersionedObjectPointerArray<Il2CppGenericInst>(MetadataRegistration.GenericInsts, (int) MetadataRegistration.GenericInstsCount);
|
||||
|
||||
// Concrete generic method pointers
|
||||
var genericMethodPointers = Image.ReadMappedArray<ulong>(CodeRegistration.GenericMethodPointers, (int) CodeRegistration.GenericMethodPointersCount);
|
||||
var genericMethodTable = Image.ReadMappedArray<Il2CppGenericMethodFunctionsDefinitions>(MetadataRegistration.GenericMethodTable, (int) MetadataRegistration.GenericMethodTableCount);
|
||||
var genericMethodPointers = Image.ReadMappedUWordArray(CodeRegistration.GenericMethodPointers, (int) CodeRegistration.GenericMethodPointersCount);
|
||||
var genericMethodTable = Image.ReadMappedVersionedObjectArray<Il2CppGenericMethodFunctionsDefinitions>(MetadataRegistration.GenericMethodTable, (int) MetadataRegistration.GenericMethodTableCount);
|
||||
foreach (var tableEntry in genericMethodTable) {
|
||||
GenericMethodPointers.Add(MethodSpecs[tableEntry.GenericMethodIndex], genericMethodPointers[tableEntry.Indices.MethodIndex]);
|
||||
GenericMethodInvokerIndices.Add(MethodSpecs[tableEntry.GenericMethodIndex], tableEntry.Indices.InvokerIndex);
|
||||
}
|
||||
|
||||
TypeDefinitionSizes = Image.ReadMappedObjectPointerArray<Il2CppTypeDefinitionSizes>(
|
||||
TypeDefinitionSizes = Image.ReadMappedVersionedObjectPointerArray<Il2CppTypeDefinitionSizes>(
|
||||
MetadataRegistration.TypeDefinitionsSizes, (int) MetadataRegistration.TypeDefinitionsSizesCount);
|
||||
|
||||
// Plugin hook to pre-process binary
|
||||
|
||||
Reference in New Issue
Block a user