* dotnet format style --severity info Some changes were manually reverted. * dotnet format analyzers --serverity info Some changes have been minimally adapted. * Restore a few unused methods and variables * Silence dotnet format IDE0060 warnings * Silence dotnet format IDE0052 warnings * Address or silence dotnet format IDE1006 warnings * Address dotnet format CA1816 warnings * Address or silence dotnet format CA2208 warnings * Address or silence dotnet format CA1806 and a few CA1854 warnings * Address dotnet format CA2211 warnings * Address dotnet format CA1822 warnings * Address or silence dotnet format CA1069 warnings * Make dotnet format succeed in style mode * Address or silence dotnet format CA2211 warnings * Address review comments * Address dotnet format CA2208 warnings properly * Make ProcessResult readonly * Address most dotnet format whitespace warnings * Apply dotnet format whitespace formatting A few of them have been manually reverted and the corresponding warning was silenced * Add previously silenced warnings back I have no clue how these disappeared * Revert formatting changes for while and for-loops * Format if-blocks correctly * Run dotnet format style after rebase * Run dotnet format whitespace after rebase * Run dotnet format style after rebase * Run dotnet format analyzers after rebase * Run dotnet format after rebase and remove unused usings - analyzers - style - whitespace * Disable 'prefer switch expression' rule * Add comments to disabled warnings * Fix a few disabled warnings * Fix naming rule violation, Convert shader properties to auto-property and convert values to const * Simplify properties and array initialization, Use const when possible, Remove trailing commas * Start working on disabled warnings * Fix and silence a few dotnet-format warnings again * Run dotnet format after rebase * Use using declaration instead of block syntax * Address IDE0251 warnings * Address a few disabled IDE0060 warnings * Silence IDE0060 in .editorconfig * Revert "Simplify properties and array initialization, Use const when possible, Remove trailing commas" This reverts commit 9462e4136c0a2100dc28b20cf9542e06790aa67e. * dotnet format whitespace after rebase * First dotnet format pass * Fix naming rule violations * Fix typo * Add trailing commas, use targeted new and use array initializer * Fix build issues * Fix remaining build issues * Remove SuppressMessage for CA1069 where possible * Address dotnet format issues * Address formatting issues Co-authored-by: Ac_K <acoustik666@gmail.com> * Add GetHashCode implementation for RenderingSurfaceInfo * Explicitly silence CA1822 for every affected method in Syscall * Address formatting issues in Demangler.cs * Address review feedback Co-authored-by: Ac_K <acoustik666@gmail.com> * Revert marking service methods as static * Next dotnet format pass * Address review feedback --------- Co-authored-by: Ac_K <acoustik666@gmail.com>
134 lines
4.8 KiB
C#
134 lines
4.8 KiB
C#
using LibHac.Common;
|
|
using LibHac.Fs;
|
|
using LibHac.Fs.Fsa;
|
|
using LibHac.Loader;
|
|
using LibHac.Ns;
|
|
using LibHac.Tools.FsSystem;
|
|
using Ryujinx.Common.Configuration;
|
|
using Ryujinx.Common.Logging;
|
|
using Ryujinx.HLE.Loaders.Executables;
|
|
using Ryujinx.Memory;
|
|
using System;
|
|
using System.Linq;
|
|
using static Ryujinx.HLE.HOS.ModLoader;
|
|
|
|
namespace Ryujinx.HLE.Loaders.Processes.Extensions
|
|
{
|
|
static class FileSystemExtensions
|
|
{
|
|
public static MetaLoader GetNpdm(this IFileSystem fileSystem)
|
|
{
|
|
MetaLoader metaLoader = new();
|
|
|
|
if (fileSystem == null || !fileSystem.FileExists(ProcessConst.MainNpdmPath))
|
|
{
|
|
Logger.Warning?.Print(LogClass.Loader, "NPDM file not found, using default values!");
|
|
|
|
metaLoader.LoadDefault();
|
|
}
|
|
else
|
|
{
|
|
metaLoader.LoadFromFile(fileSystem);
|
|
}
|
|
|
|
return metaLoader;
|
|
}
|
|
|
|
public static ProcessResult Load(this IFileSystem exeFs, Switch device, BlitStruct<ApplicationControlProperty> nacpData, MetaLoader metaLoader, bool isHomebrew = false)
|
|
{
|
|
ulong programId = metaLoader.GetProgramId();
|
|
|
|
// Replace the whole ExeFs partition by the modded one.
|
|
if (device.Configuration.VirtualFileSystem.ModLoader.ReplaceExefsPartition(programId, ref exeFs))
|
|
{
|
|
metaLoader = null;
|
|
}
|
|
|
|
// Reload the MetaLoader in case of ExeFs partition replacement.
|
|
metaLoader ??= exeFs.GetNpdm();
|
|
|
|
NsoExecutable[] nsoExecutables = new NsoExecutable[ProcessConst.ExeFsPrefixes.Length];
|
|
|
|
for (int i = 0; i < nsoExecutables.Length; i++)
|
|
{
|
|
string name = ProcessConst.ExeFsPrefixes[i];
|
|
|
|
if (!exeFs.FileExists($"/{name}"))
|
|
{
|
|
continue; // File doesn't exist, skip.
|
|
}
|
|
|
|
Logger.Info?.Print(LogClass.Loader, $"Loading {name}...");
|
|
|
|
using var nsoFile = new UniqueRef<IFile>();
|
|
|
|
exeFs.OpenFile(ref nsoFile.Ref, $"/{name}".ToU8Span(), OpenMode.Read).ThrowIfFailure();
|
|
|
|
nsoExecutables[i] = new NsoExecutable(nsoFile.Release().AsStorage(), name);
|
|
}
|
|
|
|
// ExeFs file replacements.
|
|
ModLoadResult modLoadResult = device.Configuration.VirtualFileSystem.ModLoader.ApplyExefsMods(programId, nsoExecutables);
|
|
|
|
// Take the Npdm from mods if present.
|
|
if (modLoadResult.Npdm != null)
|
|
{
|
|
metaLoader = modLoadResult.Npdm;
|
|
}
|
|
|
|
// Collect the Nsos, ignoring ones that aren't used.
|
|
nsoExecutables = nsoExecutables.Where(x => x != null).ToArray();
|
|
|
|
// Apply Nsos patches.
|
|
device.Configuration.VirtualFileSystem.ModLoader.ApplyNsoPatches(programId, nsoExecutables);
|
|
|
|
// Don't use PTC if ExeFS files have been replaced.
|
|
bool enablePtc = device.System.EnablePtc && !modLoadResult.Modified;
|
|
if (!enablePtc)
|
|
{
|
|
Logger.Warning?.Print(LogClass.Ptc, "Detected unsupported ExeFs modifications. PTC disabled.");
|
|
}
|
|
|
|
// We allow it for nx-hbloader because it can be used to launch homebrew.
|
|
bool allowCodeMemoryForJit = programId == 0x010000000000100DUL || isHomebrew;
|
|
|
|
string programName = "";
|
|
|
|
if (!isHomebrew && programId > 0x010000000000FFFF)
|
|
{
|
|
programName = nacpData.Value.Title[(int)device.System.State.DesiredTitleLanguage].NameString.ToString();
|
|
|
|
if (string.IsNullOrWhiteSpace(programName))
|
|
{
|
|
programName = Array.Find(nacpData.Value.Title.ItemsRo.ToArray(), x => x.Name[0] != 0).NameString.ToString();
|
|
}
|
|
}
|
|
|
|
// Initialize GPU.
|
|
Graphics.Gpu.GraphicsConfig.TitleId = $"{programId:x16}";
|
|
device.Gpu.HostInitalized.Set();
|
|
|
|
if (!MemoryBlock.SupportsFlags(MemoryAllocationFlags.ViewCompatible))
|
|
{
|
|
device.Configuration.MemoryManagerMode = MemoryManagerMode.SoftwarePageTable;
|
|
}
|
|
|
|
ProcessResult processResult = ProcessLoaderHelper.LoadNsos(
|
|
device,
|
|
device.System.KernelContext,
|
|
metaLoader,
|
|
nacpData,
|
|
enablePtc,
|
|
allowCodeMemoryForJit,
|
|
programName,
|
|
metaLoader.GetProgramId(),
|
|
null,
|
|
nsoExecutables);
|
|
|
|
// TODO: This should be stored using ProcessId instead.
|
|
device.System.LibHacHorizonManager.ArpIReader.ApplicationId = new LibHac.ApplicationId(metaLoader.GetProgramId());
|
|
|
|
return processResult;
|
|
}
|
|
}
|
|
}
|