dahjah/Ryujinx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch ryujinx:master into ui-userprofiles-and-misc

Browse Source
This commit is contained in:
Neo 2025-10-23 10:11:31 -05:00
commit 4d56f4dcd3
7 changed files with 134 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Ryujinx.HLE/Debugger/Debugger.MainThread.cs
View File

@ -60,7 +60,6 @@ namespace Ryujinx.HLE.Debugger
_readStream = new NetworkStream(_clientSocket, System.IO.FileAccess.Read); _readStream = new NetworkStream(_clientSocket, System.IO.FileAccess.Read);
_writeStream = new NetworkStream(_clientSocket, System.IO.FileAccess.Write); _writeStream = new NetworkStream(_clientSocket, System.IO.FileAccess.Write);
_commands = new GdbCommands(_listenerSocket, _clientSocket, _readStream, _writeStream, this); _commands = new GdbCommands(_listenerSocket, _clientSocket, _readStream, _writeStream, this);
_commandProcessor = _commands.CreateProcessor();
Logger.Notice.Print(LogClass.GdbStub, "GDB client connected"); Logger.Notice.Print(LogClass.GdbStub, "GDB client connected");
@ -119,7 +118,6 @@ namespace Ryujinx.HLE.Debugger
_writeStream = null; _writeStream = null;
_clientSocket.Close(); _clientSocket.Close();
_clientSocket = null; _clientSocket = null;
_commandProcessor = null;
_commands = null; _commands = null;
BreakpointManager.ClearAll(); BreakpointManager.ClearAll();

4
src/Ryujinx.HLE/Debugger/Debugger.MessageHandler.cs
View File

@ -29,14 +29,14 @@ namespace Ryujinx.HLE.Debugger
case CommandMessage { Command: { } cmd }: case CommandMessage { Command: { } cmd }:
Logger.Debug?.Print(LogClass.GdbStub, $"Received Command: {cmd}"); Logger.Debug?.Print(LogClass.GdbStub, $"Received Command: {cmd}");
_writeStream.WriteByte((byte)'+'); _writeStream.WriteByte((byte)'+');
_commandProcessor.Process(cmd); _commands.Processor.Process(cmd);
break; break;
case ThreadBreakMessage { Context: { } ctx }: case ThreadBreakMessage { Context: { } ctx }:
DebugProcess.DebugStop(); DebugProcess.DebugStop();
GThread = CThread = ctx.ThreadUid; GThread = CThread = ctx.ThreadUid;
_breakHandlerEvent.Set(); _breakHandlerEvent.Set();
_commandProcessor.Reply($"T05thread:{ctx.ThreadUid:x};"); _commands.Processor.Reply($"T05thread:{ctx.ThreadUid:x};");
break; break;
} }
} }

64
src/Ryujinx.HLE/Debugger/Debugger.Rcmd.cs
View File

@ -62,38 +62,16 @@ namespace Ryujinx.HLE.Debugger
public string GetMinidump() public string GetMinidump()
{ {
StringBuilder response = new(); if (Process is not { } kProcess)
response.AppendLine("=== Begin Minidump ===\n"); return "No application process found\n";
response.AppendLine(GetProcessInfo());
foreach (KThread thread in GetThreads()) if (kProcess.Debugger is not { } debugger)
{ return $"Error getting minidump: debugger is null\n";
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}]");
}
try var response = debugger.GetMinidump();
{
string registers = Process.Debugger.GetCpuRegisterPrintout(thread);
response.AppendLine(registers);
}
catch (Exception e)
{
response.AppendLine($"[Error getting registers: {e.Message}]");
}
}
response.AppendLine("=== End Minidump ==="); Logger.Info?.Print(LogClass.GdbStub, response);
return response;
Logger.Info?.Print(LogClass.GdbStub, response.ToString());
return response.ToString();
} }
public string GetProcessInfo() public string GetProcessInfo()
@ -103,32 +81,10 @@ namespace Ryujinx.HLE.Debugger
if (Process is not { } kProcess) if (Process is not { } kProcess)
return "No application process found\n"; return "No application process found\n";
StringBuilder sb = new(); if (kProcess.Debugger is not { } debugger)
return $"Error getting process info: debugger is null\n";
sb.AppendLine($"Program Id: 0x{kProcess.TitleId:x16}"); return debugger.GetProcessInfoPrintout();
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:");
HleProcessDebugger 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();
} }
catch (Exception e) catch (Exception e)
{ {

3
src/Ryujinx.HLE/Debugger/Debugger.cs
View File

@ -26,8 +26,7 @@ namespace Ryujinx.HLE.Debugger
private Socket _clientSocket; private Socket _clientSocket;
private NetworkStream _readStream; private NetworkStream _readStream;
private NetworkStream _writeStream; private NetworkStream _writeStream;
private GdbCommandProcessor _commandProcessor;
private GdbCommands _commands; private GdbCommands _commands;
private bool _shuttingDown; private bool _shuttingDown;

32
src/Ryujinx.HLE/Debugger/Gdb/Commands.cs
View File

@ -11,19 +11,18 @@ namespace Ryujinx.HLE.Debugger.Gdb
{ {
class GdbCommands class GdbCommands
{ {
const int GdbRegisterCount64 = 68;
const int GdbRegisterCount32 = 66;
public readonly Debugger Debugger; 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 TcpListener ListenerSocket;
internal readonly Socket ClientSocket; internal readonly Socket ClientSocket;
internal readonly NetworkStream ReadStream; internal readonly NetworkStream ReadStream;
internal readonly NetworkStream WriteStream; internal readonly NetworkStream WriteStream;
public GdbCommands(TcpListener listenerSocket, Socket clientSocket, NetworkStream readStream, public GdbCommands(TcpListener listenerSocket, Socket clientSocket, NetworkStream readStream,
NetworkStream writeStream, Debugger debugger) NetworkStream writeStream, Debugger debugger)
{ {
@ -34,21 +33,6 @@ namespace Ryujinx.HLE.Debugger.Gdb
Debugger = debugger; 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() internal void Query()
{ {
// GDB is performing initial contact. Stop everything. // GDB is performing initial contact. Stop everything.
@ -104,14 +88,14 @@ namespace Ryujinx.HLE.Debugger.Gdb
string registers = string.Empty; string registers = string.Empty;
if (Debugger.IsProcess32Bit) if (Debugger.IsProcess32Bit)
{ {
for (int i = 0; i < GdbRegisterCount32; i++) for (int i = 0; i < GdbRegisters.Count32; i++)
{ {
registers += ctx.ReadRegister32(i); registers += ctx.ReadRegister32(i);
} }
} }
else else
{ {
for (int i = 0; i < GdbRegisterCount64; i++) for (int i = 0; i < GdbRegisters.Count64; i++)
{ {
registers += ctx.ReadRegister64(i); registers += ctx.ReadRegister64(i);
} }
@ -131,7 +115,7 @@ namespace Ryujinx.HLE.Debugger.Gdb
IExecutionContext ctx = Debugger.DebugProcess.GetThread(Debugger.GThread.Value).Context; IExecutionContext ctx = Debugger.DebugProcess.GetThread(Debugger.GThread.Value).Context;
if (Debugger.IsProcess32Bit) if (Debugger.IsProcess32Bit)
{ {
for (int i = 0; i < GdbRegisterCount32; i++) for (int i = 0; i < GdbRegisters.Count32; i++)
{ {
if (!ctx.WriteRegister32(i, ss)) if (!ctx.WriteRegister32(i, ss))
{ {
@ -142,7 +126,7 @@ namespace Ryujinx.HLE.Debugger.Gdb
} }
else else
{ {
for (int i = 0; i < GdbRegisterCount64; i++) for (int i = 0; i < GdbRegisters.Count64; i++)
{ {
if (!ctx.WriteRegister64(i, ss)) if (!ctx.WriteRegister64(i, ss))
{ {

3
src/Ryujinx.HLE/Debugger/Gdb/Registers.cs
View File

@ -6,6 +6,9 @@ namespace Ryujinx.HLE.Debugger.Gdb
{ {
static class GdbRegisters static class GdbRegisters
{ {
public const int Count64 = 68;
public const int Count32 = 66;
/* /*
FPCR = FPSR & ~FpcrMask FPCR = FPSR & ~FpcrMask
All of FPCR's bits are reserved in FPCR and vice versa, All of FPCR's bits are reserved in FPCR and vice versa,

110
src/Ryujinx.HLE/HOS/Kernel/Process/HleProcessDebugger.cs
View File

@ -161,6 +161,116 @@ namespace Ryujinx.HLE.HOS.Kernel.Process
return sb.ToString(); 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) private static bool TryGetSubName(Image image, ulong address, out ElfSymbol symbol)
{ {
address -= image.BaseAddress; address -= image.BaseAddress;