Merge 3b447b764e into 7085bafa60

formatting pt.2

docs/compatibility.csv

@@ -2483,7 +2483,7 @@
 0100A5200C2E0000,"Safety First!",,playable,2021-01-06 09:05:23
 0100A51013530000,"SaGa Frontier Remastered",nvdec,playable,2022-11-03 13:54:56
 010003A00D0B4000,"SaGa SCARLET GRACE: AMBITIONS™",,playable,2022-10-06 13:20:31
-01008D100D43E000,"Saints Row IV®: Re-Elected™",ldn-untested;LAN;deadlock,ingame,2025-02-02 16:57:53
+01008D100D43E000,"Saints Row IV®: Re-Elected™",ldn-untested;LAN,playable,2023-12-04 18:33:37
 0100DE600BEEE000,"SAINTS ROW®: THE THIRD™ - THE FULL PACKAGE",slow;LAN,playable,2023-08-24 02:40:58
 01007F000EB36000,"Sakai and...",nvdec,playable,2022-12-15 13:53:19
 0100B1400E8FE000,"Sakuna: Of Rice and Ruin",,playable,2023-07-24 13:47:13

src/ARMeilleure/CodeGen/CompiledFunction.cs

@@ -1,6 +1,7 @@
 using ARMeilleure.CodeGen.Linking;
 using ARMeilleure.CodeGen.Unwinding;
 using ARMeilleure.Translation.Cache;
+using System;
 using System.Runtime.InteropServices;
 
 namespace ARMeilleure.CodeGen

src/ARMeilleure/IntermediateRepresentation/MemoryOperand.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Diagnostics;
 using System.Runtime.CompilerServices;
 

src/ARMeilleure/Native/JitSupportDarwin.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Runtime.InteropServices;
 using System.Runtime.Versioning;
 

src/ARMeilleure/Signal/TestMethods.cs

@@ -1,5 +1,6 @@
 using ARMeilleure.IntermediateRepresentation;
 using ARMeilleure.Translation;
+using System;
 using System.Runtime.InteropServices;
 using static ARMeilleure.IntermediateRepresentation.Operand.Factory;
 

src/ARMeilleure/Signal/WindowsPartialUnmapHandler.cs

@@ -1,6 +1,7 @@
 using ARMeilleure.IntermediateRepresentation;
 using ARMeilleure.Translation;
 using Ryujinx.Common.Memory.PartialUnmaps;
+using System;
 using System.Runtime.InteropServices;
 using static ARMeilleure.IntermediateRepresentation.Operand.Factory;
 

src/ARMeilleure/State/ExecutionContext.cs

@@ -1,4 +1,5 @@
 using ARMeilleure.Memory;
+using System;
 
 namespace ARMeilleure.State
 {

src/ARMeilleure/Translation/ArmEmitterContext.cs

@@ -6,6 +6,7 @@ using ARMeilleure.Instructions;
 using ARMeilleure.IntermediateRepresentation;
 using ARMeilleure.Memory;
 using ARMeilleure.State;
+using System;
 using System.Collections.Generic;
 using System.Reflection;
 using static ARMeilleure.IntermediateRepresentation.Operand.Factory;

src/ARMeilleure/Translation/Cache/JitCacheInvalidation.cs

@@ -1,4 +1,5 @@
 using ARMeilleure.Memory;
+using System;
 using System.Runtime.InteropServices;
 
 namespace ARMeilleure.Translation.Cache

src/ARMeilleure/Translation/DelegateInfo.cs

@@ -1,3 +1,5 @@
+using System;
+
 namespace ARMeilleure.Translation
 {
     class DelegateInfo

src/ARMeilleure/Translation/DispatcherFunction.cs

@@ -1,3 +1,5 @@
+using System;
+
 namespace ARMeilleure.Translation
 {
     delegate void DispatcherFunction(nint nativeContext, ulong startAddress);

src/ARMeilleure/Translation/GuestFunction.cs

@@ -1,3 +1,5 @@
+using System;
+
 namespace ARMeilleure.Translation
 {
     delegate ulong GuestFunction(nint nativeContextPtr);

src/ARMeilleure/Translation/PTC/Ptc.cs

@@ -4,7 +4,6 @@ using ARMeilleure.CodeGen.Unwinding;
 using ARMeilleure.Common;
 using ARMeilleure.Memory;
 using ARMeilleure.State;
-using Humanizer;
 using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Logging;
@@ -924,11 +923,15 @@ namespace ARMeilleure.Translation.PTC
             sw.Stop();
 
             PtcStateChanged?.Invoke(PtcLoadingState.Loaded, _translateCount, _translateTotalCount);
-            
+
-            Logger.Info?.Print(LogClass.Ptc, 
+            if (_translateCount == _translateTotalCount)
-                $"{_translateCount} of {_translateTotalCount} functions translated in {sw.Elapsed.TotalSeconds} seconds " +
+            {
-                $"| {"function".ToQuantity(_translateTotalCount - _translateCount)} blacklisted " +
+                Logger.Info?.Print(LogClass.Ptc, $"{_translateCount} of {_translateTotalCount} functions translated | Thread count: {degreeOfParallelism} in {sw.Elapsed.TotalSeconds} s");
-                $"| Thread count: {degreeOfParallelism}");
+            }
+            else
+            {
+                Logger.Info?.Print(LogClass.Ptc, $"{_translateCount} of {_translateTotalCount} functions translated | {_translateTotalCount - _translateCount} function{(_translateTotalCount - _translateCount != 1 ? "s" : "")} blacklisted | Thread count: {degreeOfParallelism} in {sw.Elapsed.TotalSeconds} s");
+            }
 
             Thread preSaveThread = new(PreSave)
             {

src/ARMeilleure/Translation/TranslatedFunction.cs

@@ -1,4 +1,5 @@
 using ARMeilleure.Common;
+using System;
 
 namespace ARMeilleure.Translation
 {

src/ARMeilleure/Translation/Translator.cs

@@ -5,6 +5,7 @@ using ARMeilleure.Diagnostics;
 using ARMeilleure.Instructions;
 using ARMeilleure.IntermediateRepresentation;
 using ARMeilleure.Memory;
+using ARMeilleure.Signal;
 using ARMeilleure.State;
 using ARMeilleure.Translation.Cache;
 using ARMeilleure.Translation.PTC;

src/ARMeilleure/Translation/TranslatorStubs.cs

@@ -4,6 +4,7 @@ using ARMeilleure.IntermediateRepresentation;
 using ARMeilleure.State;
 using ARMeilleure.Translation.Cache;
 using System;
+using System.Reflection;
 using System.Runtime.InteropServices;
 using static ARMeilleure.IntermediateRepresentation.Operand.Factory;
 

src/Ryujinx.Audio.Backends.SDL2/SDL2HardwareDeviceSession.cs

@@ -4,6 +4,7 @@ using Ryujinx.Common.Logging;
 using Ryujinx.Common.Memory;
 using Ryujinx.Memory;
 using System;
+using System.Buffers;
 using System.Collections.Concurrent;
 using System.Threading;
 

src/Ryujinx.Audio.Backends.SoundIo/Native/SoundIo.cs

@@ -1,4 +1,5 @@
 using Ryujinx.Common.Memory;
+using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 

src/Ryujinx.Audio.Backends.SoundIo/Native/SoundIoDeviceContext.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using static Ryujinx.Audio.Backends.SoundIo.Native.SoundIo;

src/Ryujinx.Audio.Backends.SoundIo/SoundIoHardwareDeviceSession.cs

@@ -4,6 +4,7 @@ using Ryujinx.Audio.Common;
 using Ryujinx.Common.Memory;
 using Ryujinx.Memory;
 using System;
+using System.Buffers;
 using System.Collections.Concurrent;
 using System.Runtime.CompilerServices;
 using System.Threading;

src/Ryujinx.Audio/Backends/Common/DynamicRingBuffer.cs

@@ -1,6 +1,7 @@
 using Ryujinx.Common;
 using Ryujinx.Common.Memory;
 using System;
+using System.Buffers;
 using System.Threading;
 
 namespace Ryujinx.Audio.Backends.Common

src/Ryujinx.Audio/Renderer/Server/MemoryPool/MemoryPoolState.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Runtime.InteropServices;
 using CpuAddress = System.UInt64;
 using DspAddress = System.UInt64;

src/Ryujinx.Common/Configuration/VSyncMode.cs

@@ -6,16 +6,4 @@ namespace Ryujinx.Common.Configuration
         Unbounded,
         Custom
     }
-    
-    public static class VSyncModeExtensions
-    {
-        public static VSyncMode Next(this VSyncMode vsync, bool customEnabled = false) =>
-            vsync switch
-            {
-                VSyncMode.Switch => customEnabled ? VSyncMode.Custom : VSyncMode.Unbounded,
-                VSyncMode.Unbounded => VSyncMode.Switch,
-                VSyncMode.Custom => VSyncMode.Unbounded,
-                _ => VSyncMode.Switch
-            };
-    }
 }

src/Ryujinx.Common/Helpers/FileAssociationHelper.cs

@@ -1,4 +1,5 @@
 using Microsoft.Win32;
+using Ryujinx.Common;
 using Ryujinx.Common.Logging;
 using System;
 using System.Diagnostics;

src/Ryujinx.Common/Helpers/ObjectiveC.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Runtime.InteropServices;
 using System.Runtime.Versioning;
 

src/Ryujinx.Common/Helpers/Patterns.cs

@@ -1,118 +0,0 @@
-using System.Text.RegularExpressions;
-
-namespace Ryujinx.Common.Helper
-{
-    public static partial class Patterns
-    {
-        #region Accessors
-
-        public static readonly Regex Numeric = NumericRegex();
-
-        public static readonly Regex AmdGcn = AmdGcnRegex();
-        public static readonly Regex NvidiaConsumerClass = NvidiaConsumerClassRegex();
-
-        public static readonly Regex DomainLp1Ns = DomainLp1NsRegex();
-        public static readonly Regex DomainLp1Lp1Npln = DomainLp1Lp1NplnRegex();
-        public static readonly Regex DomainLp1Znc = DomainLp1ZncRegex();
-        public static readonly Regex DomainSbApi = DomainSbApiRegex();
-        public static readonly Regex DomainSbAccounts = DomainSbAccountsRegex();
-        public static readonly Regex DomainAccounts = DomainAccountsRegex();
-
-        public static readonly Regex Module = ModuleRegex();
-        public static readonly Regex FsSdk = FsSdkRegex();
-        public static readonly Regex SdkMw = SdkMwRegex();
-
-        // ReSharper disable once InconsistentNaming
-        public static readonly Regex CJK = CJKRegex();
-
-        public static readonly Regex LdnPassphrase = LdnPassphraseRegex();
-
-        public static readonly Regex CleanText = CleanTextRegex();
-
-        #endregion
-
-        #region Generated pattern stubs
-
-        #region Numeric validation
-
-        [GeneratedRegex("[0-9]|.")]
-        internal static partial Regex NumericRegex();
-
-        #endregion
-
-        #region GPU names
-
-        [GeneratedRegex(
-            "Radeon (((HD|R(5|7|9|X)) )?((M?[2-6]\\d{2}(\\D|$))|([7-8]\\d{3}(\\D|$))|Fury|Nano))|(Pro Duo)")]
-        internal static partial Regex AmdGcnRegex();
-
-        [GeneratedRegex("NVIDIA GeForce (R|G)?TX? (\\d{3}\\d?)M?")]
-        internal static partial Regex NvidiaConsumerClassRegex();
-
-        #endregion
-
-        #region DNS blocking
-
-        public static readonly Regex[] BlockedHosts =
-        [
-            DomainLp1Ns,
-            DomainLp1Lp1Npln,
-            DomainLp1Znc,
-            DomainSbApi,
-            DomainSbAccounts,
-            DomainAccounts
-        ];
-
-        const RegexOptions DnsRegexOpts =
-            RegexOptions.CultureInvariant | RegexOptions.IgnoreCase | RegexOptions.ExplicitCapture;
-
-        [GeneratedRegex(@"^(.*)\-lp1\.(n|s)\.n\.srv\.nintendo\.net$", DnsRegexOpts)]
-        internal static partial Regex DomainLp1NsRegex();
-
-        [GeneratedRegex(@"^(.*)\-lp1\.lp1\.t\.npln\.srv\.nintendo\.net$", DnsRegexOpts)]
-        internal static partial Regex DomainLp1Lp1NplnRegex();
-
-        [GeneratedRegex(@"^(.*)\-lp1\.(znc|p)\.srv\.nintendo\.net$", DnsRegexOpts)]
-        internal static partial Regex DomainLp1ZncRegex();
-
-        [GeneratedRegex(@"^(.*)\-sb\-api\.accounts\.nintendo\.com$", DnsRegexOpts)]
-        internal static partial Regex DomainSbApiRegex();
-
-        [GeneratedRegex(@"^(.*)\-sb\.accounts\.nintendo\.com$", DnsRegexOpts)]
-        internal static partial Regex DomainSbAccountsRegex();
-
-        [GeneratedRegex(@"^accounts\.nintendo\.com$", DnsRegexOpts)]
-        internal static partial Regex DomainAccountsRegex();
-
-        #endregion
-
-        #region Executable information
-
-        [GeneratedRegex(@"[a-z]:[\\/][ -~]{5,}\.nss", RegexOptions.IgnoreCase | RegexOptions.CultureInvariant)]
-        internal static partial Regex ModuleRegex();
-
-        [GeneratedRegex(@"sdk_version: ([0-9.]*)")]
-        internal static partial Regex FsSdkRegex();
-
-        [GeneratedRegex(@"SDK MW[ -~]*")]
-        internal static partial Regex SdkMwRegex();
-
-        #endregion
-
-        #region CJK
-
-        [GeneratedRegex(
-            "\\p{IsHangulJamo}|\\p{IsCJKRadicalsSupplement}|\\p{IsCJKSymbolsandPunctuation}|\\p{IsEnclosedCJKLettersandMonths}|\\p{IsCJKCompatibility}|\\p{IsCJKUnifiedIdeographsExtensionA}|\\p{IsCJKUnifiedIdeographs}|\\p{IsHangulSyllables}|\\p{IsCJKCompatibilityForms}")]
-        private static partial Regex CJKRegex();
-
-        #endregion
-
-        [GeneratedRegex("Ryujinx-[0-9a-f]{8}")]
-        private static partial Regex LdnPassphraseRegex();
-
-        [GeneratedRegex(@"[^\u0000\u0009\u000A\u000D\u0020-\uFFFF]..")]
-        private static partial Regex CleanTextRegex();
-
-        #endregion
-    }
-}

src/Ryujinx.Common/Helpers/RefEvent.cs

@@ -1,58 +0,0 @@
-using Gommon;
-using System.Collections.Generic;
-using System.Threading;
-
-namespace Ryujinx.Common.Helper
-{
-    public class RefEvent<T>
-    {
-        public delegate void Handler(ref T arg);
-        
-        private readonly Lock _subLock = new();
-        private readonly List<Handler> _subscriptions = [];
-    
-        public bool HasSubscribers
-        {
-            get
-            {
-                lock (_subLock)
-                    return _subscriptions.Count != 0;
-            }
-        }
-
-        public IReadOnlyList<Handler> Subscriptions
-        {
-            get
-            {
-                lock (_subLock)
-                    return _subscriptions;
-            }
-        }
-
-        public void Add(Handler subscriber)
-        {
-            Guard.Require(subscriber, nameof(subscriber));
-            lock (_subLock)
-                _subscriptions.Add(subscriber);
-        }
-
-        public void Remove(Handler subscriber)
-        {
-            Guard.Require(subscriber, nameof(subscriber));
-            lock (_subLock)
-                _subscriptions.Remove(subscriber);
-        }
-
-        public void Clear()
-        {
-            lock (_subLock)
-                _subscriptions.Clear();
-        }
-
-        public void Call(ref T arg)
-        {
-            foreach (Handler subscription in Subscriptions)
-                subscription(ref arg);
-        }
-    }
-}

src/Ryujinx.Common/Helpers/RunningPlatform.cs

@@ -10,18 +10,14 @@ namespace Ryujinx.Common.Helper
         public static bool IsMacOS => OperatingSystem.IsMacOS();
         public static bool IsWindows => OperatingSystem.IsWindows();
         public static bool IsLinux => OperatingSystem.IsLinux();
-        
-        public static bool IsArm => RuntimeInformation.OSArchitecture is Architecture.Arm64;
-        
-        public static bool IsX64 => RuntimeInformation.OSArchitecture is Architecture.X64;
 
-        public static bool IsIntelMac => IsMacOS && IsX64;
+        public static bool IsIntelMac => IsMacOS && RuntimeInformation.OSArchitecture is Architecture.X64;
-        public static bool IsArmMac => IsMacOS && IsArm;
+        public static bool IsArmMac => IsMacOS && RuntimeInformation.OSArchitecture is Architecture.Arm64;
         
-        public static bool IsX64Windows => IsWindows && IsX64;
+        public static bool IsX64Windows => IsWindows && (RuntimeInformation.OSArchitecture is Architecture.X64);
-        public static bool IsArmWindows => IsWindows && IsArm;
+        public static bool IsArmWindows => IsWindows && (RuntimeInformation.OSArchitecture is Architecture.Arm64);
         
-        public static bool IsX64Linux => IsLinux && IsX64;
+        public static bool IsX64Linux => IsLinux && (RuntimeInformation.OSArchitecture is Architecture.X64);
-        public static bool IsArmLinux => IsLinux && IsArmMac;
+        public static bool IsArmLinux => IsLinux && (RuntimeInformation.OSArchitecture is Architecture.Arm64);
     }
 }

src/Ryujinx.Common/TitleIDs.cs

@@ -3,6 +3,7 @@ using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Helper;
 using System;
 using System.Linq;
+using System.Runtime.InteropServices;
 
 namespace Ryujinx.Common
 {
@@ -29,11 +30,10 @@ namespace Ryujinx.Common
         
         public static readonly string[] GreatMetalTitles =
         [
-            "01009b500007c000", // ARMS
+            "010076f0049a2000", // Bayonetta
             "0100a5c00d162000", // Cuphead
             "010023800d64a000", // Deltarune
             "01003a30012c0000", // LEGO City Undercover
-            "010048701995e000", // Luigi's Manion 2 HD
             "010028600EBDA000", // Mario 3D World
             "0100152000022000", // Mario Kart 8 Deluxe
             "010075a016a3a000", // Persona 4 Arena Ultimax
@@ -47,16 +47,11 @@ namespace Ryujinx.Common
             "01006f8002326000", // Animal Crossings: New Horizons
             "01009bf0072d4000", // Captain Toad: Treasure Tracker
             "01009510001ca000", // Fast RMX
-            "01005CA01580E000", // Persona 5 Royal
+            "01005CA01580E000", // Persona 5 Royale
-            "0100b880154fc000", // Persona 5 The Royal (Japan)
-            "010015100b514000", // Super Mario Bros. Wonder
             "0100000000010000", // Super Mario Odyssey
 
-            // Further testing is appreciated, I did not test the entire game:
+            //Isaac claims it has a issue in level 2, but I am not able to replicate it on my M3. More testing would be appreciated:
-            "01007300020fa000", // Astral Chain
+            "010015100b514000", // Super Mario Bros. Wonder
-            "010076f0049a2000", // Bayonetta
-            "0100cf5010fec000", // Bayonetta Origins: Cereza and the Lost Demon
-            "0100f4300bf2c000", // New Pokemon Snap
         ];
         
         public static string GetDiscordGameAsset(string titleId) 

src/Ryujinx.Common/Utilities/Rainbow.cs

@@ -1,5 +1,4 @@
 using Gommon;
-using Ryujinx.Common.Helper;
 using System;
 using System.Drawing;
 using System.Threading;
@@ -56,7 +55,7 @@ namespace Ryujinx.Common.Utilities
             {
                 _color = HsbToRgb((_color.GetHue() + Speed) / 360);
             
-                _updatedHandler.Call(ref _color);
+                _updatedHandler.Call(_color.ToArgb());
             }
         }
 
@@ -68,13 +67,13 @@ namespace Ryujinx.Common.Utilities
                 _color = Color.Blue;
         }
 
-        public static event RefEvent<Color>.Handler Updated
+        public static event Action<int> Updated
         {
             add => _updatedHandler.Add(value);
             remove => _updatedHandler.Remove(value);
         }
 
-        private static readonly RefEvent<Color> _updatedHandler = new();
+        private static readonly Event<int> _updatedHandler = new();
 
         private static Color HsbToRgb(float hue, float saturation = 1, float brightness = 1)
         {

src/Ryujinx.Cpu/AppleHv/HvExecutionContextVcpu.cs

@@ -1,5 +1,6 @@
 using ARMeilleure.State;
 using Ryujinx.Memory;
+using System;
 using System.Runtime.InteropServices;
 using System.Runtime.Versioning;
 

src/Ryujinx.Cpu/AppleHv/HvMemoryManager.cs

@@ -5,6 +5,7 @@ using Ryujinx.Memory.Tracking;
 using System;
 using System.Buffers;
 using System.Collections.Generic;
+using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Runtime.Versioning;
 

src/Ryujinx.Cpu/AppleHv/HvVm.cs

@@ -1,4 +1,5 @@
 using Ryujinx.Memory;
+using System;
 using System.Runtime.Versioning;
 using System.Threading;
 

src/Ryujinx.Cpu/Jit/JitCpuContext.cs

@@ -2,6 +2,7 @@ using ARMeilleure.Common;
 using ARMeilleure.Memory;
 using ARMeilleure.Translation;
 using Ryujinx.Cpu.Signal;
+using Ryujinx.Memory;
 
 namespace Ryujinx.Cpu.Jit
 {

src/Ryujinx.Cpu/Jit/MemoryManager.cs

@@ -5,6 +5,7 @@ using Ryujinx.Memory.Tracking;
 using System;
 using System.Buffers;
 using System.Collections.Generic;
+using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Threading;

src/Ryujinx.Cpu/Jit/MemoryManagerHostTracked.cs

@@ -8,6 +8,7 @@ using Ryujinx.Memory.Tracking;
 using System;
 using System.Buffers;
 using System.Collections.Generic;
+using System.Linq;
 using System.Runtime.CompilerServices;
 
 namespace Ryujinx.Cpu.Jit

src/Ryujinx.Cpu/LightningJit/AarchCompiler.cs

@@ -3,6 +3,7 @@ using ARMeilleure.Memory;
 using Ryujinx.Cpu.LightningJit.Arm32;
 using Ryujinx.Cpu.LightningJit.Arm64;
 using Ryujinx.Cpu.LightningJit.State;
+using System;
 using System.Runtime.InteropServices;
 
 namespace Ryujinx.Cpu.LightningJit

src/Ryujinx.Cpu/LightningJit/Arm32/Target/Arm64/Compiler.cs

@@ -2,6 +2,7 @@ using ARMeilleure.Common;
 using ARMeilleure.Memory;
 using Ryujinx.Cpu.LightningJit.CodeGen;
 using Ryujinx.Cpu.LightningJit.CodeGen.Arm64;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Numerics;

src/Ryujinx.Cpu/LightningJit/Arm32/Target/Arm64/InstEmitVfpCompare.cs

@@ -1,4 +1,5 @@
 using Ryujinx.Cpu.LightningJit.CodeGen;
+using System;
 using System.Diagnostics;
 
 namespace Ryujinx.Cpu.LightningJit.Arm32.Target.Arm64

src/Ryujinx.Cpu/LightningJit/Arm32/Target/Arm64/InstEmitVfpMove.cs

@@ -1,3 +1,5 @@
+using Ryujinx.Cpu.LightningJit.CodeGen;
+
 namespace Ryujinx.Cpu.LightningJit.Arm32.Target.Arm64
 {
     static class InstEmitVfpMove

src/Ryujinx.Cpu/LightningJit/Arm64/SysUtils.cs

@@ -1,3 +1,5 @@
+using System.Diagnostics;
+
 namespace Ryujinx.Cpu.LightningJit.Arm64
 {
     static class SysUtils

src/Ryujinx.Cpu/LightningJit/Arm64/Target/Arm64/Compiler.cs

@@ -3,6 +3,7 @@ using ARMeilleure.Memory;
 using Ryujinx.Cpu.LightningJit.CodeGen;
 using Ryujinx.Cpu.LightningJit.CodeGen.Arm64;
 using Ryujinx.Cpu.LightningJit.Graph;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Numerics;

src/Ryujinx.Cpu/LightningJit/Cache/JitCacheInvalidation.cs

@@ -1,4 +1,5 @@
 using ARMeilleure.Memory;
+using System;
 using System.Runtime.InteropServices;
 
 namespace Ryujinx.Cpu.LightningJit.Cache

src/Ryujinx.Cpu/LightningJit/Cache/JitSupportDarwin.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Runtime.InteropServices;
 using System.Runtime.Versioning;
 

src/Ryujinx.Cpu/LightningJit/CodeGen/Arm64/StackWalker.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
 

src/Ryujinx.Cpu/LightningJit/IStackWalker.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 
 namespace Ryujinx.Cpu.LightningJit

src/Ryujinx.Cpu/LightningJit/TranslatedFunction.cs

@@ -1,3 +1,5 @@
+using System;
+
 namespace Ryujinx.Cpu.LightningJit
 {
     class TranslatedFunction

src/Ryujinx.Cpu/LightningJit/Translator.cs

@@ -5,6 +5,7 @@ using Ryujinx.Cpu.LightningJit.Cache;
 using Ryujinx.Cpu.LightningJit.CodeGen.Arm64;
 using Ryujinx.Cpu.LightningJit.State;
 using Ryujinx.Cpu.Signal;
+using Ryujinx.Memory;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;

src/Ryujinx.Cpu/Signal/WindowsSignalHandlerRegistration.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Runtime.InteropServices;
 
 namespace Ryujinx.Cpu.Signal

src/Ryujinx.Graphics.Device/ISynchronizationManager.cs

@@ -1,4 +1,6 @@
+using Ryujinx.Common.Logging;
 using System;
+using System.Threading;
 
 namespace Ryujinx.Graphics.Device
 {

src/Ryujinx.Graphics.Gpu/Engine/Threed/Blender/AdvancedBlendPreGenTable.cs

@@ -1,5 +1,6 @@
 using Ryujinx.Common;
 using Ryujinx.Graphics.GAL;
+using System;
 using System.Collections.Generic;
 
 namespace Ryujinx.Graphics.Gpu.Engine.Threed.Blender

src/Ryujinx.Graphics.Gpu/Engine/Threed/StateUpdateTracker.cs

@@ -1,3 +1,4 @@
+using Ryujinx.Graphics.Device;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;

src/Ryujinx.Graphics.Gpu/Image/TextureBindingsArrayCache.cs

@@ -4,6 +4,7 @@ using Ryujinx.Graphics.Gpu.Memory;
 using Ryujinx.Graphics.Shader;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Runtime.InteropServices;
 
 namespace Ryujinx.Graphics.Gpu.Image

src/Ryujinx.Graphics.Gpu/Memory/MemoryManager.cs

@@ -1,4 +1,5 @@
 using Ryujinx.Common.Memory;
+using Ryujinx.Graphics.Gpu.Image;
 using Ryujinx.Memory;
 using Ryujinx.Memory.Range;
 using System;

src/Ryujinx.Graphics.Gpu/Memory/PhysicalMemory.cs

@@ -7,6 +7,7 @@ using Ryujinx.Memory;
 using Ryujinx.Memory.Range;
 using Ryujinx.Memory.Tracking;
 using System;
+using System.Buffers;
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.InteropServices;

src/Ryujinx.Graphics.Gpu/Memory/SupportBufferUpdater.cs

@@ -1,5 +1,6 @@
 using Ryujinx.Graphics.GAL;
 using Ryujinx.Graphics.Shader;
+using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 

src/Ryujinx.Graphics.Gpu/Shader/CachedShaderBindings.cs

@@ -2,6 +2,7 @@ using Ryujinx.Graphics.GAL;
 using Ryujinx.Graphics.Gpu.Engine;
 using Ryujinx.Graphics.Gpu.Image;
 using Ryujinx.Graphics.Shader;
+using System;
 using System.Linq;
 
 namespace Ryujinx.Graphics.Gpu.Shader

src/Ryujinx.Graphics.Gpu/Shader/ShaderCache.cs

@@ -1,3 +1,4 @@
+using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Logging;
 using Ryujinx.Graphics.GAL;

src/Ryujinx.Graphics.Gpu/Synchronization/SynchronizationManager.cs

@@ -87,7 +87,7 @@ namespace Ryujinx.Graphics.Gpu.Synchronization
             }
 
             using ManualResetEvent waitEvent = new(false);
-            SyncpointWaiterHandle info = _syncpoints[id].RegisterCallback(threshold, _ => waitEvent.Set());
+            SyncpointWaiterHandle info = _syncpoints[id].RegisterCallback(threshold, (x) => waitEvent.Set());
 
             if (info == null)
             {
@@ -96,7 +96,7 @@ namespace Ryujinx.Graphics.Gpu.Synchronization
 
             bool signaled = waitEvent.WaitOne(timeout);
 
-            if (!signaled)
+            if (!signaled && info != null)
             {
                 Logger.Error?.Print(LogClass.Gpu, $"Wait on syncpoint {id} for threshold {threshold} took more than {timeout.TotalMilliseconds}ms, resuming execution...");
 

src/Ryujinx.Graphics.Metal/EnumConversion.cs

@@ -1,6 +1,7 @@
 using Ryujinx.Common.Logging;
 using Ryujinx.Graphics.GAL;
 using SharpMetal.Metal;
+using System;
 using System.Runtime.Versioning;
 
 namespace Ryujinx.Graphics.Metal

src/Ryujinx.Graphics.Metal/HardwareInfo.cs

@@ -76,7 +76,7 @@ namespace Ryujinx.Graphics.Metal
                 return model;
             }
 
-            return string.Empty;
+            return "";
         }
     }
 }

src/Ryujinx.Graphics.Nvdec.FFmpeg/Native/AVCodec.cs

@@ -1,3 +1,5 @@
+using System;
+
 namespace Ryujinx.Graphics.Nvdec.FFmpeg.Native
 {
     struct AVCodec

src/Ryujinx.Graphics.Nvdec.FFmpeg/Native/AVCodec501.cs

@@ -1,3 +1,5 @@
+using System;
+
 namespace Ryujinx.Graphics.Nvdec.FFmpeg.Native
 {
     struct AVCodec501

src/Ryujinx.Graphics.Nvdec.FFmpeg/Native/AVCodecContext.cs

@@ -1,4 +1,5 @@
 using Ryujinx.Common.Memory;
+using System;
 
 namespace Ryujinx.Graphics.Nvdec.FFmpeg.Native
 {

src/Ryujinx.Graphics.Nvdec.FFmpeg/Native/AVFrame.cs

@@ -1,4 +1,5 @@
 using Ryujinx.Common.Memory;
+using System;
 
 namespace Ryujinx.Graphics.Nvdec.FFmpeg.Native
 {

src/Ryujinx.Graphics.Nvdec.FFmpeg/Native/FFCodec.cs

@@ -1,3 +1,5 @@
+using System;
+
 namespace Ryujinx.Graphics.Nvdec.FFmpeg.Native
 {
     struct FFCodec<T> where T : struct

src/Ryujinx.Graphics.Nvdec.FFmpeg/Native/FFCodecLegacy.cs

@@ -1,3 +1,5 @@
+using System;
+
 namespace Ryujinx.Graphics.Nvdec.FFmpeg.Native
 {
     struct FFCodecLegacy<T> where T : struct

src/Ryujinx.Graphics.Nvdec.FFmpeg/Surface.cs

@@ -1,5 +1,6 @@
 using Ryujinx.Graphics.Nvdec.FFmpeg.Native;
 using Ryujinx.Graphics.Video;
+using System;
 
 namespace Ryujinx.Graphics.Nvdec.FFmpeg
 {

src/Ryujinx.Graphics.Nvdec.Vp9/Types/Surface.cs

@@ -1,5 +1,6 @@
 using Ryujinx.Common.Memory;
 using Ryujinx.Graphics.Video;
+using System;
 using System.Runtime.InteropServices;
 
 namespace Ryujinx.Graphics.Nvdec.Vp9.Types

src/Ryujinx.Graphics.OpenGL/Effects/AreaScalingFilter.cs

@@ -2,6 +2,7 @@ using OpenTK.Graphics.OpenGL;
 using Ryujinx.Common;
 using Ryujinx.Graphics.GAL;
 using Ryujinx.Graphics.OpenGL.Image;
+using System;
 using static Ryujinx.Graphics.OpenGL.Effects.ShaderHelper;
 
 namespace Ryujinx.Graphics.OpenGL.Effects

src/Ryujinx.Graphics.OpenGL/Helper/GLXHelper.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Runtime.InteropServices;
 using System.Runtime.Versioning;
 

src/Ryujinx.Graphics.OpenGL/Helper/WGLHelper.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Runtime.InteropServices;
 using System.Runtime.Versioning;
 

src/Ryujinx.Graphics.OpenGL/IOpenGLContext.cs

@@ -1,3 +1,4 @@
+using Ryujinx.Graphics.OpenGL.Helper;
 using System;
 
 namespace Ryujinx.Graphics.OpenGL

src/Ryujinx.Graphics.Shader/CodeGen/Msl/Declarations.cs

@@ -1,4 +1,5 @@
 using Ryujinx.Common;
+using Ryujinx.Common.Logging;
 using Ryujinx.Graphics.Shader.IntermediateRepresentation;
 using Ryujinx.Graphics.Shader.StructuredIr;
 using Ryujinx.Graphics.Shader.Translation;
@@ -217,7 +218,7 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Msl
 
             foreach (MemoryDefinition memory in memories)
             {
-                string arraySize = string.Empty;
+                string arraySize = "";
                 if ((memory.Type & AggregateType.Array) != 0)
                 {
                     arraySize = $"[{memory.ArrayLength}]";
@@ -239,7 +240,7 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Msl
                 BufferDefinition buffer = buffers[i];
 
                 bool needsPadding = buffer.Layout == BufferLayout.Std140;
-                string fsiSuffix = !constant && fsi ? " [[raster_order_group(0)]]" : string.Empty;
+                string fsiSuffix = !constant && fsi ? " [[raster_order_group(0)]]" : "";
 
                 bufferDec[i] = $"{addressSpace} {Defaults.StructPrefix}_{buffer.Name}* {buffer.Name}{fsiSuffix};";
 
@@ -256,7 +257,7 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Msl
                     type &= ~AggregateType.Array;
 
                     string typeName = GetVarTypeName(type);
-                    string arraySuffix = string.Empty;
+                    string arraySuffix = "";
 
                     if (field.Type.HasFlag(AggregateType.Array))
                     {
@@ -352,7 +353,7 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Msl
                     imageTypeName = $"array<{imageTypeName}, {image.ArrayLength}>";
                 }
 
-                string fsiSuffix = fsi ? " [[raster_order_group(0)]]" : string.Empty;
+                string fsiSuffix = fsi ? " [[raster_order_group(0)]]" : "";
 
                 imageDec[i] = $"{imageTypeName} {image.Name}{fsiSuffix};";
             }
@@ -453,7 +454,7 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Msl
                         IoVariable.VertexIndex => "[[vertex_id]]",
                         // IoVariable.PointCoord => "[[point_coord]]",
                         IoVariable.UserDefined => context.Definitions.Stage == ShaderStage.Fragment ? $"[[user(loc{ioDefinition.Location})]]" : $"[[attribute({ioDefinition.Location})]]",
-                        _ => string.Empty
+                        _ => ""
                     };
 
                     context.AppendLine($"{type} {name} {iq}{suffix};");
@@ -544,7 +545,7 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Msl
                         IoVariable.FragmentOutputColor => $"[[color({ioDefinition.Location})]]",
                         IoVariable.FragmentOutputDepth => "[[depth(any)]]",
                         IoVariable.ClipDistance => $"[[clip_distance]][{Defaults.TotalClipDistances}]",
-                        _ => string.Empty
+                        _ => ""
                     };
 
                     context.AppendLine($"{type} {name} {suffix};");

src/Ryujinx.Graphics.Shader/CodeGen/Msl/Instructions/InstGenMemory.cs

@@ -27,7 +27,7 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Msl.Instructions
                 inputsCount--;
             }
 
-            string fieldName = string.Empty;
+            string fieldName = "";
             switch (storageKind)
             {
                 case StorageKind.ConstantBuffer:
@@ -140,7 +140,7 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Msl.Instructions
                 }
             }
             varName += fieldName;
-            varName += fieldHasPadding ? ".x" : string.Empty;
+            varName += fieldHasPadding ? ".x" : "";
 
             if (isStore)
             {
@@ -434,7 +434,7 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Msl.Instructions
 
                 string prefix = intCoords ? "uint" : "float";
 
-                return prefix + (count > 1 ? count : string.Empty) + "(" + coords + ")";
+                return prefix + (count > 1 ? count : "") + "(" + coords + ")";
             }
 
             Append(AssemblePVector(pCount));
@@ -504,7 +504,7 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Msl.Instructions
             }
 
             texCallBuilder.Append(')');
-            texCallBuilder.Append(colorIsVector ? GetMaskMultiDest(texOp.Index) : string.Empty);
+            texCallBuilder.Append(colorIsVector ? GetMaskMultiDest(texOp.Index) : "");
 
             return texCallBuilder.ToString();
         }
@@ -558,7 +558,7 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Msl.Instructions
         {
             if (mask == 0x0)
             {
-                return string.Empty;
+                return "";
             }
 
             string swizzle = ".";

src/Ryujinx.Graphics.Shader/CodeGen/Msl/MslGenerator.cs

@@ -15,7 +15,7 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Msl
             if (parameters.Definitions.Stage is not (ShaderStage.Vertex or ShaderStage.Fragment or ShaderStage.Compute))
             {
                 Logger.Warning?.Print(LogClass.Gpu, $"Attempted to generate unsupported shader type {parameters.Definitions.Stage}!");
-                return string.Empty;
+                return "";
             }
 
             CodeGenContext context = new(info, parameters);

src/Ryujinx.Graphics.Shader/CodeGen/Spirv/CodeGenContext.cs

@@ -4,6 +4,7 @@ using Ryujinx.Graphics.Shader.Translation;
 using Spv.Generator;
 using System;
 using System.Collections.Generic;
+using static Spv.Specification;
 using Instruction = Spv.Generator.Instruction;
 
 namespace Ryujinx.Graphics.Shader.CodeGen.Spirv

src/Ryujinx.Graphics.Shader/SamplerType.cs

@@ -199,7 +199,7 @@ namespace Ryujinx.Graphics.Shader
                 _ => "float"
             };
 
-            return $"{typeName}<{format}{(image ? ", access::read_write" : string.Empty)}>";
+            return $"{typeName}<{format}{(image ? ", access::read_write" : "")}>";
         }
     }
 }

src/Ryujinx.Graphics.Shader/StructuredIr/AstOptimizer.cs

@@ -1,4 +1,5 @@
 using Ryujinx.Graphics.Shader.IntermediateRepresentation;
+using Ryujinx.Graphics.Shader.Translation;
 using System.Collections.Generic;
 using System.Linq;
 

src/Ryujinx.Graphics.Video/Plane.cs

@@ -1,3 +1,5 @@
+using System;
+
 namespace Ryujinx.Graphics.Video
 {
     public readonly record struct Plane(nint Pointer, int Length);

src/Ryujinx.Graphics.Vulkan/DescriptorSetUpdater.cs

@@ -3,6 +3,7 @@ using Ryujinx.Graphics.GAL;
 using Ryujinx.Graphics.Shader;
 using Silk.NET.Vulkan;
 using System;
+using System.Buffers;
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

src/Ryujinx.Graphics.Vulkan/PipelineBase.cs

@@ -11,6 +11,7 @@ using System.Runtime.InteropServices;
 using BlendOp = Silk.NET.Vulkan.BlendOp;
 using Buffer = Silk.NET.Vulkan.Buffer;
 using CompareOp = Ryujinx.Graphics.GAL.CompareOp;
+using Format = Ryujinx.Graphics.GAL.Format;
 using FrontFace = Ryujinx.Graphics.GAL.FrontFace;
 using IndexType = Ryujinx.Graphics.GAL.IndexType;
 using PolygonMode = Ryujinx.Graphics.GAL.PolygonMode;

src/Ryujinx.Graphics.Vulkan/PipelineHelperShader.cs

@@ -1,4 +1,5 @@
 using Silk.NET.Vulkan;
+using VkFormat = Silk.NET.Vulkan.Format;
 
 namespace Ryujinx.Graphics.Vulkan
 {

src/Ryujinx.Graphics.Vulkan/PipelineLayoutFactory.cs

@@ -1,5 +1,7 @@
+using Ryujinx.Common.Memory;
 using Ryujinx.Graphics.GAL;
 using Silk.NET.Vulkan;
+using System;
 using System.Collections.ObjectModel;
 
 namespace Ryujinx.Graphics.Vulkan

src/Ryujinx.Graphics.Vulkan/Queries/CounterQueue.cs

@@ -2,6 +2,7 @@ using Ryujinx.Graphics.GAL;
 using Silk.NET.Vulkan;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading;
 
 namespace Ryujinx.Graphics.Vulkan.Queries

src/Ryujinx.Graphics.Vulkan/TextureBuffer.cs

@@ -2,6 +2,8 @@ using Ryujinx.Common.Memory;
 using Ryujinx.Graphics.GAL;
 using Silk.NET.Vulkan;
 using System;
+using System.Collections.Generic;
+using Format = Ryujinx.Graphics.GAL.Format;
 using VkFormat = Silk.NET.Vulkan.Format;
 
 namespace Ryujinx.Graphics.Vulkan

src/Ryujinx.Graphics.Vulkan/Vendor.cs

@@ -16,8 +16,14 @@ namespace Ryujinx.Graphics.Vulkan
         Unknown,
     }
 
-    static class VendorUtils
+    static partial class VendorUtils
     {
+        [GeneratedRegex("Radeon (((HD|R(5|7|9|X)) )?((M?[2-6]\\d{2}(\\D|$))|([7-8]\\d{3}(\\D|$))|Fury|Nano))|(Pro Duo)")]
+        public static partial Regex AmdGcnRegex();
+
+        [GeneratedRegex("NVIDIA GeForce (R|G)?TX? (\\d{3}\\d?)M?")]
+        public static partial Regex NvidiaConsumerClassRegex();
+
         public static Vendor FromId(uint id)
         {
             return id switch

src/Ryujinx.Graphics.Vulkan/VulkanException.cs

@@ -1,5 +1,6 @@
 using Silk.NET.Vulkan;
 using System;
+using System.Runtime.Serialization;
 
 namespace Ryujinx.Graphics.Vulkan
 {

src/Ryujinx.Graphics.Vulkan/VulkanRenderer.cs

@@ -1,6 +1,5 @@
 using Gommon;
 using Ryujinx.Common.Configuration;
-using Ryujinx.Common.Helper;
 using Ryujinx.Common.Logging;
 using Ryujinx.Graphics.GAL;
 using Ryujinx.Graphics.Shader;
@@ -376,11 +375,11 @@ namespace Ryujinx.Graphics.Vulkan
 
             GpuVersion = $"Vulkan v{ParseStandardVulkanVersion(properties.ApiVersion)}, Driver v{ParseDriverVersion(ref properties)}";
 
-            IsAmdGcn = !IsMoltenVk && Vendor == Vendor.Amd && Patterns.AmdGcn.IsMatch(GpuRenderer);
+            IsAmdGcn = !IsMoltenVk && Vendor == Vendor.Amd && VendorUtils.AmdGcnRegex().IsMatch(GpuRenderer);
 
             if (Vendor == Vendor.Nvidia)
             {
-                Match match = Patterns.NvidiaConsumerClass.Match(GpuRenderer);
+                Match match = VendorUtils.NvidiaConsumerClassRegex().Match(GpuRenderer);
 
                 if (match != null && int.TryParse(match.Groups[2].Value, out int gpuNumber))
                 {

src/Ryujinx.HLE/Exceptions/ServiceNotImplementedException.cs

@@ -7,6 +7,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
+using System.Runtime.Serialization;
 using System.Text;
 
 namespace Ryujinx.HLE.Exceptions

src/Ryujinx.HLE/HOS/Applets/AppletManager.cs

@@ -4,6 +4,8 @@ using Ryujinx.HLE.HOS.Applets.Cabinet;
 using Ryujinx.HLE.HOS.Applets.Dummy;
 using Ryujinx.HLE.HOS.Applets.Error;
 using Ryujinx.HLE.HOS.Services.Am.AppletAE;
+using System;
+using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Applets
 {

src/Ryujinx.HLE/HOS/Applets/Dummy/DummyApplet.cs

@@ -1,8 +1,10 @@
+using Ryujinx.Common.Logging;
 using Ryujinx.Common.Memory;
+using Ryujinx.HLE.HOS.Applets;
 using Ryujinx.HLE.HOS.Services.Am.AppletAE;
 using System;
 using System.IO;
-
+using System.Runtime.InteropServices;
 namespace Ryujinx.HLE.HOS.Applets.Dummy
 {
     internal class DummyApplet : IApplet

src/Ryujinx.HLE/HOS/Applets/Error/ErrorApplet.cs

@@ -5,7 +5,6 @@ using LibHac.FsSystem;
 using LibHac.Ncm;
 using LibHac.Tools.FsSystem;
 using LibHac.Tools.FsSystem.NcaUtils;
-using Ryujinx.Common.Helper;
 using Ryujinx.Common.Logging;
 using Ryujinx.HLE.HOS.Services.Am.AppletAE;
 using Ryujinx.HLE.HOS.SystemState;
@@ -31,6 +30,9 @@ namespace Ryujinx.HLE.HOS.Applets.Error
 
         public event EventHandler AppletStateChanged;
 
+        [GeneratedRegex(@"[^\u0000\u0009\u000A\u000D\u0020-\uFFFF]..")]
+        private static partial Regex CleanTextRegex();
+
         public ErrorApplet(Horizon horizon)
         {
             _horizon = horizon;
@@ -105,7 +107,7 @@ namespace Ryujinx.HLE.HOS.Applets.Error
 
         private static string CleanText(string value)
         {
-            return Patterns.CleanText.Replace(value, string.Empty).Replace("\0", string.Empty);
+            return CleanTextRegex().Replace(value, string.Empty).Replace("\0", string.Empty);
         }
 
         private string GetMessageText(uint module, uint description, string key)

src/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/CJKCharacterValidation.cs

@@ -0,0 +1,17 @@
+using System.Text.RegularExpressions;
+
+namespace Ryujinx.HLE.HOS.Applets.SoftwareKeyboard
+{
+    public static partial class CJKCharacterValidation
+    {
+        public static bool IsCJK(char value)
+        {
+            Regex regex = CJKRegex();
+
+            return regex.IsMatch(value.ToString());
+        }
+
+        [GeneratedRegex("\\p{IsHangulJamo}|\\p{IsCJKRadicalsSupplement}|\\p{IsCJKSymbolsandPunctuation}|\\p{IsEnclosedCJKLettersandMonths}|\\p{IsCJKCompatibility}|\\p{IsCJKUnifiedIdeographsExtensionA}|\\p{IsCJKUnifiedIdeographs}|\\p{IsHangulSyllables}|\\p{IsCJKCompatibilityForms}")]
+        private static partial Regex CJKRegex();
+    }
+}

src/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/CharacterValidation.cs

@@ -1,10 +0,0 @@
-using Ryujinx.Common.Helper;
-
-namespace Ryujinx.HLE.HOS.Applets.SoftwareKeyboard
-{
-    public static class CharacterValidation
-    {
-        public static bool IsNumeric(char value) => Patterns.Numeric.IsMatch(value.ToString());
-        public static bool IsCJK(char value) => Patterns.CJK.IsMatch(value.ToString());
-    }
-}

src/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/NumericCharacterValidation.cs

@@ -0,0 +1,17 @@
+using System.Text.RegularExpressions;
+
+namespace Ryujinx.HLE.HOS.Applets.SoftwareKeyboard
+{
+    public static partial class NumericCharacterValidation
+    {
+        public static bool IsNumeric(char value)
+        {
+            Regex regex = NumericRegex();
+
+            return regex.IsMatch(value.ToString());
+        }
+
+        [GeneratedRegex("[0-9]|.")]
+        private static partial Regex NumericRegex();
+    }
+}

src/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/SoftwareKeyboardRendererBase.cs

@@ -5,6 +5,7 @@ using System;
 using System.Diagnostics;
 using System.IO;
 using System.Reflection;
+using System.Runtime.InteropServices;
 using System.Threading;
 
 namespace Ryujinx.HLE.HOS.Applets.SoftwareKeyboard

src/Ryujinx.HLE/HOS/Kernel/Common/KResourceLimit.cs

@@ -2,6 +2,7 @@ using Ryujinx.Common;
 using Ryujinx.HLE.HOS.Kernel.Threading;
 using Ryujinx.Horizon.Common;
 using System.Collections.Generic;
+using System.Threading;
 
 namespace Ryujinx.HLE.HOS.Kernel.Common
 {

src/Ryujinx.HLE/HOS/ModLoader.cs

@@ -296,7 +296,7 @@ namespace Ryujinx.HLE.HOS
             AddModsFromDirectory(mods, applicationDir, modMetadata);
         }
 
-        public static void QueryContentsDir(ModCache mods, DirectoryInfo contentsDir, ulong applicationId, ulong[] installedDlcs)
+        public static void QueryContentsDir(ModCache mods, DirectoryInfo contentsDir, ulong applicationId)
         {
             if (!contentsDir.Exists)
             {
@@ -311,16 +311,6 @@ namespace Ryujinx.HLE.HOS
             {
                 QueryApplicationDir(mods, applicationDir, applicationId);
             }
-
-            foreach (ulong installedDlcId in installedDlcs)
-            {
-                DirectoryInfo dlcModDir = FindApplicationDir(contentsDir, $"{installedDlcId:x16}");
-
-                if (dlcModDir != null)
-                {
-                    QueryApplicationDir(mods, dlcModDir, applicationId);
-                }
-            }
         }
 
         private static int QueryCheatsDir(ModCache mods, DirectoryInfo cheatsDir)
@@ -427,7 +417,7 @@ namespace Ryujinx.HLE.HOS
                 {
                     foreach ((ulong applicationId, ModCache cache) in modCaches)
                     {
-                        QueryContentsDir(cache, searchDir, applicationId, Array.Empty<ulong>());
+                        QueryContentsDir(cache, searchDir, applicationId);
                     }
 
                     return true;
@@ -689,7 +679,7 @@ namespace Ryujinx.HLE.HOS
             {
                 using (MD5 md5 = MD5.Create())
                 {
-                    modLoadResult.Hash += BitConverter.ToString(md5.ComputeHash(tempHash.ToBytes())).Replace("-", string.Empty).ToLowerInvariant();
+                    modLoadResult.Hash += BitConverter.ToString(md5.ComputeHash(tempHash.ToBytes())).Replace("-", "").ToLowerInvariant();
                 }
             }
 

src/Ryujinx.HLE/HOS/Services/Ldn/UserServiceCreator/LdnRyu/LdnMasterProxyClient.cs

@@ -121,7 +121,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator.LdnRyu
 
         private void UpdatePassphraseIfNeeded()
         {
-            string passphrase = _config.MultiplayerLdnPassphrase ?? string.Empty;
+            string passphrase = _config.MultiplayerLdnPassphrase ?? "";
             if (passphrase != _passphrase)
             {
                 _passphrase = passphrase;