H3cJP/ryujinx
1
0
Fork 0
mirror of https://git.ryujinx.app/ryubing/ryujinx.git synced 2025-10-19 15:45:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

gdb: Cleanup (ryubing/ryujinx!171)

Browse Source 
See merge request ryubing/ryujinx!171
This commit is contained in:
Coxxs 2025-10-16 19:53:51 -05:00 committed by GreemDev
parent 9aacf9b37b
commit 8e941e4a8f
4 changed files with 11 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/Ryujinx.HLE/Debugger/BreakpointManager.cs
View File

@ -11,12 +11,9 @@ namespace Ryujinx.HLE.Debugger
{ {
public byte[] OriginalData { get; } public byte[] OriginalData { get; }
public bool IsStep { get; } public Breakpoint(byte[] originalData)
public Breakpoint(byte[] originalData, bool isStep)
{ {
OriginalData = originalData; OriginalData = originalData;
IsStep = isStep;
} }
} }
@ -44,7 +41,7 @@ namespace Ryujinx.HLE.Debugger
/// <param name="length">The length of the instruction to replace.</param> /// <param name="length">The length of the instruction to replace.</param>
/// <param name="isStep">Indicates if this is a single-step breakpoint.</param> /// <param name="isStep">Indicates if this is a single-step breakpoint.</param>
/// <returns>True if the breakpoint was set successfully; otherwise, false.</returns> /// <returns>True if the breakpoint was set successfully; otherwise, false.</returns>
public bool SetBreakPoint(ulong address, ulong length, bool isStep = false) public bool SetBreakPoint(ulong address, ulong length)
{ {
if (_breakpoints.ContainsKey(address)) if (_breakpoints.ContainsKey(address))
{ {
@ -71,7 +68,7 @@ namespace Ryujinx.HLE.Debugger
return false; return false;
} }
var breakpoint = new Breakpoint(originalInstruction, isStep); var breakpoint = new Breakpoint(originalInstruction);
if (_breakpoints.TryAdd(address, breakpoint)) if (_breakpoints.TryAdd(address, breakpoint))
{ {
Logger.Debug?.Print(LogClass.GdbStub, $"Breakpoint set at 0x{address:X16}"); Logger.Debug?.Print(LogClass.GdbStub, $"Breakpoint set at 0x{address:X16}");
@ -124,30 +121,6 @@ namespace Ryujinx.HLE.Debugger
Logger.Debug?.Print(LogClass.GdbStub, "All breakpoints cleared."); Logger.Debug?.Print(LogClass.GdbStub, "All breakpoints cleared.");
} }
/// <summary>
/// Clears all currently set single-step software breakpoints.
/// </summary>
public void ClearAllStepBreakpoints()
{
var stepBreakpoints = _breakpoints.Where(p => p.Value.IsStep).ToList();
if (stepBreakpoints.Count == 0)
{
return;
}
foreach (var bp in stepBreakpoints)
{
if (_breakpoints.TryRemove(bp.Key, out Breakpoint removedBreakpoint))
{
WriteMemory(bp.Key, removedBreakpoint.OriginalData);
}
}
Logger.Debug?.Print(LogClass.GdbStub, "All step breakpoints cleared.");
}
private byte[] GetBreakInstruction(ulong length) private byte[] GetBreakInstruction(ulong length)
{ {
if (_debugger.IsProcessAarch32) if (_debugger.IsProcessAarch32)

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

@ -103,6 +103,10 @@ namespace Ryujinx.HLE.Debugger
{ {
Logger.Error?.Print(LogClass.GdbStub, "Error while processing GDB messages", e); Logger.Error?.Print(LogClass.GdbStub, "Error while processing GDB messages", e);
} }
catch (ObjectDisposedException e)
{
Logger.Error?.Print(LogClass.GdbStub, "Error while processing GDB messages", e);
}
} }
} }
@ -304,6 +308,7 @@ namespace Ryujinx.HLE.Debugger
WriteStream = null; WriteStream = null;
ClientSocket.Close(); ClientSocket.Close();
ClientSocket = null; ClientSocket = null;
CommandProcessor = null;
BreakpointManager.ClearAll(); BreakpointManager.ClearAll();
} }

4
src/Ryujinx.HLE/Debugger/Gdb/CommandProcessor.cs
View File

@ -310,7 +310,7 @@ namespace Ryujinx.HLE.Debugger.Gdb
switch (type) switch (type)
{ {
case "0": // Software breakpoint case "0": // Software breakpoint
if (!Commands.Debugger.BreakpointManager.SetBreakPoint(addr, len, false)) if (!Commands.Debugger.BreakpointManager.SetBreakPoint(addr, len))
{ {
Commands.ReplyError(); Commands.ReplyError();
return; return;
@ -325,7 +325,7 @@ namespace Ryujinx.HLE.Debugger.Gdb
Commands.ReplyError(); Commands.ReplyError();
return; return;
default: default:
Commands. ReplyError(); Commands.ReplyError();
return; return;
} }
} }

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

@ -17,7 +17,7 @@ namespace Ryujinx.HLE.Debugger
private static string GetEmbeddedResourceContent(string resourceName) private static string GetEmbeddedResourceContent(string resourceName)
{ {
Stream stream = System.Reflection.Assembly.GetExecutingAssembly().GetManifestResourceStream("Ryujinx.HLE.Debugger.GdbXml." + resourceName); Stream stream = System.Reflection.Assembly.GetExecutingAssembly().GetManifestResourceStream("Ryujinx.HLE.Debugger.Gdb.Xml." + resourceName);
StreamReader reader = new StreamReader(stream); StreamReader reader = new StreamReader(stream);
string result = reader.ReadToEnd(); string result = reader.ReadToEnd();
reader.Dispose(); reader.Dispose();