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

Model: Change CustomAttributeData.VirtualAddress to be non-nullable

Browse Source
This commit is contained in:
Katy Coe
2020-08-09 20:44:13 +02:00
parent 10b6d22edf
commit ea8a18353a
4 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Il2CppInspector.Common/Outputs/JSONMetadata.cs
View File

@@ -52,9 +52,11 @@ namespace Il2CppInspector.Outputs
writeArray("methodDefinitions", () => writeMethods(model.GetMethodGroup("types_from_methods")), "Method definitions"); writeArray("methodDefinitions", () => writeMethods(model.GetMethodGroup("types_from_methods")), "Method definitions");
writeArray("constructedGenericMethods", () => writeMethods(model.GetMethodGroup("types_from_generic_methods")), "Constructed generic methods"); writeArray("constructedGenericMethods", () => writeMethods(model.GetMethodGroup("types_from_generic_methods")), "Constructed generic methods");
// We could use ILModel.CustomAttributeGenerators here to ensure uniqueness but then we lose function name information
// TODO: Merge CAG names that deal with multiple attribute types to reflect all of the attribute type names (solving the above)
writeArray("customAttributesGenerators", () => { writeArray("customAttributesGenerators", () => {
foreach (var method in model.ILModel.AttributesByIndices.Values) { foreach (var method in model.ILModel.AttributesByIndices.Values) {
writeObject(() => writeTypedFunctionName(method.VirtualAddress.Value.Start, method.Signature, method.Name)); writeObject(() => writeTypedFunctionName(method.VirtualAddress.Start, method.Signature, method.Name));
} }
}, "Custom attributes generators"); }, "Custom attributes generators");

2
Il2CppInspector.Common/Reflection/CustomAttributeData.cs
View File

@@ -21,7 +21,7 @@ namespace Il2CppInspector.Reflection
// The type of the attribute // The type of the attribute
public TypeInfo AttributeType { get; set; } public TypeInfo AttributeType { get; set; }
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
(Model.Package.CustomAttributeGenerators[Index], Model.Package.FunctionAddresses[Model.Package.CustomAttributeGenerators[Index]]); (Model.Package.CustomAttributeGenerators[Index], Model.Package.FunctionAddresses[Model.Package.CustomAttributeGenerators[Index]]);

2
Il2CppInspector.Common/Reflection/Extensions.cs
View File

@@ -55,6 +55,8 @@ namespace Il2CppInspector.Reflection
public static string ToAddressString(this (ulong start, ulong end)? address) => ToAddressString(address?.start ?? 0) + "-" + ToAddressString(address?.end ?? 0); public static string ToAddressString(this (ulong start, ulong end)? address) => ToAddressString(address?.start ?? 0) + "-" + ToAddressString(address?.end ?? 0);
public static string ToAddressString(this (ulong start, ulong end) address) => ToAddressString(address.start) + "-" + ToAddressString(address.end);
// C# string literal escape characters // C# string literal escape characters
// Taken from: https://docs.microsoft.com/en-us/dotnet/csharp/programming-guide/strings/#regular-and-verbatim-string-literals // Taken from: https://docs.microsoft.com/en-us/dotnet/csharp/programming-guide/strings/#regular-and-verbatim-string-literals
private static Dictionary<char, string> escapeChars = new Dictionary<char, string> { private static Dictionary<char, string> escapeChars = new Dictionary<char, string> {

2
Il2CppInspector.Common/Reflection/TypeModel.cs
View File

@@ -133,7 +133,7 @@ namespace Il2CppInspector.Reflection
var allParameterAttributes = MethodsByDefinitionIndex.SelectMany(m => m.DeclaredParameters).Select(p => p.CustomAttributes).ToList(); var allParameterAttributes = MethodsByDefinitionIndex.SelectMany(m => m.DeclaredParameters).Select(p => p.CustomAttributes).ToList();
// Populate list of unique custom attribute generators // Populate list of unique custom attribute generators
CustomAttributeGenerators = AttributesByIndices.Values.GroupBy(a => a.VirtualAddress.Value.Start).Select(a => a.First()).ToList(); CustomAttributeGenerators = AttributesByIndices.Values.GroupBy(a => a.VirtualAddress.Start).Select(a => a.First()).ToList();
// Create method invokers (one per signature, in invoker index order) // Create method invokers (one per signature, in invoker index order)
foreach (var method in MethodsByDefinitionIndex) { foreach (var method in MethodsByDefinitionIndex) {