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

Model/C#: Provide FieldHasRVA flag; output metadata preview for static array initializer implementations (#59)

Browse Source
This commit is contained in:
Katy Coe
2020-08-22 03:13:50 +02:00
parent f590ee3def
commit 5828ed106b
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Il2CppInspector.Common/Outputs/CSharpCodeStubs.cs
View File

@@ -399,7 +399,14 @@ namespace Il2CppInspector.Outputs
sb.Append($" // 0x{(uint) field.Offset:X2}"); sb.Append($" // 0x{(uint) field.Offset:X2}");
// Output metadata file offset for const fields // Output metadata file offset for const fields
if (field.IsLiteral && !SuppressMetadata) if (field.IsLiteral && !SuppressMetadata)
sb.Append($" // Metadata: 0x{(uint) field.DefaultValueMetadataAddress:X8}"); sb.Append($" // Metadata: {field.DefaultValueMetadataAddress.ToAddressString()}");
// For static array initializers, output metadata address and preview
if (field.HasFieldRVA && !SuppressMetadata) {
var preview = model.Package.Metadata.ReadBytes((long) field.DefaultValueMetadataAddress, 8);
var previewText = string.Join(" ", preview.Select(b => $"{b:x2}"));
sb.Append($" // Starts with: {previewText} - Metadata: {field.DefaultValueMetadataAddress.ToAddressString()}");
}
sb.Append("\n"); sb.Append("\n");
} }
codeBlocks.Add("Fields", sb.ToString()); codeBlocks.Add("Fields", sb.ToString());

5
Il2CppInspector.Common/Reflection/FieldInfo.cs
View File

@@ -25,7 +25,8 @@ namespace Il2CppInspector.Reflection {
private readonly long rawOffset; private readonly long rawOffset;
public long Offset => DeclaringType.ContainsGenericParameters? 0 : public long Offset => DeclaringType.ContainsGenericParameters? 0 :
rawOffset - (DeclaringType.IsValueType && !IsStatic? (Assembly.Model.Package.BinaryImage.Bits / 8) * 2 : 0); rawOffset - (DeclaringType.IsValueType && !IsStatic? (Assembly.Model.Package.BinaryImage.Bits / 8) * 2 : 0);
public bool HasFieldRVA => (Attributes & FieldAttributes.HasFieldRVA) != 0;
public ulong DefaultValueMetadataAddress { get; } public ulong DefaultValueMetadataAddress { get; }
// Custom attributes for this member // Custom attributes for this member
@@ -126,6 +127,8 @@ namespace Il2CppInspector.Reflection {
Attributes |= FieldAttributes.PinvokeImpl; Attributes |= FieldAttributes.PinvokeImpl;
if ((fieldType.attrs & Il2CppConstants.FIELD_ATTRIBUTE_HAS_DEFAULT) != 0) if ((fieldType.attrs & Il2CppConstants.FIELD_ATTRIBUTE_HAS_DEFAULT) != 0)
Attributes |= FieldAttributes.HasDefault; Attributes |= FieldAttributes.HasDefault;
if ((fieldType.attrs & Il2CppConstants.FIELD_ATTRIBUTE_HAS_FIELD_RVA) != 0)
Attributes |= FieldAttributes.HasFieldRVA;
// Default initialization value if present // Default initialization value if present
if (pkg.FieldDefaultValue.TryGetValue(fieldIndex, out (ulong address, object variant) value)) { if (pkg.FieldDefaultValue.TryGetValue(fieldIndex, out (ulong address, object variant) value)) {