Rework metadata struct loading to use new struct versioning
This commit is contained in:
@@ -7,6 +7,7 @@
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Collections.Immutable;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Reflection;
|
||||
@@ -21,30 +22,30 @@ namespace Il2CppInspector
|
||||
{
|
||||
public Il2CppGlobalMetadataHeader Header { get; set; }
|
||||
|
||||
public Il2CppAssemblyDefinition[] Assemblies { get; set; }
|
||||
public Il2CppImageDefinition[] Images { get; set; }
|
||||
public Il2CppTypeDefinition[] Types { get; set; }
|
||||
public Il2CppMethodDefinition[] Methods { get; set; }
|
||||
public Il2CppParameterDefinition[] Params { get; set; }
|
||||
public Il2CppFieldDefinition[] Fields { get; set; }
|
||||
public Il2CppFieldDefaultValue[] FieldDefaultValues { get; set; }
|
||||
public Il2CppParameterDefaultValue[] ParameterDefaultValues { get; set; }
|
||||
public Il2CppPropertyDefinition[] Properties { get; set; }
|
||||
public Il2CppEventDefinition[] Events { get; set; }
|
||||
public Il2CppGenericContainer[] GenericContainers { get; set; }
|
||||
public Il2CppGenericParameter[] GenericParameters { get; set; }
|
||||
public Il2CppCustomAttributeTypeRange[] AttributeTypeRanges { get; set; }
|
||||
public Il2CppCustomAttributeDataRange[] AttributeDataRanges { get; set; }
|
||||
public Il2CppInterfaceOffsetPair[] InterfaceOffsets { get; set; }
|
||||
public Il2CppMetadataUsageList[] MetadataUsageLists { get; set; }
|
||||
public Il2CppMetadataUsagePair[] MetadataUsagePairs { get; set; }
|
||||
public Il2CppFieldRef[] FieldRefs { get; set; }
|
||||
public ImmutableArray<Il2CppAssemblyDefinition> Assemblies { get; set; }
|
||||
public ImmutableArray<Il2CppImageDefinition> Images { get; set; }
|
||||
public ImmutableArray<Il2CppTypeDefinition> Types { get; set; }
|
||||
public ImmutableArray<Il2CppMethodDefinition> Methods { get; set; }
|
||||
public ImmutableArray<Il2CppParameterDefinition> Params { get; set; }
|
||||
public ImmutableArray<Il2CppFieldDefinition> Fields { get; set; }
|
||||
public ImmutableArray<Il2CppFieldDefaultValue> FieldDefaultValues { get; set; }
|
||||
public ImmutableArray<Il2CppParameterDefaultValue> ParameterDefaultValues { get; set; }
|
||||
public ImmutableArray<Il2CppPropertyDefinition> Properties { get; set; }
|
||||
public ImmutableArray<Il2CppEventDefinition> Events { get; set; }
|
||||
public ImmutableArray<Il2CppGenericContainer> GenericContainers { get; set; }
|
||||
public ImmutableArray<Il2CppGenericParameter> GenericParameters { get; set; }
|
||||
public ImmutableArray<Il2CppCustomAttributeTypeRange> AttributeTypeRanges { get; set; }
|
||||
public ImmutableArray<Il2CppCustomAttributeDataRange> AttributeDataRanges { get; set; }
|
||||
public ImmutableArray<Il2CppInterfaceOffsetPair> InterfaceOffsets { get; set; }
|
||||
public ImmutableArray<Il2CppMetadataUsageList> MetadataUsageLists { get; set; }
|
||||
public ImmutableArray<Il2CppMetadataUsagePair> MetadataUsagePairs { get; set; }
|
||||
public ImmutableArray<Il2CppFieldRef> FieldRefs { get; set; }
|
||||
|
||||
public int[] InterfaceUsageIndices { get; set; }
|
||||
public int[] NestedTypeIndices { get; set; }
|
||||
public int[] AttributeTypeIndices { get; set; }
|
||||
public int[] GenericConstraintIndices { get; set; }
|
||||
public uint[] VTableMethodIndices { get; set; }
|
||||
public ImmutableArray<int> InterfaceUsageIndices { get; set; }
|
||||
public ImmutableArray<int> NestedTypeIndices { get; set; }
|
||||
public ImmutableArray<int> AttributeTypeIndices { get; set; }
|
||||
public ImmutableArray<int> GenericConstraintIndices { get; set; }
|
||||
public ImmutableArray<uint> VTableMethodIndices { get; set; }
|
||||
public string[] StringLiterals { get; set; }
|
||||
|
||||
public Dictionary<int, string> Strings { get; private set; } = new Dictionary<int, string>();
|
||||
@@ -81,7 +82,7 @@ namespace Il2CppInspector
|
||||
StatusUpdate("Processing metadata");
|
||||
|
||||
// Read metadata header
|
||||
Header = ReadObject<Il2CppGlobalMetadataHeader>(0);
|
||||
Header = ReadVersionedObject<Il2CppGlobalMetadataHeader>(0);
|
||||
|
||||
// Check for correct magic bytes
|
||||
if (!Header.SanityValid) {
|
||||
@@ -96,7 +97,7 @@ namespace Il2CppInspector
|
||||
}
|
||||
|
||||
// Rewind and read metadata header with the correct version settings
|
||||
Header = ReadObject<Il2CppGlobalMetadataHeader>(0);
|
||||
Header = ReadVersionedObject<Il2CppGlobalMetadataHeader>(0);
|
||||
|
||||
// Sanity checking
|
||||
// Unity.IL2CPP.MetadataCacheWriter.WriteLibIl2CppMetadata always writes the metadata information in the same order it appears in the header,
|
||||
@@ -110,21 +111,21 @@ namespace Il2CppInspector
|
||||
if (!pluginResult.SkipValidation) {
|
||||
var realHeaderLength = Header.StringLiteralOffset;
|
||||
|
||||
if (realHeaderLength != Sizeof(typeof(Il2CppGlobalMetadataHeader))) {
|
||||
if (realHeaderLength != Sizeof<Il2CppGlobalMetadataHeader>()) {
|
||||
if (Version == MetadataVersions.V240) {
|
||||
Version = MetadataVersions.V242;
|
||||
Header = ReadObject<Il2CppGlobalMetadataHeader>(0);
|
||||
Header = ReadVersionedObject<Il2CppGlobalMetadataHeader>(0);
|
||||
}
|
||||
}
|
||||
|
||||
if (realHeaderLength != Sizeof(typeof(Il2CppGlobalMetadataHeader))) {
|
||||
if (realHeaderLength != Sizeof<Il2CppGlobalMetadataHeader>()) {
|
||||
throw new InvalidOperationException("Could not verify the integrity of the metadata file or accurately identify the metadata sub-version");
|
||||
}
|
||||
}
|
||||
|
||||
// Load all the relevant metadata using offsets provided in the header
|
||||
if (Version >= MetadataVersions.V160)
|
||||
Images = ReadArray<Il2CppImageDefinition>(Header.ImagesOffset, Header.ImagesSize / Sizeof(typeof(Il2CppImageDefinition)));
|
||||
Images = ReadVersionedObjectArray<Il2CppImageDefinition>(Header.ImagesOffset, Header.ImagesSize / Sizeof<Il2CppImageDefinition>());
|
||||
|
||||
// As an additional sanity check, all images in the metadata should have Mono.Cecil.MetadataToken == 1
|
||||
// In metadata v24.1, two extra fields were added which will cause the below test to fail.
|
||||
@@ -135,32 +136,32 @@ namespace Il2CppInspector
|
||||
Version = MetadataVersions.V241;
|
||||
|
||||
// No need to re-read the header, it's the same for both sub-versions
|
||||
Images = ReadArray<Il2CppImageDefinition>(Header.ImagesOffset, Header.ImagesSize / Sizeof(typeof(Il2CppImageDefinition)));
|
||||
Images = ReadVersionedObjectArray<Il2CppImageDefinition>(Header.ImagesOffset, Header.ImagesSize / Sizeof<Il2CppImageDefinition>());
|
||||
|
||||
if (Images.Any(x => x.Token != 1))
|
||||
throw new InvalidOperationException("Could not verify the integrity of the metadata file image list");
|
||||
}
|
||||
|
||||
Types = ReadArray<Il2CppTypeDefinition>(Header.TypeDefinitionsOffset, Header.TypeDefinitionsSize / Sizeof(typeof(Il2CppTypeDefinition)));
|
||||
Methods = ReadArray<Il2CppMethodDefinition>(Header.MethodsOffset, Header.MethodsSize / Sizeof(typeof(Il2CppMethodDefinition)));
|
||||
Params = ReadArray<Il2CppParameterDefinition>(Header.ParametersOffset, Header.ParametersSize / Sizeof(typeof(Il2CppParameterDefinition)));
|
||||
Fields = ReadArray<Il2CppFieldDefinition>(Header.FieldsOffset, Header.FieldsSize / Sizeof(typeof(Il2CppFieldDefinition)));
|
||||
FieldDefaultValues = ReadArray<Il2CppFieldDefaultValue>(Header.FieldDefaultValuesOffset, Header.FieldDefaultValuesSize / Sizeof(typeof(Il2CppFieldDefaultValue)));
|
||||
Properties = ReadArray<Il2CppPropertyDefinition>(Header.PropertiesOffset, Header.PropertiesSize / Sizeof(typeof(Il2CppPropertyDefinition)));
|
||||
Events = ReadArray<Il2CppEventDefinition>(Header.EventsOffset, Header.EventsSize / Sizeof(typeof(Il2CppEventDefinition)));
|
||||
InterfaceUsageIndices = ReadArray<int>(Header.InterfacesOffset, Header.InterfacesSize / sizeof(int));
|
||||
NestedTypeIndices = ReadArray<int>(Header.NestedTypesOffset, Header.NestedTypesSize / sizeof(int));
|
||||
GenericContainers = ReadArray<Il2CppGenericContainer>(Header.GenericContainersOffset, Header.GenericContainersSize / Sizeof(typeof(Il2CppGenericContainer)));
|
||||
GenericParameters = ReadArray<Il2CppGenericParameter>(Header.GenericParametersOffset, Header.GenericParametersSize / Sizeof(typeof(Il2CppGenericParameter)));
|
||||
GenericConstraintIndices = ReadArray<int>(Header.GenericParameterConstraintsOffset, Header.GenericParameterConstraintsSize / sizeof(int));
|
||||
InterfaceOffsets = ReadArray<Il2CppInterfaceOffsetPair>(Header.InterfaceOffsetsOffset, Header.InterfaceOffsetsSize / Sizeof(typeof(Il2CppInterfaceOffsetPair)));
|
||||
VTableMethodIndices = ReadArray<uint>(Header.VTableMethodsOffset, Header.VTableMethodsSize / sizeof(uint));
|
||||
Types = ReadVersionedObjectArray<Il2CppTypeDefinition>(Header.TypeDefinitionsOffset, Header.TypeDefinitionsSize / Sizeof<Il2CppTypeDefinition>());
|
||||
Methods = ReadVersionedObjectArray<Il2CppMethodDefinition>(Header.MethodsOffset, Header.MethodsSize / Sizeof<Il2CppMethodDefinition>());
|
||||
Params = ReadVersionedObjectArray<Il2CppParameterDefinition>(Header.ParametersOffset, Header.ParametersSize / Sizeof<Il2CppParameterDefinition>());
|
||||
Fields = ReadVersionedObjectArray<Il2CppFieldDefinition>(Header.FieldsOffset, Header.FieldsSize / Sizeof<Il2CppFieldDefinition>());
|
||||
FieldDefaultValues = ReadVersionedObjectArray<Il2CppFieldDefaultValue>(Header.FieldDefaultValuesOffset, Header.FieldDefaultValuesSize / Sizeof<Il2CppFieldDefaultValue>());
|
||||
Properties = ReadVersionedObjectArray<Il2CppPropertyDefinition>(Header.PropertiesOffset, Header.PropertiesSize / Sizeof<Il2CppPropertyDefinition>());
|
||||
Events = ReadVersionedObjectArray<Il2CppEventDefinition>(Header.EventsOffset, Header.EventsSize / Sizeof<Il2CppEventDefinition>());
|
||||
InterfaceUsageIndices = ReadPrimitiveArray<int>(Header.InterfacesOffset, Header.InterfacesSize / sizeof(int));
|
||||
NestedTypeIndices = ReadPrimitiveArray<int>(Header.NestedTypesOffset, Header.NestedTypesSize / sizeof(int));
|
||||
GenericContainers = ReadVersionedObjectArray<Il2CppGenericContainer>(Header.GenericContainersOffset, Header.GenericContainersSize / Sizeof<Il2CppGenericContainer>());
|
||||
GenericParameters = ReadVersionedObjectArray<Il2CppGenericParameter>(Header.GenericParametersOffset, Header.GenericParametersSize / Sizeof<Il2CppGenericParameter>());
|
||||
GenericConstraintIndices = ReadPrimitiveArray<int>(Header.GenericParameterConstraintsOffset, Header.GenericParameterConstraintsSize / sizeof(int));
|
||||
InterfaceOffsets = ReadVersionedObjectArray<Il2CppInterfaceOffsetPair>(Header.InterfaceOffsetsOffset, Header.InterfaceOffsetsSize / Sizeof<Il2CppInterfaceOffsetPair>());
|
||||
VTableMethodIndices = ReadPrimitiveArray<uint>(Header.VTableMethodsOffset, Header.VTableMethodsSize / sizeof(uint));
|
||||
|
||||
if (Version >= MetadataVersions.V160) {
|
||||
// In v24.4 hashValueIndex was removed from Il2CppAssemblyNameDefinition, which is a field in Il2CppAssemblyDefinition
|
||||
// The number of images and assemblies should be the same. If they are not, we deduce that we are using v24.4
|
||||
// Note the version comparison matches both 24.2 and 24.3 here since 24.3 is tested for during binary loading
|
||||
var assemblyCount = Header.AssembliesSize / Sizeof(typeof(Il2CppAssemblyDefinition));
|
||||
var assemblyCount = Header.AssembliesSize / Sizeof<Il2CppAssemblyDefinition>();
|
||||
var changedAssemblyDefStruct = false;
|
||||
if ((Version == MetadataVersions.V241 || Version == MetadataVersions.V242 || Version == MetadataVersions.V243) && assemblyCount < Images.Length)
|
||||
{
|
||||
@@ -169,29 +170,29 @@ namespace Il2CppInspector
|
||||
Version = MetadataVersions.V244;
|
||||
}
|
||||
|
||||
Assemblies = ReadArray<Il2CppAssemblyDefinition>(Header.AssembliesOffset, Images.Length);
|
||||
Assemblies = ReadVersionedObjectArray<Il2CppAssemblyDefinition>(Header.AssembliesOffset, Images.Length);
|
||||
|
||||
if (changedAssemblyDefStruct)
|
||||
Version = MetadataVersions.V241;
|
||||
|
||||
ParameterDefaultValues = ReadArray<Il2CppParameterDefaultValue>(Header.ParameterDefaultValuesOffset, Header.ParameterDefaultValuesSize / Sizeof(typeof(Il2CppParameterDefaultValue)));
|
||||
ParameterDefaultValues = ReadVersionedObjectArray<Il2CppParameterDefaultValue>(Header.ParameterDefaultValuesOffset, Header.ParameterDefaultValuesSize / Sizeof<Il2CppParameterDefaultValue>());
|
||||
}
|
||||
if (Version >= MetadataVersions.V190 && Version < MetadataVersions.V270) {
|
||||
MetadataUsageLists = ReadArray<Il2CppMetadataUsageList>(Header.MetadataUsageListsOffset, Header.MetadataUsageListsCount / Sizeof(typeof(Il2CppMetadataUsageList)));
|
||||
MetadataUsagePairs = ReadArray<Il2CppMetadataUsagePair>(Header.MetadataUsagePairsOffset, Header.MetadataUsagePairsCount / Sizeof(typeof(Il2CppMetadataUsagePair)));
|
||||
MetadataUsageLists = ReadVersionedObjectArray<Il2CppMetadataUsageList>(Header.MetadataUsageListsOffset, Header.MetadataUsageListsCount / Sizeof<Il2CppMetadataUsageList>());
|
||||
MetadataUsagePairs = ReadVersionedObjectArray<Il2CppMetadataUsagePair>(Header.MetadataUsagePairsOffset, Header.MetadataUsagePairsCount / Sizeof<Il2CppMetadataUsagePair>());
|
||||
}
|
||||
if (Version >= MetadataVersions.V190) {
|
||||
FieldRefs = ReadArray<Il2CppFieldRef>(Header.FieldRefsOffset, Header.FieldRefsSize / Sizeof(typeof(Il2CppFieldRef)));
|
||||
FieldRefs = ReadVersionedObjectArray<Il2CppFieldRef>(Header.FieldRefsOffset, Header.FieldRefsSize / Sizeof<Il2CppFieldRef>());
|
||||
}
|
||||
if (Version >= MetadataVersions.V210 && Version < MetadataVersions.V290) {
|
||||
AttributeTypeIndices = ReadArray<int>(Header.AttributesTypesOffset, Header.AttributesTypesCount / sizeof(int));
|
||||
AttributeTypeRanges = ReadArray<Il2CppCustomAttributeTypeRange>(Header.AttributesInfoOffset, Header.AttributesInfoCount / Sizeof(typeof(Il2CppCustomAttributeTypeRange)));
|
||||
AttributeTypeIndices = ReadPrimitiveArray<int>(Header.AttributesTypesOffset, Header.AttributesTypesCount / sizeof(int));
|
||||
AttributeTypeRanges = ReadVersionedObjectArray<Il2CppCustomAttributeTypeRange>(Header.AttributesInfoOffset, Header.AttributesInfoCount / Sizeof<Il2CppCustomAttributeTypeRange>());
|
||||
}
|
||||
|
||||
if (Version >= MetadataVersions.V290)
|
||||
{
|
||||
AttributeDataRanges = ReadArray<Il2CppCustomAttributeDataRange>(Header.AttributeDataRangeOffset,
|
||||
Header.AttributeDataRangeSize / Sizeof(typeof(Il2CppCustomAttributeDataRange)));
|
||||
AttributeDataRanges = ReadVersionedObjectArray<Il2CppCustomAttributeDataRange>(Header.AttributeDataRangeOffset,
|
||||
Header.AttributeDataRangeSize / Sizeof<Il2CppCustomAttributeDataRange>());
|
||||
}
|
||||
|
||||
if (Version == MetadataVersions.V290 || Version == MetadataVersions.V310)
|
||||
@@ -207,8 +208,8 @@ namespace Il2CppInspector
|
||||
{
|
||||
Version = new StructVersion(Version.Major, 1, Version.Tag);
|
||||
|
||||
Methods = ReadArray<Il2CppMethodDefinition>(Header.MethodsOffset,
|
||||
Header.MethodsSize / Sizeof(typeof(Il2CppMethodDefinition)));
|
||||
Methods = ReadVersionedObjectArray<Il2CppMethodDefinition>(Header.MethodsOffset,
|
||||
Header.MethodsSize / Sizeof<Il2CppMethodDefinition>());
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -231,7 +232,7 @@ namespace Il2CppInspector
|
||||
StringLiterals = pluginGetStringLiteralsResult.StringLiterals.ToArray();
|
||||
|
||||
else {
|
||||
var stringLiteralList = ReadArray<Il2CppStringLiteral>(Header.StringLiteralOffset, Header.StringLiteralSize / Sizeof(typeof(Il2CppStringLiteral)));
|
||||
var stringLiteralList = ReadVersionedObjectArray<Il2CppStringLiteral>(Header.StringLiteralOffset, Header.StringLiteralSize / Sizeof<Il2CppStringLiteral>());
|
||||
|
||||
StringLiterals = new string[stringLiteralList.Length];
|
||||
for (var i = 0; i < stringLiteralList.Length; i++)
|
||||
@@ -249,42 +250,6 @@ namespace Il2CppInspector
|
||||
CopyTo(outFile);
|
||||
}
|
||||
|
||||
public int Sizeof(Type type) => Sizeof(type, Version);
|
||||
|
||||
public int Sizeof(Type type, StructVersion metadataVersion, int longSizeBytes = 8)
|
||||
{
|
||||
var doubleRepresentation = metadataVersion.AsDouble;
|
||||
|
||||
if (Reader.ObjectMappings.TryGetValue(type, out var streamType))
|
||||
type = streamType;
|
||||
|
||||
int size = 0;
|
||||
foreach (var i in type.GetTypeInfo().GetFields())
|
||||
{
|
||||
// Only process fields for our selected object versioning (always process if none supplied)
|
||||
var versions = i.GetCustomAttributes<VersionAttribute>(false).Select(v => (v.Min, v.Max)).ToList();
|
||||
if (versions.Any() && !versions.Any(v => (v.Min <= doubleRepresentation || v.Min == -1) && (v.Max >= doubleRepresentation || v.Max == -1)))
|
||||
continue;
|
||||
|
||||
if (i.FieldType == typeof(long) || i.FieldType == typeof(ulong))
|
||||
size += longSizeBytes;
|
||||
else if (i.FieldType == typeof(int) || i.FieldType == typeof(uint))
|
||||
size += 4;
|
||||
else if (i.FieldType == typeof(short) || i.FieldType == typeof(ushort))
|
||||
size += 2;
|
||||
|
||||
// Fixed-length array
|
||||
else if (i.FieldType.IsArray) {
|
||||
var attr = i.GetCustomAttribute<ArrayLengthAttribute>(false) ??
|
||||
throw new InvalidOperationException("Array field " + i.Name + " must have ArrayLength attribute");
|
||||
size += attr.FixedSize;
|
||||
}
|
||||
|
||||
// Embedded object
|
||||
else
|
||||
size += Sizeof(i.FieldType, metadataVersion);
|
||||
}
|
||||
return size;
|
||||
}
|
||||
public int Sizeof<T>() where T : IReadable => T.Size(Version, Is32Bit);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user