diff options
| author | mageven <62494521+mageven@users.noreply.github.com> | 2020-05-15 11:46:46 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-15 03:16:46 -0300 |
| commit | ba4830293e4786851d743865b1232928f9873c7e (patch) | |
| tree | 235a9d8c7b428e5ea45c5d8e60a29399c9102be0 /Ryujinx.HLE/HOS/ProgramLoader.cs | |
| parent | 0ff00bd6d35390eb132eecd3ba307ba4bbfdd56d (diff) | |
Refactor out Application details from Horizon (#1236)
* Initial Application refactor
* Misc typo and access modifier fixes
* Clean unused namespaces
* Address gdkchan's comments
* Move ticket reading to common method
* Change IParentalControlService to use ApplicationLoader.ControlData
Diffstat (limited to 'Ryujinx.HLE/HOS/ProgramLoader.cs')
| -rw-r--r-- | Ryujinx.HLE/HOS/ProgramLoader.cs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Ryujinx.HLE/HOS/ProgramLoader.cs b/Ryujinx.HLE/HOS/ProgramLoader.cs index c1e18491..07b1a18b 100644 --- a/Ryujinx.HLE/HOS/ProgramLoader.cs +++ b/Ryujinx.HLE/HOS/ProgramLoader.cs @@ -121,21 +121,21 @@ namespace Ryujinx.HLE.HOS } public static bool LoadNsos( - KernelContext context, - Npdm metaData, - IExecutable[] nsos, - byte[] arguments = null) + KernelContext context, + Npdm metaData, + byte[] arguments = null, + params IExecutable[] executables) { ulong argsStart = 0; int argsSize = 0; ulong codeStart = metaData.Is64Bit ? 0x8000000UL : 0x200000UL; int codeSize = 0; - ulong[] nsoBase = new ulong[nsos.Length]; + ulong[] nsoBase = new ulong[executables.Length]; - for (int index = 0; index < nsos.Length; index++) + for (int index = 0; index < executables.Length; index++) { - IExecutable staticObject = nsos[index]; + IExecutable staticObject = executables[index]; int textEnd = staticObject.TextOffset + staticObject.Text.Length; int roEnd = staticObject.RoOffset + staticObject.Ro.Length; @@ -226,11 +226,11 @@ namespace Ryujinx.HLE.HOS return false; } - for (int index = 0; index < nsos.Length; index++) + for (int index = 0; index < executables.Length; index++) { Logger.PrintInfo(LogClass.Loader, $"Loading image {index} at 0x{nsoBase[index]:x16}..."); - result = LoadIntoMemory(process, nsos[index], nsoBase[index]); + result = LoadIntoMemory(process, executables[index], nsoBase[index]); if (result != KernelResult.Success) { |