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

IL2CPP: Eliminate public BinaryMetadataUsages

Browse Source
This commit is contained in:
Katy Coe
2020-02-02 23:03:38 +01:00
parent c43f92b1e2
commit 3e69784898
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Il2CppDumper/Il2CppIDAScriptDumper.cs
View File

@@ -78,12 +78,11 @@ def SetName(addr, name):
private void writeUsages() {
foreach (var usage in model.Package.MetadataUsages) {
var escapedName = model.GetMetadataUsageName(usage).ToEscapedString();
var address = model.Package.BinaryMetadataUsages[usage.DestinationIndex];
if (usage.Type != MetadataUsageType.StringLiteral)
writeLines($"SetName({address.ToAddressString()}, '{usagePrefixes[usage.Type]}${escapedName}')");
writeLines($"SetName({usage.VirtualAddress.ToAddressString()}, '{usagePrefixes[usage.Type]}${escapedName}')");
else
writeLines($"SetString({address.ToAddressString()}, r'{escapedName}')");
writeLines($"SetString({usage.VirtualAddress.ToAddressString()}, r'{escapedName}')");
}
}

17
Il2CppInspector/IL2CPP/Il2CppInspector.cs
View File

@@ -27,7 +27,6 @@ namespace Il2CppInspector
// Merged list of all metadata usage references
public List<MetadataUsage> MetadataUsages { get; }
public ulong[] BinaryMetadataUsages { get; } // TODO: Make private
// Shortcuts
public double Version => Metadata.Version;
@@ -143,6 +142,14 @@ namespace Il2CppInspector
usages.TryAdd(destinationIndex, new MetadataUsage(usageType, (int)sourceIndex, (int)destinationIndex));
}
}
// Metadata usages (addresses)
// Unfortunately the value supplied in MetadataRegistration.matadataUsagesCount seems to be incorrect,
// so we have to calculate the correct number of usages above before reading the usage address list from the binary
var addresses = Binary.Image.ReadMappedArray<ulong>(Binary.MetadataRegistration.metadataUsages, usages.Count);
foreach (var usage in usages.Values)
usage.SetAddress(addresses[usage.DestinationIndex]);
return usages.Values.ToList();
}
@@ -221,14 +228,8 @@ namespace Il2CppInspector
}
// Merge all metadata usage references into a single distinct list
if (Version >= 19) {
if (Version >= 19)
MetadataUsages = buildMetadataUsages();
// Metadata usages (addresses)
// Unfortunately the value supplied in MetadataRegistration.matadataUsagesCount seems to be incorrect,
// so we have to calculate the correct number of usages above before reading the usage address list from the binary
BinaryMetadataUsages = Binary.Image.ReadMappedArray<ulong>(Binary.MetadataRegistration.metadataUsages, MetadataUsages.Count);
}
}
// Get a method pointer if available

3
Il2CppInspector/IL2CPP/MetadataUsage.cs
View File

@@ -22,11 +22,14 @@ namespace Il2CppInspector
public MetadataUsageType Type { get; }
public int SourceIndex { get; }
public int DestinationIndex { get; }
public ulong VirtualAddress { get; private set; }
public MetadataUsage(MetadataUsageType type, int sourceIndex, int destinationIndex) {
Type = type;
SourceIndex = sourceIndex;
DestinationIndex = destinationIndex;
}
public void SetAddress(ulong virtualAddress) => VirtualAddress = virtualAddress;
}
}