Debugger: Label list - Toggle breakpoint on ram labels should create …

…RWX breakpoints
SourMesen · Dec 8, 2024 · 8d49d0e · 8d49d0e
1 parent d946465
commit 8d49d0e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/UI/Debugger/Breakpoints/BreakpointManager.cs b/UI/Debugger/Breakpoints/BreakpointManager.cs
@@ -169,17 +169,17 @@ public static bool EnableDisableBreakpoint(AddressInfo info, CpuType cpuType)
 			return false;
 		}
 
-		public static void ToggleBreakpoint(AddressInfo info, CpuType cpuType, bool forceExecBreakpoint = true)
+		public static void ToggleBreakpoint(AddressInfo info, CpuType cpuType)
 		{
 			if(info.Address < 0) {
 				return;
 			}
 
-			Breakpoint? breakpoint = BreakpointManager.GetMatchingForbidBreakpoint(info, cpuType) ?? BreakpointManager.GetMatchingBreakpoint(info, cpuType, forceExecBreakpoint);
+			Breakpoint? breakpoint = BreakpointManager.GetMatchingForbidBreakpoint(info, cpuType) ?? BreakpointManager.GetMatchingBreakpoint(info, cpuType);
 			if(breakpoint != null) {
 				BreakpointManager.RemoveBreakpoint(breakpoint);
 			} else {
-				bool execBreakpoint = forceExecBreakpoint || info.Type.IsRomMemory();
+				bool execBreakpoint = true;
 				bool readWriteBreakpoint = !info.Type.IsRomMemory() || info.Type.IsRelativeMemory();
 				if(info.Type.SupportsCdl()) {
 					CdlFlags cdlData = DebugApi.GetCdlData((uint)info.Address, 1, info.Type)[0];

diff --git a/UI/Debugger/ViewModels/EventViewerViewModel.cs b/UI/Debugger/ViewModels/EventViewerViewModel.cs
@@ -189,7 +189,7 @@ private List<ContextMenuAction> GetContextMenuActions()
 					OnClick = () => {
 						if(SelectedEvent != null) {
 							int addr = (int)SelectedEvent.Value.ProgramCounter;
-							BreakpointManager.ToggleBreakpoint(new AddressInfo() { Address = addr, Type = CpuType.ToMemoryType() }, CpuType, true);
+							BreakpointManager.ToggleBreakpoint(new AddressInfo() { Address = addr, Type = CpuType.ToMemoryType() }, CpuType);
 						}
 					}
 				},
@@ -200,7 +200,7 @@ private List<ContextMenuAction> GetContextMenuActions()
 					OnClick = () => {
 						if(SelectedEvent?.Flags.HasFlag(EventFlags.ReadWriteOp) == true) {
 							int addr = (int)SelectedEvent.Value.Operation.Address;
-							BreakpointManager.ToggleBreakpoint(new AddressInfo() { Address = addr, Type = CpuType.ToMemoryType() }, CpuType, false);
+							BreakpointManager.ToggleBreakpoint(new AddressInfo() { Address = addr, Type = CpuType.ToMemoryType() }, CpuType);
 						}
 					}
 				},

diff --git a/UI/Debugger/ViewModels/LabelListViewModel.cs b/UI/Debugger/ViewModels/LabelListViewModel.cs
@@ -112,7 +112,7 @@ public void InitContextMenu(Control parent)
 					OnClick = () => {
 						if(Selection.SelectedItem is LabelViewModel vm) {
 							AddressInfo addr = vm.Label.GetAbsoluteAddress();
-							BreakpointManager.ToggleBreakpoint(addr, CpuType, false);
+							BreakpointManager.ToggleBreakpoint(addr, CpuType);
 						}
 					}
 				},