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
147
Il2CppInspector.Common/Next/BinaryObjectStreamReader.cs
Normal file
147
Il2CppInspector.Common/Next/BinaryObjectStreamReader.cs
Normal file
@@ -0,0 +1,147 @@
|
||||
using System.Collections.Immutable;
|
||||
using System.Runtime.CompilerServices;
|
||||
using System.Runtime.InteropServices;
|
||||
using NoisyCowStudios.Bin2Object;
|
||||
using VersionedSerialization;
|
||||
|
||||
namespace Il2CppInspector.Next;
|
||||
|
||||
public class BinaryObjectStreamReader : BinaryObjectStream, IReader
|
||||
{
|
||||
public new StructVersion Version
|
||||
{
|
||||
get => _version;
|
||||
set
|
||||
{
|
||||
_version = value;
|
||||
base.Version = _version.AsDouble;
|
||||
}
|
||||
}
|
||||
|
||||
private StructVersion _version;
|
||||
|
||||
public virtual int Bits { get; set; }
|
||||
public bool Is32Bit => Bits == 32;
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
private static TTo Cast<TFrom, TTo>(in TFrom from) => Unsafe.As<TFrom, TTo>(ref Unsafe.AsRef(in from));
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
private T ReadInternal<T>() where T : unmanaged
|
||||
{
|
||||
var size = Unsafe.SizeOf<T>();
|
||||
var value = MemoryMarshal.Read<T>(ReadBytes(size));
|
||||
return value;
|
||||
}
|
||||
|
||||
public T ReadPrimitive<T>() where T : unmanaged
|
||||
{
|
||||
if (typeof(T) == typeof(sbyte))
|
||||
return Cast<byte, T>(ReadByte());
|
||||
|
||||
if (typeof(T) == typeof(short))
|
||||
return Cast<short, T>(ReadInt16());
|
||||
|
||||
if (typeof(T) == typeof(int))
|
||||
return Cast<int, T>(ReadInt32());
|
||||
|
||||
if (typeof(T) == typeof(long))
|
||||
return Cast<long, T>(ReadInt64());
|
||||
|
||||
if (typeof(T) == typeof(byte))
|
||||
return Cast<byte, T>(ReadByte());
|
||||
|
||||
if (typeof(T) == typeof(ushort))
|
||||
return Cast<ushort, T>(ReadUInt16());
|
||||
|
||||
if (typeof(T) == typeof(uint))
|
||||
return Cast<uint, T>(ReadUInt32());
|
||||
|
||||
if (typeof(T) == typeof(ulong))
|
||||
return Cast<ulong, T>(ReadUInt64());
|
||||
|
||||
return ReadInternal<T>();
|
||||
}
|
||||
|
||||
public ImmutableArray<T> ReadPrimitiveArray<T>(long count) where T : unmanaged
|
||||
{
|
||||
var array = ImmutableArray.CreateBuilder<T>(checked((int)count));
|
||||
for (long i = 0; i < count; i++)
|
||||
array.Add(ReadPrimitive<T>());
|
||||
|
||||
return array.MoveToImmutable();
|
||||
}
|
||||
|
||||
public T ReadVersionedObject<T>() where T : IReadable, new() => ReadVersionedObject<T>(Version);
|
||||
|
||||
public T ReadVersionedObject<T>(in StructVersion version = default) where T : IReadable, new()
|
||||
{
|
||||
var obj = new T();
|
||||
var a = this;
|
||||
obj.Read(ref a, in version);
|
||||
return obj;
|
||||
}
|
||||
|
||||
public ImmutableArray<T> ReadVersionedObjectArray<T>(long count) where T : IReadable, new() => ReadVersionedObjectArray<T>(count, Version);
|
||||
|
||||
public ImmutableArray<T> ReadVersionedObjectArray<T>(long count, in StructVersion version = default) where T : IReadable, new()
|
||||
{
|
||||
var array = ImmutableArray.CreateBuilder<T>(checked((int)count));
|
||||
for (long i = 0; i < count; i++)
|
||||
array.Add(ReadVersionedObject<T>(in version));
|
||||
|
||||
return array.MoveToImmutable();
|
||||
}
|
||||
|
||||
public long ReadNInt()
|
||||
=> Is32Bit ? ReadPrimitive<int>() : ReadPrimitive<long>();
|
||||
|
||||
public ulong ReadNUInt()
|
||||
=> Is32Bit ? ReadPrimitive<uint>() : ReadPrimitive<ulong>();
|
||||
|
||||
public string ReadString() => ReadNullTerminatedString();
|
||||
|
||||
public new ReadOnlySpan<byte> ReadBytes(int length)
|
||||
{
|
||||
return base.ReadBytes(length);
|
||||
}
|
||||
|
||||
public void Align(int alignment = 0)
|
||||
{
|
||||
if (alignment == 0)
|
||||
alignment = Is32Bit ? 4 : 8;
|
||||
|
||||
var rem = Position % alignment;
|
||||
if (rem != 0)
|
||||
Position += alignment - rem;
|
||||
}
|
||||
|
||||
public TType ReadPrimitive<TType>(long addr) where TType : unmanaged
|
||||
{
|
||||
Position = addr;
|
||||
return ReadPrimitive<TType>();
|
||||
}
|
||||
|
||||
public ImmutableArray<TType> ReadPrimitiveArray<TType>(long addr, long count) where TType : unmanaged
|
||||
{
|
||||
Position = addr;
|
||||
return ReadPrimitiveArray<TType>(count);
|
||||
}
|
||||
|
||||
public TType ReadVersionedObject<TType>(long addr) where TType : IReadable, new()
|
||||
{
|
||||
Position = addr;
|
||||
return ReadVersionedObject<TType>(Version);
|
||||
}
|
||||
|
||||
public ImmutableArray<TType> ReadVersionedObjectArray<TType>(long addr, long count) where TType : IReadable, new()
|
||||
{
|
||||
Position = addr;
|
||||
return ReadVersionedObjectArray<TType>(count, Version);
|
||||
}
|
||||
|
||||
public void Skip(int count)
|
||||
{
|
||||
Position += count;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user