Struct reading and disassembly script overhaul, various misc. loading fixes, bump to .NET 9 (#13)
* Bump projects to .net 9 and update nugets * add VersionedSerialization + source generator * migrate versioning to StructVersion class, add handling/detection for 29.2/31.2 * add new struct definitions * rename serialization methods and add BinaryObjectStreamReader for interop * Rework metadata struct loading to use new struct versioning * move 29/31.1/.2 to use tags (-2022,-2023) instead of minor versions * fix metadata usage validity checks * rework code registration offsetting a bit and add second 29/31.1 condition * tweak .1 condition (again) * 29/31.2 was a psyop * also remove 29.2 from the readme * remove loading of packed dlls - this was a very unsafe feature * support auto-recovering type indices from type handles fixes loading of memory-dumped v29+ libraries since those replacee their class indices on load with a pointer to the corresponding type * support loading PEs without an export table * also read UnresolvedVirtualCallCount on regular v31 * Disable plugin loading for now * Overhaul disassembler script + add Binary Ninja target (#12) * Overhaul diassembler scripts: - No longer defines top level functions - Split into three classes: StatusHandler (like before), DisassemblerInterface (for interfacing with the used program API), ScriptContext (for definiting general functions that use the disassembler interface) - Add type annotations to all class methods and remove 2.7 compatibility stuff (Ghidra now supports Python 3 so this is unnecessary anymore) - Disassembler backends are now responsible for launching metadata/script processing, to better support disassembler differences - String handling is back in the base ScriptContext class, disassembler interfaces opt into the fake string segment creation and fall back to the old method if it isn't supported * Add Binary Ninja disassembler script backend This uses the new backend-controlled execution to launch metadata processing on a background thread to keep the ui responsive * make binary ninja script use own _BINARYNINJA_ define and add define helpers to header * Update README to account for new script and binary ninja backend * implement fake string segment functions for binary ninja but don't advertise support * also cache API function types in binary ninja backend * fix ida script and disable folders again * Fix metadata usage issues caused by it being a value type now * make TryMapVATR overrideable and implement it for ELFs * Make field offset reading use TryMapVATR to reduce exceptions * Fix NRE in Assembly ctor on < v24.2 * Update actions workflow to produce cross-platform CLI binaries, update readme to reflect .net 9 changes * workflow: only restore packages for projects that are being built * workflow: tweak caching and fix gui compilation * workflow: remove double .zip in CLI artifact name * 29/31.2 don't actually exist, this logic is not needed
This commit is contained in:
Luke
@@ -6,17 +6,20 @@
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Collections.Immutable;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Reflection;
|
||||
using System.Text;
|
||||
using Il2CppInspector.Next;
|
||||
using NoisyCowStudios.Bin2Object;
|
||||
using VersionedSerialization;
|
||||
|
||||
namespace Il2CppInspector
|
||||
{
|
||||
public interface IFileFormatStream
|
||||
{
|
||||
double Version { get; set; }
|
||||
StructVersion Version { get; set; }
|
||||
long Length { get; }
|
||||
uint NumImages { get; }
|
||||
string DefaultFilename { get; }
|
||||
@@ -91,6 +94,9 @@ namespace Il2CppInspector
|
||||
long[] ReadMappedWordArray(ulong uiAddr, int count);
|
||||
List<U> ReadMappedObjectPointerArray<U>(ulong uiAddr, int count) where U : new();
|
||||
|
||||
ulong ReadMappedUWord(ulong uiAddr);
|
||||
ulong[] ReadMappedUWordArray(ulong uiAddr, int count);
|
||||
|
||||
void WriteEndianBytes(byte[] bytes);
|
||||
void Write(long int64);
|
||||
void Write(ulong uint64);
|
||||
@@ -120,6 +126,30 @@ namespace Il2CppInspector
|
||||
|
||||
public void AddPrimitiveMapping(Type objType, Type streamType);
|
||||
public void CopyTo(Stream stream);
|
||||
|
||||
public TType ReadMappedPrimitive<TType>(ulong addr) where TType : unmanaged;
|
||||
public TType ReadPrimitive<TType>(long addr) where TType : unmanaged;
|
||||
public TType ReadPrimitive<TType>() where TType : unmanaged;
|
||||
|
||||
public ImmutableArray<TType> ReadMappedPrimitiveArray<TType>(ulong addr, long count) where TType : unmanaged;
|
||||
public ImmutableArray<TType> ReadPrimitiveArray<TType>(long addr, long count) where TType : unmanaged;
|
||||
public ImmutableArray<TType> ReadPrimitiveArray<TType>(long count) where TType : unmanaged;
|
||||
|
||||
public TType ReadMappedVersionedObject<TType>(ulong addr) where TType : IReadable, new();
|
||||
public TType ReadVersionedObject<TType>(long addr) where TType : IReadable, new();
|
||||
public TType ReadVersionedObject<TType>() where TType : IReadable, new();
|
||||
|
||||
public ImmutableArray<TType> ReadMappedVersionedObjectArray<TType>(ulong addr, long count)
|
||||
where TType : IReadable, new();
|
||||
|
||||
public ImmutableArray<TType> ReadVersionedObjectArray<TType>(long addr, long count)
|
||||
where TType : IReadable, new();
|
||||
|
||||
public ImmutableArray<TType> ReadVersionedObjectArray<TType>(long count)
|
||||
where TType : IReadable, new();
|
||||
|
||||
public ImmutableArray<TType> ReadMappedVersionedObjectPointerArray<TType>(ulong addr, int count)
|
||||
where TType : IReadable, new();
|
||||
}
|
||||
|
||||
public class FileFormatStream
|
||||
@@ -160,7 +190,7 @@ namespace Il2CppInspector
|
||||
}
|
||||
}
|
||||
|
||||
public abstract class FileFormatStream<T> : BinaryObjectStream, IFileFormatStream where T : FileFormatStream<T>
|
||||
public abstract class FileFormatStream<T> : BinaryObjectStreamReader, IFileFormatStream where T : FileFormatStream<T>
|
||||
{
|
||||
public abstract string DefaultFilename { get; }
|
||||
|
||||
@@ -254,7 +284,7 @@ namespace Il2CppInspector
|
||||
public virtual uint MapVATR(ulong uiAddr) => (uint) uiAddr;
|
||||
|
||||
// Try to map an RVA to an offset in the file image
|
||||
public bool TryMapVATR(ulong uiAddr, out uint fileOffset) {
|
||||
public virtual bool TryMapVATR(ulong uiAddr, out uint fileOffset) {
|
||||
try {
|
||||
fileOffset = MapVATR(uiAddr);
|
||||
return true;
|
||||
@@ -322,5 +352,42 @@ namespace Il2CppInspector
|
||||
array.Add(ReadMappedObject<U>(pointers[i]));
|
||||
return array;
|
||||
}
|
||||
|
||||
public TType ReadMappedPrimitive<TType>(ulong addr) where TType : unmanaged => ReadPrimitive<TType>(MapVATR(addr));
|
||||
|
||||
public ImmutableArray<TType> ReadMappedPrimitiveArray<TType>(ulong addr, long count) where TType : unmanaged
|
||||
=> ReadPrimitiveArray<TType>(MapVATR(addr), count);
|
||||
|
||||
public TType ReadMappedVersionedObject<TType>(ulong addr) where TType : IReadable, new() => ReadVersionedObject<TType>(MapVATR(addr));
|
||||
|
||||
public ImmutableArray<TType> ReadMappedVersionedObjectArray<TType>(ulong addr, long count) where TType : IReadable, new()
|
||||
=> ReadVersionedObjectArray<TType>(MapVATR(addr), count);
|
||||
|
||||
public ImmutableArray<TType> ReadMappedVersionedObjectPointerArray<TType>(ulong addr, int count)
|
||||
where TType : IReadable, new()
|
||||
{
|
||||
var pointers = ReadMappedUWordArray(addr, count);
|
||||
var builder = ImmutableArray.CreateBuilder<TType>((int)count);
|
||||
for (long i = 0; i < count; i++)
|
||||
builder.Add(ReadMappedVersionedObject<TType>(pointers[i]));
|
||||
|
||||
return builder.MoveToImmutable();
|
||||
}
|
||||
|
||||
public ulong ReadMappedUWord(ulong uiAddr)
|
||||
{
|
||||
Position = MapVATR(uiAddr);
|
||||
return ReadNUInt();
|
||||
}
|
||||
|
||||
public ulong[] ReadMappedUWordArray(ulong uiAddr, int count)
|
||||
{
|
||||
Position = MapVATR(uiAddr);
|
||||
var arr = new ulong[count];
|
||||
for (int i = 0; i < count; i++)
|
||||
arr[i] = ReadNUInt();
|
||||
|
||||
return arr;
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user