drashna/ryujinx
1
0
Fork 0
Code Activity Actions

Fix compilation warnings and use new LibHac APIs for executable loading (#1350)

Browse source 
* Fix compilation warnings and use new LibHac APIs for executable loading

* Migrate NSO loader to the new reader and fix kip loader

* Fix CS0162 restore

* Remove extra return lines

* Address Moose's comment
This commit is contained in:
Mary 2020-07-04 01:58:01 +02:00 • committed by GitHub
parent e13154c83d
commit 2c48750ff0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 102 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

67
Ryujinx.HLE/Loaders/Executables/KipExecutable.cs
View file

@ -1,35 +1,76 @@
using LibHac;
using LibHac.Fs;
using System.IO;
using LibHac.Loader;
namespace Ryujinx.HLE.Loaders.Executables
{
class KipExecutable : Kip, IExecutable
class KipExecutable : IExecutable
{
public byte[] Text { get; }
public byte[] Ro { get; }
public byte[] Data { get; }
public int TextOffset => Header.Sections[0].OutOffset;
public int RoOffset => Header.Sections[1].OutOffset;
public int DataOffset => Header.Sections[2].OutOffset;
public int BssOffset => Header.Sections[3].OutOffset;
public int BssSize => Header.Sections[3].DecompressedSize;
public int TextOffset { get; }
public int RoOffset { get; }
public int DataOffset { get; }
public int BssOffset { get; }
public int BssSize { get; }
public int[] Capabilities { get; }
public bool UsesSecureMemory { get; }
public bool Is64BitAddressSpace { get; }
public bool Is64Bit { get; }
public ulong ProgramId { get; }
public byte Priority { get; }
public int StackSize { get; }
public byte IdealCoreId { get; }
public int Version { get; }
public string Name { get; }
public KipExecutable(IStorage inStorage) : base(inStorage)
public KipExecutable(IStorage inStorage)
{
KipReader reader = new KipReader();
reader.Initialize(inStorage).ThrowIfFailure();
TextOffset = reader.Segments[0].MemoryOffset;
RoOffset = reader.Segments[1].MemoryOffset;
DataOffset = reader.Segments[2].MemoryOffset;
BssOffset = reader.Segments[3].MemoryOffset;
BssSize = reader.Segments[3].Size;
StackSize = reader.StackSize;
UsesSecureMemory = reader.UsesSecureMemory;
Is64BitAddressSpace = reader.Is64BitAddressSpace;
Is64Bit = reader.Is64Bit;
ProgramId = reader.ProgramId;
Priority = reader.Priority;
IdealCoreId = reader.IdealCoreId;
Version = reader.Version;
Name = reader.Name.ToString();
Capabilities = new int[32];
for (int index = 0; index < Capabilities.Length; index++)
{
Capabilities[index] = System.BitConverter.ToInt32(Header.Capabilities, index * 4);
Capabilities[index] = (int)reader.Capabilities[index];
}
Text = DecompressSection(0);
Ro = DecompressSection(1);
Data = DecompressSection(2);
Text = DecompressSection(reader, KipReader.SegmentType.Text);
Ro = DecompressSection(reader, KipReader.SegmentType.Ro);
Data = DecompressSection(reader, KipReader.SegmentType.Data);
}
private static byte[] DecompressSection(KipReader reader, KipReader.SegmentType segmentType)
{
reader.GetSegmentSize(segmentType, out int uncompressedSize).ThrowIfFailure();
byte[] result = new byte[uncompressedSize];
reader.ReadSegment(segmentType, result).ThrowIfFailure();
return result;
}
}
}