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

AppModel: Move C++ type ordering to model

Browse Source
This commit is contained in:
Katy Coe
2020-07-13 17:55:32 +02:00
parent 3c4908c470
commit 20d0ffcdfe
3 changed files with 33 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Il2CppInspector.Common/Cpp/CppDeclarationGenerator.cs
View File

@@ -245,19 +245,16 @@ namespace Il2CppInspector.Cpp
} }
// "Flush" the list of visited types, generating C structures for each one // "Flush" the list of visited types, generating C structures for each one
private List<CppType> GenerateVisitedFieldStructs() { private List<(TypeInfo ilType, CppType valueType, CppType referenceType, CppType fieldsType)> GenerateVisitedFieldStructs() {
var structs = new List<CppType>(TodoTypeStructs.Count); var structs = new List<(TypeInfo ilType, CppType valueType, CppType referenceType, CppType fieldsType)>(TodoTypeStructs.Count);
foreach (var ti in TodoFieldStructs) { foreach (var ti in TodoFieldStructs) {
if (ti.IsEnum || ti.IsValueType) { if (ti.IsEnum || ti.IsValueType) {
var (valueType, boxedType) = GenerateValueFieldStruct(ti); var (valueType, boxedType) = GenerateValueFieldStruct(ti);
structs.Add(valueType); structs.Add((ti, valueType, boxedType, null));
structs.Add(boxedType);
} }
else { else {
var (objectOrArrayType, fieldsType) = GenerateRefFieldStruct(ti); var (objectOrArrayType, fieldsType) = GenerateRefFieldStruct(ti);
if (fieldsType != null) structs.Add((ti, null, objectOrArrayType, fieldsType));
structs.Add(fieldsType);
structs.Add(objectOrArrayType);
} }
} }
TodoFieldStructs.Clear(); TodoFieldStructs.Clear();
@@ -435,14 +432,12 @@ namespace Il2CppInspector.Cpp
/// Type declarations that have previously been generated by this instance of CppDeclarationGenerator will not be generated again. /// Type declarations that have previously been generated by this instance of CppDeclarationGenerator will not be generated again.
/// </summary> /// </summary>
/// <returns>A string containing C type declarations</returns> /// <returns>A string containing C type declarations</returns>
public List<CppType> GenerateRemainingTypeDeclarations() { public List<(TypeInfo ilType, CppType valueType, CppType referenceType, CppType fieldsType, CppType vtableType, CppType staticsType)> GenerateRemainingTypeDeclarations() {
var decl = GenerateVisitedFieldStructs(); var decl = GenerateVisitedFieldStructs().Select(s => (s.ilType, s.valueType, s.referenceType, s.fieldsType, (CppType) null, (CppType) null)).ToList();
foreach (var ti in TodoTypeStructs) { foreach (var ti in TodoTypeStructs) {
var (cls, statics, vtable) = GenerateTypeStruct(ti); var (cls, statics, vtable) = GenerateTypeStruct(ti);
decl.Add(vtable); decl.Add((ti, null, cls, null, vtable, statics));
decl.Add(statics);
decl.Add(cls);
} }
TodoTypeStructs.Clear(); TodoTypeStructs.Clear();

26
Il2CppInspector.Common/Model/AppModel.cs
View File

@@ -49,7 +49,7 @@ namespace Il2CppInspector.Model
// All of the C++ types used in the application including Unity internal types // All of the C++ types used in the application including Unity internal types
// NOTE: This is for querying individual types for static analysis // NOTE: This is for querying individual types for static analysis
// To generate code output, use DeclarationOrderedTypes // To generate code output, use DependencyOrderedTypes
public CppTypeCollection TypeCollection { get; set; } // TODO: Change to private set after integrating IDA output public CppTypeCollection TypeCollection { get; set; } // TODO: Change to private set after integrating IDA output
// All of the C++ types used in the application (.NET type translations only) // All of the C++ types used in the application (.NET type translations only)
@@ -130,7 +130,7 @@ namespace Il2CppInspector.Model
foreach (var method in ILModel.MethodsByDefinitionIndex.Where(m => m.VirtualAddress.HasValue)) { foreach (var method in ILModel.MethodsByDefinitionIndex.Where(m => m.VirtualAddress.HasValue)) {
declarationGenerator.IncludeMethod(method); declarationGenerator.IncludeMethod(method);
DependencyOrderedTypes.AddRange(declarationGenerator.GenerateRemainingTypeDeclarations()); AddTypes(declarationGenerator.GenerateRemainingTypeDeclarations());
var fnPtr = declarationGenerator.GenerateMethodDeclaration(method); var fnPtr = declarationGenerator.GenerateMethodDeclaration(method);
Methods.Add(method, fnPtr, new AppMethod(method, fnPtr)); Methods.Add(method, fnPtr, new AppMethod(method, fnPtr));
@@ -141,7 +141,7 @@ namespace Il2CppInspector.Model
foreach (var method in ILModel.GenericMethods.Values.Where(m => m.VirtualAddress.HasValue)) { foreach (var method in ILModel.GenericMethods.Values.Where(m => m.VirtualAddress.HasValue)) {
declarationGenerator.IncludeMethod(method); declarationGenerator.IncludeMethod(method);
DependencyOrderedTypes.AddRange(declarationGenerator.GenerateRemainingTypeDeclarations()); AddTypes(declarationGenerator.GenerateRemainingTypeDeclarations());
var fnPtr = declarationGenerator.GenerateMethodDeclaration(method); var fnPtr = declarationGenerator.GenerateMethodDeclaration(method);
Methods.Add(method, fnPtr, new AppMethod(method, fnPtr)); Methods.Add(method, fnPtr, new AppMethod(method, fnPtr));
@@ -160,13 +160,13 @@ namespace Il2CppInspector.Model
case MetadataUsageType.TypeInfo: case MetadataUsageType.TypeInfo:
var type = ILModel.GetMetadataUsageType(usage); var type = ILModel.GetMetadataUsageType(usage);
declarationGenerator.IncludeType(type); declarationGenerator.IncludeType(type);
DependencyOrderedTypes.AddRange(declarationGenerator.GenerateRemainingTypeDeclarations()); AddTypes(declarationGenerator.GenerateRemainingTypeDeclarations());
break; break;
case MetadataUsageType.MethodDef: case MetadataUsageType.MethodDef:
case MetadataUsageType.MethodRef: case MetadataUsageType.MethodRef:
var method = ILModel.GetMetadataUsageMethod(usage); var method = ILModel.GetMetadataUsageMethod(usage);
declarationGenerator.IncludeMethod(method); declarationGenerator.IncludeMethod(method);
DependencyOrderedTypes.AddRange(declarationGenerator.GenerateRemainingTypeDeclarations()); AddTypes(declarationGenerator.GenerateRemainingTypeDeclarations());
Methods[method].MethodInfoPtrAddress = address; Methods[method].MethodInfoPtrAddress = address;
break; break;
@@ -179,6 +179,22 @@ namespace Il2CppInspector.Model
return this; return this;
} }
private void AddTypes(List<(TypeInfo ilType, CppType valueType, CppType referenceType, CppType fieldsType, CppType vtableType, CppType staticsType)> types) {
foreach (var type in types) {
if (type.vtableType != null)
DependencyOrderedTypes.Add(type.vtableType);
if (type.staticsType != null)
DependencyOrderedTypes.Add(type.staticsType);
if (type.fieldsType != null)
DependencyOrderedTypes.Add(type.fieldsType);
if (type.valueType != null)
DependencyOrderedTypes.Add(type.valueType);
DependencyOrderedTypes.Add(type.referenceType);
}
}
// Get all the types for a group // Get all the types for a group
public IEnumerable<CppType> GetTypeGroup(string groupName) => TypeCollection.GetTypeGroup(groupName); public IEnumerable<CppType> GetTypeGroup(string groupName) => TypeCollection.GetTypeGroup(groupName);
public IEnumerable<CppType> GetDependencyOrderedTypeGroup(string groupName) => DependencyOrderedTypes.Where(t => t.Group == groupName); public IEnumerable<CppType> GetDependencyOrderedTypeGroup(string groupName) => DependencyOrderedTypes.Where(t => t.Group == groupName);

6
Il2CppInspector.Common/Outputs/IDAPythonScript.cs
View File

@@ -226,7 +226,11 @@ typedef __int64 int64_t;
} }
// TODO: Temporary compatibility function, remove when integrated with ApplicationModel // TODO: Temporary compatibility function, remove when integrated with ApplicationModel
private void writeDecls(List<CppType> types) => writeDecls(string.Join("\n", types.Select(t => t.ToString()))); private void writeDecls(List<(TypeInfo ilType, CppType valueType, CppType referenceType, CppType fieldsType, CppType vtableType, CppType staticsType)> types)
=> writeDecls(string.Join("\n",
types.SelectMany(t => new List<CppType> {t.vtableType, t.staticsType, t.fieldsType, t.valueType, t.referenceType})
.Where(t => t != null)
.Select(t => t.ToString())));
private void writeName(ulong address, string name) { private void writeName(ulong address, string name) {
writeLine($"SetName({address.ToAddressString()}, r'{name.ToEscapedString()}')"); writeLine($"SetName({address.ToAddressString()}, r'{name.ToEscapedString()}')");