From dc144d2e190e03729b16e402da9c36eec5aaf53f Mon Sep 17 00:00:00 2001
From: Elise <elisezerotwo@gmail.com>
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
---
 Ryujinx.HLE/HOS/Services/Ro/IRoInterface.cs  | 2 +-
 Ryujinx.HLE/HOS/Services/Ro/Types/NroInfo.cs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'Ryujinx.HLE/HOS/Services')

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,
-- 
cgit v1.2.3