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

Model: Handle nested types

Browse Source
This commit is contained in:
Katy Coe
2019-10-31 16:02:32 +01:00
parent cb9d391d52
commit 70a541c36c
7 changed files with 53 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Il2CppInspector/Reflection/Assembly.cs
View File

@@ -47,7 +47,7 @@ namespace Il2CppInspector.Reflection {
// Generate types in DefinedTypes from typeStart to typeStart+typeCount-1
for (var t = Definition.typeStart; t < Definition.typeStart + Definition.typeCount; t++) {
var type = new TypeInfo(Model.Package, t, this);
var type = new TypeInfo(t, this);
// Don't add empty module definitions
if (type.Name != "<Module>")

12
Il2CppInspector/Reflection/MemberInfo.cs
View File

@@ -18,7 +18,8 @@ namespace Il2CppInspector.Reflection {
public IEnumerable<CustomAttributeData> CustomAttributes => throw new NotImplementedException();
// Type that this type is declared in for nested types
public TypeInfo DeclaringType { get; }
protected int declaringTypeDefinitionIndex { private get; set; } = -1;
public TypeInfo DeclaringType => declaringTypeDefinitionIndex != -1? Assembly.Model.TypesByIndex[declaringTypeDefinitionIndex] : null;
// What sort of member this is, eg. method, field etc.
public abstract MemberTypes MemberType { get; }
@@ -29,16 +30,13 @@ namespace Il2CppInspector.Reflection {
// TODO: GetCustomAttributes etc.
// For top-level members in an assembly (ie. non-nested types)
protected MemberInfo(Assembly asm, TypeInfo declaringType = null) {
Assembly = asm;
DeclaringType = declaringType;
}
protected MemberInfo(Assembly asm) => Assembly = asm;
// For lower level members, eg. fields, properties etc. and nested types
protected MemberInfo(TypeInfo declaringType) {
protected MemberInfo(TypeInfo declaringType = null) {
if (declaringType != null) {
Assembly = declaringType.Assembly;
DeclaringType = declaringType;
declaringTypeDefinitionIndex = declaringType.Index;
}
}

2
Il2CppInspector/Reflection/ParameterInfo.cs
View File

@@ -38,7 +38,7 @@ namespace Il2CppInspector.Reflection
public TypeInfo ParameterType => Member.Assembly.Model.GetType(paramType, MemberTypes.TypeInfo);
// Zero-indexed position of the parameter in parameter list
public int Position { get; private set; }
public int Position { get; }
// Create a parameter. Specify paramIndex == -1 for a return type parameter
public ParameterInfo(Il2CppInspector pkg, int paramIndex, MethodBase declaringMethod) {

46
Il2CppInspector/Reflection/TypeInfo.cs
View File

@@ -47,7 +47,10 @@ namespace Il2CppInspector.Reflection {
public List<FieldInfo> DeclaredFields { get; } = new List<FieldInfo>();
public List<MemberInfo> DeclaredMembers => throw new NotImplementedException();
public List<MethodInfo> DeclaredMethods { get; } = new List<MethodInfo>();
public List<TypeInfo> DeclaredNestedTypes => throw new NotImplementedException();
private int[] declaredNestedTypes;
public IEnumerable<TypeInfo> DeclaredNestedTypes => declaredNestedTypes.Select(x => Assembly.Model.TypesByIndex[x]);
public List<PropertyInfo> DeclaredProperties { get; } = new List<PropertyInfo>();
// Method that the type is declared in if this is a type parameter of a generic method
@@ -68,6 +71,7 @@ namespace Il2CppInspector.Reflection {
public string FullName => (IsPointer? "void *" : "")
+ Namespace
+ (Namespace.Length > 0? "." : "")
+ (DeclaringType != null? DeclaringType.Name + "." : "")
+ base.Name
+ (GenericTypeParameters != null ? "<" + string.Join(", ", GenericTypeParameters.Select(x => x.Name)) + ">" : "")
+ (IsArray? "[]" : "");
@@ -91,7 +95,7 @@ namespace Il2CppInspector.Reflection {
public bool IsGenericTypeDefinition => throw new NotImplementedException();
public bool IsImport => (Attributes & TypeAttributes.Import) == TypeAttributes.Import;
public bool IsInterface => (Attributes & TypeAttributes.ClassSemanticsMask) == TypeAttributes.Interface;
public bool IsNested { get; } // TODO: Partially implemented
public bool IsNested => DeclaringType != null;
public bool IsNestedAssembly => (Attributes & TypeAttributes.VisibilityMask) == TypeAttributes.NestedAssembly;
public bool IsNestedFamANDAssem => (Attributes & TypeAttributes.VisibilityMask) == TypeAttributes.NestedFamANDAssem;
public bool IsNestedFamily => (Attributes & TypeAttributes.VisibilityMask) == TypeAttributes.NestedFamily;
@@ -108,7 +112,8 @@ namespace Il2CppInspector.Reflection {
public bool IsSpecialName => (Attributes & TypeAttributes.SpecialName) == TypeAttributes.SpecialName;
public bool IsValueType => BaseType?.FullName == "System.ValueType";
public override MemberTypes MemberType { get; }
// May get overridden by Il2CppType-based constructor below
public override MemberTypes MemberType { get; } = MemberTypes.TypeInfo;
public override string Name {
get => (IsPointer ? "void *" : "")
@@ -118,7 +123,11 @@ namespace Il2CppInspector.Reflection {
protected set => base.Name = value;
}
public string Namespace { get; }
private string @namespace;
public string Namespace {
get => !string.IsNullOrEmpty(@namespace) ? @namespace : DeclaringType?.Namespace ?? "<default namespace>";
set => @namespace = value;
}
// Number of dimensions of an array
private readonly int arrayRank;
@@ -135,8 +144,11 @@ namespace Il2CppInspector.Reflection {
// TODO: Generic stuff
// Initialize from specified type index in metadata
public TypeInfo(Il2CppInspector pkg, int typeIndex, Assembly owner) :
base(owner) {
// Top-level types
public TypeInfo(int typeIndex, Assembly owner) : base(owner) {
var pkg = Assembly.Model.Package;
Definition = pkg.TypeDefinitions[typeIndex];
Index = typeIndex;
Namespace = pkg.Strings[Definition.namespaceIndex];
@@ -145,6 +157,14 @@ namespace Il2CppInspector.Reflection {
if (Definition.parentIndex >= 0)
baseType = pkg.TypeUsages[Definition.parentIndex];
// Nested type?
if (Definition.declaringTypeIndex >= 0) {
declaringTypeDefinitionIndex = (int) pkg.TypeUsages[Definition.declaringTypeIndex].datapoint;
}
// Add to global type definition list
Assembly.Model.TypesByIndex[Index] = this;
if ((Definition.flags & Il2CppConstants.TYPE_ATTRIBUTE_SERIALIZABLE) != 0)
Attributes |= TypeAttributes.Serializable;
if ((Definition.flags & Il2CppConstants.TYPE_ATTRIBUTE_VISIBILITY_MASK) == Il2CppConstants.TYPE_ATTRIBUTE_PUBLIC)
@@ -187,6 +207,11 @@ namespace Il2CppInspector.Reflection {
for (var i = 0; i < Definition.interfaces_count; i++)
implementedInterfaces[i] = pkg.TypeUsages[pkg.InterfaceUsageIndices[Definition.interfacesStart + i]];
// Add all nested types
declaredNestedTypes = new int[Definition.nested_type_count];
for (var n = 0; n < Definition.nested_type_count; n++)
declaredNestedTypes[n] = pkg.NestedTypeIndices[Definition.nestedTypesStart + n];
// Add all fields
for (var f = Definition.fieldStart; f < Definition.fieldStart + Definition.field_count; f++)
DeclaredFields.Add(new FieldInfo(pkg, f, this));
@@ -207,20 +232,21 @@ namespace Il2CppInspector.Reflection {
// Add all events
for (var e = Definition.eventStart; e < Definition.eventStart + Definition.event_count; e++)
DeclaredEvents.Add(new EventInfo(pkg, e, this));
MemberType = MemberTypes.TypeInfo;
}
// Initialize type from binary usage
public TypeInfo(Il2CppModel model, Il2CppType pType, MemberTypes memberType) : base(null) {
public TypeInfo(Il2CppModel model, Il2CppType pType, MemberTypes memberType) {
var image = model.Package.BinaryImage;
IsNested = true;
// TODO: IsNested = true;
MemberType = memberType;
// TODO: Set Assembly and DeclaringType
// Generic type unresolved and concrete instance types
if (pType.type == Il2CppTypeEnum.IL2CPP_TYPE_GENERICINST) {
var generic = image.ReadMappedObject<Il2CppGenericClass>(pType.datapoint);
var genericTypeDef = model.GetTypeFromIndex(generic.typeDefinitionIndex);
var genericTypeDef = model.TypesByIndex[generic.typeDefinitionIndex];
Namespace = genericTypeDef.Namespace;
Name = genericTypeDef.Name;