[Ryujinx.Graphics.Vic] Address dotnet-format issues (#5374)

* dotnet format style --severity info

Some changes were manually reverted.

* Restore a few unused methods and variables

* Address review comments

* Address most dotnet format whitespace warnings

* Add comments to disabled warnings

* Address IDE0251 warnings

* dotnet format whitespace after rebase

* Remove SuppressMessage attribute for removed rule

distribution/macos/Info.plist

@@ -39,10 +39,15 @@
     <key>CSResourcesFileMapped</key>
     <true/>
     <key>NSHumanReadableCopyright</key>
-    <string>Copyright © 2018 - 2022 Ryujinx Team and Contributors.</string>
+    <string>Copyright © 2018 - 2023 Ryujinx Team and Contributors.</string>
     <key>LSApplicationCategoryType</key>
     <string>public.app-category.games</string>
     <key>LSMinimumSystemVersion</key>
     <string>11.0</string>
+    <key>LSEnvironment</key>
+    <dict>
+        <key>COMPlus_DefaultStackSize</key>
+        <string>200000</string>
+    </dict>
 </dict>
 </plist>

src/Ryujinx.Ava/AppHost.cs

@@ -134,7 +134,7 @@ namespace Ryujinx.Ava
             _inputManager           = inputManager;
             _accountManager         = accountManager;
             _userChannelPersistence = userChannelPersistence;
-            _renderingThread        = new Thread(RenderLoop, 1 * 1024 * 1024) { Name = "GUI.RenderThread" };
+            _renderingThread        = new Thread(RenderLoop) { Name = "GUI.RenderThread" };
             _lastCursorMoveTime     = Stopwatch.GetTimestamp();
             _glLogLevel             = ConfigurationState.Instance.Logger.GraphicsDebugLevel;
             _topLevel               = topLevel;

src/Ryujinx.Graphics.Vic/Image/BufferPool.cs

@@ -34,7 +34,7 @@ namespace Ryujinx.Graphics.Vic.Image
         {
             int index = RentMinimum(length, out T[] bufferArray);
 
-            buffer = new Span<T>(bufferArray).Slice(0, length);
+            buffer = new Span<T>(bufferArray)[..length];
 
             return index;
         }

src/Ryujinx.Graphics.Vic/Image/InputSurface.cs

@@ -4,7 +4,7 @@ namespace Ryujinx.Graphics.Vic.Image
 {
     ref struct RentedBuffer
     {
-        public static RentedBuffer Empty => new RentedBuffer(Span<byte>.Empty, -1);
+        public static RentedBuffer Empty => new(Span<byte>.Empty, -1);
 
         public Span<byte> Data;
         public int Index;
@@ -15,7 +15,7 @@ namespace Ryujinx.Graphics.Vic.Image
             Index = index;
         }
 
-        public void Return(BufferPool<byte> pool)
+        public readonly void Return(BufferPool<byte> pool)
         {
             if (Index != -1)
             {
@@ -65,7 +65,7 @@ namespace Ryujinx.Graphics.Vic.Image
             Buffer2Index = buffer.Index;
         }
 
-        public void Return(BufferPool<byte> pool)
+        public readonly void Return(BufferPool<byte> pool)
         {
             if (Buffer0Index != -1)
             {

src/Ryujinx.Graphics.Vic/Image/SurfaceReader.cs

@@ -21,7 +21,8 @@ namespace Ryujinx.Graphics.Vic.Image
         {
             switch (surfaceConfig.SlotPixelFormat)
             {
-                case PixelFormat.Y8___V8U8_N420: return ReadNv12(rm, ref config, ref surfaceConfig, ref offsets);
+                case PixelFormat.Y8___V8U8_N420:
+                    return ReadNv12(rm, ref config, ref surfaceConfig, ref offsets);
             }
 
             Logger.Error?.Print(LogClass.Vic, $"Unsupported pixel format \"{surfaceConfig.SlotPixelFormat}\".");
@@ -46,7 +47,7 @@ namespace Ryujinx.Graphics.Vic.Image
             int yStride = GetPitch(width, 1);
             int uvStride = GetPitch(input.UvWidth, 2);
 
-            Surface output = new Surface(rm.SurfacePool, width, height);
+            Surface output = new(rm.SurfacePool, width, height);
 
             if (Sse41.IsSupported)
             {
@@ -276,7 +277,7 @@ namespace Ryujinx.Graphics.Vic.Image
             int bytesPerPixel,
             int planes)
         {
-            InputSurface surface = new InputSurface();
+            InputSurface surface = new();
 
             surface.Initialize();
 
@@ -458,7 +459,7 @@ namespace Ryujinx.Graphics.Vic.Image
             int outSize = dstStride * height;
             int bufferIndex = rm.BufferPool.RentMinimum(outSize, out byte[] buffer);
             Span<byte> dst = buffer;
-            dst = dst.Slice(0, outSize);
+            dst = dst[..outSize];
 
             for (int y = 0; y < height; y++)
             {
@@ -485,9 +486,9 @@ namespace Ryujinx.Graphics.Vic.Image
             int outSize = dstStride * height;
             int bufferIndex = rm.BufferPool.RentMinimum(outSize, out byte[] buffer);
             Span<byte> dst = buffer;
-            dst = dst.Slice(0, outSize);
+            dst = dst[..outSize];
 
-            LayoutConverter.ConvertBlockLinearToLinear(dst.Slice(dstStart), width, height, dstStride, bytesPerPixel, gobBlocksInY, src);
+            LayoutConverter.ConvertBlockLinearToLinear(dst[dstStart..], width, height, dstStride, bytesPerPixel, gobBlocksInY, src);
 
             return new RentedBuffer(dst, bufferIndex);
         }

src/Ryujinx.Graphics.Vic/Rectangle.cs

@@ -15,4 +15,4 @@ namespace Ryujinx.Graphics.Vic
             Height = height;
         }
     }
-}
+}

src/Ryujinx.Graphics.Vic/Scaler.cs

@@ -121,4 +121,4 @@ namespace Ryujinx.Graphics.Vic
             }
         }
     }
-}
+}

src/Ryujinx.Graphics.Vic/Types/BlendingSlotStruct.cs

@@ -2,10 +2,10 @@
 
 namespace Ryujinx.Graphics.Vic.Types
 {
-    struct BlendingSlotStruct
+    readonly struct BlendingSlotStruct
     {
-        private long _word0;
-        private long _word1;
+        private readonly long _word0;
+        private readonly long _word1;
 
         public int AlphaK1 => (int)_word0.Extract(0, 10);
         public int AlphaK2 => (int)_word0.Extract(16, 10);

src/Ryujinx.Graphics.Vic/Types/ClearRectStruct.cs

@@ -2,11 +2,11 @@
 
 namespace Ryujinx.Graphics.Vic.Types
 {
-    struct ClearRectStruct
+    readonly struct ClearRectStruct
     {
-#pragma warning disable CS0649
-        private long _word0;
-        private long _word1;
+#pragma warning disable CS0649 // Field is never assigned to
+        private readonly long _word0;
+        private readonly long _word1;
 #pragma warning restore CS0649
 
         public int ClearRect0Left => (int)_word0.Extract(0, 14);

src/Ryujinx.Graphics.Vic/Types/ConfigStruct.cs

@@ -4,7 +4,7 @@ namespace Ryujinx.Graphics.Vic.Types
 {
     struct ConfigStruct
     {
-#pragma warning disable CS0649
+#pragma warning disable CS0649 // Field is never assigned to
         public PipeConfig PipeConfig;
         public OutputConfig OutputConfig;
         public OutputSurfaceConfig OutputSurfaceConfig;

src/Ryujinx.Graphics.Vic/Types/DeinterlaceMode.cs

@@ -9,4 +9,4 @@ namespace Ryujinx.Graphics.Vic.Types
         Disi1,
         WeaveLumaBobFieldChroma
     }
-}
+}

src/Ryujinx.Graphics.Vic/Types/FrameFormat.cs

@@ -76,4 +76,4 @@ namespace Ryujinx.Graphics.Vic.Types
             return false;
         }
     }
-}
+}

src/Ryujinx.Graphics.Vic/Types/LumaKeyStruct.cs

@@ -2,10 +2,10 @@
 
 namespace Ryujinx.Graphics.Vic.Types
 {
-    struct LumaKeyStruct
+    readonly struct LumaKeyStruct
     {
-        private long _word0;
-        private long _word1;
+        private readonly long _word0;
+        private readonly long _word1;
 
         public int LumaCoeff0 => (int)_word0.Extract(0, 20);
         public int LumaCoeff1 => (int)_word0.Extract(20, 20);

src/Ryujinx.Graphics.Vic/Types/MatrixStruct.cs

@@ -2,12 +2,12 @@
 
 namespace Ryujinx.Graphics.Vic.Types
 {
-    struct MatrixStruct
+    readonly struct MatrixStruct
     {
-        private long _word0;
-        private long _word1;
-        private long _word2;
-        private long _word3;
+        private readonly long _word0;
+        private readonly long _word1;
+        private readonly long _word2;
+        private readonly long _word3;
 
         public int MatrixCoeff00 => (int)_word0.ExtractSx(0, 20);
         public int MatrixCoeff10 => (int)_word0.ExtractSx(20, 20);

src/Ryujinx.Graphics.Vic/Types/OutputConfig.cs

@@ -2,11 +2,11 @@
 
 namespace Ryujinx.Graphics.Vic.Types
 {
-    struct OutputConfig
+    readonly struct OutputConfig
     {
-#pragma warning disable CS0649
-        private long _word0;
-        private long _word1;
+#pragma warning disable CS0649 // Field is never assigned to
+        private readonly long _word0;
+        private readonly long _word1;
 #pragma warning restore CS0649
 
         public int AlphaFillMode => (int)_word0.Extract(0, 3);

src/Ryujinx.Graphics.Vic/Types/OutputSurfaceConfig.cs

@@ -2,11 +2,11 @@
 
 namespace Ryujinx.Graphics.Vic.Types
 {
-    struct OutputSurfaceConfig
+    readonly struct OutputSurfaceConfig
     {
-#pragma warning disable CS0649
-        private long _word0;
-        private long _word1;
+#pragma warning disable CS0649 // Field is never assigned to
+        private readonly long _word0;
+        private readonly long _word1;
 #pragma warning restore CS0649
 
         public PixelFormat OutPixelFormat => (PixelFormat)_word0.Extract(0, 7);

src/Ryujinx.Graphics.Vic/Types/PipeConfig.cs

@@ -2,12 +2,12 @@
 
 namespace Ryujinx.Graphics.Vic.Types
 {
-    struct PipeConfig
+    readonly struct PipeConfig
     {
-#pragma warning disable CS0169, CS0649
-        private long _word0;
-        private long _word1;
-#pragma warning restore CS0169, CS0649
+#pragma warning disable CS0169, CS0649, IDE0051 // Remove unused private member
+        private readonly long _word0;
+        private readonly long _word1;
+#pragma warning restore CS0169, CS0649, IDE0051
 
         public int DownsampleHoriz => (int)_word0.Extract(0, 11);
         public int DownsampleVert => (int)_word0.Extract(16, 11);

src/Ryujinx.Graphics.Vic/Types/SlotConfig.cs

@@ -2,16 +2,18 @@
 
 namespace Ryujinx.Graphics.Vic.Types
 {
-    struct SlotConfig
+    readonly struct SlotConfig
     {
-        private long _word0;
-        private long _word1;
-        private long _word2;
-        private long _word3;
-        private long _word4;
-        private long _word5;
-        private long _word6;
-        private long _word7;
+        private readonly long _word0;
+        private readonly long _word1;
+        private readonly long _word2;
+        private readonly long _word3;
+        private readonly long _word4;
+        private readonly long _word5;
+        private readonly long _word6;
+#pragma warning disable IDE0051 // Remove unused private member
+        private readonly long _word7;
+#pragma warning restore IDE0051
 
         public bool SlotEnable => _word0.Extract(0);
         public bool DeNoise => _word0.Extract(1);

src/Ryujinx.Graphics.Vic/Types/SlotSurfaceConfig.cs

@@ -2,10 +2,10 @@
 
 namespace Ryujinx.Graphics.Vic.Types
 {
-    struct SlotSurfaceConfig
+    readonly struct SlotSurfaceConfig
     {
-        private long _word0;
-        private long _word1;
+        private readonly long _word0;
+        private readonly long _word1;
 
         public PixelFormat SlotPixelFormat => (PixelFormat)_word0.Extract(0, 7);
         public int SlotChromaLocHoriz => (int)_word0.Extract(7, 2);

src/Ryujinx.Graphics.Vic/VicDevice.cs

@@ -30,7 +30,7 @@ namespace Ryujinx.Graphics.Vic
         {
             ConfigStruct config = ReadIndirect<ConfigStruct>(_state.State.SetConfigStructOffset);
 
-            using Surface output = new Surface(
+            using Surface output = new(
                 _rm.SurfacePool,
                 config.OutputSurfaceConfig.OutSurfaceWidth + 1,
                 config.OutputSurfaceConfig.OutSurfaceHeight + 1);
@@ -58,7 +58,7 @@ namespace Ryujinx.Graphics.Vic
                 int targetW = Math.Min(output.Width - targetX, Math.Abs(x2 - x1));
                 int targetH = Math.Min(output.Height - targetY, Math.Abs(y2 - y1));
 
-                Rectangle targetRect = new Rectangle(targetX, targetY, targetW, targetH);
+                Rectangle targetRect = new(targetX, targetY, targetW, targetH);
 
                 Blender.BlendOne(output, src, ref slot, targetRect);
             }

src/Ryujinx.Graphics.Vic/VicRegisters.cs

@@ -4,7 +4,7 @@ namespace Ryujinx.Graphics.Vic
 {
     struct PlaneOffsets
     {
-#pragma warning disable CS0649
+#pragma warning disable CS0649 // Field is never assigned to
         public uint LumaOffset;
         public uint ChromaUOffset;
         public uint ChromaVOffset;
@@ -13,7 +13,7 @@ namespace Ryujinx.Graphics.Vic
 
     struct VicRegisters
     {
-#pragma warning disable CS0649
+#pragma warning disable CS0649 // Field is never assigned to
         public Array64<uint> Reserved0;
         public uint Nop;
         public Array15<uint> Reserved104;

src/Ryujinx.Tests.Unicorn/IndexedProperty.cs

@@ -4,12 +4,12 @@ namespace Ryujinx.Tests.Unicorn
 {
     public class IndexedProperty<TIndex, TValue>
     {
-        private Func<TIndex, TValue>   _getFunc;
-        private Action<TIndex, TValue> _setAction;
+        private readonly Func<TIndex, TValue> _getFunc;
+        private readonly Action<TIndex, TValue> _setAction;
 
         public IndexedProperty(Func<TIndex, TValue> getFunc, Action<TIndex, TValue> setAction)
         {
-            _getFunc   = getFunc;
+            _getFunc = getFunc;
             _setAction = setAction;
         }
 

src/Ryujinx.Tests.Unicorn/MemoryPermission.cs

@@ -11,4 +11,4 @@ namespace Ryujinx.Tests.Unicorn
         Exec = 4,
         All = 7,
     }
-}
+}

src/Ryujinx.Tests.Unicorn/SimdValue.cs

@@ -2,7 +2,7 @@ using System;
 
 namespace Ryujinx.Tests.Unicorn
 {
-    public struct SimdValue : IEquatable<SimdValue>
+    public readonly struct SimdValue : IEquatable<SimdValue>
     {
         private readonly ulong _e0;
         private readonly ulong _e1;
@@ -39,31 +39,29 @@ namespace Ryujinx.Tests.Unicorn
             return BitConverter.Int64BitsToDouble(GetInt64(index));
         }
 
-        public int  GetInt32(int index) => (int)GetUInt32(index);
+        public int GetInt32(int index) => (int)GetUInt32(index);
         public long GetInt64(int index) => (long)GetUInt64(index);
 
         public uint GetUInt32(int index)
         {
-            switch (index)
+            return index switch
             {
-                case 0: return (uint)(_e0 >> 0);
-                case 1: return (uint)(_e0 >> 32);
-                case 2: return (uint)(_e1 >> 0);
-                case 3: return (uint)(_e1 >> 32);
-            }
-
-            throw new ArgumentOutOfRangeException(nameof(index));
+                0 => (uint)(_e0 >> 0),
+                1 => (uint)(_e0 >> 32),
+                2 => (uint)(_e1 >> 0),
+                3 => (uint)(_e1 >> 32),
+                _ => throw new ArgumentOutOfRangeException(nameof(index)),
+            };
         }
 
         public ulong GetUInt64(int index)
         {
-            switch (index)
+            return index switch
             {
-                case 0: return _e0;
-                case 1: return _e1;
-            }
-
-            throw new ArgumentOutOfRangeException(nameof(index));
+                0 => _e0,
+                1 => _e1,
+                _ => throw new ArgumentOutOfRangeException(nameof(index)),
+            };
         }
 
         public byte[] ToArray()
@@ -109,4 +107,4 @@ namespace Ryujinx.Tests.Unicorn
             return $"0x{_e1:X16}{_e0:X16}";
         }
     }
-}
+}

src/Ryujinx.Tests.Unicorn/UnicornAArch32.cs

@@ -5,7 +5,7 @@ namespace Ryujinx.Tests.Unicorn
 {
     public class UnicornAArch32 : IDisposable
     {
-        internal readonly UnicornEngine.Unicorn uc;
+        internal readonly UnicornEngine.Unicorn Uc;
         private bool _isDisposed;
 
         public IndexedProperty<int, uint> R => new(GetX, SetX);
@@ -84,7 +84,7 @@ namespace Ryujinx.Tests.Unicorn
 
         public UnicornAArch32()
         {
-            uc = new UnicornEngine.Unicorn(Common.UC_ARCH_ARM, Common.UC_MODE_LITTLE_ENDIAN);
+            Uc = new UnicornEngine.Unicorn(Common.UC_ARCH_ARM, Common.UC_MODE_LITTLE_ENDIAN);
 
             SetRegister(Arm.UC_ARM_REG_C1_C0_2, GetRegister(Arm.UC_ARM_REG_C1_C0_2) | 0xf00000);
             SetRegister(Arm.UC_ARM_REG_FPEXC, 0x40000000);
@@ -105,7 +105,7 @@ namespace Ryujinx.Tests.Unicorn
         {
             if (!_isDisposed)
             {
-                uc.Close();
+                Uc.Close();
                 _isDisposed = true;
             }
         }
@@ -113,7 +113,7 @@ namespace Ryujinx.Tests.Unicorn
         public void RunForCount(ulong count)
         {
             // FIXME: untilAddr should be 0xFFFFFFFFFFFFFFFFu
-            uc.EmuStart(this.PC, -1, 0, (long)count);
+            Uc.EmuStart(this.PC, -1, 0, (long)count);
         }
 
         public void Step()
@@ -121,7 +121,7 @@ namespace Ryujinx.Tests.Unicorn
             RunForCount(1);
         }
 
-        private static int[] XRegisters =
+        private static readonly int[] _xRegisters =
         {
             Arm.UC_ARM_REG_R0,
             Arm.UC_ARM_REG_R1,
@@ -141,7 +141,8 @@ namespace Ryujinx.Tests.Unicorn
             Arm.UC_ARM_REG_R15,
         };
 
-        private static int[] QRegisters =
+#pragma warning disable IDE0051, IDE0052 // Remove unused private member
+        private static readonly int[] _qRegisters =
         {
             Arm.UC_ARM_REG_Q0,
             Arm.UC_ARM_REG_Q1,
@@ -160,6 +161,7 @@ namespace Ryujinx.Tests.Unicorn
             Arm.UC_ARM_REG_Q14,
             Arm.UC_ARM_REG_Q15
         };
+#pragma warning restore IDE0051, IDE0052
 
         public uint GetX(int index)
         {
@@ -168,7 +170,7 @@ namespace Ryujinx.Tests.Unicorn
                 throw new ArgumentOutOfRangeException(nameof(index));
             }
 
-            return GetRegister(XRegisters[index]);
+            return GetRegister(_xRegisters[index]);
         }
 
         public void SetX(int index, uint value)
@@ -178,7 +180,7 @@ namespace Ryujinx.Tests.Unicorn
                 throw new ArgumentOutOfRangeException(nameof(index));
             }
 
-            SetRegister(XRegisters[index], value);
+            SetRegister(_xRegisters[index], value);
         }
 
         public SimdValue GetQ(int index)
@@ -206,7 +208,7 @@ namespace Ryujinx.Tests.Unicorn
         {
             byte[] data = new byte[4];
 
-            uc.RegRead(register, data);
+            Uc.RegRead(register, data);
 
             return BitConverter.ToUInt32(data, 0);
         }
@@ -215,16 +217,16 @@ namespace Ryujinx.Tests.Unicorn
         {
             byte[] data = BitConverter.GetBytes(value);
 
-            uc.RegWrite(register, data);
+            Uc.RegWrite(register, data);
         }
 
         public SimdValue GetVector(int register)
         {
             byte[] data = new byte[8];
 
-            uc.RegRead(register, data);
+            Uc.RegRead(register, data);
             ulong lo = BitConverter.ToUInt64(data, 0);
-            uc.RegRead(register + 1, data);
+            Uc.RegRead(register + 1, data);
             ulong hi = BitConverter.ToUInt64(data, 0);
 
             return new SimdValue(lo, hi);
@@ -233,16 +235,16 @@ namespace Ryujinx.Tests.Unicorn
         private void SetVector(int register, SimdValue value)
         {
             byte[] data = BitConverter.GetBytes(value.GetUInt64(0));
-            uc.RegWrite(register, data);
+            Uc.RegWrite(register, data);
             data = BitConverter.GetBytes(value.GetUInt64(1));
-            uc.RegWrite(register + 1, data);
+            Uc.RegWrite(register + 1, data);
         }
 
         public byte[] MemoryRead(ulong address, ulong size)
         {
             byte[] value = new byte[size];
 
-            uc.MemRead((long)address, value);
+            Uc.MemRead((long)address, value);
 
             return value;
         }
@@ -254,7 +256,7 @@ namespace Ryujinx.Tests.Unicorn
 
         public void MemoryWrite(ulong address, byte[] value)
         {
-            uc.MemWrite((long)address, value);
+            Uc.MemWrite((long)address, value);
         }
 
         public void MemoryWrite8(ulong address, byte value) => MemoryWrite(address, new[] { value });
@@ -267,17 +269,17 @@ namespace Ryujinx.Tests.Unicorn
 
         public void MemoryMap(ulong address, ulong size, MemoryPermission permissions)
         {
-            uc.MemMap((long)address, (long)size, (int)permissions);
+            Uc.MemMap((long)address, (long)size, (int)permissions);
         }
 
         public void MemoryUnmap(ulong address, ulong size)
         {
-            uc.MemUnmap((long)address, (long)size);
+            Uc.MemUnmap((long)address, (long)size);
         }
 
         public void MemoryProtect(ulong address, ulong size, MemoryPermission permissions)
         {
-            uc.MemProtect((long)address, (long)size, (int)permissions);
+            Uc.MemProtect((long)address, (long)size, (int)permissions);
         }
     }
-}
+}

src/Ryujinx.Tests.Unicorn/UnicornAArch64.cs

@@ -5,7 +5,7 @@ namespace Ryujinx.Tests.Unicorn
 {
     public class UnicornAArch64 : IDisposable
     {
-        internal readonly UnicornEngine.Unicorn uc;
+        internal readonly UnicornEngine.Unicorn Uc;
         private bool _isDisposed;
 
         public IndexedProperty<int, ulong> X => new(GetX, SetX);
@@ -33,48 +33,48 @@ namespace Ryujinx.Tests.Unicorn
         public uint Pstate
         {
             get => (uint)GetRegister(Arm64.UC_ARM64_REG_PSTATE);
-            set =>       SetRegister(Arm64.UC_ARM64_REG_PSTATE, value);
+            set => SetRegister(Arm64.UC_ARM64_REG_PSTATE, value);
         }
 
         public int Fpcr
         {
             get => (int)GetRegister(Arm64.UC_ARM64_REG_FPCR);
-            set =>      SetRegister(Arm64.UC_ARM64_REG_FPCR, (uint)value);
+            set => SetRegister(Arm64.UC_ARM64_REG_FPCR, (uint)value);
         }
 
         public int Fpsr
         {
             get => (int)GetRegister(Arm64.UC_ARM64_REG_FPSR);
-            set =>      SetRegister(Arm64.UC_ARM64_REG_FPSR, (uint)value);
+            set => SetRegister(Arm64.UC_ARM64_REG_FPSR, (uint)value);
         }
 
         public bool OverflowFlag
         {
-            get =>          (Pstate &  0x10000000u) != 0;
+            get => (Pstate & 0x10000000u) != 0;
             set => Pstate = (Pstate & ~0x10000000u) | (value ? 0x10000000u : 0u);
         }
 
         public bool CarryFlag
         {
-            get =>          (Pstate &  0x20000000u) != 0;
+            get => (Pstate & 0x20000000u) != 0;
             set => Pstate = (Pstate & ~0x20000000u) | (value ? 0x20000000u : 0u);
         }
 
         public bool ZeroFlag
         {
-            get =>          (Pstate &  0x40000000u) != 0;
+            get => (Pstate & 0x40000000u) != 0;
             set => Pstate = (Pstate & ~0x40000000u) | (value ? 0x40000000u : 0u);
         }
 
         public bool NegativeFlag
         {
-            get =>          (Pstate &  0x80000000u) != 0;
+            get => (Pstate & 0x80000000u) != 0;
             set => Pstate = (Pstate & ~0x80000000u) | (value ? 0x80000000u : 0u);
         }
 
         public UnicornAArch64()
         {
-            uc = new UnicornEngine.Unicorn(Common.UC_ARCH_ARM64, Common.UC_MODE_LITTLE_ENDIAN);
+            Uc = new UnicornEngine.Unicorn(Common.UC_ARCH_ARM64, Common.UC_MODE_LITTLE_ENDIAN);
 
             SetRegister(Arm64.UC_ARM64_REG_CPACR_EL1, 0x00300000);
         }
@@ -94,7 +94,7 @@ namespace Ryujinx.Tests.Unicorn
         {
             if (!_isDisposed)
             {
-                uc.Close();
+                Uc.Close();
                 _isDisposed = true;
             }
         }
@@ -102,7 +102,7 @@ namespace Ryujinx.Tests.Unicorn
         public void RunForCount(ulong count)
         {
             // FIXME: untilAddr should be 0xFFFFFFFFFFFFFFFFul
-            uc.EmuStart((long)this.PC, -1, 0, (long)count);
+            Uc.EmuStart((long)this.PC, -1, 0, (long)count);
         }
 
         public void Step()
@@ -110,7 +110,7 @@ namespace Ryujinx.Tests.Unicorn
             RunForCount(1);
         }
 
-        private static int[] XRegisters =
+        private static readonly int[] _xRegisters =
         {
             Arm64.UC_ARM64_REG_X0,
             Arm64.UC_ARM64_REG_X1,
@@ -145,7 +145,7 @@ namespace Ryujinx.Tests.Unicorn
             Arm64.UC_ARM64_REG_X30,
         };
 
-        private static int[] QRegisters =
+        private static readonly int[] _qRegisters =
         {
             Arm64.UC_ARM64_REG_Q0,
             Arm64.UC_ARM64_REG_Q1,
@@ -188,7 +188,7 @@ namespace Ryujinx.Tests.Unicorn
                 throw new ArgumentOutOfRangeException(nameof(index));
             }
 
-            return GetRegister(XRegisters[index]);
+            return GetRegister(_xRegisters[index]);
         }
 
         public void SetX(int index, ulong value)
@@ -198,7 +198,7 @@ namespace Ryujinx.Tests.Unicorn
                 throw new ArgumentOutOfRangeException(nameof(index));
             }
 
-            SetRegister(XRegisters[index], value);
+            SetRegister(_xRegisters[index], value);
         }
 
         public SimdValue GetQ(int index)
@@ -208,7 +208,7 @@ namespace Ryujinx.Tests.Unicorn
                 throw new ArgumentOutOfRangeException(nameof(index));
             }
 
-            return GetVector(QRegisters[index]);
+            return GetVector(_qRegisters[index]);
         }
 
         public void SetQ(int index, SimdValue value)
@@ -218,14 +218,14 @@ namespace Ryujinx.Tests.Unicorn
                 throw new ArgumentOutOfRangeException(nameof(index));
             }
 
-            SetVector(QRegisters[index], value);
+            SetVector(_qRegisters[index], value);
         }
 
         private ulong GetRegister(int register)
         {
             byte[] data = new byte[8];
 
-            uc.RegRead(register, data);
+            Uc.RegRead(register, data);
 
             return BitConverter.ToUInt64(data, 0);
         }
@@ -234,14 +234,14 @@ namespace Ryujinx.Tests.Unicorn
         {
             byte[] data = BitConverter.GetBytes(value);
 
-            uc.RegWrite(register, data);
+            Uc.RegWrite(register, data);
         }
 
         private SimdValue GetVector(int register)
         {
             byte[] data = new byte[16];
 
-            uc.RegRead(register, data);
+            Uc.RegRead(register, data);
 
             return new SimdValue(data);
         }
@@ -250,49 +250,49 @@ namespace Ryujinx.Tests.Unicorn
         {
             byte[] data = value.ToArray();
 
-            uc.RegWrite(register, data);
+            Uc.RegWrite(register, data);
         }
 
         public byte[] MemoryRead(ulong address, ulong size)
         {
             byte[] value = new byte[size];
 
-            uc.MemRead((long)address, value);
+            Uc.MemRead((long)address, value);
 
             return value;
         }
 
-        public byte   MemoryRead8 (ulong address) => MemoryRead(address, 1)[0];
+        public byte MemoryRead8(ulong address) => MemoryRead(address, 1)[0];
         public ushort MemoryRead16(ulong address) => BitConverter.ToUInt16(MemoryRead(address, 2), 0);
-        public uint   MemoryRead32(ulong address) => BitConverter.ToUInt32(MemoryRead(address, 4), 0);
-        public ulong  MemoryRead64(ulong address) => BitConverter.ToUInt64(MemoryRead(address, 8), 0);
+        public uint MemoryRead32(ulong address) => BitConverter.ToUInt32(MemoryRead(address, 4), 0);
+        public ulong MemoryRead64(ulong address) => BitConverter.ToUInt64(MemoryRead(address, 8), 0);
 
         public void MemoryWrite(ulong address, byte[] value)
         {
-            uc.MemWrite((long)address, value);
+            Uc.MemWrite((long)address, value);
         }
 
-        public void MemoryWrite8 (ulong address, byte value)   => MemoryWrite(address, new[]{ value });
-        public void MemoryWrite16(ulong address, short value)  => MemoryWrite(address, BitConverter.GetBytes(value));
+        public void MemoryWrite8(ulong address, byte value) => MemoryWrite(address, new[] { value });
+        public void MemoryWrite16(ulong address, short value) => MemoryWrite(address, BitConverter.GetBytes(value));
         public void MemoryWrite16(ulong address, ushort value) => MemoryWrite(address, BitConverter.GetBytes(value));
-        public void MemoryWrite32(ulong address, int value)  => MemoryWrite(address, BitConverter.GetBytes(value));
+        public void MemoryWrite32(ulong address, int value) => MemoryWrite(address, BitConverter.GetBytes(value));
         public void MemoryWrite32(ulong address, uint value) => MemoryWrite(address, BitConverter.GetBytes(value));
-        public void MemoryWrite64(ulong address, long value)  => MemoryWrite(address, BitConverter.GetBytes(value));
+        public void MemoryWrite64(ulong address, long value) => MemoryWrite(address, BitConverter.GetBytes(value));
         public void MemoryWrite64(ulong address, ulong value) => MemoryWrite(address, BitConverter.GetBytes(value));
 
         public void MemoryMap(ulong address, ulong size, MemoryPermission permissions)
         {
-            uc.MemMap((long)address, (long)size, (int)permissions);
+            Uc.MemMap((long)address, (long)size, (int)permissions);
         }
 
         public void MemoryUnmap(ulong address, ulong size)
         {
-            uc.MemUnmap((long)address, (long)size);
+            Uc.MemUnmap((long)address, (long)size);
         }
 
         public void MemoryProtect(ulong address, ulong size, MemoryPermission permissions)
         {
-            uc.MemProtect((long)address, (long)size, (int)permissions);
+            Uc.MemProtect((long)address, (long)size, (int)permissions);
         }
     }
-}
+}