Improve IRoInterface logic (#809)

* hle: Improve IRoInterface logic

This commit contains a little rewrite of IRoInterface to fix some issues
that we were facing on some recent games (AC3 Remastered & Final Fantasy
VIII Remastered)

Related issues:

- https://github.com/Ryujinx/Ryujinx-Games-List/issues/196

* Address comments

5 files changed, 0 insertions, 589 deletions

diff --git a/Ryujinx.HLE/HOS/Services/Loader/IRoInterface.cs b/Ryujinx.HLE/HOS/Services/Loader/IRoInterface.cs
deleted file mode 100644
index 3d58594b..00000000
--- a/Ryujinx.HLE/HOS/Services/Loader/IRoInterface.cs
+++ /dev/null
@@ -1,485 +0,0 @@
-using ARMeilleure.Memory;
-using Ryujinx.Common;
-using Ryujinx.HLE.HOS.Kernel.Common;
-using Ryujinx.HLE.HOS.Kernel.Memory;
-using Ryujinx.HLE.HOS.Kernel.Process;
-using Ryujinx.HLE.Loaders.Executables;
-using Ryujinx.HLE.Utilities;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Security.Cryptography;
-
-namespace Ryujinx.HLE.HOS.Services.Loader
-{
-    [Service("ldr:ro")]
-    [Service("ro:1")] // 7.0.0+
-    class IRoInterface : IpcService
-    {
-        private const int MaxNrr = 0x40;
-        private const int MaxNro = 0x40;
-
-        private const uint NrrMagic = 0x3052524E;
-        private const uint NroMagic = 0x304F524E;
-
-        private List<NrrInfo> _nrrInfos;
-        private List<NroInfo> _nroInfos;
-
-        private bool _isInitialized;
-
-        public IRoInterface(ServiceCtx context)
-        {
-            _nrrInfos = new List<NrrInfo>(MaxNrr);
-            _nroInfos = new List<NroInfo>(MaxNro);
-        }
-
-        private ResultCode ParseNrr(out NrrInfo nrrInfo, ServiceCtx context, long nrrAddress, long nrrSize)
-        {
-            nrrInfo = null;
-
-            if (nrrSize == 0 || nrrAddress + nrrSize <= nrrAddress || (nrrSize & 0xFFF) != 0)
-            {
-                return ResultCode.BadSize;
-            }
-            else if ((nrrAddress & 0xFFF) != 0)
-            {
-                return ResultCode.UnalignedAddress;
-            }
-
-            StructReader reader = new StructReader(context.Memory, nrrAddress);
-            NrrHeader    header = reader.Read<NrrHeader>();
-
-            if (header.Magic != NrrMagic)
-            {
-                return ResultCode.InvalidNrr;
-            }
-            else if (header.NrrSize != nrrSize)
-            {
-                return ResultCode.BadSize;
-            }
-
-            List<byte[]> hashes = new List<byte[]>();
-
-            for (int i = 0; i < header.HashCount; i++)
-            {
-                hashes.Add(context.Memory.ReadBytes(nrrAddress + header.HashOffset + (i * 0x20), 0x20));
-            }
-
-            nrrInfo = new NrrInfo(nrrAddress, header, hashes);
-
-            return ResultCode.Success;
-        }
-
-        public bool IsNroHashPresent(byte[] nroHash)
-        {
-            foreach (NrrInfo info in _nrrInfos)
-            {
-                foreach (byte[] hash in info.Hashes)
-                {
-                    if (hash.SequenceEqual(nroHash))
-                    {
-                        return true;
-                    }
-                }
-            }
-
-            return false;
-        }
-
-        public bool IsNroLoaded(byte[] nroHash)
-        {
-            foreach (NroInfo info in _nroInfos)
-            {
-                if (info.Hash.SequenceEqual(nroHash))
-                {
-                    return true;
-                }
-            }
-
-            return false;
-        }
-
-        public ResultCode ParseNro(out NroInfo res, ServiceCtx context, ulong nroAddress, ulong nroSize, ulong bssAddress, ulong bssSize)
-        {
-            res = null;
-
-            if (_nroInfos.Count >= MaxNro)
-            {
-                return ResultCode.MaxNro;
-            }
-            else if (nroSize == 0 || nroAddress + nroSize <= nroAddress || (nroSize & 0xFFF) != 0)
-            {
-                return ResultCode.BadSize;
-            }
-            else if (bssSize != 0 && bssAddress + bssSize <= bssAddress)
-            {
-                return ResultCode.BadSize;
-            }
-            else if ((nroAddress & 0xFFF) != 0)
-            {
-                return ResultCode.UnalignedAddress;
-            }
-
-            uint magic       = context.Memory.ReadUInt32((long)nroAddress + 0x10);
-            uint nroFileSize = context.Memory.ReadUInt32((long)nroAddress + 0x18);
-
-            if (magic != NroMagic || nroSize != nroFileSize)
-            {
-                return ResultCode.InvalidNro;
-            }
-
-            byte[] nroData = context.Memory.ReadBytes((long)nroAddress, (long)nroSize);
-            byte[] nroHash = null;
-
-            MemoryStream stream = new MemoryStream(nroData);
-
-            using (SHA256 hasher = SHA256.Create())
-            {
-                nroHash = hasher.ComputeHash(stream);
-            }
-
-            if (!IsNroHashPresent(nroHash))
-            {
-                return ResultCode.NroHashNotPresent;
-            }
-
-            if (IsNroLoaded(nroHash))
-            {
-                return ResultCode.NroAlreadyLoaded;
-            }
-
-            stream.Position = 0;
-
-            NxRelocatableObject executable = new NxRelocatableObject(stream, nroAddress, bssAddress);
-
-            // check if everything is page align.
-            if ((executable.Text.Length & 0xFFF) != 0 || (executable.Ro.Length & 0xFFF) != 0 ||
-                (executable.Data.Length & 0xFFF) != 0 || (executable.BssSize & 0xFFF)   != 0)
-            {
-                return ResultCode.InvalidNro;
-            }
-
-            // check if everything is contiguous.
-            if (executable.RoOffset   != executable.TextOffset + executable.Text.Length ||
-                executable.DataOffset != executable.RoOffset   + executable.Ro.Length   ||
-                nroFileSize           != executable.DataOffset + executable.Data.Length)
-            {
-                return ResultCode.InvalidNro;
-            }
-
-            // finally check the bss size match.
-            if ((ulong)executable.BssSize != bssSize)
-            {
-                return ResultCode.InvalidNro;
-            }
-
-            int totalSize = executable.Text.Length + executable.Ro.Length + executable.Data.Length + executable.BssSize;
-
-            res = new NroInfo(
-                executable,
-                nroHash,
-                nroAddress,
-                nroSize,
-                bssAddress,
-                bssSize,
-                (ulong)totalSize);
-
-            return ResultCode.Success;
-        }
-
-        private ResultCode MapNro(ServiceCtx context, NroInfo info, out ulong nroMappedAddress)
-        {
-            nroMappedAddress = 0;
-
-            KMemoryManager memMgr = context.Process.MemoryManager;
-
-            ulong targetAddress = memMgr.GetAddrSpaceBaseAddr();
-
-            while (true)
-            {
-                if (targetAddress + info.TotalSize >= memMgr.AddrSpaceEnd)
-                {
-                    return ResultCode.InvalidMemoryState;
-                }
-
-                KMemoryInfo memInfo = memMgr.QueryMemory(targetAddress);
-
-                if (memInfo.State == MemoryState.Unmapped && memInfo.Size >= info.TotalSize)
-                {
-                    if (!memMgr.InsideHeapRegion (targetAddress, info.TotalSize) &&
-                        !memMgr.InsideAliasRegion(targetAddress, info.TotalSize))
-                    {
-                        break;
-                    }
-                }
-
-                targetAddress += memInfo.Size;
-            }
-
-            KernelResult result = memMgr.MapProcessCodeMemory(targetAddress, info.NroAddress, info.NroSize);
-
-            if (result != KernelResult.Success)
-            {
-                return ResultCode.InvalidMemoryState;
-            }
-
-            ulong bssTargetAddress = targetAddress + info.NroSize;
-
-            if (info.BssSize != 0)
-            {
-                result = memMgr.MapProcessCodeMemory(bssTargetAddress, info.BssAddress, info.BssSize);
-
-                if (result != KernelResult.Success)
-                {
-                    memMgr.UnmapProcessCodeMemory(targetAddress, info.NroAddress, info.NroSize);
-
-                    return ResultCode.InvalidMemoryState;
-                }
-            }
-
-            result = LoadNroIntoMemory(context.Process, info.Executable, targetAddress);
-
-            if (result != KernelResult.Success)
-            {
-                memMgr.UnmapProcessCodeMemory(targetAddress, info.NroAddress, info.NroSize);
-
-                if (info.BssSize != 0)
-                {
-                    memMgr.UnmapProcessCodeMemory(bssTargetAddress, info.BssAddress, info.BssSize);
-                }
-
-                return ResultCode.Success;
-            }
-
-            info.NroMappedAddress = targetAddress;
-            nroMappedAddress      = targetAddress;
-
-            return ResultCode.Success;
-        }
-
-        private KernelResult LoadNroIntoMemory(KProcess process, IExecutable relocatableObject, ulong baseAddress)
-        {
-            ulong textStart = baseAddress + (ulong)relocatableObject.TextOffset;
-            ulong roStart   = baseAddress + (ulong)relocatableObject.RoOffset;
-            ulong dataStart = baseAddress + (ulong)relocatableObject.DataOffset;
-
-            ulong bssStart = dataStart + (ulong)relocatableObject.Data.Length;
-
-            ulong bssEnd = BitUtils.AlignUp(bssStart + (ulong)relocatableObject.BssSize, KMemoryManager.PageSize);
-
-            process.CpuMemory.WriteBytes((long)textStart, relocatableObject.Text);
-            process.CpuMemory.WriteBytes((long)roStart,   relocatableObject.Ro);
-            process.CpuMemory.WriteBytes((long)dataStart, relocatableObject.Data);
-
-            MemoryHelper.FillWithZeros(process.CpuMemory, (long)bssStart, (int)(bssEnd - bssStart));
-
-            KernelResult result;
-
-            result = process.MemoryManager.SetProcessMemoryPermission(textStart, roStart - textStart, MemoryPermission.ReadAndExecute);
-
-            if (result != KernelResult.Success)
-            {
-                return result;
-            }
-
-            result = process.MemoryManager.SetProcessMemoryPermission(roStart, dataStart - roStart, MemoryPermission.Read);
-
-            if (result != KernelResult.Success)
-            {
-                return result;
-            }
-
-            return process.MemoryManager.SetProcessMemoryPermission(dataStart, bssEnd - dataStart, MemoryPermission.ReadAndWrite);
-        }
-
-        private ResultCode RemoveNrrInfo(long nrrAddress)
-        {
-            foreach (NrrInfo info in _nrrInfos)
-            {
-                if (info.NrrAddress == nrrAddress)
-                {
-                    _nrrInfos.Remove(info);
-
-                    return ResultCode.Success;
-                }
-            }
-
-            return ResultCode.BadNrrAddress;
-        }
-
-        private ResultCode RemoveNroInfo(ServiceCtx context, ulong nroMappedAddress)
-        {
-            foreach (NroInfo info in _nroInfos)
-            {
-                if (info.NroMappedAddress == nroMappedAddress)
-                {
-                    _nroInfos.Remove(info);
-
-                    ulong textSize = (ulong)info.Executable.Text.Length;
-                    ulong roSize   = (ulong)info.Executable.Ro.Length;
-                    ulong dataSize = (ulong)info.Executable.Data.Length;
-                    ulong bssSize  = (ulong)info.Executable.BssSize;
-
-                    KernelResult result = KernelResult.Success;
-
-                    if (info.Executable.BssSize != 0)
-                    {
-                        result = context.Process.MemoryManager.UnmapProcessCodeMemory(
-                            info.NroMappedAddress + textSize + roSize + dataSize,
-                            info.Executable.BssAddress,
-                            bssSize);
-                    }
-
-                    if (result == KernelResult.Success)
-                    {
-                        result = context.Process.MemoryManager.UnmapProcessCodeMemory(
-                            info.NroMappedAddress         + textSize + roSize,
-                            info.Executable.SourceAddress + textSize + roSize,
-                            dataSize);
-
-                        if (result == KernelResult.Success)
-                        {
-                            result = context.Process.MemoryManager.UnmapProcessCodeMemory(
-                                info.NroMappedAddress,
-                                info.Executable.SourceAddress,
-                                textSize + roSize);
-                        }
-                    }
-
-                    return (ResultCode)result;
-                }
-            }
-
-            return ResultCode.BadNroAddress;
-        }
-
-        [Command(0)]
-        // LoadNro(u64, u64, u64, u64, u64, pid) -> u64
-        public ResultCode LoadNro(ServiceCtx context)
-        {
-            ResultCode result = ResultCode.BadInitialization;
-
-            // Zero
-            context.RequestData.ReadUInt64();
-
-            ulong nroHeapAddress = context.RequestData.ReadUInt64();
-            ulong nroSize        = context.RequestData.ReadUInt64();
-            ulong bssHeapAddress = context.RequestData.ReadUInt64();
-            ulong bssSize        = context.RequestData.ReadUInt64();
-
-            ulong nroMappedAddress = 0;
-
-            if (_isInitialized)
-            {
-                NroInfo info;
-
-                result = ParseNro(out info, context, nroHeapAddress, nroSize, bssHeapAddress, bssSize);
-
-                if (result == 0)
-                {
-                    result = MapNro(context, info, out nroMappedAddress);
-
-                    if (result == 0)
-                    {
-                        _nroInfos.Add(info);
-                    }
-                }
-            }
-
-            context.ResponseData.Write(nroMappedAddress);
-
-            return result;
-        }
-
-        [Command(1)]
-        // UnloadNro(u64, u64, pid)
-        public ResultCode UnloadNro(ServiceCtx context)
-        {
-            ResultCode result = ResultCode.BadInitialization;
-
-            // Zero
-            context.RequestData.ReadUInt64();
-
-            ulong nroMappedAddress = context.RequestData.ReadUInt64();
-
-            if (_isInitialized)
-            {
-                if ((nroMappedAddress & 0xFFF) != 0)
-                {
-                    return ResultCode.UnalignedAddress;
-                }
-
-                result = RemoveNroInfo(context, nroMappedAddress);
-            }
-
-            return result;
-        }
-
-        [Command(2)]
-        // LoadNrr(u64, u64, u64, pid)
-        public ResultCode LoadNrr(ServiceCtx context)
-        {
-            ResultCode result = ResultCode.BadInitialization;
-
-            // Zero
-            context.RequestData.ReadUInt64();
-
-            long nrrAddress = context.RequestData.ReadInt64();
-            long nrrSize    = context.RequestData.ReadInt64();
-
-            if (_isInitialized)
-            {
-                NrrInfo info;
-                result = ParseNrr(out info, context, nrrAddress, nrrSize);
-
-                if (result == 0)
-                {
-                    if (_nrrInfos.Count >= MaxNrr)
-                    {
-                        result = ResultCode.MaxNrr;
-                    }
-                    else
-                    {
-                        _nrrInfos.Add(info);
-                    }
-                }
-            }
-
-            return result;
-        }
-
-        [Command(3)]
-        // UnloadNrr(u64, u64, pid)
-        public ResultCode UnloadNrr(ServiceCtx context)
-        {
-            ResultCode result = ResultCode.BadInitialization;
-
-            // Zero
-            context.RequestData.ReadUInt64();
-
-            long nrrHeapAddress = context.RequestData.ReadInt64();
-
-            if (_isInitialized)
-            {
-                if ((nrrHeapAddress & 0xFFF) != 0)
-                {
-                    return ResultCode.UnalignedAddress;
-                }
-
-                result = RemoveNrrInfo(nrrHeapAddress);
-            }
-
-            return result;
-        }
-
-        [Command(4)]
-        // Initialize(u64, pid, KObject)
-        public ResultCode Initialize(ServiceCtx context)
-        {
-            // TODO: we actually ignore the pid and process handle receive, we will need to use them when we will have multi process support.
-            _isInitialized = true;
-
-            return ResultCode.Success;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Ryujinx.HLE/HOS/Services/Loader/ResultCode.cs b/Ryujinx.HLE/HOS/Services/Loader/ResultCode.cs
index 4746ecc5..35fd4dcb 100644
--- a/Ryujinx.HLE/HOS/Services/Loader/ResultCode.cs
+++ b/Ryujinx.HLE/HOS/Services/Loader/ResultCode.cs
@@ -6,18 +6,5 @@
         ErrorCodeShift = 9,
 
         Success = 0,
-
-        InvalidMemoryState = (51 << ErrorCodeShift) | ModuleId,
-        InvalidNro         = (52 << ErrorCodeShift) | ModuleId,
-        InvalidNrr         = (53 << ErrorCodeShift) | ModuleId,
-        MaxNro             = (55 << ErrorCodeShift) | ModuleId,
-        MaxNrr             = (56 << ErrorCodeShift) | ModuleId,
-        NroAlreadyLoaded   = (57 << ErrorCodeShift) | ModuleId,
-        NroHashNotPresent  = (54 << ErrorCodeShift) | ModuleId,
-        UnalignedAddress   = (81 << ErrorCodeShift) | ModuleId,
-        BadSize            = (82 << ErrorCodeShift) | ModuleId,
-        BadNroAddress      = (84 << ErrorCodeShift) | ModuleId,
-        BadNrrAddress      = (85 << ErrorCodeShift) | ModuleId,
-        BadInitialization  = (87 << ErrorCodeShift) | ModuleId
     }
 }
\ No newline at end of file
diff --git a/Ryujinx.HLE/HOS/Services/Loader/Types/NroInfo.cs b/Ryujinx.HLE/HOS/Services/Loader/Types/NroInfo.cs
deleted file mode 100644
index a71d4c08..00000000
--- a/Ryujinx.HLE/HOS/Services/Loader/Types/NroInfo.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using Ryujinx.HLE.Loaders.Executables;
-
-namespace Ryujinx.HLE.HOS.Services.Loader
-{
-    class NroInfo
-    {
-        public NxRelocatableObject Executable { get; private set; }
-
-        public byte[] Hash             { get; private set; }
-        public ulong  NroAddress       { get; private set; }
-        public ulong  NroSize          { get; private set; }
-        public ulong  BssAddress       { get; private set; }
-        public ulong  BssSize          { get; private set; }
-        public ulong  TotalSize        { get; private set; }
-        public ulong  NroMappedAddress { get; set;         }
-
-        public NroInfo(
-            NxRelocatableObject executable,
-            byte[]              hash,
-            ulong               nroAddress,
-            ulong               nroSize,
-            ulong               bssAddress,
-            ulong               bssSize,
-            ulong               totalSize)
-        {
-            Executable = executable;
-            Hash       = hash;
-            NroAddress = nroAddress;
-            NroSize    = nroSize;
-            BssAddress = bssAddress;
-            BssSize    = bssSize;
-            TotalSize  = totalSize;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Ryujinx.HLE/HOS/Services/Loader/Types/NrrHeader.cs b/Ryujinx.HLE/HOS/Services/Loader/Types/NrrHeader.cs
deleted file mode 100644
index 15217196..00000000
--- a/Ryujinx.HLE/HOS/Services/Loader/Types/NrrHeader.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using System.Runtime.InteropServices;
-
-namespace Ryujinx.HLE.HOS.Services.Loader
-{
-    [StructLayout(LayoutKind.Explicit, Size = 0x350)]
-    unsafe struct NrrHeader
-    {
-        [FieldOffset(0)]
-        public uint Magic;
-
-        [FieldOffset(0x10)]
-        public ulong TitleIdMask;
-
-        [FieldOffset(0x18)]
-        public ulong TitleIdPattern;
-
-        [FieldOffset(0x30)]
-        public fixed byte Modulus[0x100];
-
-        [FieldOffset(0x130)]
-        public fixed byte FixedKeySignature[0x100];
-
-        [FieldOffset(0x230)]
-        public fixed byte NrrSignature[0x100];
-
-        [FieldOffset(0x330)]
-        public ulong TitleIdMin;
-
-        [FieldOffset(0x338)]
-        public uint NrrSize;
-
-        [FieldOffset(0x340)]
-        public uint HashOffset;
-
-        [FieldOffset(0x344)]
-        public uint HashCount;
-    }
-}
\ No newline at end of file
diff --git a/Ryujinx.HLE/HOS/Services/Loader/Types/NrrInfo.cs b/Ryujinx.HLE/HOS/Services/Loader/Types/NrrInfo.cs
deleted file mode 100644
index 2c60360a..00000000
--- a/Ryujinx.HLE/HOS/Services/Loader/Types/NrrInfo.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System.Collections.Generic;
-
-namespace Ryujinx.HLE.HOS.Services.Loader
-{
-    class NrrInfo
-    {
-        public NrrHeader    Header     { get; private set; }
-        public List<byte[]> Hashes     { get; private set; }
-        public long         NrrAddress { get; private set; }
-
-        public NrrInfo(long nrrAddress, NrrHeader header, List<byte[]> hashes)
-        {
-            NrrAddress = nrrAddress;
-            Header     = header;
-            Hashes     = hashes;
-        }
-    }
-}
\ No newline at end of file