From dc144d2e190e03729b16e402da9c36eec5aaf53f Mon Sep 17 00:00:00 2001 From: Elise Date: Wed, 8 Apr 2020 00:41:02 +0200 Subject: Use libhac for loading NSO and KIP (#1047) * Use libhac for loading NSOs and KIPs * Fix formatting * Refactor KIP and NSO executables for libhac * Fix up formatting * Remove Ryujinx.HLE.Loaders.Compression * Remove reference to Ryujinx.HLE.Loaders.Compression in NxStaticObject.cs * Remove reference to Ryujinx.HLE.Loaders.Compression in KernelInitialProcess.cs * Rename classes in Ryujinx.HLE.Loaders.Executables * Fix space alignment * Fix up formatting --- .../Loaders/Executables/NxRelocatableObject.cs | 67 ---------------------- 1 file changed, 67 deletions(-) delete mode 100644 Ryujinx.HLE/Loaders/Executables/NxRelocatableObject.cs (limited to 'Ryujinx.HLE/Loaders/Executables/NxRelocatableObject.cs') diff --git a/Ryujinx.HLE/Loaders/Executables/NxRelocatableObject.cs b/Ryujinx.HLE/Loaders/Executables/NxRelocatableObject.cs deleted file mode 100644 index e68fe267..00000000 --- a/Ryujinx.HLE/Loaders/Executables/NxRelocatableObject.cs +++ /dev/null @@ -1,67 +0,0 @@ -using System.IO; - -namespace Ryujinx.HLE.Loaders.Executables -{ - class NxRelocatableObject : IExecutable - { - public byte[] Text { get; private set; } - public byte[] Ro { get; private set; } - public byte[] Data { get; private set; } - - public int Mod0Offset { get; private set; } - public int TextOffset { get; private set; } - public int RoOffset { get; private set; } - public int DataOffset { get; private set; } - public int BssSize { get; private set; } - public int FileSize { get; private set; } - - public int BssOffset => DataOffset + Data.Length; - - public ulong SourceAddress { get; private set; } - public ulong BssAddress { get; private set; } - - public NxRelocatableObject(Stream input, ulong sourceAddress = 0, ulong bssAddress = 0) - { - SourceAddress = sourceAddress; - BssAddress = bssAddress; - - BinaryReader reader = new BinaryReader(input); - - input.Seek(4, SeekOrigin.Begin); - - int mod0Offset = reader.ReadInt32(); - int padding8 = reader.ReadInt32(); - int paddingC = reader.ReadInt32(); - int nroMagic = reader.ReadInt32(); - int unknown14 = reader.ReadInt32(); - int fileSize = reader.ReadInt32(); - int unknown1C = reader.ReadInt32(); - int textOffset = reader.ReadInt32(); - int textSize = reader.ReadInt32(); - int roOffset = reader.ReadInt32(); - int roSize = reader.ReadInt32(); - int dataOffset = reader.ReadInt32(); - int dataSize = reader.ReadInt32(); - int bssSize = reader.ReadInt32(); - - Mod0Offset = mod0Offset; - TextOffset = textOffset; - RoOffset = roOffset; - DataOffset = dataOffset; - BssSize = bssSize; - - byte[] Read(long position, int size) - { - input.Seek(position, SeekOrigin.Begin); - - return reader.ReadBytes(size); - } - - Text = Read(textOffset, textSize); - Ro = Read(roOffset, roSize); - Data = Read(dataOffset, dataSize); - - FileSize = fileSize; - } - } -} \ No newline at end of file -- cgit v1.2.3