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

Output: Show offsets in metadata file for const fields and parameters with default values

Browse Source
This commit is contained in:
Katy Coe
2019-11-14 05:02:36 +01:00
parent 1fb013dcc2
commit 9b79217a38
4 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Il2CppDumper/Il2CppCSharpDumper.cs
View File

@@ -207,6 +207,9 @@ namespace Il2CppInspector
// Don't output field indices for const fields (they don't have any storage) // Don't output field indices for const fields (they don't have any storage)
if (!field.IsLiteral && !SuppressMetadata) if (!field.IsLiteral && !SuppressMetadata)
sb.Append($" // 0x{(uint) field.Offset:X2}"); sb.Append($" // 0x{(uint) field.Offset:X2}");
// Output metadata file offset for const fields
if (field.IsLiteral && !SuppressMetadata)
sb.Append($" // Metadata: 0x{(uint) field.DefaultValueMetadataAddress:X8}");
sb.Append("\n"); sb.Append("\n");
} }
codeBlocks.Add("Fields", sb.ToString()); codeBlocks.Add("Fields", sb.ToString());

18
Il2CppInspector/Il2CppInspector.cs
View File

@@ -20,7 +20,7 @@ namespace Il2CppInspector
private Metadata Metadata { get; } private Metadata Metadata { get; }
// All method pointers sorted in ascending order (for finding the end of a method) // All method pointers sorted in ascending order (for finding the end of a method)
private List<ulong> sortedMethodPointers { get; set; } private List<ulong> sortedMethodPointers { get; }
// Shortcuts // Shortcuts
public double Version => Metadata.Version; public double Version => Metadata.Version;
@@ -41,8 +41,8 @@ namespace Il2CppInspector
public int[] InterfaceUsageIndices => Metadata.InterfaceUsageIndices; public int[] InterfaceUsageIndices => Metadata.InterfaceUsageIndices;
public int[] NestedTypeIndices => Metadata.NestedTypeIndices; public int[] NestedTypeIndices => Metadata.NestedTypeIndices;
public int[] AttributeTypeIndices => Metadata.AttributeTypeIndices; public int[] AttributeTypeIndices => Metadata.AttributeTypeIndices;
public Dictionary<int, object> FieldDefaultValue { get; } = new Dictionary<int, object>(); public Dictionary<int, (ulong, object)> FieldDefaultValue { get; } = new Dictionary<int, (ulong, object)>();
public Dictionary<int, object> ParameterDefaultValue { get; } = new Dictionary<int, object>(); public Dictionary<int, (ulong, object)> ParameterDefaultValue { get; } = new Dictionary<int, (ulong, object)>();
public List<long> FieldOffsets { get; } public List<long> FieldOffsets { get; }
public List<Il2CppType> TypeUsages => Binary.Types; public List<Il2CppType> TypeUsages => Binary.Types;
public Dictionary<string, Il2CppCodeGenModule> Modules => Binary.Modules; public Dictionary<string, Il2CppCodeGenModule> Modules => Binary.Modules;
@@ -51,10 +51,10 @@ namespace Il2CppInspector
// TODO: Finish all file access in the constructor and eliminate the need for this // TODO: Finish all file access in the constructor and eliminate the need for this
public IFileFormatReader BinaryImage => Binary.Image; public IFileFormatReader BinaryImage => Binary.Image;
private object getDefaultValue(int typeIndex, int dataIndex) { private (ulong MetadataAddress, object Value)? getDefaultValue(int typeIndex, int dataIndex) {
// No default // No default
if (dataIndex == -1) if (dataIndex == -1)
return null; return (0ul, null);
// Get pointer in binary to default value // Get pointer in binary to default value
var pValue = Metadata.Header.fieldAndParameterDefaultValueDataOffset + dataIndex; var pValue = Metadata.Header.fieldAndParameterDefaultValueDataOffset + dataIndex;
@@ -62,7 +62,7 @@ namespace Il2CppInspector
// Default value is null // Default value is null
if (pValue == 0) if (pValue == 0)
return null; return (0ul, null);
object value = null; object value = null;
Metadata.Position = pValue; Metadata.Position = pValue;
@@ -107,7 +107,7 @@ namespace Il2CppInspector
value = Encoding.UTF8.GetString(Metadata.ReadBytes(uiLen)); value = Encoding.UTF8.GetString(Metadata.ReadBytes(uiLen));
break; break;
} }
return value; return ((ulong) pValue, value);
} }
public Il2CppInspector(Il2CppBinary binary, Metadata metadata) { public Il2CppInspector(Il2CppBinary binary, Metadata metadata) {
@@ -117,11 +117,11 @@ namespace Il2CppInspector
// Get all field default values // Get all field default values
foreach (var fdv in Metadata.FieldDefaultValues) foreach (var fdv in Metadata.FieldDefaultValues)
FieldDefaultValue.Add(fdv.fieldIndex, getDefaultValue(fdv.typeIndex, fdv.dataIndex)); FieldDefaultValue.Add(fdv.fieldIndex, ((ulong,object)) getDefaultValue(fdv.typeIndex, fdv.dataIndex));
// Get all parameter default values // Get all parameter default values
foreach (var pdv in Metadata.ParameterDefaultValues) foreach (var pdv in Metadata.ParameterDefaultValues)
ParameterDefaultValue.Add(pdv.parameterIndex, getDefaultValue(pdv.typeIndex, pdv.dataIndex)); ParameterDefaultValue.Add(pdv.parameterIndex, ((ulong,object)) getDefaultValue(pdv.typeIndex, pdv.dataIndex));
// Get all field offsets // Get all field offsets
if (Binary.FieldOffsets != null) { if (Binary.FieldOffsets != null) {

7
Il2CppInspector/Reflection/FieldInfo.cs
View File

@@ -16,6 +16,7 @@ namespace Il2CppInspector.Reflection {
public Il2CppFieldDefinition Definition { get; } public Il2CppFieldDefinition Definition { get; }
public int Index { get; } public int Index { get; }
public long Offset { get; } public long Offset { get; }
public ulong DefaultValueMetadataAddress { get; }
// Custom attributes for this member // Custom attributes for this member
public override IEnumerable<CustomAttributeData> CustomAttributes => CustomAttributeData.GetCustomAttributes(this); public override IEnumerable<CustomAttributeData> CustomAttributes => CustomAttributeData.GetCustomAttributes(this);
@@ -111,8 +112,10 @@ namespace Il2CppInspector.Reflection {
Attributes |= FieldAttributes.HasDefault; Attributes |= FieldAttributes.HasDefault;
// Default initialization value if present // Default initialization value if present
if (pkg.FieldDefaultValue.TryGetValue(fieldIndex, out object variant)) if (pkg.FieldDefaultValue.TryGetValue(fieldIndex, out (ulong address, object variant) value)) {
DefaultValue = variant; DefaultValue = value.variant;
DefaultValueMetadataAddress = value.address;
}
} }
public string GetAccessModifierString() => this switch { public string GetAccessModifierString() => this switch {

9
Il2CppInspector/Reflection/ParameterInfo.cs
View File

@@ -16,6 +16,7 @@ namespace Il2CppInspector.Reflection
// IL2CPP-specific data // IL2CPP-specific data
public Il2CppParameterDefinition Definition { get; } public Il2CppParameterDefinition Definition { get; }
public int Index { get; } public int Index { get; }
public ulong DefaultValueMetadataAddress { get; }
// Information/flags about the parameter // Information/flags about the parameter
public ParameterAttributes Attributes { get; } public ParameterAttributes Attributes { get; }
@@ -84,8 +85,10 @@ namespace Il2CppInspector.Reflection
Attributes |= ParameterAttributes.Retval; Attributes |= ParameterAttributes.Retval;
// Default initialization value if present // Default initialization value if present
if (pkg.ParameterDefaultValue.TryGetValue(paramIndex, out object variant)) if (pkg.ParameterDefaultValue.TryGetValue(paramIndex, out (ulong address, object variant) value)) {
DefaultValue = variant; DefaultValue = value.variant;
DefaultValueMetadataAddress = value.address;
}
} }
public string GetModifierString() => public string GetModifierString() =>
@@ -100,7 +103,7 @@ namespace Il2CppInspector.Reflection
(Position == 0 && Member.GetCustomAttributes("System.Runtime.CompilerServices.ExtensionAttribute").Any()? "this ":"") (Position == 0 && Member.GetCustomAttributes("System.Runtime.CompilerServices.ExtensionAttribute").Any()? "this ":"")
+ $"{CustomAttributes.ToString(inline: true, emitPointer: emitPointer).Replace("[ParamArray]", "params")}" + $"{CustomAttributes.ToString(inline: true, emitPointer: emitPointer).Replace("[ParamArray]", "params")}"
+ $"{getCSharpSignatureString()} {Name}" + $"{getCSharpSignatureString()} {Name}"
+ (HasDefaultValue ? " = " + DefaultValue.ToCSharpValue() : ""); + (HasDefaultValue ? " = " + DefaultValue.ToCSharpValue() + (emitPointer && !(DefaultValue is null)? $" /* Metadata: 0x{(uint) DefaultValueMetadataAddress:X8} */" : "") : "");
public string GetReturnParameterString() => !IsRetval? null : getCSharpSignatureString(); public string GetReturnParameterString() => !IsRetval? null : getCSharpSignatureString();
} }