Attribute parsing for metadata version >= 29

This commit is contained in:
Xpl0itR 2024-07-02 05:36:06 +01:00
parent c23dd70b6d
commit f13e27a11c
Signed by: Xpl0itR
GPG Key ID: 91798184109676AD
14 changed files with 368 additions and 89 deletions

View File

@ -27,7 +27,7 @@ Limitations
----------- -----------
- Integers are assumed to be (u)int32/64 as CIL doesn't differentiate between them and sint32/64 and (s)fixed32/64. - Integers are assumed to be (u)int32/64 as CIL doesn't differentiate between them and sint32/64 and (s)fixed32/64.
- Package names are not preserved in protobuf compilation so naturally we cannot recover them during decompilation, which may result in naming conflicts. - Package names are not preserved in protobuf compilation so naturally we cannot recover them during decompilation, which may result in naming conflicts.
- Due to the development branch of Cpp2Il not yet recovering method bodies - Due to the development branch of Cpp2Il not yet recovering method bodies, when parsing an Il2Cpp assembly older than metadata version 29
- The `Name` parameter of `OriginalNameAttribute` is not parsed. In this case, the CIL enum field names are used after conforming them to protobuf conventions. - The `Name` parameter of `OriginalNameAttribute` is not parsed. In this case, the CIL enum field names are used after conforming them to protobuf conventions.
- The `Tool` parameter of `GeneratedCodeAttribute` is not compared against when parsing gRPC service methods, which may cause false positives in the event that another tool has generated methods in the service class. - The `Tool` parameter of `GeneratedCodeAttribute` is not compared against when parsing gRPC service methods, which may cause false positives in the event that another tool has generated methods in the service class.

View File

@ -6,37 +6,36 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Reflection; using System.Reflection;
namespace LibProtodec.Models.Cil.Clr; namespace LibProtodec.Models.Cil.Clr;
public sealed class ClrAttribute(CustomAttributeData clrAttribute) : ICilAttribute public sealed class ClrAttribute(CustomAttributeData clrAttribute) : ICilAttribute
{ {
private IList<object?>? _constructorArguments; private object?[]? _constructorArgumentValues;
public ICilType Type => public ICilType Type =>
ClrType.GetOrCreate(clrAttribute.AttributeType); ClrType.GetOrCreate(clrAttribute.AttributeType);
public IList<object?> ConstructorArguments public IList<object?> ConstructorArgumentValues
{ {
get get
{ {
if (_constructorArguments is null) if (_constructorArgumentValues is null)
{ {
IList<CustomAttributeTypedArgument> args = clrAttribute.ConstructorArguments; IList<CustomAttributeTypedArgument> args = clrAttribute.ConstructorArguments;
if (args.Count < 1) _constructorArgumentValues = args.Count < 1
? Array.Empty<object>()
: new object[args.Count];
for (int i = 0; i < args.Count; i++)
{ {
_constructorArguments = Array.Empty<object>(); _constructorArgumentValues[i] = args[i].Value;
}
else
{
_constructorArguments = args.Select(static arg => arg.Value).ToList();
} }
} }
return _constructorArguments; return _constructorArgumentValues;
} }
} }
} }

View File

@ -4,6 +4,7 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this // License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/. // file, You can obtain one at http://mozilla.org/MPL/2.0/.
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Reflection; using System.Reflection;
@ -11,6 +12,8 @@ namespace LibProtodec.Models.Cil.Clr;
public abstract class ClrMember(MemberInfo clrMember) public abstract class ClrMember(MemberInfo clrMember)
{ {
private ICilAttribute[]? _customAttributes;
public string Name => public string Name =>
clrMember.Name; clrMember.Name;
@ -23,11 +26,25 @@ public abstract class ClrMember(MemberInfo clrMember)
: ClrType.GetOrCreate( : ClrType.GetOrCreate(
clrMember.DeclaringType); clrMember.DeclaringType);
public IEnumerable<ICilAttribute> GetCustomAttributes() public IList<ICilAttribute> CustomAttributes
{ {
foreach (CustomAttributeData attribute in clrMember.GetCustomAttributesData()) get
{ {
yield return new ClrAttribute(attribute); if (_customAttributes is null)
{
IList<CustomAttributeData> attributes = clrMember.GetCustomAttributesData();
_customAttributes = attributes.Count < 1
? Array.Empty<ICilAttribute>()
: new ICilAttribute[attributes.Count];
for (int i = 0; i < attributes.Count; i++)
{
_customAttributes[i] = new ClrAttribute(attributes[i]);
}
}
return _customAttributes;
} }
} }
} }

View File

@ -7,7 +7,6 @@
using System; using System;
using System.Collections.Concurrent; using System.Collections.Concurrent;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Reflection; using System.Reflection;
using CommunityToolkit.Diagnostics; using CommunityToolkit.Diagnostics;
@ -18,7 +17,7 @@ public sealed class ClrType : ClrMember, ICilType
private const BindingFlags Everything = BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Static | BindingFlags.Instance; private const BindingFlags Everything = BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Static | BindingFlags.Instance;
private readonly Type _clrType; private readonly Type _clrType;
private IList<ICilType>? _genericTypeArguments; private ICilType[]? _genericTypeArguments;
private ClrType(Type clrType) : base(clrType) => private ClrType(Type clrType) : base(clrType) =>
_clrType = clrType; _clrType = clrType;
@ -62,13 +61,13 @@ public sealed class ClrType : ClrMember, ICilType
{ {
Type[] args = _clrType.GenericTypeArguments; Type[] args = _clrType.GenericTypeArguments;
if (args.Length < 1) _genericTypeArguments = args.Length < 1
? Array.Empty<ICilType>()
: new ICilType[args.Length];
for (int i = 0; i < args.Length; i++)
{ {
_genericTypeArguments = Array.Empty<ICilType>(); _genericTypeArguments[i] = GetOrCreate(args[i]);
}
else
{
_genericTypeArguments = args.Select(GetOrCreate).ToList();
} }
} }

View File

@ -12,5 +12,5 @@ public interface ICilAttribute
{ {
ICilType Type { get; } ICilType Type { get; }
IList<object?> ConstructorArguments { get; } IList<object?> ConstructorArgumentValues { get; }
} }

View File

@ -14,9 +14,9 @@ public interface ICilField
object? ConstantValue { get; } object? ConstantValue { get; }
IList<ICilAttribute> CustomAttributes { get; }
bool IsLiteral { get; } bool IsLiteral { get; }
bool IsPublic { get; } bool IsPublic { get; }
bool IsStatic { get; } bool IsStatic { get; }
IEnumerable<ICilAttribute> GetCustomAttributes();
} }

View File

@ -19,7 +19,7 @@ public interface ICilMethod
ICilType ReturnType { get; } ICilType ReturnType { get; }
IEnumerable<ICilAttribute> GetCustomAttributes(); IList<ICilAttribute> CustomAttributes { get; }
IEnumerable<ICilType> GetParameterTypes(); IEnumerable<ICilType> GetParameterTypes();
} }

View File

@ -20,5 +20,5 @@ public interface ICilProperty
ICilMethod? Getter { get; } ICilMethod? Getter { get; }
ICilMethod? Setter { get; } ICilMethod? Setter { get; }
IEnumerable<ICilAttribute> GetCustomAttributes(); IList<ICilAttribute> CustomAttributes { get; }
} }

View File

@ -26,7 +26,7 @@ public interface ICilType
IList<ICilType> GenericTypeArguments { get; } IList<ICilType> GenericTypeArguments { get; }
IEnumerable<ICilAttribute> GetCustomAttributes(); IList<ICilAttribute> CustomAttributes { get; }
IEnumerable<ICilField> GetFields(); IEnumerable<ICilField> GetFields();

View File

@ -4,17 +4,19 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this // License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/. // file, You can obtain one at http://mozilla.org/MPL/2.0/.
using System;
using System.Collections.Generic; using System.Collections.Generic;
using LibCpp2IL.Reflection; using CommunityToolkit.Diagnostics;
using LibCpp2IL.Metadata;
namespace LibProtodec.Models.Cil.Il2Cpp; namespace LibProtodec.Models.Cil.Il2Cpp;
public sealed class Il2CppAttribute(Il2CppTypeReflectionData il2CppAttrType) : ICilAttribute public sealed class Il2CppAttribute(Il2CppTypeDefinition il2CppAttrType, object?[]? ctorArgValues) : ICilAttribute
{ {
public ICilType Type => public ICilType Type =>
Il2CppType.GetOrCreate(il2CppAttrType); Il2CppType.GetOrCreate(il2CppAttrType);
public IList<object?> ConstructorArguments => public IList<object?> ConstructorArgumentValues =>
throw new NotImplementedException(); ctorArgValues
?? ThrowHelper.ThrowNotSupportedException<IList<object?>>(
"Attribute constructor argument parsing is only available on metadata version 29 or greater.");
} }

View File

@ -6,36 +6,112 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text;
using SystemEx.Memory;
using CommunityToolkit.Diagnostics;
using LibCpp2IL; using LibCpp2IL;
using LibCpp2IL.BinaryStructures;
using LibCpp2IL.Metadata; using LibCpp2IL.Metadata;
namespace LibProtodec.Models.Cil.Il2Cpp; namespace LibProtodec.Models.Cil.Il2Cpp;
public abstract class Il2CppMember public abstract class Il2CppMember
{ {
public IEnumerable<ICilAttribute> GetCustomAttributes() private ICilAttribute[]? _customAttributes;
public IList<ICilAttribute> CustomAttributes
{ {
if (LibCpp2IlMain.MetadataVersion >= 29) get
{ {
throw new NotImplementedException(); if (_customAttributes is null)
} {
if (LibCpp2IlMain.MetadataVersion < 29f)
{
int attrTypeRngIdx = LibCpp2IlMain.MetadataVersion <= 24f
? CustomAttributeIndex
: BinarySearchToken(
LibCpp2IlMain.TheMetadata!.attributeTypeRanges,
Token,
DeclaringAssembly.customAttributeStart,
(int)DeclaringAssembly.customAttributeCount);
Il2CppCustomAttributeTypeRange? attributeTypeRange = LibCpp2IlMain.TheMetadata!.GetCustomAttributeData( if (attrTypeRngIdx < 0)
DeclaringAssembly, CustomAttributeIndex, Token, out _); return _customAttributes = Array.Empty<ICilAttribute>();
if (attributeTypeRange is null || attributeTypeRange.count == 0) Il2CppCustomAttributeTypeRange attrTypeRng = LibCpp2IlMain.TheMetadata!.attributeTypeRanges[attrTypeRngIdx];
yield break;
for (int attrIndex = attributeTypeRange.start, _customAttributes = new ICilAttribute[attrTypeRng.count];
end = attributeTypeRange.start + attributeTypeRange.count; for (int attrTypeIdx = 0; attrTypeIdx < attrTypeRng.count; attrTypeIdx++)
attrIndex < end; {
attrIndex++) int typeIndex = LibCpp2IlMain.TheMetadata.attributeTypes[attrTypeRng.start + attrTypeIdx];
{ var type = LibCpp2IlMain.Binary!.GetType(typeIndex);
int typeIndex = LibCpp2IlMain.TheMetadata.attributeTypes[attrIndex]; var typeDef = LibCpp2IlMain.TheMetadata.typeDefs[type.Data.ClassIndex];
yield return new Il2CppAttribute( _customAttributes[attrTypeIdx] = new Il2CppAttribute(typeDef, null);
LibCpp2ILUtils.GetTypeReflectionData( }
LibCpp2IlMain.Binary!.GetType(typeIndex))); }
else
{
int attrDataRngIdx = BinarySearchToken(
LibCpp2IlMain.TheMetadata!.AttributeDataRanges,
Token,
DeclaringAssembly.customAttributeStart,
(int)DeclaringAssembly.customAttributeCount);
if (attrDataRngIdx < 0)
return _customAttributes = Array.Empty<ICilAttribute>();
Il2CppCustomAttributeDataRange attrDataRange = LibCpp2IlMain.TheMetadata.AttributeDataRanges[attrDataRngIdx];
Il2CppCustomAttributeDataRange attrDataRngNext = LibCpp2IlMain.TheMetadata.AttributeDataRanges[attrDataRngIdx + 1];
long attrDataStart = LibCpp2IlMain.TheMetadata.metadataHeader.attributeDataOffset + attrDataRange.startOffset;
long attrDataEnd = LibCpp2IlMain.TheMetadata.metadataHeader.attributeDataOffset + attrDataRngNext.startOffset;
byte[] attrData = LibCpp2IlMain.TheMetadata.ReadByteArrayAtRawAddress(attrDataStart, (int)(attrDataEnd - attrDataStart));
MemoryReader reader = new(attrData);
int attributeCount = (int)ReadUnityCompressedUInt32(ref reader);
Span<uint> ctorIndices = stackalloc uint[attributeCount];
for (int i = 0; i < attributeCount; i++)
ctorIndices[i] = reader.ReadUInt32LittleEndian();
_customAttributes = new ICilAttribute[attributeCount];
for (int i = 0; i < attributeCount; i++)
{
uint ctorArgCount = ReadUnityCompressedUInt32(ref reader);
uint fieldCount = ReadUnityCompressedUInt32(ref reader);
uint propCount = ReadUnityCompressedUInt32(ref reader);
object?[] ctorArgValues = ctorArgCount > 0
? new object[ctorArgCount]
: Array.Empty<object?>();
for (int j = 0; j < ctorArgCount; j++)
{
ctorArgValues[j] = ReadValue(ref reader);
}
for (uint j = 0; j < fieldCount; j++)
{
ReadValue(ref reader);
ResolveMember(ref reader);
}
for (uint j = 0; j < propCount; j++)
{
ReadValue(ref reader);
ResolveMember(ref reader);
}
Il2CppMethodDefinition attrCtor = LibCpp2IlMain.TheMetadata.methodDefs[ctorIndices[i]];
Il2CppTypeDefinition attrType = LibCpp2IlMain.TheMetadata.typeDefs[attrCtor.declaringTypeIdx];
_customAttributes[i] = new Il2CppAttribute(attrType, ctorArgValues);
}
}
}
return _customAttributes;
} }
} }
@ -44,4 +120,187 @@ public abstract class Il2CppMember
protected abstract int CustomAttributeIndex { get; } protected abstract int CustomAttributeIndex { get; }
protected abstract uint Token { get; } protected abstract uint Token { get; }
private static int BinarySearchToken(IReadOnlyList<IIl2CppTokenProvider> source, uint token, int start, int count)
{
int lo = start;
int hi = start + count - 1;
while (lo <= hi)
{
int i = lo + ((hi - lo) >> 1);
switch (source[i].Token.CompareTo(token))
{
case 0:
return i;
case < 0:
lo = i + 1;
break;
default:
hi = i - 1;
break;
}
}
return ~lo;
}
private static uint ReadUnityCompressedUInt32(ref MemoryReader reader)
{
byte byt = reader.ReadByte();
switch (byt)
{
case < 128:
return byt;
case 240:
return reader.ReadUInt32LittleEndian();
case 254:
return uint.MaxValue - 1;
case byte.MaxValue:
return uint.MaxValue;
}
if ((byt & 192) == 192)
{
return (byt & ~192U) << 24
| ((uint)reader.ReadByte() << 16)
| ((uint)reader.ReadByte() << 8)
| reader.ReadByte();
}
if ((byt & 128) == 128)
{
return (byt & ~128U) << 8
| reader.ReadByte();
}
return ThrowHelper.ThrowInvalidDataException<uint>();
}
private static int ReadUnityCompressedInt32(ref MemoryReader reader)
{
uint unsigned = ReadUnityCompressedUInt32(ref reader);
if (unsigned == uint.MaxValue)
return int.MinValue;
bool isNegative = (unsigned & 1) == 1;
unsigned >>= 1;
return isNegative
? -(int)(unsigned + 1)
: (int)unsigned;
}
private static object? ReadValue(ref MemoryReader reader)
{
Il2CppTypeEnum type = (Il2CppTypeEnum)reader.ReadByte();
return ReadValue(ref reader, type);
}
private static object? ReadValue(ref MemoryReader reader, Il2CppTypeEnum type)
{
switch (type)
{
case Il2CppTypeEnum.IL2CPP_TYPE_ENUM:
Il2CppTypeEnum underlyingType = ReadEnumUnderlyingType(ref reader);
return ReadValue(ref reader, underlyingType);
case Il2CppTypeEnum.IL2CPP_TYPE_SZARRAY:
return ReadSzArray(ref reader);
case Il2CppTypeEnum.IL2CPP_TYPE_IL2CPP_TYPE_INDEX:
int typeIndex = ReadUnityCompressedInt32(ref reader);
return LibCpp2IlMain.Binary!.GetType(typeIndex);
case Il2CppTypeEnum.IL2CPP_TYPE_BOOLEAN:
return reader.ReadBoolean();
case Il2CppTypeEnum.IL2CPP_TYPE_CHAR:
return (char)reader.ReadInt16LittleEndian();
case Il2CppTypeEnum.IL2CPP_TYPE_I1:
return reader.ReadSByte();
case Il2CppTypeEnum.IL2CPP_TYPE_U1:
return reader.ReadByte();
case Il2CppTypeEnum.IL2CPP_TYPE_I2:
return reader.ReadInt16LittleEndian();
case Il2CppTypeEnum.IL2CPP_TYPE_U2:
return reader.ReadUInt16LittleEndian();
case Il2CppTypeEnum.IL2CPP_TYPE_I4:
return ReadUnityCompressedInt32(ref reader);
case Il2CppTypeEnum.IL2CPP_TYPE_U4:
return ReadUnityCompressedUInt32(ref reader);
case Il2CppTypeEnum.IL2CPP_TYPE_I8:
return reader.ReadInt64LittleEndian();
case Il2CppTypeEnum.IL2CPP_TYPE_U8:
return reader.ReadUInt64LittleEndian();
case Il2CppTypeEnum.IL2CPP_TYPE_R4:
return reader.ReadSingleLittleEndian();
case Il2CppTypeEnum.IL2CPP_TYPE_R8:
return reader.ReadDoubleLittleEndian();
case Il2CppTypeEnum.IL2CPP_TYPE_STRING:
return ReadString(ref reader);
case Il2CppTypeEnum.IL2CPP_TYPE_CLASS:
case Il2CppTypeEnum.IL2CPP_TYPE_OBJECT:
case Il2CppTypeEnum.IL2CPP_TYPE_GENERICINST:
default:
return ThrowHelper.ThrowNotSupportedException<object>();
}
}
private static Il2CppTypeEnum ReadEnumUnderlyingType(ref MemoryReader reader)
{
int typeIdx = ReadUnityCompressedInt32(ref reader);
var enumType = LibCpp2IlMain.Binary!.GetType(typeIdx);
var underlyingType = LibCpp2IlMain.Binary.GetType(
enumType.AsClass().ElementTypeIndex);
return underlyingType.Type;
}
private static object?[]? ReadSzArray(ref MemoryReader reader)
{
int arrayLength = ReadUnityCompressedInt32(ref reader);
if (arrayLength == -1)
return null;
Il2CppTypeEnum arrayType = (Il2CppTypeEnum)reader.ReadByte();
if (arrayType == Il2CppTypeEnum.IL2CPP_TYPE_ENUM)
arrayType = ReadEnumUnderlyingType(ref reader);
bool typePrefixed = reader.ReadBoolean();
if (typePrefixed && arrayType != Il2CppTypeEnum.IL2CPP_TYPE_OBJECT)
ThrowHelper.ThrowInvalidDataException("Array elements are type-prefixed, but the array type is not object");
object?[] array = new object?[arrayLength];
for (int i = 0; i < arrayLength; i++)
{
Il2CppTypeEnum elementType = typePrefixed
? (Il2CppTypeEnum)reader.ReadByte()
: arrayType;
array[i] = ReadValue(ref reader, elementType);
}
return array;
}
private static string? ReadString(ref MemoryReader reader)
{
int length = ReadUnityCompressedInt32(ref reader);
if (length == -1)
return null;
ReadOnlySpan<byte> bytes = reader.ReadBytes(length);
return Encoding.UTF8.GetString(bytes);
}
private static void ResolveMember(ref MemoryReader reader)
{
// We don't care about attribute properties or fields,
// so we just read enough to exhaust the stream
int memberIndex = ReadUnityCompressedInt32(ref reader);
if (memberIndex < 0)
{
uint typeIndex = ReadUnityCompressedUInt32(ref reader);
memberIndex = -(memberIndex + 1);
}
}
} }

View File

@ -7,7 +7,6 @@
using System; using System;
using System.Collections.Concurrent; using System.Collections.Concurrent;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Reflection; using System.Reflection;
using CommunityToolkit.Diagnostics; using CommunityToolkit.Diagnostics;
using LibCpp2IL; using LibCpp2IL;
@ -20,7 +19,7 @@ public sealed class Il2CppType : Il2CppMember, ICilType
{ {
private readonly Il2CppTypeDefinition _il2CppType; private readonly Il2CppTypeDefinition _il2CppType;
private readonly Il2CppTypeReflectionData[] _genericArgs; private readonly Il2CppTypeReflectionData[] _genericArgs;
private IList<ICilType>? _genericTypeArguments; private ICilType[]? _genericTypeArguments;
private Il2CppType(Il2CppTypeDefinition il2CppType, Il2CppTypeReflectionData[] genericArgs) => private Il2CppType(Il2CppTypeDefinition il2CppType, Il2CppTypeReflectionData[] genericArgs) =>
(_il2CppType, _genericArgs) = (il2CppType, genericArgs); (_il2CppType, _genericArgs) = (il2CppType, genericArgs);
@ -76,13 +75,13 @@ public sealed class Il2CppType : Il2CppMember, ICilType
{ {
if (_genericTypeArguments is null) if (_genericTypeArguments is null)
{ {
if (_genericArgs.Length < 1) _genericTypeArguments = _genericArgs.Length < 1
? Array.Empty<ICilType>()
: new ICilType[_genericArgs.Length];
for (int i = 0; i < _genericArgs.Length; i++)
{ {
_genericTypeArguments = Array.Empty<ICilType>(); _genericTypeArguments[i] = GetOrCreate(_genericArgs[i]);
}
else
{
_genericTypeArguments = _genericArgs.Select(GetOrCreate).ToList();
} }
} }
@ -92,38 +91,42 @@ public sealed class Il2CppType : Il2CppMember, ICilType
public IEnumerable<ICilField> GetFields() public IEnumerable<ICilField> GetFields()
{ {
for (int idx = _il2CppType.FirstFieldIdx, end = _il2CppType.FirstFieldIdx + _il2CppType.FieldCount; idx < end; idx++) for (int i = 0; i < _il2CppType.FieldCount; i++)
{ {
yield return new Il2CppField( yield return new Il2CppField(
LibCpp2IlMain.TheMetadata!.fieldDefs[idx]); LibCpp2IlMain.TheMetadata!.fieldDefs[
_il2CppType.FirstFieldIdx + i]);
} }
} }
public IEnumerable<ICilMethod> GetMethods() public IEnumerable<ICilMethod> GetMethods()
{ {
for (int idx = _il2CppType.FirstMethodIdx, end = _il2CppType.FirstMethodIdx + _il2CppType.MethodCount; idx < end; idx++) for (int i = 0; i < _il2CppType.MethodCount; i++)
{ {
yield return new Il2CppMethod( yield return new Il2CppMethod(
LibCpp2IlMain.TheMetadata!.methodDefs[idx]); LibCpp2IlMain.TheMetadata!.methodDefs[
_il2CppType.FirstMethodIdx + i]);
} }
} }
public IEnumerable<ICilType> GetNestedTypes() public IEnumerable<ICilType> GetNestedTypes()
{ {
for (int idx = _il2CppType.NestedTypesStart, end = _il2CppType.NestedTypesStart + _il2CppType.NestedTypeCount; idx < end; idx++) for (int i = 0; i < _il2CppType.NestedTypeCount; i++)
{ {
yield return GetOrCreate( yield return GetOrCreate(
LibCpp2IlMain.TheMetadata!.typeDefs[ LibCpp2IlMain.TheMetadata!.typeDefs[
LibCpp2IlMain.TheMetadata.nestedTypeIndices[idx]]); LibCpp2IlMain.TheMetadata.nestedTypeIndices[
_il2CppType.NestedTypesStart + i]]);
} }
} }
public IEnumerable<ICilProperty> GetProperties() public IEnumerable<ICilProperty> GetProperties()
{ {
for (int idx = _il2CppType.FirstPropertyId, end = _il2CppType.FirstPropertyId + _il2CppType.PropertyCount; idx < end; idx++) for (int i = 0; i < _il2CppType.PropertyCount; i++)
{ {
yield return new Il2CppProperty( yield return new Il2CppProperty(
LibCpp2IlMain.TheMetadata!.propertyDefs[idx], LibCpp2IlMain.TheMetadata!.propertyDefs[
_il2CppType.FirstPropertyId + i],
_il2CppType); _il2CppType);
} }
} }

View File

@ -12,6 +12,7 @@ using System.Diagnostics.CodeAnalysis;
using System.Linq; using System.Linq;
using SystemEx; using SystemEx;
using CommunityToolkit.Diagnostics; using CommunityToolkit.Diagnostics;
using LibCpp2IL;
using LibProtodec.Models.Cil; using LibProtodec.Models.Cil;
using LibProtodec.Models.Protobuf; using LibProtodec.Models.Protobuf;
using LibProtodec.Models.Protobuf.Fields; using LibProtodec.Models.Protobuf.Fields;
@ -61,7 +62,7 @@ public sealed class ProtodecContext
Message message = new() Message message = new()
{ {
Name = TranslateTypeName(messageClass), Name = TranslateTypeName(messageClass),
IsObsolete = HasObsoleteAttribute(messageClass.GetCustomAttributes()) IsObsolete = HasObsoleteAttribute(messageClass.CustomAttributes)
}; };
_parsed.Add(messageClass.FullName, message); _parsed.Add(messageClass.FullName, message);
@ -77,10 +78,8 @@ public sealed class ProtodecContext
for (int pi = 0, fi = 0; pi < properties.Count; pi++) for (int pi = 0, fi = 0; pi < properties.Count; pi++)
{ {
ICilProperty property = properties[pi]; ICilProperty property = properties[pi];
List<ICilAttribute> attributes = property.GetCustomAttributes().ToList(); if (((options & ParserOptions.IncludePropertiesWithoutNonUserCodeAttribute) == 0 && !HasNonUserCodeAttribute(property.CustomAttributes)))
if (((options & ParserOptions.IncludePropertiesWithoutNonUserCodeAttribute) == 0 && !HasNonUserCodeAttribute(attributes)))
{ {
continue; continue;
} }
@ -113,7 +112,7 @@ public sealed class ProtodecContext
Type = ParseFieldType(propertyType, options, protobuf), Type = ParseFieldType(propertyType, options, protobuf),
Name = TranslateMessageFieldName(property.Name), Name = TranslateMessageFieldName(property.Name),
Id = (int)idFields[fi].ConstantValue!, Id = (int)idFields[fi].ConstantValue!,
IsObsolete = HasObsoleteAttribute(attributes), IsObsolete = HasObsoleteAttribute(property.CustomAttributes),
HasHasProp = msgFieldHasHasProp HasHasProp = msgFieldHasHasProp
}; };
@ -136,7 +135,7 @@ public sealed class ProtodecContext
Enum @enum = new() Enum @enum = new()
{ {
Name = TranslateTypeName(enumEnum), Name = TranslateTypeName(enumEnum),
IsObsolete = HasObsoleteAttribute(enumEnum.GetCustomAttributes()) IsObsolete = HasObsoleteAttribute(enumEnum.CustomAttributes)
}; };
_parsed.Add(enumEnum.FullName, @enum); _parsed.Add(enumEnum.FullName, @enum);
@ -144,14 +143,12 @@ public sealed class ProtodecContext
foreach (ICilField field in enumEnum.GetFields().Where(static field => field.IsLiteral)) foreach (ICilField field in enumEnum.GetFields().Where(static field => field.IsLiteral))
{ {
List<ICilAttribute> attributes = field.GetCustomAttributes().ToList();
@enum.Fields.Add( @enum.Fields.Add(
new EnumField new EnumField
{ {
Id = (int)field.ConstantValue!, Id = (int)field.ConstantValue!,
Name = TranslateEnumFieldName(attributes, field.Name, @enum.Name), Name = TranslateEnumFieldName(field.CustomAttributes, field.Name, @enum.Name),
IsObsolete = HasObsoleteAttribute(attributes) IsObsolete = HasObsoleteAttribute(field.CustomAttributes)
}); });
} }
@ -199,7 +196,7 @@ public sealed class ProtodecContext
Service service = new() Service service = new()
{ {
Name = TranslateTypeName(serviceClass.DeclaringType), Name = TranslateTypeName(serviceClass.DeclaringType),
IsObsolete = HasObsoleteAttribute(serviceClass.GetCustomAttributes()) IsObsolete = HasObsoleteAttribute(serviceClass.CustomAttributes)
}; };
_parsed.Add(serviceClass.DeclaringType!.FullName, service); _parsed.Add(serviceClass.DeclaringType!.FullName, service);
@ -207,9 +204,8 @@ public sealed class ProtodecContext
foreach (ICilMethod method in serviceClass.GetMethods().Where(static method => method is { IsInherited: false, IsPublic: true, IsStatic: false })) foreach (ICilMethod method in serviceClass.GetMethods().Where(static method => method is { IsInherited: false, IsPublic: true, IsStatic: false }))
{ {
List<ICilAttribute> attributes = method.GetCustomAttributes().ToList();
if ((options & ParserOptions.IncludeServiceMethodsWithoutGeneratedCodeAttribute) == 0 if ((options & ParserOptions.IncludeServiceMethodsWithoutGeneratedCodeAttribute) == 0
&& !HasGeneratedCodeAttribute(attributes, "grpc_csharp_plugin")) && !HasGeneratedCodeAttribute(method.CustomAttributes, "grpc_csharp_plugin"))
{ {
continue; continue;
} }
@ -284,7 +280,7 @@ public sealed class ProtodecContext
new ServiceMethod new ServiceMethod
{ {
Name = TranslateMethodName(method.Name), Name = TranslateMethodName(method.Name),
IsObsolete = HasObsoleteAttribute(attributes), IsObsolete = HasObsoleteAttribute(method.CustomAttributes),
RequestType = ParseFieldType(requestType, options, protobuf), RequestType = ParseFieldType(requestType, options, protobuf),
ResponseType = ParseFieldType(responseType, options, protobuf), ResponseType = ParseFieldType(responseType, options, protobuf),
IsRequestStreamed = streamReq, IsRequestStreamed = streamReq,
@ -420,7 +416,12 @@ public sealed class ProtodecContext
private string TranslateEnumFieldName(IEnumerable<ICilAttribute> attributes, string fieldName, string enumName) private string TranslateEnumFieldName(IEnumerable<ICilAttribute> attributes, string fieldName, string enumName)
{ {
//TODO: parse original name from first parameter of OriginalNameAttribute constructor if (LibCpp2IlMain.MetadataVersion >= 29f //TODO: do not merge into master until il2cpp-specific global is removed
&& attributes.SingleOrDefault(static attr => attr.Type.Name == "OriginalNameAttribute")
?.ConstructorArgumentValues[0] is string originalName)
{
return originalName;
}
if (NameLookup?.Invoke(fieldName, out string? translatedName) == true) if (NameLookup?.Invoke(fieldName, out string? translatedName) == true)
{ {
@ -591,11 +592,10 @@ public sealed class ProtodecContext
private static bool IsBeebyted(string name) => private static bool IsBeebyted(string name) =>
name.Length == 11 && name.CountUpper() == 11; name.Length == 11 && name.CountUpper() == 11;
private static bool HasGeneratedCodeAttribute(IEnumerable<ICilAttribute> attributes, string tool) private static bool HasGeneratedCodeAttribute(IEnumerable<ICilAttribute> attributes, string tool) =>
{ attributes.Any(attr => attr.Type.Name == nameof(GeneratedCodeAttribute)
return attributes.Any(attr => attr.Type.Name == nameof(GeneratedCodeAttribute)); && (LibCpp2IlMain.MetadataVersion < 29f //TODO: do not merge into master until il2cpp-specific global is removed
//TODO: ensure the first argument of the GeneratedCodeAttribute constructor == tool parameter || attr.ConstructorArgumentValues[0] as string == tool));
}
private static bool HasNonUserCodeAttribute(IEnumerable<ICilAttribute> attributes) => private static bool HasNonUserCodeAttribute(IEnumerable<ICilAttribute> attributes) =>
attributes.Any(static attr => attr.Type.Name == nameof(DebuggerNonUserCodeAttribute)); attributes.Any(static attr => attr.Type.Name == nameof(DebuggerNonUserCodeAttribute));

View File

@ -130,4 +130,4 @@ IEnumerable<ICilType> GetProtobufServiceClientTypes() =>
IEnumerable<ICilType> GetProtobufServiceServerTypes() => IEnumerable<ICilType> GetProtobufServiceServerTypes() =>
loader.LoadedTypes.Where( loader.LoadedTypes.Where(
type => type is { IsNested: true, IsAbstract: true, DeclaringType: { IsNested: false, IsSealed: true, IsAbstract: true } } type => type is { IsNested: true, IsAbstract: true, DeclaringType: { IsNested: false, IsSealed: true, IsAbstract: true } }
&& type.GetCustomAttributes().Any(attribute => attribute.Type == loader.BindServiceMethodAttribute)); && type.CustomAttributes.Any(attribute => attribute.Type == loader.BindServiceMethodAttribute));