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

AppModel/C++/JSON/Script: Don't output generic method definitions (no compiled code)

Browse Source
This commit is contained in:
Katy Coe
2020-08-04 05:14:19 +02:00
parent 86dec121e5
commit eb55e5b527
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Il2CppInspector.Common/Model/AppMethod.cs
View File

@@ -23,10 +23,16 @@ namespace Il2CppInspector.Model
public MethodBase Method { get; internal set; }
// The VA of the MethodInfo* (VA of the pointer to the MethodInfo) object which defines this method
// Methods not referenced by the binary will be 0xffffffff_ffffffff
public ulong MethodInfoPtrAddress { get; internal set; }
// The VA of the method code itself, or 0 if unknown/not compiled
public ulong MethodCodeAddress => Method.VirtualAddress?.Start ?? 0;
// The VA of the method code itself
// Generic method definitions do not have a code address but may have a reference above
public ulong MethodCodeAddress => Method.VirtualAddress?.Start ?? 0xffffffff_ffffffff;
// Helpers
public bool HasMethodInfo => MethodInfoPtrAddress != 0xffffffff_ffffffff;
public bool HasCompiledCode => Method.VirtualAddress.HasValue && Method.VirtualAddress.Value.Start != 0;
public AppMethod(MethodBase method, CppFnPtrType cppMethod, ulong methodInfoPtr = 0xffffffff_ffffffff) {
Method = method;

2
Il2CppInspector.Common/Outputs/CppScaffolding.cs
View File

@@ -163,7 +163,7 @@ typedef size_t uintptr_t;
writeCode("using namespace app;");
writeLine("");
foreach (var method in model.Methods.Values) {
foreach (var method in model.Methods.Values.Where(m => m.HasCompiledCode)) {
var arguments = string.Join(", ", method.CppFnPtrType.Arguments.Select(a => a.Type.Name + " " + (a.Name == "this" ? "__this" : a.Name)));
writeCode($"DO_APP_FUNC(0x{method.MethodCodeAddress - model.Package.BinaryImage.ImageBase:X8}, {method.CppFnPtrType.ReturnType.Name}, "
+ $"{method.CppFnPtrType.Name}, ({arguments}));");

4
Il2CppInspector.Common/Outputs/JSONMetadata.cs
View File

@@ -64,7 +64,7 @@ namespace Il2CppInspector.Outputs
}
private void writeMethods(IEnumerable<AppMethod> methods) {
foreach (var method in methods) {
foreach (var method in methods.Where(m => m.HasCompiledCode)) {
writeObject(() => {
writeTypedFunctionName(method.MethodCodeAddress, method.CppFnPtrType.ToSignatureString(), method.CppFnPtrType.Name);
writeDotNetSignature(method.Method);
@@ -123,7 +123,7 @@ namespace Il2CppInspector.Outputs
// Metedata usage methods
writeArray("methodInfoPointers",
() => {
foreach (var method in model.Methods.Values.Where(m => m.MethodInfoPtrAddress != 0xffffffff_ffffffff)) {
foreach (var method in model.Methods.Values.Where(m => m.HasMethodInfo)) {
writeObject(() => {
writeName(method.MethodInfoPtrAddress, $"{method.CppFnPtrType.Name}__MethodInfo");
writeDotNetSignature(method.Method);