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

IL2CPP: Add plugin warning when failing to analyze

Browse Source
This commit is contained in:
Katy Coe
2021-01-12 01:10:30 +01:00
parent 9c2f314d83
commit 930b00f588
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Il2CppInspector.Common/IL2CPP/Il2CppBinary.cs
View File

@@ -106,7 +106,7 @@ namespace Il2CppInspector
StatusUpdate($"Analyzing IL2CPP data for {Image.Format}/{Image.Arch} image"); StatusUpdate($"Analyzing IL2CPP data for {Image.Format}/{Image.Arch} image");
DiscoverAPIExports(); DiscoverAPIExports();
PrepareMetadata(codeRegistration, metadataRegistration); TryPrepareMetadata(codeRegistration, metadataRegistration);
} }
// Load and initialize a binary of any supported architecture // Load and initialize a binary of any supported architecture
@@ -164,7 +164,7 @@ namespace Il2CppInspector
if (!((FindMetadataFromSymbols() ?? FindMetadataFromCode()) is (ulong code, ulong meta))) if (!((FindMetadataFromSymbols() ?? FindMetadataFromCode()) is (ulong code, ulong meta)))
return false; return false;
PrepareMetadata(code, meta); TryPrepareMetadata(code, meta);
return true; return true;
} }
@@ -175,7 +175,7 @@ namespace Il2CppInspector
if (!((FindMetadataFromSymbols() ?? FindMetadataFromCode() ?? FindMetadataFromData(metadata)) is (ulong code, ulong meta))) if (!((FindMetadataFromSymbols() ?? FindMetadataFromCode() ?? FindMetadataFromData(metadata)) is (ulong code, ulong meta)))
return false; return false;
PrepareMetadata(code, meta, metadata); TryPrepareMetadata(code, meta, metadata);
return true; return true;
} }
@@ -246,6 +246,17 @@ namespace Il2CppInspector
// Architecture-specific search function // Architecture-specific search function
protected abstract (ulong, ulong) ConsiderCode(IFileFormatStream image, uint loc); protected abstract (ulong, ulong) ConsiderCode(IFileFormatStream image, uint loc);
// Load all of the discovered metadata in the binary
private void TryPrepareMetadata(ulong codeRegistration, ulong metadataRegistration, Metadata metadata = null) {
try {
PrepareMetadata(codeRegistration, metadataRegistration);
}
catch (Exception ex) when (!(ex is NotSupportedException)) {
throw new InvalidOperationException($"Could not analyze IL2CPP data. Ensure that the latest core plugins package is installed and all core plugins are enabled before filing a bug report. The error was: {ex.Message}", ex);
}
}
// Load all of the discovered metadata in the binary // Load all of the discovered metadata in the binary
private void PrepareMetadata(ulong codeRegistration, ulong metadataRegistration, Metadata metadata = null) { private void PrepareMetadata(ulong codeRegistration, ulong metadataRegistration, Metadata metadata = null) {
// Store locations // Store locations