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

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
// 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
// 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)) {
declarationGenerator.IncludeMethod(method);
DependencyOrderedTypes.AddRange(declarationGenerator.GenerateRemainingTypeDeclarations());
AddTypes(declarationGenerator.GenerateRemainingTypeDeclarations());
var fnPtr = declarationGenerator.GenerateMethodDeclaration(method);
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)) {
declarationGenerator.IncludeMethod(method);
DependencyOrderedTypes.AddRange(declarationGenerator.GenerateRemainingTypeDeclarations());
AddTypes(declarationGenerator.GenerateRemainingTypeDeclarations());
var fnPtr = declarationGenerator.GenerateMethodDeclaration(method);
Methods.Add(method, fnPtr, new AppMethod(method, fnPtr));
@@ -160,13 +160,13 @@ namespace Il2CppInspector.Model
case MetadataUsageType.TypeInfo:
var type = ILModel.GetMetadataUsageType(usage);
declarationGenerator.IncludeType(type);
DependencyOrderedTypes.AddRange(declarationGenerator.GenerateRemainingTypeDeclarations());
AddTypes(declarationGenerator.GenerateRemainingTypeDeclarations());
break;
case MetadataUsageType.MethodDef:
case MetadataUsageType.MethodRef:
var method = ILModel.GetMetadataUsageMethod(usage);
declarationGenerator.IncludeMethod(method);
DependencyOrderedTypes.AddRange(declarationGenerator.GenerateRemainingTypeDeclarations());
AddTypes(declarationGenerator.GenerateRemainingTypeDeclarations());
Methods[method].MethodInfoPtrAddress = address;
break;
@@ -179,6 +179,22 @@ namespace Il2CppInspector.Model
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
public IEnumerable<CppType> GetTypeGroup(string groupName) => TypeCollection.GetTypeGroup(groupName);
public IEnumerable<CppType> GetDependencyOrderedTypeGroup(string groupName) => DependencyOrderedTypes.Where(t => t.Group == groupName);