diff options
| author | Elise <elisezerotwo@gmail.com> | 2020-04-08 00:41:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-07 19:41:02 -0300 |
| commit | dc144d2e190e03729b16e402da9c36eec5aaf53f (patch) | |
| tree | 00728f4639cc9642c25031aff6ae9a6d465f4fe7 /Ryujinx.HLE/HOS/Services | |
| parent | 468d8f841ffcbebf4130371eb64ab04165bce3e9 (diff) | |
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
Diffstat (limited to 'Ryujinx.HLE/HOS/Services')
| -rw-r--r-- | Ryujinx.HLE/HOS/Services/Ro/IRoInterface.cs | 2 | ||||
| -rw-r--r-- | Ryujinx.HLE/HOS/Services/Ro/Types/NroInfo.cs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Ryujinx.HLE/HOS/Services/Ro/IRoInterface.cs b/Ryujinx.HLE/HOS/Services/Ro/IRoInterface.cs index d2eb3873..e8bebb8a 100644 --- a/Ryujinx.HLE/HOS/Services/Ro/IRoInterface.cs +++ b/Ryujinx.HLE/HOS/Services/Ro/IRoInterface.cs @@ -157,7 +157,7 @@ namespace Ryujinx.HLE.HOS.Services.Ro stream.Position = 0; - NxRelocatableObject executable = new NxRelocatableObject(stream, nroAddress, bssAddress); + NroExecutable executable = new NroExecutable(stream, nroAddress, bssAddress); // check if everything is page align. if ((executable.Text.Length & 0xFFF) != 0 || (executable.Ro.Length & 0xFFF) != 0 || diff --git a/Ryujinx.HLE/HOS/Services/Ro/Types/NroInfo.cs b/Ryujinx.HLE/HOS/Services/Ro/Types/NroInfo.cs index a0911627..45daf1bd 100644 --- a/Ryujinx.HLE/HOS/Services/Ro/Types/NroInfo.cs +++ b/Ryujinx.HLE/HOS/Services/Ro/Types/NroInfo.cs @@ -4,7 +4,7 @@ namespace Ryujinx.HLE.HOS.Services.Ro { class NroInfo { - public NxRelocatableObject Executable { get; private set; } + public NroExecutable Executable { get; private set; } public byte[] Hash { get; private set; } public ulong NroAddress { get; private set; } @@ -15,7 +15,7 @@ namespace Ryujinx.HLE.HOS.Services.Ro public ulong NroMappedAddress { get; set; } public NroInfo( - NxRelocatableObject executable, + NroExecutable executable, byte[] hash, ulong nroAddress, ulong nroSize, |