Move ProcessInfo and Minidump to HleProcessDebugger (ryubing/ryujinx!187)

See merge request ryubing/ryujinx!187

COMPILING.md

@@ -10,7 +10,7 @@ Make sure your SDK version is higher or equal to the required version specified
 
 ### Step 2
 
-Either use `git clone https://github.com/Ryubing/Ryujinx` on the command line to clone the repository or use Code --> Download zip button to get the files.
+Either use `git clone https://git.ryujinx.app/ryubing/ryujinx.git` on the command line to clone the repository or use Code --> Download zip button to get the files.
 
 ### Step 3
 

assets/locales.json

@@ -6454,7 +6454,7 @@
         "he_IL": "",
         "it_IT": "Voglio ripristinare le mie impostazioni.",
         "ja_JP": "",
-        "ko_KR": "설정을 초기화하고 싶습니다.",
+        "ko_KR": "설정을 초기화하고자 합니다.",
         "no_NO": "Jeg vil tilbakestille innstillingene mine.",
         "pl_PL": "",
         "pt_BR": "Quero redefinir minhas configurações.",

src/Ryujinx.Common/Logging/Targets/AsyncLogTargetWrapper.cs

@@ -94,7 +94,7 @@ namespace Ryujinx.Common.Logging.Targets
                 return;
             }
 
-            using var signal = new ManualResetEventSlim(false);
+            using ManualResetEventSlim signal = new ManualResetEventSlim(false);
             try
             {
                 _messageQueue.Add(new FlushEventArgs(signal));

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

@@ -205,7 +205,7 @@ namespace Ryujinx.Graphics.Gpu.Shader
             GpuChannelComputeState computeState,
             ulong gpuVa)
         {
-            if (_cpPrograms.TryGetValue(gpuVa, out var cpShader) && IsShaderEqual(channel, poolState, computeState, cpShader, gpuVa))
+            if (_cpPrograms.TryGetValue(gpuVa, out CachedShaderProgram cpShader) && IsShaderEqual(channel, poolState, computeState, cpShader, gpuVa))
             {
                 return cpShader;
             }
@@ -252,8 +252,8 @@ namespace Ryujinx.Graphics.Gpu.Shader
         {
             channel.TextureManager.UpdateRenderTargets();
 
-            var rtControl = state.RtControl;
-            var msaaMode = state.RtMsaaMode;
+            RtControl rtControl = state.RtControl;
+            TextureMsaaMode msaaMode = state.RtMsaaMode;
 
             pipeline.SamplesCount = msaaMode.SamplesInX() * msaaMode.SamplesInY();
 
@@ -267,7 +267,7 @@ namespace Ryujinx.Graphics.Gpu.Shader
             {
                 int rtIndex = rtControl.UnpackPermutationIndex(index);
 
-                var colorState = rtColorStateSpan[rtIndex];
+                RtColorState colorState = rtColorStateSpan[rtIndex];
 
                 if (index >= count || colorState.Format == 0 || colorState.WidthOrStride == 0)
                 {
@@ -312,12 +312,12 @@ namespace Ryujinx.Graphics.Gpu.Shader
             ref GpuChannelGraphicsState graphicsState,
             ShaderAddresses addresses)
         {
-            if (_gpPrograms.TryGetValue(addresses, out var gpShaders) && IsShaderEqual(channel, ref poolState, ref graphicsState, gpShaders, addresses))
+            if (_gpPrograms.TryGetValue(addresses, out CachedShaderProgram gpShaders) && IsShaderEqual(channel, ref poolState, ref graphicsState, gpShaders, addresses))
             {
                 return gpShaders;
             }
 
-            if (_graphicsShaderCache.TryFind(channel, ref poolState, ref graphicsState, addresses, out gpShaders, out var cachedGuestCode))
+            if (_graphicsShaderCache.TryFind(channel, ref poolState, ref graphicsState, addresses, out gpShaders, out CachedGraphicsGuestCode cachedGuestCode))
             {
                 _gpPrograms[addresses] = gpShaders;
                 return gpShaders;
@@ -590,7 +590,7 @@ namespace Ryujinx.Graphics.Gpu.Shader
             
             for (int i = 0; i < Constants.TotalTransformFeedbackBuffers; i++)
             {
-                var tf = tfStateSpan[i];
+                TfState tf = tfStateSpan[i];
 
                 descs[i] = new TransformFeedbackDescriptor(
                     tf.BufferIndex,
@@ -696,7 +696,7 @@ namespace Ryujinx.Graphics.Gpu.Shader
         /// <returns>The generated translator context</returns>
         public static TranslatorContext DecodeComputeShader(IGpuAccessor gpuAccessor, TargetApi api, ulong gpuVa)
         {
-            var options = CreateTranslationOptions(api, DefaultFlags | TranslationFlags.Compute);
+            TranslationOptions options = CreateTranslationOptions(api, DefaultFlags | TranslationFlags.Compute);
             return Translator.CreateContext(gpuVa, gpuAccessor, options);
         }
 
@@ -713,7 +713,7 @@ namespace Ryujinx.Graphics.Gpu.Shader
         /// <returns>The generated translator context</returns>
         public static TranslatorContext DecodeGraphicsShader(IGpuAccessor gpuAccessor, TargetApi api, TranslationFlags flags, ulong gpuVa)
         {
-            var options = CreateTranslationOptions(api, flags);
+            TranslationOptions options = CreateTranslationOptions(api, flags);
             return Translator.CreateContext(gpuVa, gpuAccessor, options);
         }
 
@@ -739,7 +739,7 @@ namespace Ryujinx.Graphics.Gpu.Shader
         {
             ulong cb1DataAddress = channel.BufferManager.GetGraphicsUniformBufferAddress(0, 1);
 
-            var memoryManager = channel.MemoryManager;
+            MemoryManager memoryManager = channel.MemoryManager;
 
             codeA ??= memoryManager.GetSpan(vertexA.Address, vertexA.Size).ToArray();
             codeB ??= memoryManager.GetSpan(currentStage.Address, currentStage.Size).ToArray();
@@ -777,7 +777,7 @@ namespace Ryujinx.Graphics.Gpu.Shader
         /// <returns>Compiled graphics shader code</returns>
         private static TranslatedShader TranslateShader(ShaderDumper dumper, GpuChannel channel, TranslatorContext context, byte[] code, bool asCompute)
         {
-            var memoryManager = channel.MemoryManager;
+            MemoryManager memoryManager = channel.MemoryManager;
 
             ulong cb1DataAddress = context.Stage == ShaderStage.Compute
                 ? channel.BufferManager.GetComputeUniformBufferAddress(1)

src/Ryujinx.Graphics.Metal.SharpMetalExtensions/CAMetalLayerExtensions.cs

@@ -1,22 +0,0 @@
-using SharpMetal;
-using SharpMetal.Foundation;
-using SharpMetal.ObjectiveCCore;
-using SharpMetal.QuartzCore;
-using System.Runtime.Versioning;
-// ReSharper disable InconsistentNaming
-
-namespace Ryujinx.Graphics.Metal.SharpMetalExtensions
-{
-    [SupportedOSPlatform("macOS")]
-    public static class CAMetalLayerExtensions
-    {
-        private static readonly Selector sel_developerHUDProperties = "developerHUDProperties";
-        private static readonly Selector sel_setDeveloperHUDProperties = "setDeveloperHUDProperties:";
-
-        public static NSDictionary GetDeveloperHudProperties(this CAMetalLayer metalLayer)
-            => new(ObjectiveCRuntime.IntPtr_objc_msgSend(metalLayer.NativePtr, sel_developerHUDProperties));
-
-        public static void SetDeveloperHudProperties(this CAMetalLayer metalLayer, NSDictionary dictionary) 
-            => ObjectiveCRuntime.objc_msgSend(metalLayer.NativePtr, sel_setDeveloperHUDProperties, dictionary);
-    }
-}

src/Ryujinx.Graphics.Metal.SharpMetalExtensions/NSHelper.cs

@@ -1,32 +0,0 @@
-using SharpMetal.Foundation;
-using SharpMetal.ObjectiveCCore;
-using System.Runtime.Versioning;
-// ReSharper disable InconsistentNaming
-
-namespace Ryujinx.Graphics.Metal.SharpMetalExtensions
-{
-    [SupportedOSPlatform("macOS")]
-    public static class NSHelper
-    {
-        private static readonly Selector sel_getCStringMaxLengthEncoding = "getCString:maxLength:encoding:";
-        private static readonly Selector sel_stringWithUTF8String = "stringWithUTF8String:";
-        
-        public static unsafe string ToDotNetString(this NSString source)
-        {
-            char[] sourceBuffer = new char[source.Length];
-            fixed (char* pSourceBuffer = sourceBuffer)
-            {
-                ObjectiveC.bool_objc_msgSend(source,
-                    sel_getCStringMaxLengthEncoding,
-                    pSourceBuffer,
-                    source.MaximumLengthOfBytes(NSStringEncoding.UTF16) + 1,
-                    (ulong)NSStringEncoding.UTF16);
-            }
-
-            return new string(sourceBuffer);
-        }
-        
-        public static NSString ToNSString(this string source) 
-            => new(ObjectiveC.IntPtr_objc_msgSend(new ObjectiveCClass(nameof(NSString)), sel_stringWithUTF8String, source));
-    }
-}

src/Ryujinx.Graphics.Metal.SharpMetalExtensions/Ryujinx.Graphics.Metal.SharpMetalExtensions.csproj

@@ -1,11 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  
-  <ItemGroup>
-    <PackageReference Include="SharpMetal" />
-  </ItemGroup>
-</Project>

src/Ryujinx.Graphics.Shader/Translation/ResourceManager.cs

@@ -93,7 +93,7 @@ namespace Ryujinx.Graphics.Shader.Translation
                     size = DefaultLocalMemorySize;
                 }
 
-                var lmem = new MemoryDefinition("local_memory", AggregateType.Array | AggregateType.U32, BitUtils.DivRoundUp(size, sizeof(uint)));
+                MemoryDefinition lmem = new MemoryDefinition("local_memory", AggregateType.Array | AggregateType.U32, BitUtils.DivRoundUp(size, sizeof(uint)));
 
                 LocalMemoryId = Properties.AddLocalMemory(lmem);
             }
@@ -112,7 +112,7 @@ namespace Ryujinx.Graphics.Shader.Translation
                     size = DefaultSharedMemorySize;
                 }
 
-                var smem = new MemoryDefinition("shared_memory", AggregateType.Array | AggregateType.U32, BitUtils.DivRoundUp(size, sizeof(uint)));
+                MemoryDefinition smem = new MemoryDefinition("shared_memory", AggregateType.Array | AggregateType.U32, BitUtils.DivRoundUp(size, sizeof(uint)));
 
                 SharedMemoryId = Properties.AddSharedMemory(smem);
             }
@@ -273,16 +273,16 @@ namespace Ryujinx.Graphics.Shader.Translation
             bool coherent,
             bool separate)
         {
-            var dimensions = type == SamplerType.None ? 0 : type.GetDimensions();
-            var dict = isImage ? _usedImages : _usedTextures;
+            int dimensions = type == SamplerType.None ? 0 : type.GetDimensions();
+            Dictionary<TextureInfo, TextureMeta> dict = isImage ? _usedImages : _usedTextures;
 
-            var usageFlags = TextureUsageFlags.None;
+            TextureUsageFlags usageFlags = TextureUsageFlags.None;
 
             if (intCoords)
             {
                 usageFlags |= TextureUsageFlags.NeedsScaleValue;
 
-                var canScale = _stage.SupportsRenderScale() && arrayLength == 1 && !write && dimensions == 2;
+                bool canScale = _stage.SupportsRenderScale() && arrayLength == 1 && !write && dimensions == 2;
 
                 if (!canScale)
                 {
@@ -304,9 +304,9 @@ namespace Ryujinx.Graphics.Shader.Translation
 
             // For array textures, we also want to use type as key,
             // since we may have texture handles stores in the same buffer, but for textures with different types.
-            var keyType = arrayLength > 1 ? type : SamplerType.None;
-            var info = new TextureInfo(cbufSlot, handle, arrayLength, separate, keyType, format);
-            var meta = new TextureMeta()
+            SamplerType keyType = arrayLength > 1 ? type : SamplerType.None;
+            TextureInfo info = new TextureInfo(cbufSlot, handle, arrayLength, separate, keyType, format);
+            TextureMeta meta = new TextureMeta()
             {
                 AccurateType = accurateType,
                 Type = type,
@@ -316,7 +316,7 @@ namespace Ryujinx.Graphics.Shader.Translation
             int setIndex;
             int binding;
 
-            if (dict.TryGetValue(info, out var existingMeta))
+            if (dict.TryGetValue(info, out TextureMeta existingMeta))
             {
                 dict[info] = MergeTextureMeta(meta, existingMeta);
                 setIndex = existingMeta.Set;
@@ -373,7 +373,7 @@ namespace Ryujinx.Graphics.Shader.Translation
                 nameSuffix = cbufSlot < 0 ? $"{prefix}_tcb_{handle:X}" : $"{prefix}_cb{cbufSlot}_{handle:X}";
             }
 
-            var definition = new TextureDefinition(
+            TextureDefinition definition = new TextureDefinition(
                 setIndex,
                 binding,
                 arrayLength,
@@ -433,8 +433,8 @@ namespace Ryujinx.Graphics.Shader.Translation
             {
                 selectedMeta.UsageFlags |= TextureUsageFlags.NeedsScaleValue;
 
-                var dimensions = type.GetDimensions();
-                var canScale = _stage.SupportsRenderScale() && selectedInfo.ArrayLength == 1 && dimensions == 2;
+                int dimensions = type.GetDimensions();
+                bool canScale = _stage.SupportsRenderScale() && selectedInfo.ArrayLength == 1 && dimensions == 2;
 
                 if (!canScale)
                 {
@@ -454,7 +454,7 @@ namespace Ryujinx.Graphics.Shader.Translation
 
         public BufferDescriptor[] GetConstantBufferDescriptors()
         {
-            var descriptors = new BufferDescriptor[_usedConstantBufferBindings.Count];
+            BufferDescriptor[] descriptors = new BufferDescriptor[_usedConstantBufferBindings.Count];
 
             int descriptorIndex = 0;
 
@@ -478,7 +478,7 @@ namespace Ryujinx.Graphics.Shader.Translation
 
         public BufferDescriptor[] GetStorageBufferDescriptors()
         {
-            var descriptors = new BufferDescriptor[_sbSlots.Count];
+            BufferDescriptor[] descriptors = new BufferDescriptor[_sbSlots.Count];
 
             int descriptorIndex = 0;
 

src/Ryujinx.Graphics.Shader/Translation/TranslatorContext.cs

@@ -242,8 +242,8 @@ namespace Ryujinx.Graphics.Shader.Translation
                 usedFeatures |= FeatureFlags.VtgAsCompute;
             }
 
-            var cfgs = new ControlFlowGraph[functions.Length];
-            var frus = new RegisterUsage.FunctionRegisterUsage[functions.Length];
+            ControlFlowGraph[] cfgs = new ControlFlowGraph[functions.Length];
+            RegisterUsage.FunctionRegisterUsage[] frus = new RegisterUsage.FunctionRegisterUsage[functions.Length];
 
             for (int i = 0; i < functions.Length; i++)
             {
@@ -266,14 +266,14 @@ namespace Ryujinx.Graphics.Shader.Translation
 
             for (int i = 0; i < functions.Length; i++)
             {
-                var cfg = cfgs[i];
+                ControlFlowGraph cfg = cfgs[i];
 
                 int inArgumentsCount = 0;
                 int outArgumentsCount = 0;
 
                 if (i != 0)
                 {
-                    var fru = frus[i];
+                    RegisterUsage.FunctionRegisterUsage fru = frus[i];
 
                     inArgumentsCount = fru.InArguments.Length;
                     outArgumentsCount = fru.OutArguments.Length;
@@ -325,7 +325,7 @@ namespace Ryujinx.Graphics.Shader.Translation
             FeatureFlags usedFeatures,
             byte clipDistancesWritten)
         {
-            var sInfo = StructuredProgram.MakeStructuredProgram(
+            StructuredProgramInfo sInfo = StructuredProgram.MakeStructuredProgram(
                 funcs,
                 attributeUsage,
                 definitions,
@@ -340,7 +340,7 @@ namespace Ryujinx.Graphics.Shader.Translation
                 _ => 1
             };
 
-            var info = new ShaderProgramInfo(
+            ShaderProgramInfo info = new ShaderProgramInfo(
                 resourceManager.GetConstantBufferDescriptors(),
                 resourceManager.GetStorageBufferDescriptors(),
                 resourceManager.GetTextureDescriptors(),
@@ -356,7 +356,7 @@ namespace Ryujinx.Graphics.Shader.Translation
                 clipDistancesWritten,
                 originalDefinitions.OmapTargets);
 
-            var hostCapabilities = new HostCapabilities(
+            HostCapabilities hostCapabilities = new HostCapabilities(
                 GpuAccessor.QueryHostReducedPrecision(),
                 GpuAccessor.QueryHostSupportsFragmentShaderInterlock(),
                 GpuAccessor.QueryHostSupportsFragmentShaderOrderingIntel(),
@@ -367,7 +367,7 @@ namespace Ryujinx.Graphics.Shader.Translation
                 GpuAccessor.QueryHostSupportsTextureShadowLod(),
                 GpuAccessor.QueryHostSupportsViewportMask());
 
-            var parameters = new CodeGenParameters(attributeUsage, definitions, resourceManager.Properties, hostCapabilities, GpuAccessor, Options.TargetApi);
+            CodeGenParameters parameters = new CodeGenParameters(attributeUsage, definitions, resourceManager.Properties, hostCapabilities, GpuAccessor, Options.TargetApi);
 
             return Options.TargetLanguage switch
             {
@@ -486,10 +486,10 @@ namespace Ryujinx.Graphics.Shader.Translation
 
         public ShaderProgram GenerateVertexPassthroughForCompute()
         {
-            var attributeUsage = new AttributeUsage(GpuAccessor);
-            var resourceManager = new ResourceManager(ShaderStage.Vertex, GpuAccessor);
+            AttributeUsage attributeUsage = new AttributeUsage(GpuAccessor);
+            ResourceManager resourceManager = new ResourceManager(ShaderStage.Vertex, GpuAccessor);
 
-            var reservations = GetResourceReservations();
+            ResourceReservations reservations = GetResourceReservations();
 
             int vertexInfoCbBinding = reservations.VertexInfoConstantBufferBinding;
 
@@ -508,7 +508,7 @@ namespace Ryujinx.Graphics.Shader.Translation
             BufferDefinition vertexOutputBuffer = new(BufferLayout.Std430, 1, vertexDataSbBinding, "vb_input", vertexInputStruct);
             resourceManager.Properties.AddOrUpdateStorageBuffer(vertexOutputBuffer);
 
-            var context = new EmitterContext();
+            EmitterContext context = new EmitterContext();
 
             Operand vertexIndex = Options.TargetApi == TargetApi.OpenGL
                 ? context.Load(StorageKind.Input, IoVariable.VertexId)
@@ -553,13 +553,13 @@ namespace Ryujinx.Graphics.Shader.Translation
                 }
             }
 
-            var operations = context.GetOperations();
-            var cfg = ControlFlowGraph.Create(operations);
-            var function = new Function(cfg.Blocks, "main", false, 0, 0);
+            Operation[] operations = context.GetOperations();
+            ControlFlowGraph cfg = ControlFlowGraph.Create(operations);
+            Function function = new Function(cfg.Blocks, "main", false, 0, 0);
 
-            var transformFeedbackOutputs = GetTransformFeedbackOutputs(GpuAccessor, out ulong transformFeedbackVecMap);
+            TransformFeedbackOutput[] transformFeedbackOutputs = GetTransformFeedbackOutputs(GpuAccessor, out ulong transformFeedbackVecMap);
 
-            var definitions = new ShaderDefinitions(ShaderStage.Vertex, transformFeedbackVecMap, transformFeedbackOutputs)
+            ShaderDefinitions definitions = new ShaderDefinitions(ShaderStage.Vertex, transformFeedbackVecMap, transformFeedbackOutputs)
             {
                 LastInVertexPipeline = true
             };
@@ -604,10 +604,10 @@ namespace Ryujinx.Graphics.Shader.Translation
                     break;
             }
 
-            var attributeUsage = new AttributeUsage(GpuAccessor);
-            var resourceManager = new ResourceManager(ShaderStage.Geometry, GpuAccessor);
+            AttributeUsage attributeUsage = new AttributeUsage(GpuAccessor);
+            ResourceManager resourceManager = new ResourceManager(ShaderStage.Geometry, GpuAccessor);
 
-            var context = new EmitterContext();
+            EmitterContext context = new EmitterContext();
 
             for (int v = 0; v < maxOutputVertices; v++)
             {
@@ -648,11 +648,11 @@ namespace Ryujinx.Graphics.Shader.Translation
 
             context.EndPrimitive();
 
-            var operations = context.GetOperations();
-            var cfg = ControlFlowGraph.Create(operations);
-            var function = new Function(cfg.Blocks, "main", false, 0, 0);
+            Operation[] operations = context.GetOperations();
+            ControlFlowGraph cfg = ControlFlowGraph.Create(operations);
+            Function function = new Function(cfg.Blocks, "main", false, 0, 0);
 
-            var definitions = new ShaderDefinitions(
+            ShaderDefinitions definitions = new ShaderDefinitions(
                 ShaderStage.Geometry,
                 GpuAccessor.QueryGraphicsState(),
                 false,

src/Ryujinx.Graphics.Vulkan/HelperShader.cs

@@ -904,8 +904,8 @@ namespace Ryujinx.Graphics.Vulkan
 
             pattern.OffsetIndex.CopyTo(shaderParams[..pattern.OffsetIndex.Length]);
 
-            using var patternScoped = gd.BufferManager.ReserveOrCreate(gd, cbs, ParamsBufferSize);
-            var patternBuffer = patternScoped.Holder;
+            using ScopedTemporaryBuffer patternScoped = gd.BufferManager.ReserveOrCreate(gd, cbs, ParamsBufferSize);
+            BufferHolder patternBuffer = patternScoped.Holder;
 
             patternBuffer.SetDataUnchecked<int>(patternScoped.Offset, shaderParams);
 

src/Ryujinx.HLE/Debugger/BreakpointManager.cs

@@ -1,6 +1,7 @@
 using Ryujinx.Common.Logging;
 using Ryujinx.Memory;
 using System.Collections.Concurrent;
+using System.Collections.Generic;
 
 namespace Ryujinx.HLE.Debugger
 {
@@ -52,7 +53,7 @@ namespace Ryujinx.HLE.Debugger
                 return false;
             }
 
-            var originalInstruction = new byte[length];
+            byte[] originalInstruction = new byte[length];
             if (!ReadMemory(address, originalInstruction))
             {
                 Logger.Error?.Print(LogClass.GdbStub, $"Failed to read memory at 0x{address:X16} to set breakpoint.");
@@ -65,7 +66,7 @@ namespace Ryujinx.HLE.Debugger
                 return false;
             }
 
-            var breakpoint = new Breakpoint(originalInstruction);
+            Breakpoint breakpoint = new(originalInstruction);
             if (_breakpoints.TryAdd(address, breakpoint))
             {
                 Logger.Debug?.Print(LogClass.GdbStub, $"Breakpoint set at 0x{address:X16}");
@@ -106,7 +107,7 @@ namespace Ryujinx.HLE.Debugger
         /// </summary>
         public void ClearAll()
         {
-            foreach (var bp in _breakpoints)
+            foreach (KeyValuePair<ulong, Breakpoint> bp in _breakpoints)
             {
                 if (!WriteMemory(bp.Key, bp.Value.OriginalData))
                 {

src/Ryujinx.HLE/Debugger/Debugger.MainThread.cs

@@ -1,5 +1,6 @@
 using Ryujinx.Common.Logging;
 using Ryujinx.HLE.Debugger.Gdb;
+using System;
 using System.IO;
 using System.Net;
 using System.Net.Sockets;
@@ -9,11 +10,22 @@ namespace Ryujinx.HLE.Debugger
 {
     public partial class Debugger
     {
-        private void DebuggerThreadMain()
+        private void MainLoop()
         {
             IPEndPoint endpoint = new(IPAddress.Any, GdbStubPort);
             _listenerSocket = new TcpListener(endpoint);
-            _listenerSocket.Start();
+            
+            try
+            {
+                _listenerSocket.Start();
+            }
+            catch (SocketException se)
+            {
+                Logger.Error?.Print(LogClass.GdbStub,
+                    $"Failed to create TCP server on {endpoint} for GDB client: {Enum.GetName(se.SocketErrorCode)}");
+                throw;
+            }
+
             Logger.Notice.Print(LogClass.GdbStub, $"Currently waiting on {endpoint} for GDB client");
 
             while (!_shuttingDown)
@@ -22,8 +34,10 @@ namespace Ryujinx.HLE.Debugger
                 {
                     _clientSocket = _listenerSocket.AcceptSocket();
                 }
-                catch (SocketException)
+                catch (SocketException se)
                 {
+                    Logger.Error?.Print(LogClass.GdbStub, 
+                        $"Failed to accept incoming GDB client connection: {Enum.GetName(se.SocketErrorCode)}");
                     return;
                 }
 
@@ -31,7 +45,7 @@ namespace Ryujinx.HLE.Debugger
                 int retries = 10;
                 while ((DebugProcess == null || GetThreads().Length == 0) && retries-- > 0)
                 {
-                    Thread.Sleep(200);
+                    Thread.Sleep(500);
                 }
 
                 if (DebugProcess == null || GetThreads().Length == 0)
@@ -46,7 +60,6 @@ namespace Ryujinx.HLE.Debugger
                 _readStream = new NetworkStream(_clientSocket, System.IO.FileAccess.Read);
                 _writeStream = new NetworkStream(_clientSocket, System.IO.FileAccess.Write);
                 _commands = new GdbCommands(_listenerSocket, _clientSocket, _readStream, _writeStream, this);
-                _commandProcessor = _commands.CreateProcessor();
 
                 Logger.Notice.Print(LogClass.GdbStub, "GDB client connected");
 
@@ -64,7 +77,7 @@ namespace Ryujinx.HLE.Debugger
                                 Logger.Notice.Print(LogClass.GdbStub, "NACK received!");
                                 continue;
                             case '\x03':
-                                _messages.Add(StatelessMessage.BreakIn);
+                                _messages.Add(Message.BreakIn);
                                 break;
                             case '$':
                                 string cmd = string.Empty;
@@ -85,7 +98,7 @@ namespace Ryujinx.HLE.Debugger
                                 }
                                 else
                                 {
-                                    _messages.Add(StatelessMessage.SendNack);
+                                    _messages.Add(Message.SendNack);
                                 }
 
                                 break;
@@ -105,7 +118,6 @@ namespace Ryujinx.HLE.Debugger
                 _writeStream = null;
                 _clientSocket.Close();
                 _clientSocket = null;
-                _commandProcessor = null;
                 _commands = null;
 
                 BreakpointManager.ClearAll();

src/Ryujinx.HLE/Debugger/Debugger.MessageHandler.cs

@@ -14,29 +14,29 @@ namespace Ryujinx.HLE.Debugger
                 {
                     switch (_messages.Take())
                     {
-                        case StatelessMessage { Type: MessageType.BreakIn }:
+                        case Message { Type: MessageType.BreakIn }:
                             Logger.Notice.Print(LogClass.GdbStub, "Break-in requested");
                             _commands.Interrupt();
                             break;
 
-                        case StatelessMessage { Type: MessageType.SendNack }:
+                        case Message { Type: MessageType.SendNack }:
                             _writeStream.WriteByte((byte)'-');
                             break;
 
-                        case StatelessMessage { Type: MessageType.Kill }:
+                        case Message { Type: MessageType.Kill }:
                             return;
 
                         case CommandMessage { Command: { } cmd }:
                             Logger.Debug?.Print(LogClass.GdbStub, $"Received Command: {cmd}");
                             _writeStream.WriteByte((byte)'+');
-                            _commandProcessor.Process(cmd);
+                            _commands.Processor.Process(cmd);
                             break;
 
                         case ThreadBreakMessage { Context: { } ctx }:
                             DebugProcess.DebugStop();
                             GThread = CThread = ctx.ThreadUid;
                             _breakHandlerEvent.Set();
-                            _commandProcessor.Reply($"T05thread:{ctx.ThreadUid:x};");
+                            _commands.Processor.Reply($"T05thread:{ctx.ThreadUid:x};");
                             break;
                     }
                 }

src/Ryujinx.HLE/Debugger/Debugger.Rcmd.cs

@@ -1,12 +1,49 @@
+using Gommon;
+using JetBrains.Annotations;
 using Ryujinx.Common.Logging;
 using Ryujinx.HLE.HOS.Kernel.Process;
+using Ryujinx.HLE.HOS.Kernel.Threading;
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Text;
 
 namespace Ryujinx.HLE.Debugger
 {
     public partial class Debugger
     {
+        static Debugger()
+        {
+            _rcmdDelegates.Add(["help"], 
+                _ => _rcmdDelegates.Keys
+                    .Where(x => !x[0].Equals("help"))
+                    .Select(x => x.JoinToString('\n'))
+                    .JoinToString('\n') + '\n'
+                );
+            _rcmdDelegates.Add(["get info"], dbgr => dbgr.GetProcessInfo());
+            _rcmdDelegates.Add(["backtrace", "bt"], dbgr => dbgr.GetStackTrace());
+            _rcmdDelegates.Add(["registers", "reg"], dbgr => dbgr.GetRegisters());
+            _rcmdDelegates.Add(["minidump"], dbgr => dbgr.GetMinidump());
+        }
+
+        private static readonly Dictionary<string[], Func<Debugger, string>> _rcmdDelegates = new();
+
+        public static Func<Debugger, string> FindRcmdDelegate(string command)
+        {
+            Func<Debugger, string> searchResult = _ => $"Unknown command: {command}\n";
+
+            foreach ((string[] names, Func<Debugger, string> dlg) in _rcmdDelegates)
+            {
+                if (names.ContainsIgnoreCase(command.Trim()))
+                {
+                    searchResult = dlg;
+                    break;
+                }
+            }
+
+            return searchResult;
+        }
+
         public string GetStackTrace()
         {
             if (GThread == null)
@@ -25,38 +62,16 @@ namespace Ryujinx.HLE.Debugger
 
         public string GetMinidump()
         {
-            var response = new StringBuilder();
-            response.AppendLine("=== Begin Minidump ===\n");
-            response.AppendLine(GetProcessInfo());
+            if (Process is not { } kProcess)
+                return "No application process found\n";
 
-            foreach (var thread in GetThreads())
-            {
-                response.AppendLine($"=== Thread {thread.ThreadUid} ===");
-                try
-                {
-                    string stackTrace = Process.Debugger.GetGuestStackTrace(thread);
-                    response.AppendLine(stackTrace);
-                }
-                catch (Exception e)
-                {
-                    response.AppendLine($"[Error getting stack trace: {e.Message}]");
-                }
+            if (kProcess.Debugger is not { } debugger)
+                return $"Error getting minidump: debugger is null\n";
 
-                try
-                {
-                    string registers = Process.Debugger.GetCpuRegisterPrintout(thread);
-                    response.AppendLine(registers);
-                }
-                catch (Exception e)
-                {
-                    response.AppendLine($"[Error getting registers: {e.Message}]");
-                }
-            }
+            var response = debugger.GetMinidump();
 
-            response.AppendLine("=== End Minidump ===");
-
-            Logger.Info?.Print(LogClass.GdbStub, response.ToString());
-            return response.ToString();
+            Logger.Info?.Print(LogClass.GdbStub, response);
+            return response;
         }
 
         public string GetProcessInfo()
@@ -66,32 +81,10 @@ namespace Ryujinx.HLE.Debugger
                 if (Process is not { } kProcess)
                     return "No application process found\n";
 
-                var sb = new StringBuilder();
+                if (kProcess.Debugger is not { } debugger)
+                    return $"Error getting process info: debugger is null\n";
 
-                sb.AppendLine($"Program Id:  0x{kProcess.TitleId:x16}");
-                sb.AppendLine($"Application: {(kProcess.IsApplication ? 1 : 0)}");
-                sb.AppendLine("Layout:");
-                sb.AppendLine(
-                    $"  Alias: 0x{kProcess.MemoryManager.AliasRegionStart:x10} - 0x{kProcess.MemoryManager.AliasRegionEnd - 1:x10}");
-                sb.AppendLine(
-                    $"  Heap:  0x{kProcess.MemoryManager.HeapRegionStart:x10} - 0x{kProcess.MemoryManager.HeapRegionEnd - 1:x10}");
-                sb.AppendLine(
-                    $"  Aslr:  0x{kProcess.MemoryManager.AslrRegionStart:x10} - 0x{kProcess.MemoryManager.AslrRegionEnd - 1:x10}");
-                sb.AppendLine(
-                    $"  Stack: 0x{kProcess.MemoryManager.StackRegionStart:x10} - 0x{kProcess.MemoryManager.StackRegionEnd - 1:x10}");
-
-                sb.AppendLine("Modules:");
-                var debugger = kProcess.Debugger;
-                if (debugger != null)
-                {
-                    foreach (HleProcessDebugger.Image image in debugger.GetLoadedImages())
-                    {
-                        ulong endAddress = image.BaseAddress + image.Size - 1;
-                        sb.AppendLine($"  0x{image.BaseAddress:x10} - 0x{endAddress:x10} {image.Name}");
-                    }
-                }
-
-                return sb.ToString();
+                return debugger.GetProcessInfoPrintout();
             }
             catch (Exception e)
             {

src/Ryujinx.HLE/Debugger/Debugger.cs

@@ -4,10 +4,8 @@ using Ryujinx.HLE.HOS.Kernel.Process;
 using Ryujinx.HLE.HOS.Kernel.Threading;
 using System;
 using System.Collections.Concurrent;
-using System.IO;
 using System.Linq;
 using System.Net.Sockets;
-using System.Text;
 using System.Threading;
 using IExecutionContext = Ryujinx.Cpu.IExecutionContext;
 
@@ -20,7 +18,7 @@ namespace Ryujinx.HLE.Debugger
 
         public ushort GdbStubPort { get; private set; }
 
-        private readonly BlockingCollection<IMessage> _messages = new(1);
+        private readonly BlockingCollection<Message.IMarker> _messages = new(1);
         private readonly Thread _debuggerThread;
         private readonly Thread _messageHandlerThread;
 
@@ -28,8 +26,7 @@ namespace Ryujinx.HLE.Debugger
         private Socket _clientSocket;
         private NetworkStream _readStream;
         private NetworkStream _writeStream;
-
-        private GdbCommandProcessor _commandProcessor;
+        
         private GdbCommands _commands;
 
         private bool _shuttingDown;
@@ -47,7 +44,7 @@ namespace Ryujinx.HLE.Debugger
 
             ARMeilleure.Optimizations.EnableDebugging = true;
 
-            _debuggerThread = new Thread(DebuggerThreadMain);
+            _debuggerThread = new Thread(MainLoop);
             _debuggerThread.Start();
             _messageHandlerThread = new Thread(MessageHandlerMain);
             _messageHandlerThread.Start();
@@ -59,8 +56,8 @@ namespace Ryujinx.HLE.Debugger
 
         internal KThread[] GetThreads() => DebugProcess.ThreadUids.Select(DebugProcess.GetThread).ToArray();
 
-        internal bool IsProcess32Bit => DebugProcess.GetThread(GThread.Value).Context.IsAarch32;
-        
+        internal bool IsProcess32Bit => DebugProcess.GetThread(GThread ?? DebugProcess.ThreadUids.First()).Context.IsAarch32;
+
         internal bool WriteRegister(IExecutionContext ctx, int registerId, StringStream ss) =>
             IsProcess32Bit
                 ? ctx.WriteRegister32(registerId, ss)
@@ -89,7 +86,7 @@ namespace Ryujinx.HLE.Debugger
                 _readStream?.Close();
                 _writeStream?.Close();
                 _debuggerThread.Join();
-                _messages.Add(StatelessMessage.Kill);
+                _messages.Add(Message.Kill);
                 _messageHandlerThread.Join();
                 _messages.Dispose();
                 _breakHandlerEvent.Dispose();

src/Ryujinx.HLE/Debugger/Gdb/CommandProcessor.cs

@@ -20,6 +20,9 @@ namespace Ryujinx.HLE.Debugger.Gdb
             Commands = commands;
         }
 
+        public void ReplyHex(string data) => Reply(Helpers.ToHex(data));
+        public void ReplyHex(byte[] data) => Reply(Helpers.ToHex(data));
+
         public void Reply(string cmd)
         {
             Logger.Debug?.Print(LogClass.GdbStub, $"Reply: {cmd}");
@@ -146,6 +149,12 @@ namespace Ryujinx.HLE.Debugger.Gdb
                         break;
                     }
 
+                    if (ss.ConsumeRemaining("Attached"))
+                    {
+                        Reply("1");
+                        break;
+                    }
+
                     if (ss.ConsumeRemaining("ProcessInfo"))
                     {
                         Reply(
@@ -191,11 +200,10 @@ namespace Ryujinx.HLE.Debugger.Gdb
                             break;
                         }
 
-                        Reply(Helpers.ToHex(
-                                DebugProcess.IsThreadPaused(DebugProcess.GetThread(threadId.Value))
-                                    ? "Paused"
-                                    : "Running"
-                            )
+                        ReplyHex(
+                            DebugProcess.IsThreadPaused(DebugProcess.GetThread(threadId.Value))
+                                ? "Paused"
+                                : "Running"
                         );
 
                         break;

src/Ryujinx.HLE/Debugger/Gdb/Commands.cs

@@ -11,19 +11,18 @@ namespace Ryujinx.HLE.Debugger.Gdb
 {
     class GdbCommands
     {
-        const int GdbRegisterCount64 = 68;
-        const int GdbRegisterCount32 = 66;
-
         public readonly Debugger Debugger;
 
-        public GdbCommandProcessor Processor { get; private set; }
+        private GdbCommandProcessor _processor;
+
+        public GdbCommandProcessor Processor 
+            => _processor ??= new GdbCommandProcessor(this);
 
         internal readonly TcpListener ListenerSocket;
         internal readonly Socket ClientSocket;
         internal readonly NetworkStream ReadStream;
         internal readonly NetworkStream WriteStream;
 
-
         public GdbCommands(TcpListener listenerSocket, Socket clientSocket, NetworkStream readStream,
             NetworkStream writeStream, Debugger debugger)
         {
@@ -34,21 +33,6 @@ namespace Ryujinx.HLE.Debugger.Gdb
             Debugger = debugger;
         }
 
-        public void SetProcessor(GdbCommandProcessor commandProcessor)
-        {
-            if (Processor != null) return;
-
-            Processor = commandProcessor;
-        }
-        
-        public GdbCommandProcessor CreateProcessor()
-        {
-            if (Processor != null) 
-                return Processor;
-
-            return Processor = new GdbCommandProcessor(this);
-        }
-
         internal void Query()
         {
             // GDB is performing initial contact. Stop everything.
@@ -83,12 +67,13 @@ namespace Ryujinx.HLE.Debugger.Gdb
             }
 
             Debugger.DebugProcess.DebugContinue();
+            Processor.ReplyOK();
         }
 
         internal void Detach()
         {
             Debugger.BreakpointManager.ClearAll();
-            Continue(null);
+            Continue(null); // Continue() will call ReplyError/ReplyOK for us.
         }
 
         internal void ReadRegisters()
@@ -103,14 +88,14 @@ namespace Ryujinx.HLE.Debugger.Gdb
             string registers = string.Empty;
             if (Debugger.IsProcess32Bit)
             {
-                for (int i = 0; i < GdbRegisterCount32; i++)
+                for (int i = 0; i < GdbRegisters.Count32; i++)
                 {
                     registers += ctx.ReadRegister32(i);
                 }
             }
             else
             {
-                for (int i = 0; i < GdbRegisterCount64; i++)
+                for (int i = 0; i < GdbRegisters.Count64; i++)
                 {
                     registers += ctx.ReadRegister64(i);
                 }
@@ -130,7 +115,7 @@ namespace Ryujinx.HLE.Debugger.Gdb
             IExecutionContext ctx = Debugger.DebugProcess.GetThread(Debugger.GThread.Value).Context;
             if (Debugger.IsProcess32Bit)
             {
-                for (int i = 0; i < GdbRegisterCount32; i++)
+                for (int i = 0; i < GdbRegisters.Count32; i++)
                 {
                     if (!ctx.WriteRegister32(i, ss))
                     {
@@ -141,7 +126,7 @@ namespace Ryujinx.HLE.Debugger.Gdb
             }
             else
             {
-                for (int i = 0; i < GdbRegisterCount64; i++)
+                for (int i = 0; i < GdbRegisters.Count64; i++)
                 {
                     if (!ctx.WriteRegister64(i, ss))
                     {
@@ -194,9 +179,9 @@ namespace Ryujinx.HLE.Debugger.Gdb
         {
             try
             {
-                var data = new byte[len];
+                byte[] data = new byte[len];
                 Debugger.DebugProcess.CpuMemory.Read(addr, data);
-                Processor.Reply(Helpers.ToHex(data));
+                Processor.ReplyHex(data);
             }
             catch (InvalidMemoryRegionException)
             {
@@ -211,7 +196,7 @@ namespace Ryujinx.HLE.Debugger.Gdb
         {
             try
             {
-                var data = new byte[len];
+                byte[] data = new byte[len];
                 for (ulong i = 0; i < len; i++)
                 {
                     data[i] = (byte)ss.ReadLengthAsHex(2);
@@ -421,17 +406,9 @@ namespace Ryujinx.HLE.Debugger.Gdb
                 string command = Helpers.FromHex(hexCommand);
                 Logger.Debug?.Print(LogClass.GdbStub, $"Received Rcmd: {command}");
 
-                string response = command.Trim().ToLowerInvariant() switch
-                {
-                    "help" => "backtrace\nbt\nregisters\nreg\nget info\nminidump\n",
-                    "get info" => Debugger.GetProcessInfo(),
-                    "backtrace" or "bt" => Debugger.GetStackTrace(),
-                    "registers" or "reg" => Debugger.GetRegisters(),
-                    "minidump" => Debugger.GetMinidump(),
-                    _ => $"Unknown command: {command}\n"
-                };
+                Func<Debugger, string> rcmd = Debugger.FindRcmdDelegate(command);
 
-                Processor.Reply(Helpers.ToHex(response));
+                Processor.ReplyHex(rcmd(Debugger));
             }
             catch (Exception e)
             {

src/Ryujinx.HLE/Debugger/Gdb/Registers.cs

@@ -6,6 +6,9 @@ namespace Ryujinx.HLE.Debugger.Gdb
 {
     static class GdbRegisters
     {
+        public const int Count64 = 68;
+        public const int Count32 = 66;
+        
         /*
         FPCR = FPSR & ~FpcrMask
         All of FPCR's bits are reserved in FPCR and vice versa,
@@ -20,8 +23,8 @@ namespace Ryujinx.HLE.Debugger.Gdb
                 32 => Helpers.ToHex(BitConverter.GetBytes(state.DebugPc)),
                 33 => Helpers.ToHex(BitConverter.GetBytes(state.Pstate)),
                 >= 34 and <= 65 => Helpers.ToHex(state.GetV(registerId - 34).ToArray()),
-                66 => Helpers.ToHex(BitConverter.GetBytes((uint)state.Fpsr)),
-                67 => Helpers.ToHex(BitConverter.GetBytes((uint)state.Fpcr)),
+                66 => Helpers.ToHex(BitConverter.GetBytes(state.Fpsr)),
+                67 => Helpers.ToHex(BitConverter.GetBytes(state.Fpcr)),
                 _ => null
             };
 

src/Ryujinx.HLE/Debugger/IDebuggableProcess.cs

@@ -6,6 +6,10 @@ namespace Ryujinx.HLE.Debugger
 {
     internal interface IDebuggableProcess
     {
+        IVirtualMemoryManager CpuMemory { get; }
+        ulong[] ThreadUids { get; }
+        DebugState DebugState { get; }
+        
         void DebugStop();
         void DebugContinue();
         void DebugContinue(KThread thread);
@@ -13,9 +17,6 @@ namespace Ryujinx.HLE.Debugger
         KThread GetThread(ulong threadUid);
         bool IsThreadPaused(KThread thread);
         public void DebugInterruptHandler(IExecutionContext ctx);
-        IVirtualMemoryManager CpuMemory { get; }
-        ulong[] ThreadUids { get; }
-        DebugState DebugState { get; }
         void InvalidateCacheRegion(ulong address, ulong size);
     }
 }

src/Ryujinx.HLE/Debugger/Message.cs

@@ -2,11 +2,6 @@ using Ryujinx.Cpu;
 
 namespace Ryujinx.HLE.Debugger
 {
-    /// <summary>
-    ///     Marker interface for debugger messages.
-    /// </summary>
-    interface IMessage;
-
     public enum MessageType
     {
         Kill,
@@ -14,14 +9,19 @@ namespace Ryujinx.HLE.Debugger
         SendNack
     }
 
-    record struct StatelessMessage(MessageType Type) : IMessage
+    record struct Message(MessageType Type) : Message.IMarker
     {
-        public static StatelessMessage Kill => new(MessageType.Kill);
-        public static StatelessMessage BreakIn => new(MessageType.BreakIn);
-        public static StatelessMessage SendNack => new(MessageType.SendNack);
+        /// <summary>
+        ///     Marker interface for debugger messages.
+        /// </summary>
+        internal interface IMarker;
+
+        public static Message Kill => new(MessageType.Kill);
+        public static Message BreakIn => new(MessageType.BreakIn);
+        public static Message SendNack => new(MessageType.SendNack);
     }
 
-    struct CommandMessage : IMessage
+    struct CommandMessage : Message.IMarker
     {
         public readonly string Command;
 
@@ -31,7 +31,7 @@ namespace Ryujinx.HLE.Debugger
         }
     }
     
-    public class ThreadBreakMessage : IMessage
+    public class ThreadBreakMessage : Message.IMarker
     {
         public IExecutionContext Context { get; }
         public ulong Address { get; }

src/Ryujinx.HLE/HOS/Kernel/Process/HleProcessDebugger.cs

@@ -161,6 +161,116 @@ namespace Ryujinx.HLE.HOS.Kernel.Process
             return sb.ToString();
         }
 
+        public string GetProcessInfoPrintout()
+        {
+            StringBuilder sb = new();
+
+            sb.AppendLine($"Process: {_owner.Name}, PID: {_owner.Pid}");
+            sb.AppendLine($"Program Id:  0x{_owner.TitleId:x16}");
+            sb.AppendLine($"Application: {(_owner.IsApplication ? 1 : 0)}");
+
+            sb.AppendLine("Layout:");
+            sb.AppendLine(
+                $"  Alias: 0x{_owner.MemoryManager.AliasRegionStart:x10} - 0x{_owner.MemoryManager.AliasRegionEnd - 1:x10}");
+            sb.AppendLine(
+                $"  Heap:  0x{_owner.MemoryManager.HeapRegionStart:x10} - 0x{_owner.MemoryManager.HeapRegionEnd - 1:x10}");
+            sb.AppendLine(
+                $"  Aslr:  0x{_owner.MemoryManager.AslrRegionStart:x10} - 0x{_owner.MemoryManager.AslrRegionEnd - 1:x10}");
+            sb.AppendLine(
+                $"  Stack: 0x{_owner.MemoryManager.StackRegionStart:x10} - 0x{_owner.MemoryManager.StackRegionEnd - 1:x10}");
+
+            sb.AppendLine("Modules:");
+
+            foreach (Image image in GetLoadedImages())
+            {
+                ulong endAddress = image.BaseAddress + image.Size - 1;
+                sb.AppendLine($"  0x{image.BaseAddress:x10} - 0x{endAddress:x10} {image.Name}");
+            }
+
+            return sb.ToString();
+        }
+
+        public string GetMinidump()
+        {
+            var result = new StringBuilder();
+
+            result.AppendLine("=== Begin Minidump ===\n");
+            try
+            {
+                result.AppendLine(GetProcessInfoPrintout());
+            }
+            catch (Exception e)
+            {
+                result.AppendLine($"[Error getting process info: {e.Message}]");
+            }
+
+            var debugInterface = _owner?.DebugInterface;
+
+            if (debugInterface != null)
+            {
+                ulong[] threadUids;
+
+                try
+                {
+                    threadUids = debugInterface.ThreadUids ?? [];
+                }
+                catch (Exception e)
+                {
+                    result.AppendLine($"[Error getting thread uids: {e.Message}]");
+                    threadUids = [];
+                }
+
+                foreach (ulong threadUid in threadUids)
+                {
+                    result.AppendLine($"=== Thread {threadUid} ===");
+
+                    KThread thread;
+
+                    try
+                    {
+                        thread = debugInterface.GetThread(threadUid);
+                    }
+                    catch (Exception e)
+                    {
+                        result.AppendLine($"[Error getting thread: {e.Message}]");
+                        continue;
+                    }
+
+                    if (thread == null)
+                    {
+                        result.AppendLine("[Thread not found]");
+                        continue;
+                    }
+
+                    try
+                    {
+                        result.AppendLine(GetGuestStackTrace(thread));
+                    }
+                    catch (Exception e)
+                    {
+                        result.AppendLine($"[Error getting stack trace: {e.Message}]");
+                    }
+
+                    try
+                    {
+                        result.AppendLine(GetCpuRegisterPrintout(thread));
+                    }
+                    catch (Exception e)
+                    {
+                        result.AppendLine($"[Error getting registers: {e.Message}]");
+                    }
+                }
+            }
+            else
+            {
+                result.AppendLine("[Error generating minidump: debugInterface is null]");
+            }
+
+            result.AppendLine("=== End Minidump ===");
+
+            return result.ToString();
+        }
+
         private static bool TryGetSubName(Image image, ulong address, out ElfSymbol symbol)
         {
             address -= image.BaseAddress;
@@ -267,7 +377,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Process
         {
             moduleName = string.Empty;
 
-            var rodataStart = image.BaseAddress + image.Size;
+            ulong rodataStart = image.BaseAddress + image.Size;
 
             KMemoryInfo roInfo = _owner.MemoryManager.QueryMemory(rodataStart);
             if (roInfo.Permission != KMemoryPermission.Read)
@@ -275,7 +385,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Process
                 return false;
             }
 
-            var rwdataStart = roInfo.Address + roInfo.Size;
+            ulong rwdataStart = roInfo.Address + roInfo.Size;
 
             try
             {
@@ -305,7 +415,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Process
                 }
 
                 pathLength = Math.Min(pathLength, rodataBuf.Length - 8);
-                var pathBuf = rodataBuf.Slice(8, pathLength);
+                Span<byte> pathBuf = rodataBuf.Slice(8, pathLength);
                 int lastSlash = pathBuf.LastIndexOfAny(new byte[] { (byte)'\\', (byte)'/' });
 
                 moduleName = Encoding.ASCII.GetString(pathBuf.Slice(lastSlash + 1).TrimEnd((byte)0));
@@ -483,12 +593,11 @@ namespace Ryujinx.HLE.HOS.Kernel.Process
 
             lock (_images)
             {
-                var image = new Image(textOffset, textSize, symbols.OrderBy(x => x.Value).ToArray());
+                Image image = new(textOffset, textSize, symbols.OrderBy(x => x.Value).ToArray());
 
-                string moduleName;
-                if (!GetModuleName(out moduleName, image))
+                if (!GetModuleName(out string moduleName, image))
                 {
-                    var newIndex = _images.Count;
+                    int newIndex = _images.Count;
                     moduleName = $"(unknown{newIndex})";
                 }
                 image.Name = moduleName;

src/Ryujinx.HLE/HOS/Services/Account/Acc/AccountService/IManagerForApplication.cs

@@ -38,6 +38,13 @@ namespace Ryujinx.HLE.HOS.Services.Account.Acc.AccountService
         }
 
         [CommandCmif(3)]
+        // LoadIdTokenCacheDeprecated() -> (u32 id_token_cache_size, buffer<bytes, 6>)
+        public ResultCode LoadIdTokenCacheDeprecated(ServiceCtx context)
+        {
+            return _managerServer.LoadIdTokenCache(context);
+        }
+
+        [CommandCmif(4)] // 19.0.0+
         // LoadIdTokenCache() -> (u32 id_token_cache_size, buffer<bytes, 6>)
         public ResultCode LoadIdTokenCache(ServiceCtx context)
         {

src/Ryujinx.HLE/HOS/Services/Account/Acc/AccountService/IManagerForSystemService.cs

@@ -38,6 +38,13 @@ namespace Ryujinx.HLE.HOS.Services.Account.Acc.AccountService
         }
 
         [CommandCmif(3)]
+        // LoadIdTokenCacheDeprecated() -> (u32 id_token_cache_size, buffer<bytes, 6>)
+        public ResultCode LoadIdTokenCacheDeprecated(ServiceCtx context)
+        {
+            return _managerServer.LoadIdTokenCache(context);
+        }
+
+        [CommandCmif(4)] // 19.0.0+
         // LoadIdTokenCache() -> (u32 id_token_cache_size, buffer<bytes, 6>)
         public ResultCode LoadIdTokenCache(ServiceCtx context)
         {

src/Ryujinx.HLE/HOS/Services/Hid/Types/SharedMemory/Common/RingLifo.cs

@@ -83,23 +83,23 @@ namespace Ryujinx.HLE.HOS.Services.Hid.Types.SharedMemory.Common
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public ReadOnlySpan<AtomicStorage<T>> ReadEntries(uint maxCount)
         {
-            ulong countAvailaible = Math.Min(Math.Max(0, ReadCurrentCount()), maxCount);
+            ulong countAvailable = Math.Min(Math.Max(0, ReadCurrentCount()), maxCount);
 
-            if (countAvailaible == 0)
+            if (countAvailable == 0)
             {
                 return ReadOnlySpan<AtomicStorage<T>>.Empty;
             }
 
             ulong index = ReadCurrentIndex();
 
-            AtomicStorage<T>[] result = new AtomicStorage<T>[countAvailaible];
+            AtomicStorage<T>[] result = new AtomicStorage<T>[countAvailable];
             
             Span<AtomicStorage<T>> storageSpan = _storage.AsSpan();
 
-            for (ulong i = 0; i < countAvailaible; i++)
+            for (ulong i = 0; i < countAvailable; i++)
             {
-                int inputEntryIndex = (int)((index + MaxEntries + 1 - countAvailaible + i) % MaxEntries);
-                int outputEntryIndex = (int)(countAvailaible - i - 1);
+                int inputEntryIndex = (int)((index + MaxEntries + 1 - countAvailable + i) % MaxEntries);
+                int outputEntryIndex = (int)(countAvailable - i - 1);
 
                 ulong samplingNumber0 = storageSpan[inputEntryIndex].ReadSamplingNumberAtomic();
                 result[outputEntryIndex] = storageSpan[inputEntryIndex];
@@ -107,9 +107,9 @@ namespace Ryujinx.HLE.HOS.Services.Hid.Types.SharedMemory.Common
 
                 if (samplingNumber0 != samplingNumber1 && (i > 0 && (result[outputEntryIndex].SamplingNumber - result[outputEntryIndex].SamplingNumber) != 1))
                 {
-                    ulong tempCount = Math.Min(ReadCurrentCount(), countAvailaible);
+                    ulong tempCount = Math.Min(ReadCurrentCount(), countAvailable);
 
-                    countAvailaible = Math.Min(tempCount, maxCount);
+                    countAvailable = Math.Min(tempCount, maxCount);
                     index = ReadCurrentIndex();
 
                     i -= 1;

src/Ryujinx.HLE/HOS/Services/Ldn/IUserServiceCreator.cs

@@ -15,5 +15,14 @@ namespace Ryujinx.HLE.HOS.Services.Ldn
 
             return ResultCode.Success;
         }
+
+        [CommandCmif(1)] // 18.0.0+
+        // CreateClientProcessMonitor() -> object<nn::ldn::detail::IClientProcessMonitor>
+        public ResultCode CreateClientProcessMonitor(ServiceCtx context)
+        {
+            MakeObject(context, new IClientProcessMonitor(context));
+
+            return ResultCode.Success;
+        }
     }
 }

src/Ryujinx.HLE/HOS/Services/Ldn/UserServiceCreator/IClientProcessMonitor.cs

@@ -0,0 +1,20 @@
+using Ryujinx.Common.Logging;
+
+namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
+{
+    class IClientProcessMonitor : DisposableIpcService
+    {
+        public IClientProcessMonitor(ServiceCtx context) { }
+
+        [CommandCmif(0)] // 18.0.0+
+        // RegisterClient(u64 pid_placeholder, pid)
+        public ResultCode RegisterClient(ServiceCtx context)
+        {
+            Logger.Stub?.PrintStub(LogClass.ServiceLdn);
+
+            return ResultCode.Success;
+        }
+
+        protected override void Dispose(bool isDisposing) { }
+    }
+}

src/Ryujinx.HLE/UI/Input/NpadReader.cs

@@ -59,18 +59,18 @@ namespace Ryujinx.HLE.UI.Input
             }
         }
 
-        public void Update(bool supressEvents = false)
+        public void Update(bool suppressEvents = false)
         {
             int npadsCount = _device.Hid.SharedMemory.Npads.Length;
 
             // Process each input individually.
             for (int npadIndex = 0; npadIndex < npadsCount; npadIndex++)
             {
-                UpdateNpad(npadIndex, supressEvents);
+                UpdateNpad(npadIndex, suppressEvents);
             }
         }
 
-        private void UpdateNpad(int npadIndex, bool supressEvents)
+        private void UpdateNpad(int npadIndex, bool suppressEvents)
         {
             const int MaxEntries = 1024;
 
@@ -103,7 +103,7 @@ namespace Ryujinx.HLE.UI.Input
                     break;
                 }
 
-                if (!supressEvents)
+                if (!suppressEvents)
                 {
                     ProcessNpadButtons(npadIndex, entry.Object.Buttons);
                 }

src/Ryujinx.Headless.SDL2/Ryujinx.Headless.SDL2.csproj

@@ -1,72 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <RuntimeIdentifiers>win-x64;osx-x64;linux-x64</RuntimeIdentifiers>
-    <OutputType>Exe</OutputType>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Version>1.0.0-dirty</Version>
-    <DefineConstants Condition=" '$(ExtraDefineConstants)' != '' ">$(DefineConstants);$(ExtraDefineConstants)</DefineConstants>
-    <SigningCertificate Condition=" '$(SigningCertificate)' == '' ">-</SigningCertificate>
-    <TieredPGO>true</TieredPGO>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="OpenTK.Core" />
-    <PackageReference Include="Ryujinx.Graphics.Nvdec.Dependencies" />
-  </ItemGroup>
-
-  <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="$([MSBuild]::IsOSPlatform('OSX'))">
-    <Exec Command="codesign --entitlements '$(ProjectDir)..\..\distribution\macos\entitlements.xml' -f -s $(SigningCertificate) '$(TargetDir)$(TargetName)'" />
-  </Target>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Ryujinx.Graphics.Vulkan\Ryujinx.Graphics.Vulkan.csproj" />
-    <ProjectReference Include="..\Ryujinx.Input\Ryujinx.Input.csproj" />
-    <ProjectReference Include="..\Ryujinx.Input.SDL2\Ryujinx.Input.SDL2.csproj" />
-    <ProjectReference Include="..\Ryujinx.Audio.Backends.SDL2\Ryujinx.Audio.Backends.SDL2.csproj" />
-    <ProjectReference Include="..\Ryujinx.Common\Ryujinx.Common.csproj" />
-    <ProjectReference Include="..\Ryujinx.HLE\Ryujinx.HLE.csproj" />
-    <ProjectReference Include="..\ARMeilleure\ARMeilleure.csproj" />
-    <ProjectReference Include="..\Ryujinx.Graphics.OpenGL\Ryujinx.Graphics.OpenGL.csproj" />
-    <ProjectReference Include="..\Ryujinx.Graphics.Gpu\Ryujinx.Graphics.Gpu.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="CommandLineParser" />
-    <PackageReference Include="Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'linux-arm64' AND '$(RuntimeIdentifier)' != 'win-x64'" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Content Include="..\..\distribution\legal\THIRDPARTY.md">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <TargetPath>THIRDPARTY.md</TargetPath>
-    </Content>
-    <Content Include="..\..\LICENSE.txt">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <TargetPath>LICENSE.txt</TargetPath>
-    </Content>
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(RuntimeIdentifier)' == 'linux-x64' OR '$(RuntimeIdentifier)' == 'linux-arm64' OR ('$(RuntimeIdentifier)' == '' AND $([MSBuild]::IsOSPlatform('Linux')))">
-    <Content Include="..\..\distribution\linux\Ryujinx.sh">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Include="Ryujinx.bmp" />
-  </ItemGroup>
-
-  <!-- Due to .net core 3.1 embedded resource loading -->
-  <PropertyGroup>
-    <EmbeddedResourceUseDependentUponConvention>false</EmbeddedResourceUseDependentUponConvention>
-    <ApplicationIcon>..\Ryujinx\Ryujinx.ico</ApplicationIcon>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(RuntimeIdentifier)' != ''">
-    <PublishSingleFile>true</PublishSingleFile>
-    <PublishTrimmed>true</PublishTrimmed>
-    <TrimMode>partial</TrimMode>
-  </PropertyGroup>
-</Project>

src/Ryujinx.Horizon/Audio/HwopusIpcServer.cs

@@ -6,7 +6,7 @@ namespace Ryujinx.Horizon.Audio
 {
     class HwopusIpcServer
     {
-        private const int MaxSessionsCount = 24;
+        private const int MaxSessionsCount = 25;
 
         private const int PointerBufferSize = 0x1000;
         private const int MaxDomains = 8;

src/Ryujinx.Input.SDL2/SDL2JoyCon.cs

@@ -362,7 +362,7 @@ namespace Ryujinx.Input.SDL2
 
             if (HasConfiguration)
             {
-                var joyconStickConfig = GetLogicalJoyStickConfig(inputId);
+                JoyconConfigControllerStick<GamepadInputId, Common.Configuration.Hid.Controller.StickInputId> joyconStickConfig = GetLogicalJoyStickConfig(inputId);
 
                 if (joyconStickConfig != null)
                 {
@@ -398,7 +398,7 @@ namespace Ryujinx.Input.SDL2
 
         public bool IsPressed(GamepadButtonInputId inputId)
         {
-            if (!_buttonsDriverMapping.TryGetValue(inputId, out var button))
+            if (!_buttonsDriverMapping.TryGetValue(inputId, out SDL_GameControllerButton button))
             {
                 return false;
             }

src/Ryujinx.Input.SDL2/SDL2JoyConPair.cs

@@ -105,7 +105,7 @@ namespace Ryujinx.Input.SDL2
 
         private static (int leftIndex, int rightIndex) DetectJoyConPair(List<string> gamepadsIds)
         {
-            var gamepadNames = gamepadsIds.Where(gamepadId => gamepadId != Id)
+            List<string> gamepadNames = gamepadsIds.Where(gamepadId => gamepadId != Id)
                 .Select((_, index) => SDL_GameControllerNameForIndex(index)).ToList();
             int leftIndex = gamepadNames.IndexOf(SDL2JoyCon.LeftName);
             int rightIndex = gamepadNames.IndexOf(SDL2JoyCon.RightName);

src/Ryujinx/Input/AvaloniaMouseDriver.cs

@@ -71,8 +71,8 @@ namespace Ryujinx.Ava.Input
         {
             _size = new Size((int)rect.Width, (int)rect.Height);
         }
-        
-        private void HandleScrollStopped() 
+
+        private void HandleScrollStopped()
         {
             Scroll = new Vector2(0, 0);
         }
@@ -104,12 +104,18 @@ namespace Ryujinx.Ava.Input
         }
         private void Parent_PointerPressedEvent(object o, PointerPressedEventArgs args)
         {
-            uint button = (uint)args.GetCurrentPoint(_widget).Properties.PointerUpdateKind;
+            PointerPoint currentPoint = args.GetCurrentPoint(_widget);
+            uint button = (uint)currentPoint.Properties.PointerUpdateKind;
 
             if ((uint)PressedButtons.Length > button)
             {
                 PressedButtons[button] = true;
             }
+
+            if (args.Pointer.Type == PointerType.Touch) // mouse position is unchanged for touch events, set touch position
+            {
+                CurrentPosition = new Vector2((float)currentPoint.Position.X, (float)currentPoint.Position.Y);
+            }
         }
 
         private void Parent_PointerMovedEvent(object o, PointerEventArgs args)

src/Ryujinx/Systems/AppHost.cs

@@ -201,8 +201,6 @@ namespace Ryujinx.Ava.Systems
             ConfigurationState.Instance.Graphics.AspectRatio.Event += UpdateAspectRatioState;
             ConfigurationState.Instance.System.EnableDockedMode.Event += UpdateDockedModeState;
             ConfigurationState.Instance.System.AudioVolume.Event += UpdateAudioVolumeState;
-            ConfigurationState.Instance.System.EnableDockedMode.Event += UpdateDockedModeState;
-            ConfigurationState.Instance.System.AudioVolume.Event += UpdateAudioVolumeState;
             ConfigurationState.Instance.Graphics.AntiAliasing.Event += UpdateAntiAliasing;
             ConfigurationState.Instance.Graphics.ScalingFilter.Event += UpdateScalingFilter;
             ConfigurationState.Instance.Graphics.ScalingFilterLevel.Event += UpdateScalingFilterLevel;

src/Ryujinx/Systems/AppLibrary/ApplicationLibrary.cs

@@ -848,7 +848,7 @@ namespace Ryujinx.Ava.Systems.AppLibrary
 
             TimeSpan temporary = TimeSpan.Zero;
 
-            foreach (var installedApplication in Applications.Items)
+            foreach (ApplicationData installedApplication in Applications.Items)
             {
                 temporary += LoadAndSaveMetaData(installedApplication.IdString).TimePlayed;
             }

src/Ryujinx/Systems/Rebooter.cs

@@ -54,7 +54,7 @@ namespace Ryujinx.Ava.Systems
                     WorkingDirectory = executableDirectory,
                 };
 
-                foreach (var arg in args)
+                foreach (string arg in args)
                 {
                     processStart.ArgumentList.Add(arg);
                 }

src/Ryujinx/UI/Applet/AvaloniaHostUITheme.cs

@@ -50,7 +50,7 @@ namespace Ryujinx.Ava.UI.Applet
 
         private string GetWindowsFontByLanguage()
         {
-            var culture = CultureInfo.CurrentUICulture;
+            CultureInfo culture = CultureInfo.CurrentUICulture;
             string langCode = culture.Name;
 
             return culture.TwoLetterISOLanguageName switch

src/Ryujinx/UI/Models/LdnGameModel.cs

@@ -107,7 +107,7 @@ namespace Ryujinx.Ava.UI.Models
 
         private static async Task<string> GetAllAsyncRequestImpl(HttpClient client = null)
         {
-            var ldnWebHost = ConfigurationState.Instance.Multiplayer.GetLdnWebServer();
+            string ldnWebHost = ConfigurationState.Instance.Multiplayer.GetLdnWebServer();
 
             LocaleManager.Associate(LocaleKeys.LdnGameListRefreshToolTip, ldnWebHost);
 

src/Ryujinx/UI/ViewModels/LdnGamesListViewModel.cs

@@ -35,7 +35,7 @@ namespace Ryujinx.Ava.UI.ViewModels
                 SortApply();
             }
 
-            var filtered = _visibleEntries;
+            IEnumerable<LdnGameModel> filtered = _visibleEntries;
 
             if (OnlyShowForOwnedGames)
                 filtered = filtered.Where(x => _ownedGameTitleIds.ContainsIgnoreCase(x.Title.Id));

src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs

@@ -348,7 +348,7 @@ namespace Ryujinx.Ava.UI.ViewModels
         {
             if (ts.HasValue)
             {
-                var formattedPlayTime = ValueFormatUtils.FormatTimeSpan(ts.Value);
+                string formattedPlayTime = ValueFormatUtils.FormatTimeSpan(ts.Value);
                 LocaleManager.Associate(LocaleKeys.GameListLabelTotalTimePlayed, formattedPlayTime);
                 ShowTotalTimePlayed = formattedPlayTime != string.Empty;
                 return;
@@ -827,10 +827,10 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         private void RefreshGrid()
         {
-            var appsList = Applications.ToObservableChangeSet()
+            IObservableList<ApplicationData> appsList = Applications.ToObservableChangeSet()
                 .Filter(Filter)
                 .Sort(GetComparer())
-                .Bind(out var apps)
+                .Bind(out ReadOnlyObservableCollection<ApplicationData> apps)
                 .AsObservableList();
 
             AppsObservableList = apps;

src/Ryujinx/UI/ViewModels/SettingsViewModel.cs

@@ -447,9 +447,9 @@ namespace Ryujinx.Ava.UI.ViewModels
             _virtualFileSystem = virtualFileSystem;
             _contentManager = contentManager;
 
-            if (gameIconData != null && gameIconData.Length > 0)
+            if (gameIconData is { Length: > 0 })
             {
-                using var ms = new MemoryStream(gameIconData);
+                using MemoryStream ms = new(gameIconData);
                 _gameIcon = new Bitmap(ms);
             }