mirror of
https://git.naxdy.org/Mirror/Ryujinx.git
synced 2024-12-29 03:53:05 +00:00
326749498b
* 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>
64 lines
3 KiB
C#
64 lines
3 KiB
C#
using Ryujinx.HLE.HOS.Kernel.Common;
|
|
using System;
|
|
|
|
namespace Ryujinx.HLE
|
|
{
|
|
public enum MemoryConfiguration
|
|
{
|
|
MemoryConfiguration4GiB = 0,
|
|
MemoryConfiguration4GiBAppletDev = 1,
|
|
MemoryConfiguration4GiBSystemDev = 2,
|
|
MemoryConfiguration6GiB = 3,
|
|
MemoryConfiguration6GiBAppletDev = 4,
|
|
MemoryConfiguration8GiB = 5,
|
|
}
|
|
|
|
static class MemoryConfigurationExtensions
|
|
{
|
|
private const ulong GiB = 1024 * 1024 * 1024;
|
|
|
|
#pragma warning disable IDE0055 // Disable formatting
|
|
public static MemoryArrange ToKernelMemoryArrange(this MemoryConfiguration configuration)
|
|
{
|
|
return configuration switch
|
|
{
|
|
MemoryConfiguration.MemoryConfiguration4GiB => MemoryArrange.MemoryArrange4GiB,
|
|
MemoryConfiguration.MemoryConfiguration4GiBAppletDev => MemoryArrange.MemoryArrange4GiBAppletDev,
|
|
MemoryConfiguration.MemoryConfiguration4GiBSystemDev => MemoryArrange.MemoryArrange4GiBSystemDev,
|
|
MemoryConfiguration.MemoryConfiguration6GiB => MemoryArrange.MemoryArrange6GiB,
|
|
MemoryConfiguration.MemoryConfiguration6GiBAppletDev => MemoryArrange.MemoryArrange6GiBAppletDev,
|
|
MemoryConfiguration.MemoryConfiguration8GiB => MemoryArrange.MemoryArrange8GiB,
|
|
_ => throw new AggregateException($"Invalid memory configuration \"{configuration}\"."),
|
|
};
|
|
}
|
|
|
|
public static MemorySize ToKernelMemorySize(this MemoryConfiguration configuration)
|
|
{
|
|
return configuration switch
|
|
{
|
|
MemoryConfiguration.MemoryConfiguration4GiB or
|
|
MemoryConfiguration.MemoryConfiguration4GiBAppletDev or
|
|
MemoryConfiguration.MemoryConfiguration4GiBSystemDev => MemorySize.MemorySize4GiB,
|
|
MemoryConfiguration.MemoryConfiguration6GiB or
|
|
MemoryConfiguration.MemoryConfiguration6GiBAppletDev => MemorySize.MemorySize6GiB,
|
|
MemoryConfiguration.MemoryConfiguration8GiB => MemorySize.MemorySize8GiB,
|
|
_ => throw new AggregateException($"Invalid memory configuration \"{configuration}\"."),
|
|
};
|
|
}
|
|
|
|
public static ulong ToDramSize(this MemoryConfiguration configuration)
|
|
{
|
|
return configuration switch
|
|
{
|
|
MemoryConfiguration.MemoryConfiguration4GiB or
|
|
MemoryConfiguration.MemoryConfiguration4GiBAppletDev or
|
|
MemoryConfiguration.MemoryConfiguration4GiBSystemDev => 4 * GiB,
|
|
MemoryConfiguration.MemoryConfiguration6GiB or
|
|
MemoryConfiguration.MemoryConfiguration6GiBAppletDev => 6 * GiB,
|
|
MemoryConfiguration.MemoryConfiguration8GiB => 8 * GiB,
|
|
_ => throw new AggregateException($"Invalid memory configuration \"{configuration}\"."),
|
|
};
|
|
}
|
|
#pragma warning restore IDE0055
|
|
}
|
|
}
|