refactor: Step into with UnconditionalBreakpoint

OpenRakis · Dec 10, 2024 · e69f978 · e69f978
1 parent 45abead
commit e69f978
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 9 deletions.
diff --git a/src/Spice86/Spice86DependencyInjection.cs b/src/Spice86/Spice86DependencyInjection.cs
@@ -242,7 +242,7 @@ public Spice86DependencyInjection(ILoggerService loggerService, Configuration co
         DebugWindowViewModel? debugWindowViewModel = null;
         if (textClipboard != null && hostStorageProvider != null && uiThreadDispatcher != null) {
             IMessenger messenger = WeakReferenceMessenger.Default;
-            debugWindowViewModel = new DebugWindowViewModel(cpu, state, stack, memory,
+            debugWindowViewModel = new DebugWindowViewModel(state, stack, memory,
                 midiDevice, videoState.DacRegisters.ArgbPalette, softwareMixer, vgaRenderer, videoState,
                 cfgCpu.ExecutionContextManager, messenger, uiThreadDispatcher, textClipboard, hostStorageProvider, 
                 emulatorBreakpointsManager,

diff --git a/src/Spice86/ViewModels/BreakpointsViewModel.cs b/src/Spice86/ViewModels/BreakpointsViewModel.cs
@@ -42,6 +42,14 @@ private void ToggleSelectedBreakpoint() {
     [NotifyCanExecuteChangedFor(nameof(ToggleSelectedBreakpointCommand))]
     private BreakpointViewModel? _selectedBreakpoint;
 
+    internal void AddUnconditionalBreakpoint(Action onReached, bool removedOnTrigger) {
+        _emulatorBreakpointsManager.ToggleBreakPoint(
+            new UnconditionalBreakPoint(
+                BreakPointType.EXECUTION,
+                (_) => onReached(),
+                removedOnTrigger), on: true);
+    }
+
     internal void AddAddressBreakpoint(
             long address,
             BreakPointType type,

diff --git a/src/Spice86/ViewModels/DebugWindowViewModel.cs b/src/Spice86/ViewModels/DebugWindowViewModel.cs
@@ -61,7 +61,7 @@ public partial class DebugWindowViewModel : ViewModelBase,
 
     private readonly IPauseHandler _pauseHandler;
 
-    public DebugWindowViewModel(IInstructionExecutor cpu, State cpuState, Stack stack, IMemory memory, Midi externalMidiDevice,
+    public DebugWindowViewModel(State cpuState, Stack stack, IMemory memory, Midi externalMidiDevice,
         ArgbPalette argbPalette, SoftwareMixer softwareMixer, IVgaRenderer vgaRenderer, VideoState videoState,
         ExecutionContextManager executionContextManager, IMessenger messenger, IUIDispatcher uiDispatcher,
         ITextClipboard textClipboard, IHostStorageProvider storageProvider, EmulatorBreakpointsManager emulatorBreakpointsManager,
@@ -79,7 +79,7 @@ public DebugWindowViewModel(IInstructionExecutor cpu, State cpuState, Stack stac
         pauseHandler.Pausing += () => uiDispatcher.Post(() => IsPaused = true);
         pauseHandler.Resumed += () => uiDispatcher.Post(() => IsPaused = false);
         DisassemblyViewModel disassemblyVm = new(
-            cpu, memory, cpuState, functionsInformation.ToDictionary(x => x.Key.ToPhysical(), x => x.Value),
+            memory, cpuState, functionsInformation.ToDictionary(x => x.Key.ToPhysical(), x => x.Value),
             BreakpointsViewModel, pauseHandler,
             uiDispatcher, messenger, textClipboard);
         DisassemblyViewModels.Add(disassemblyVm);

diff --git a/src/Spice86/ViewModels/DisassemblyViewModel.cs b/src/Spice86/ViewModels/DisassemblyViewModel.cs
@@ -25,19 +25,17 @@ public partial class DisassemblyViewModel : ViewModelWithErrorDialog {
     private readonly State _state;
     private readonly IMessenger _messenger;
     private readonly IPauseHandler _pauseHandler;
-    private readonly IInstructionExecutor _cpu;
     private readonly BreakpointsViewModel _breakpointsViewModel;
     private readonly IDictionary<uint, FunctionInformation> _functionsInformation;
     private readonly InstructionsDecoder _instructionsDecoder;
 
     public DisassemblyViewModel(
-        IInstructionExecutor cpu, IMemory memory, State state,
+        IMemory memory, State state,
         IDictionary<uint, FunctionInformation> functionsInformation,
         BreakpointsViewModel breakpointsViewModel,
         IPauseHandler pauseHandler, IUIDispatcher uiDispatcher,
         IMessenger messenger, ITextClipboard textClipboard, bool canCloseTab = false)
         : base(uiDispatcher, textClipboard) {
-        _cpu = cpu;
         _functionsInformation = functionsInformation;
         Functions = new(functionsInformation
             .Select(x => new FunctionInfo() {
@@ -201,7 +199,10 @@ private void EnableBreakpoint() {
 
     [RelayCommand(CanExecute = nameof(IsPaused))]
     private async Task StepInto() {
-        _cpu.ExecuteNext();
+        _breakpointsViewModel.AddUnconditionalBreakpoint(
+            () => Pause("Step into unconditional breakpoint was reached"),
+            removedOnTrigger: true);
+        _pauseHandler.Resume();
         if (!Instructions.GetRange(0, 15).Any(x => x.Address == _state.IpPhysicalAddress)) {
             await GoToCsIp();
         } else {
@@ -212,8 +213,9 @@ private async Task StepInto() {
     [RelayCommand(CanExecute = nameof(IsPaused))]
     private void NewDisassemblyView() {
         DisassemblyViewModel disassemblyViewModel = new(
-            _cpu, _memory, _state, _functionsInformation,
-            _breakpointsViewModel, _pauseHandler, _uiDispatcher, _messenger,
+            _memory, _state, _functionsInformation,
+            _breakpointsViewModel, 
+            _pauseHandler, _uiDispatcher, _messenger,
             _textClipboard, canCloseTab: true) {
             IsPaused = IsPaused
         };
@@ -302,6 +304,10 @@ private async Task CopyLine() {
 
     private void RequestPause(long address) {
         string message = $"Execution breakpoint was reached at address {address}.";
+        Pause(message);
+    }
+
+    private void Pause(string message) {
         _pauseHandler.RequestPause(message);
         _uiDispatcher.Post(() => {
             _messenger.Send(new StatusMessage(DateTime.Now, this, message));