empathicqubit/Mesen-X
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Debugger: Allow adding breakpoints on lines containing only a label definition

Browse source
This commit is contained in:
Sour 2018-12-16 15:59:51 -05:00
parent be2cd9a850
commit 774cf22f52
3 changed files with 26 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
GUI.NET/Debugger/Controls/CodeViewerActions.cs
View file

@ -263,9 +263,16 @@ namespace Mesen.GUI.Debugger.Controls
public void ToggleBreakpoint(bool toggleEnabledFlag)
{
int relativeAddress = Viewer.CodeViewer.CurrentLine;
AddressTypeInfo info = Viewer.GetAddressInfo(Viewer.CodeViewer.SelectedLine);
int lineIndex = Viewer.CodeViewer.SelectedLine;
int relativeAddress = Viewer.CodeViewer.GetLineNumber(lineIndex);
if(relativeAddress < 0 && Viewer.CodeViewer.LineCount > lineIndex + 1) {
//Current line has no address, try using the next line instead.
//(Used when trying to set a breakpoint on a row containing only a label)
lineIndex++;
relativeAddress = Viewer.CodeViewer.GetLineNumber(lineIndex);
}
AddressTypeInfo info = Viewer.GetAddressInfo(lineIndex);
BreakpointManager.ToggleBreakpoint(relativeAddress, info, toggleEnabledFlag);
}

12
GUI.NET/Debugger/Controls/ctrlDebuggerCode.cs
View file

@ -260,8 +260,16 @@ namespace Mesen.GUI.Debugger
_tooltipManager.Close();
if(e.Button == MouseButtons.Left && e.Location.X < this.ctrlCodeViewer.CodeMargin / 4) {
int relativeAddress = ctrlCodeViewer.GetLineNumberAtPosition(e.Y);
AddressTypeInfo info = GetAddressInfo(ctrlCodeViewer.GetLineIndexAtPosition(e.Y));
int lineIndex = ctrlCodeViewer.GetLineIndexAtPosition(e.Y);
int relativeAddress = ctrlCodeViewer.GetLineNumber(lineIndex);
if(relativeAddress < 0 && ctrlCodeViewer.LineCount > lineIndex + 1) {
//Current line has no address, try using the next line instead.
//(Used when trying to set a breakpoint on a row containing only a label)
lineIndex++;
relativeAddress = ctrlCodeViewer.GetLineNumber(lineIndex);
}
AddressTypeInfo info = GetAddressInfo(lineIndex);
BreakpointManager.ToggleBreakpoint(relativeAddress, info, false);
}
}

7
GUI.NET/Debugger/Controls/ctrlSourceViewer.cs
View file

@ -226,6 +226,13 @@ namespace Mesen.GUI.Debugger.Controls
AddressTypeInfo info = GetAddressInfo(ctrlCodeViewer.SelectedLine);
if(info.Address >= 0) {
BreakpointManager.ToggleBreakpoint(-1, info, false);
} else {
//Current line has no address, try using the next line instead.
//(Used when trying to set a breakpoint on a row containing only a label)
info = GetAddressInfo(ctrlCodeViewer.SelectedLine + 1);
if(info.Address >= 0) {
BreakpointManager.ToggleBreakpoint(-1, info, false);
}
}
}