From 4738113f293ac2477a553225a24b6c489c6855f1 Mon Sep 17 00:00:00 2001 From: Cristallix Date: Mon, 20 Apr 2020 23:59:59 +0200 Subject: Suppress warnings from fields never used or never assigned (CS0169 and CS0649) (#919) * chore : disable unwanted warnings and minor code cleanup * chore : remove more warnings * fix : reorder struct correctly * fix : restore _isKernel and remove useless comment * fix : copy/paste error * fix : restore CallMethod call * fix : whitespace * chore : clean using * feat : remove warnings * fix : simplify warning removal on struct * fix : revert fields deletion and code clean up * fix : re-add RE value * fix : typo --- Ryujinx.HLE/HOS/Kernel/Ipc/KLightSession.cs | 4 ---- Ryujinx.HLE/HOS/Kernel/Memory/KMemoryManager.cs | 3 +++ Ryujinx.HLE/HOS/Kernel/Threading/KThread.cs | 2 ++ 3 files changed, 5 insertions(+), 4 deletions(-) (limited to 'Ryujinx.HLE/HOS/Kernel') diff --git a/Ryujinx.HLE/HOS/Kernel/Ipc/KLightSession.cs b/Ryujinx.HLE/HOS/Kernel/Ipc/KLightSession.cs index a12a1986..166de065 100644 --- a/Ryujinx.HLE/HOS/Kernel/Ipc/KLightSession.cs +++ b/Ryujinx.HLE/HOS/Kernel/Ipc/KLightSession.cs @@ -7,14 +7,10 @@ namespace Ryujinx.HLE.HOS.Kernel.Ipc public KLightServerSession ServerSession { get; } public KLightClientSession ClientSession { get; } - private bool _hasBeenInitialized; - public KLightSession(Horizon system) : base(system) { ServerSession = new KLightServerSession(system, this); ClientSession = new KLightClientSession(system, this); - - _hasBeenInitialized = true; } } } \ No newline at end of file diff --git a/Ryujinx.HLE/HOS/Kernel/Memory/KMemoryManager.cs b/Ryujinx.HLE/HOS/Kernel/Memory/KMemoryManager.cs index fd2078ee..3379e912 100644 --- a/Ryujinx.HLE/HOS/Kernel/Memory/KMemoryManager.cs +++ b/Ryujinx.HLE/HOS/Kernel/Memory/KMemoryManager.cs @@ -64,6 +64,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory public int AddrSpaceWidth { get; private set; } private bool _isKernel; + private bool _aslrEnabled; private KMemoryBlockAllocator _blockAllocator; @@ -78,6 +79,8 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory _cpuMemory = cpuMemory; _blocks = new LinkedList(); + + _isKernel = false; } private static readonly int[] AddrSpaceSizes = new int[] { 32, 36, 32, 39 }; diff --git a/Ryujinx.HLE/HOS/Kernel/Threading/KThread.cs b/Ryujinx.HLE/HOS/Kernel/Threading/KThread.cs index cd60c955..e629be45 100644 --- a/Ryujinx.HLE/HOS/Kernel/Threading/KThread.cs +++ b/Ryujinx.HLE/HOS/Kernel/Threading/KThread.cs @@ -66,7 +66,9 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading private long _affinityMaskOverride; private int _preferredCoreOverride; +#pragma warning disable CS0649 private int _affinityOverrideCount; +#pragma warning restore CS0649 public ThreadSchedState SchedFlags { get; private set; } -- cgit v1.2.3