chizui/Il2CppInspectorRedux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Model: Cache instances of CustomAttributeData

Browse Source
This commit is contained in:
Katy Coe
2019-11-16 23:31:59 +01:00
parent 80d168a2de
commit d97a36d8f7
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Il2CppInspector/Il2CppModel.cs
View File

@@ -31,6 +31,9 @@ namespace Il2CppInspector.Reflection
// List of all methods ordered by their MethodDefinitionIndex // List of all methods ordered by their MethodDefinitionIndex
public MethodBase[] MethodsByDefinitionIndex { get; } public MethodBase[] MethodsByDefinitionIndex { get; }
// List of all generated CustomAttributeData objects by their index into AttributeTypeIndices
public Dictionary<int, CustomAttributeData> AttributesByIndices { get; } = new Dictionary<int, CustomAttributeData>();
public Il2CppModel(Il2CppInspector package) { public Il2CppModel(Il2CppInspector package) {
Package = package; Package = package;
TypesByDefinitionIndex = new TypeInfo[package.TypeDefinitions.Length]; TypesByDefinitionIndex = new TypeInfo[package.TypeDefinitions.Length];

15
Il2CppInspector/Reflection/CustomAttributeData.cs
View File

@@ -15,7 +15,7 @@ namespace Il2CppInspector.Reflection
public class CustomAttributeData public class CustomAttributeData
{ {
// IL2CPP-specific data // IL2CPP-specific data
private Il2CppInspector package => AttributeType.Assembly.Model.Package; public Il2CppModel Model => AttributeType.Assembly.Model;
public int Index { get; set; } public int Index { get; set; }
// The type of the attribute // The type of the attribute
@@ -23,7 +23,7 @@ namespace Il2CppInspector.Reflection
public (ulong Start, ulong End)? VirtualAddress => public (ulong Start, ulong End)? VirtualAddress =>
// The last one will be wrong but there is no way to calculate it // The last one will be wrong but there is no way to calculate it
(package.CustomAttributeGenerators[Index], package.CustomAttributeGenerators[Math.Min(Index + 1, package.CustomAttributeGenerators.Length - 1)]); (Model.Package.CustomAttributeGenerators[Index], Model.Package.CustomAttributeGenerators[Math.Min(Index + 1, Model.Package.CustomAttributeGenerators.Length - 1)]);
public override string ToString() => "[" + AttributeType.FullName + "]"; public override string ToString() => "[" + AttributeType.FullName + "]";
@@ -41,7 +41,16 @@ namespace Il2CppInspector.Reflection
var range = pkg.AttributeTypeRanges[customAttributeIndex]; var range = pkg.AttributeTypeRanges[customAttributeIndex];
for (var i = range.start; i < range.start + range.count; i++) { for (var i = range.start; i < range.start + range.count; i++) {
var typeIndex = pkg.AttributeTypeIndices[i]; var typeIndex = pkg.AttributeTypeIndices[i];
yield return new CustomAttributeData { Index = customAttributeIndex, AttributeType = asm.Model.GetTypeFromUsage(typeIndex) };
if (asm.Model.AttributesByIndices.TryGetValue(i, out var attribute)) {
yield return attribute;
continue;
}
attribute = new CustomAttributeData { Index = customAttributeIndex, AttributeType = asm.Model.GetTypeFromUsage(typeIndex) };
asm.Model.AttributesByIndices.Add(i, attribute);
yield return attribute;
} }
} }