From b1ada260cd4f073cacb6e78958dd9b76707c4325 Mon Sep 17 00:00:00 2001
From: Maximilien Noal <noal.maximilien@gmail.com>
Date: Sat, 28 Dec 2024 10:05:57 +0100
Subject: [PATCH 01/12] refactor: Remove unused ctor parameter

---
 src/Spice86/ViewModels/CpuViewModel.cs         | 2 +-
 src/Spice86/ViewModels/DebugWindowViewModel.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Spice86/ViewModels/CpuViewModel.cs b/src/Spice86/ViewModels/CpuViewModel.cs
index a50a21648..e94085812 100644
--- a/src/Spice86/ViewModels/CpuViewModel.cs
+++ b/src/Spice86/ViewModels/CpuViewModel.cs
@@ -24,7 +24,7 @@ public partial class CpuViewModel : ViewModelBase {
     [ObservableProperty]
     private CpuFlagsInfo _flags = new();
 
-    public CpuViewModel(State state, Stack stack, IMemory memory, IPauseHandler pauseHandler, IUIDispatcher uiDispatcher) {
+    public CpuViewModel(State state, IMemory memory, IPauseHandler pauseHandler, IUIDispatcher uiDispatcher) {
         _cpuState = state;
         _memory = memory;
         pauseHandler.Pausing += () => uiDispatcher.Post(() => _isPaused = true);
diff --git a/src/Spice86/ViewModels/DebugWindowViewModel.cs b/src/Spice86/ViewModels/DebugWindowViewModel.cs
index 613bb8cb5..4f5b717d2 100644
--- a/src/Spice86/ViewModels/DebugWindowViewModel.cs
+++ b/src/Spice86/ViewModels/DebugWindowViewModel.cs
@@ -90,7 +90,7 @@ public DebugWindowViewModel(State cpuState, Stack stack, IMemory memory, Midi ex
         PaletteViewModel = new(argbPalette, uiDispatcher);
         SoftwareMixerViewModel = new(softwareMixer);
         VideoCardViewModel = new(vgaRenderer, videoState);
-        CpuViewModel = new(cpuState, stack, memory, pauseHandler, uiDispatcher);
+        CpuViewModel = new(cpuState, memory, pauseHandler, uiDispatcher);
         MidiViewModel = new(externalMidiDevice);
         MemoryViewModels.Add(new(memory, BreakpointsViewModel, pauseHandler, messenger, uiDispatcher, textClipboard, storageProvider, structureViewModelFactory));
         CfgCpuViewModel = new(executionContextManager, pauseHandler, new PerformanceMeasurer());

From cc7b0b5b6f266b06f242ef6d7c457a720b68b936 Mon Sep 17 00:00:00 2001
From: Maximilien Noal <noal.maximilien@gmail.com>
Date: Sat, 28 Dec 2024 10:42:34 +0100
Subject: [PATCH 02/12] feat: Stack Memory tab

---
 src/Spice86/ViewModels/DebugWindowViewModel.cs | 18 +++++++++++++++++-
 src/Spice86/ViewModels/MemoryViewModel.cs      |  3 +++
 src/Spice86/Views/MemoryView.axaml             |  9 ++++++---
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/Spice86/ViewModels/DebugWindowViewModel.cs b/src/Spice86/ViewModels/DebugWindowViewModel.cs
index 4f5b717d2..44dc0cf85 100644
--- a/src/Spice86/ViewModels/DebugWindowViewModel.cs
+++ b/src/Spice86/ViewModels/DebugWindowViewModel.cs
@@ -92,10 +92,26 @@ public DebugWindowViewModel(State cpuState, Stack stack, IMemory memory, Midi ex
         VideoCardViewModel = new(vgaRenderer, videoState);
         CpuViewModel = new(cpuState, memory, pauseHandler, uiDispatcher);
         MidiViewModel = new(externalMidiDevice);
-        MemoryViewModels.Add(new(memory, BreakpointsViewModel, pauseHandler, messenger, uiDispatcher, textClipboard, storageProvider, structureViewModelFactory));
+        MemoryViewModel mainMemoryViewModel = new(memory,
+            BreakpointsViewModel, pauseHandler, messenger,
+            uiDispatcher, textClipboard, storageProvider, structureViewModelFactory);
+        MemoryViewModel stackMemoryViewModel = new(memory,
+            BreakpointsViewModel, pauseHandler, messenger,
+            uiDispatcher, textClipboard, storageProvider, structureViewModelFactory,
+            canCloseTab: false, startAddress: stack.PhysicalAddress) {
+            Title = "CPU Stack Memory"
+        };
+        pauseHandler.Pausing += () => UpdateStackMemoryViewModel(stackMemoryViewModel, stack);
+        MemoryViewModels.Add(mainMemoryViewModel);
+        MemoryViewModels.Add(stackMemoryViewModel);
         CfgCpuViewModel = new(executionContextManager, pauseHandler, new PerformanceMeasurer());
     }
 
+    private void UpdateStackMemoryViewModel(MemoryViewModel stackMemoryViewModel, Stack stack) {
+        stackMemoryViewModel.StartAddress = stack.PhysicalAddress;
+        stackMemoryViewModel.EndAddress = A20Gate.EndOfHighMemoryArea;
+    }
+
     [RelayCommand]
     private void Pause() => _pauseHandler.RequestPause("Pause button pressed in debug window");
 
diff --git a/src/Spice86/ViewModels/MemoryViewModel.cs b/src/Spice86/ViewModels/MemoryViewModel.cs
index eb0dbafb7..c371d60e5 100644
--- a/src/Spice86/ViewModels/MemoryViewModel.cs
+++ b/src/Spice86/ViewModels/MemoryViewModel.cs
@@ -50,6 +50,9 @@ public MemoryViewModel(IMemory memory, BreakpointsViewModel breakpointsViewModel
         TryUpdateHeaderAndMemoryDocument();
     }
 
+    [ObservableProperty]
+    private string? _title;
+
     public enum MemorySearchDataType {
         Binary,
         Ascii,
diff --git a/src/Spice86/Views/MemoryView.axaml b/src/Spice86/Views/MemoryView.axaml
index c788d2748..3f9f8cb79 100644
--- a/src/Spice86/Views/MemoryView.axaml
+++ b/src/Spice86/Views/MemoryView.axaml
@@ -53,9 +53,12 @@
 					<Label Content="End" />
 					<NumericUpDown Value="{Binding EndAddress}" />
 				</UniformGrid>
-				<Button IsVisible="{Binding IsPaused}" IsEnabled="{Binding IsPaused}"
-						Command="{Binding UpdateBinaryDocumentCommand}"
-						HotKey="Ctrl+R" ToolTip.Tip="Ctrl-R" Content="Refresh" />
+				<StackPanel Orientation="Vertical">
+					<Button IsVisible="{Binding IsPaused}" IsEnabled="{Binding IsPaused}"
+							Command="{Binding UpdateBinaryDocumentCommand}"
+							HotKey="Ctrl+R" ToolTip.Tip="Ctrl-R" Content="Refresh" />
+					<Label  IsVisible="{Binding IsPaused}" Content="{Binding Title}" />
+				</StackPanel>
 			</StackPanel>
 			<Grid Grid.Row="1"
 				  RowDefinitions="*, Auto">

From b17c16022773500d858915924c841ffb21ca35ca Mon Sep 17 00:00:00 2001
From: Maximilien Noal <noal.maximilien@gmail.com>
Date: Sun, 29 Dec 2024 21:15:27 +0100
Subject: [PATCH 03/12] refactor: Use UIDispatcher as a precaution

---
 src/Spice86/ViewModels/DebugWindowViewModel.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Spice86/ViewModels/DebugWindowViewModel.cs b/src/Spice86/ViewModels/DebugWindowViewModel.cs
index 44dc0cf85..aa3523dc5 100644
--- a/src/Spice86/ViewModels/DebugWindowViewModel.cs
+++ b/src/Spice86/ViewModels/DebugWindowViewModel.cs
@@ -25,6 +25,7 @@ public partial class DebugWindowViewModel : ViewModelBase,
     IRecipient<RemoveViewModelMessage<DisassemblyViewModel>>, IRecipient<RemoveViewModelMessage<MemoryViewModel>> {
 
     private readonly IMessenger _messenger;
+    private readonly IUIDispatcher _uiDispatcher;
 
     [ObservableProperty]
     [NotifyCanExecuteChangedFor(nameof(ContinueCommand))]
@@ -73,6 +74,7 @@ public DebugWindowViewModel(State cpuState, Stack stack, IMemory memory, Midi ex
         messenger.Register<RemoveViewModelMessage<DisassemblyViewModel>>(this);
         messenger.Register<RemoveViewModelMessage<MemoryViewModel>>(this);
         _messenger = messenger;
+        _uiDispatcher = uiDispatcher;
         BreakpointsViewModel = new(emulatorBreakpointsManager);
         StatusMessageViewModel = new(_messenger);
         _pauseHandler = pauseHandler;
@@ -113,10 +115,12 @@ private void UpdateStackMemoryViewModel(MemoryViewModel stackMemoryViewModel, St
     }
 
     [RelayCommand]
-    private void Pause() => _pauseHandler.RequestPause("Pause button pressed in debug window");
+    private void Pause() => _uiDispatcher.Post(() => {
+        _pauseHandler.RequestPause("Pause button pressed in debug window");
+    });
 
     [RelayCommand(CanExecute = nameof(IsPaused))]
-    private void Continue() => _pauseHandler.Resume();
+    private void Continue() => _uiDispatcher.Post(_pauseHandler.Resume);
 
     public void Receive(AddViewModelMessage<DisassemblyViewModel> message) => DisassemblyViewModels.Add(message.ViewModel);
     public void Receive(AddViewModelMessage<MemoryViewModel> message) => MemoryViewModels.Add(message.ViewModel);

From 734bf0c8ef66ef8dbf29a4e38efdeeaa6d2e4da6 Mon Sep 17 00:00:00 2001
From: Maximilien Noal <noal.maximilien@gmail.com>
Date: Sun, 29 Dec 2024 21:15:53 +0100
Subject: [PATCH 04/12] refactor: UI methods are public for users

---
 src/Spice86/ViewModels/BreakpointsViewModel.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Spice86/ViewModels/BreakpointsViewModel.cs b/src/Spice86/ViewModels/BreakpointsViewModel.cs
index 45a62f027..b9fe9f558 100644
--- a/src/Spice86/ViewModels/BreakpointsViewModel.cs
+++ b/src/Spice86/ViewModels/BreakpointsViewModel.cs
@@ -41,7 +41,7 @@ private void ToggleSelectedBreakpoint() {
     [NotifyCanExecuteChangedFor(nameof(ToggleSelectedBreakpointCommand))]
     private BreakpointViewModel? _selectedBreakpoint;
 
-    internal void AddUnconditionalBreakpoint(Action onReached, bool removedOnTrigger) {
+    public void AddUnconditionalBreakpoint(Action onReached, bool removedOnTrigger) {
         _emulatorBreakpointsManager.ToggleBreakPoint(
             new UnconditionalBreakPoint(
                 BreakPointType.CPU_EXECUTION_ADDRESS,
@@ -49,7 +49,7 @@ internal void AddUnconditionalBreakpoint(Action onReached, bool removedOnTrigger
                 removedOnTrigger), on: true);
     }
 
-    internal BreakpointViewModel AddAddressBreakpoint(
+    public BreakpointViewModel AddAddressBreakpoint(
             uint address,
             BreakPointType type,
             bool isRemovedOnTrigger,
@@ -64,7 +64,7 @@ internal BreakpointViewModel AddAddressBreakpoint(
         return breakpointViewModel;
     }
 
-    internal BreakpointViewModel? GetBreakpoint(CpuInstructionInfo instructionInfo) {
+    public BreakpointViewModel? GetBreakpoint(CpuInstructionInfo instructionInfo) {
         return Breakpoints.FirstOrDefault(x => x.IsFor(instructionInfo));
     }
 
@@ -76,7 +76,7 @@ private void RemoveBreakpoint() {
         DeleteBreakpoint(SelectedBreakpoint);
     }
 
-    internal void RemoveBreakpointInternal(BreakpointViewModel vm) {
+    public void RemoveBreakpointInternal(BreakpointViewModel vm) {
         DeleteBreakpoint(vm);
     }
 

From 9b516aae222bd0fc7b9507c2347e98461ff23e73 Mon Sep 17 00:00:00 2001
From: Maximilien Noal <noal.maximilien@gmail.com>
Date: Sun, 29 Dec 2024 21:25:37 +0100
Subject: [PATCH 05/12] refactor: Status bar collapses after 5 secs

---
 src/Spice86/ViewModels/DebugWindowViewModel.cs   |  2 +-
 src/Spice86/ViewModels/StatusMessageViewModel.cs | 15 ++++++++++++++-
 src/Spice86/Views/StatusMessageView.axaml        |  2 +-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/Spice86/ViewModels/DebugWindowViewModel.cs b/src/Spice86/ViewModels/DebugWindowViewModel.cs
index aa3523dc5..b02292538 100644
--- a/src/Spice86/ViewModels/DebugWindowViewModel.cs
+++ b/src/Spice86/ViewModels/DebugWindowViewModel.cs
@@ -76,7 +76,7 @@ public DebugWindowViewModel(State cpuState, Stack stack, IMemory memory, Midi ex
         _messenger = messenger;
         _uiDispatcher = uiDispatcher;
         BreakpointsViewModel = new(emulatorBreakpointsManager);
-        StatusMessageViewModel = new(_messenger);
+        StatusMessageViewModel = new(_uiDispatcher, _messenger);
         _pauseHandler = pauseHandler;
         IsPaused = pauseHandler.IsPaused;
         pauseHandler.Pausing += () => uiDispatcher.Post(() => IsPaused = true);
diff --git a/src/Spice86/ViewModels/StatusMessageViewModel.cs b/src/Spice86/ViewModels/StatusMessageViewModel.cs
index 0d713df04..0e394db1c 100644
--- a/src/Spice86/ViewModels/StatusMessageViewModel.cs
+++ b/src/Spice86/ViewModels/StatusMessageViewModel.cs
@@ -3,15 +3,28 @@ namespace Spice86.ViewModels;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Messaging;
 
+using Spice86.Infrastructure;
 using Spice86.Messages;
 
 public partial class StatusMessageViewModel : ViewModelBase, IRecipient<StatusMessage> {
+    private readonly IUIDispatcher _uiDispatcher;
+
     [ObservableProperty]
     private StatusMessage? _message;
 
-    public StatusMessageViewModel(IMessenger messenger) => messenger.Register(this);
+    [ObservableProperty]
+    private bool _isVisible;
+
+    public StatusMessageViewModel(IUIDispatcher dispatcher, IMessenger messenger) {
+        messenger.Register(this);
+        _uiDispatcher = dispatcher;
+    }
 
     public void Receive(StatusMessage message) {
         Message = message;
+        IsVisible = true;
+        Task.Delay(millisecondsDelay: 5000).ContinueWith(_ => {
+            _uiDispatcher.Post(() => IsVisible = false);
+        });
     }
 }
\ No newline at end of file
diff --git a/src/Spice86/Views/StatusMessageView.axaml b/src/Spice86/Views/StatusMessageView.axaml
index 6de797f33..cb5a4ed9f 100644
--- a/src/Spice86/Views/StatusMessageView.axaml
+++ b/src/Spice86/Views/StatusMessageView.axaml
@@ -7,7 +7,7 @@
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="Spice86.Views.StatusMessageView"
              x:DataType="viewModels:StatusMessageViewModel">
-    <controls:StatusBar>
+    <controls:StatusBar IsVisible="{Binding IsVisible}">
         <controls:StatusBarItem>
             <TextBlock DataContext="{Binding Message}">
                 <Run Text="{Binding Time}" />

From bebd5e2537d93e38973db54124f188447c6ca7e9 Mon Sep 17 00:00:00 2001
From: Maximilien Noal <noal.maximilien@gmail.com>
Date: Sat, 18 Jan 2025 09:10:16 +0100
Subject: [PATCH 06/12] Basic breakpoint form creation UI

Signed-off-by: Maximilien Noal <noal.maximilien@gmail.com>
---
 .../InterruptHandlers/Dos/DosInt21Handler.cs  |   4 +
 .../ViewModels/BreakpointsViewModel.cs        | 110 +++++++++++++++++-
 .../ViewModels/DebugWindowViewModel.cs        |   2 +-
 .../ViewModels/DisassemblyViewModel.cs        |   1 +
 .../ViewModels/ViewModelWithErrorDialog.cs    |   1 +
 src/Spice86/Views/BreakpointsView.axaml       |  49 ++++++++
 6 files changed, 160 insertions(+), 7 deletions(-)

diff --git a/src/Spice86.Core/Emulator/InterruptHandlers/Dos/DosInt21Handler.cs b/src/Spice86.Core/Emulator/InterruptHandlers/Dos/DosInt21Handler.cs
index 91d817d83..5d763c7ac 100644
--- a/src/Spice86.Core/Emulator/InterruptHandlers/Dos/DosInt21Handler.cs
+++ b/src/Spice86.Core/Emulator/InterruptHandlers/Dos/DosInt21Handler.cs
@@ -67,6 +67,10 @@ public DosInt21Handler(IMemory memory, Cpu cpu,
         FillDispatchTable();
     }
 
+    public override void Run(int index) {
+        base.Run(index);
+    }
+
     private void FillDispatchTable() {
         AddAction(0x00, QuitWithExitCode);
         AddAction(0x02, DisplayOutput);
diff --git a/src/Spice86/ViewModels/BreakpointsViewModel.cs b/src/Spice86/ViewModels/BreakpointsViewModel.cs
index b9fe9f558..761cbd8f3 100644
--- a/src/Spice86/ViewModels/BreakpointsViewModel.cs
+++ b/src/Spice86/ViewModels/BreakpointsViewModel.cs
@@ -2,23 +2,121 @@ namespace Spice86.ViewModels;
 
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
+using CommunityToolkit.Mvvm.Messaging;
 
+using Spice86.Core.Emulator.VM;
 using Spice86.Core.Emulator.VM.Breakpoint;
+using Spice86.Infrastructure;
+using Spice86.Messages;
 using Spice86.Models.Debugging;
 
 using System.Collections.ObjectModel;
 
-public partial class BreakpointsViewModel : ViewModelBase {
+public partial class BreakpointsViewModel : ViewModelWithErrorDialog {
     private readonly EmulatorBreakpointsManager _emulatorBreakpointsManager;
-
-    public BreakpointsViewModel(EmulatorBreakpointsManager emulatorBreakpointsManager) {
+    private readonly IMessenger _messenger;
+    private readonly IPauseHandler _pauseHandler;
+
+    public BreakpointsViewModel(IPauseHandler pauseHandler,
+        IMessenger messenger,
+        EmulatorBreakpointsManager emulatorBreakpointsManager,
+        IUIDispatcher uiDispatcher,
+        ITextClipboard textClipboard) : base(uiDispatcher, textClipboard) {
         _emulatorBreakpointsManager = emulatorBreakpointsManager;
+        _pauseHandler = pauseHandler;
+        _messenger = messenger;
+    }
+
+    [ObservableProperty]
+    private bool _isExecutionBreakpointSelected;
+
+    [ObservableProperty]
+    private bool _isMemoryBreakpointSelected;
+
+    [ObservableProperty]
+    private bool _isCyclesBreakpointSelected;
+
+    [ObservableProperty]
+    private bool _creatingBreakpoint;
+
+    [RelayCommand]
+    private void BeginCreateBreakpoint() {
+        CreatingBreakpoint = true;
+    }
+
+    [ObservableProperty]
+    private ulong? _cyclesValue;
+
+    [ObservableProperty]
+    private uint? _executionAddressValue;
+
+    [ObservableProperty]
+    private uint? _memoryAddressValue;
+
+    [ObservableProperty]
+    private BreakPointType _selectedMemoryBreakpointType = BreakPointType.MEMORY_ACCESS;
+
+    public BreakPointType[] MemoryBreakpointTypes => [
+        BreakPointType.MEMORY_ACCESS, BreakPointType.MEMORY_WRITE, BreakPointType.MEMORY_READ];
+
+    [RelayCommand]
+    private void ConfirmBreakpointCreation() {
+        if (IsExecutionBreakpointSelected) {
+            if (ExecutionAddressValue is null) {
+                return;
+            }
+            uint executionValue = ExecutionAddressValue.Value;
+            BreakpointViewModel executionVm = AddAddressBreakpoint(
+                executionValue,
+                BreakPointType.CPU_EXECUTION_ADDRESS,
+                false,
+                () => {
+                    PauseAndReportAddress(executionValue);
+                }, "Execution breakpoint");
+            BreakpointCreated?.Invoke(executionVm);
+        } else if (IsMemoryBreakpointSelected) {
+            if (MemoryAddressValue is null) {
+                return;
+            }
+            uint memValue = MemoryAddressValue.Value;
+            BreakpointViewModel memoryVm = AddAddressBreakpoint(
+                memValue,
+                SelectedMemoryBreakpointType,
+                false,
+                () => {
+                    PauseAndReportAddress(memValue);
+                }, "Memory breakpoint");
+            BreakpointCreated?.Invoke(memoryVm);
+        } else if (IsCyclesBreakpointSelected) {
+            if (CyclesValue is null) {
+                return;
+            }
+        }
+        CreatingBreakpoint = false;
+    }
+
+    private void PauseAndReportAddress(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));
+        });
+    }
+
+    [RelayCommand]
+    private void CancelBreakpointCreation() {
+        CreatingBreakpoint = false;
     }
 
     public event Action<BreakpointViewModel>? BreakpointDeleted;
     public event Action<BreakpointViewModel>? BreakpointEnabled;
+    public event Action<BreakpointViewModel>? BreakpointCreated;
     public event Action<BreakpointViewModel>? BreakpointDisabled;
-    
+
     [ObservableProperty]
     private ObservableCollection<BreakpointViewModel> _breakpoints = new();
 
@@ -35,7 +133,7 @@ private void ToggleSelectedBreakpoint() {
     }
 
     private bool ToggleSelectedBreakpointCanExecute() => SelectedBreakpoint is not null;
-    
+
     [ObservableProperty]
     [NotifyCanExecuteChangedFor(nameof(RemoveBreakpointCommand))]
     [NotifyCanExecuteChangedFor(nameof(ToggleSelectedBreakpointCommand))]
@@ -55,7 +153,7 @@ public BreakpointViewModel AddAddressBreakpoint(
             bool isRemovedOnTrigger,
             Action onReached,
             string comment = "") {
-        var breakpointViewModel = new BreakpointViewModel( 
+        var breakpointViewModel = new BreakpointViewModel(
             this,
             _emulatorBreakpointsManager,
             address, type, isRemovedOnTrigger, onReached, comment);
diff --git a/src/Spice86/ViewModels/DebugWindowViewModel.cs b/src/Spice86/ViewModels/DebugWindowViewModel.cs
index b02292538..2391fed76 100644
--- a/src/Spice86/ViewModels/DebugWindowViewModel.cs
+++ b/src/Spice86/ViewModels/DebugWindowViewModel.cs
@@ -75,7 +75,7 @@ public DebugWindowViewModel(State cpuState, Stack stack, IMemory memory, Midi ex
         messenger.Register<RemoveViewModelMessage<MemoryViewModel>>(this);
         _messenger = messenger;
         _uiDispatcher = uiDispatcher;
-        BreakpointsViewModel = new(emulatorBreakpointsManager);
+        BreakpointsViewModel = new(pauseHandler, messenger, emulatorBreakpointsManager, uiDispatcher, textClipboard);
         StatusMessageViewModel = new(_uiDispatcher, _messenger);
         _pauseHandler = pauseHandler;
         IsPaused = pauseHandler.IsPaused;
diff --git a/src/Spice86/ViewModels/DisassemblyViewModel.cs b/src/Spice86/ViewModels/DisassemblyViewModel.cs
index 29491315e..ac18fe1b5 100644
--- a/src/Spice86/ViewModels/DisassemblyViewModel.cs
+++ b/src/Spice86/ViewModels/DisassemblyViewModel.cs
@@ -60,6 +60,7 @@ public DisassemblyViewModel(
         breakpointsViewModel.BreakpointDeleted += OnBreakPointUpdateFromBreakpointsViewModel;
         breakpointsViewModel.BreakpointDisabled += OnBreakPointUpdateFromBreakpointsViewModel;
         breakpointsViewModel.BreakpointEnabled += OnBreakPointUpdateFromBreakpointsViewModel;
+        breakpointsViewModel.BreakpointCreated += OnBreakPointUpdateFromBreakpointsViewModel;
     }
 
     private void OnBreakPointUpdateFromBreakpointsViewModel(BreakpointViewModel breakpointViewModel) {
diff --git a/src/Spice86/ViewModels/ViewModelWithErrorDialog.cs b/src/Spice86/ViewModels/ViewModelWithErrorDialog.cs
index ea5c8fdc7..b6619539b 100644
--- a/src/Spice86/ViewModels/ViewModelWithErrorDialog.cs
+++ b/src/Spice86/ViewModels/ViewModelWithErrorDialog.cs
@@ -61,6 +61,7 @@ protected bool TryParseMemoryAddress(string? memoryAddress, [NotNullWhen(true)]
 
         return false;
     }
+
     protected void ShowError(Exception e) {
         Exception = e.GetBaseException();
         IsDialogVisible = true;
diff --git a/src/Spice86/Views/BreakpointsView.axaml b/src/Spice86/Views/BreakpointsView.axaml
index 023067ab0..79f192fde 100644
--- a/src/Spice86/Views/BreakpointsView.axaml
+++ b/src/Spice86/Views/BreakpointsView.axaml
@@ -2,7 +2,10 @@
 			 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 			 xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 			 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+			 xmlns:dialogHost="clr-namespace:DialogHostAvalonia;assembly=DialogHost.Avalonia"
 			 xmlns:viewModels="clr-namespace:Spice86.ViewModels"
+			 xmlns:converters="clr-namespace:Spice86.Converters"
+			 xmlns:controls="clr-namespace:Spice86.Controls;assembly=Spice86"
 			 mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
 			 x:Class="Spice86.Views.BreakpointsView"
 			 x:DataType="viewModels:BreakpointsViewModel">
@@ -12,6 +15,7 @@
 			<RowDefinition Height="*" />
 		</Grid.RowDefinitions>
 		<StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Center">
+			<Button Content="New..." Command="{Binding BeginCreateBreakpointCommand}" Margin="5"/>
 			<Button Content="Remove" Command="{Binding RemoveBreakpointCommand}" Margin="5"/>
 			<Button HotKey="Ctrl+F9" ToolTip.Tip="Ctrl-F9" Content="Toggle" Command="{Binding ToggleSelectedBreakpointCommand}" Margin="5"/>
 		</StackPanel>
@@ -31,5 +35,50 @@
 				<DataGridTextColumn IsReadOnly="False" Binding="{Binding Comment}" Header="Comment" />
 			</DataGrid.Columns>
 		</DataGrid>
+		<Rectangle Fill="{Binding $parent[Window].Background}" Opacity="0.5" Grid.Row="0" Grid.RowSpan="2"
+					IsVisible="{Binding CreatingBreakpoint}"/>
+		<dialogHost:DialogHost
+			Grid.Row="0" Grid.RowSpan="2"
+			Background="{Binding $parent[Window].Background}"
+			CloseOnClickAway="False"
+			IsOpen="{Binding CreatingBreakpoint}">
+			<dialogHost:DialogHost.DialogContent>
+				<Grid RowDefinitions="*,Auto" MinWidth="320" MinHeight="200">
+					<TabControl Grid.Row="0">
+						<TabItem Header="Cycles"
+							IsSelected="{Binding IsCyclesBreakpointSelected}">
+							<NumericUpDown Text="{Binding CyclesValue}" Margin="5,0,0,0" />
+						</TabItem>
+						<TabItem Header="Memory"
+							IsSelected="{Binding IsMemoryBreakpointSelected}">
+							<Grid ColumnDefinitions="Auto,*">
+								<controls:GroupBox Grid.Column="0" Header="Memory access type">
+									<ComboBox SelectedItem="{Binding SelectedMemoryBreakpointType}"
+										ItemsSource="{Binding MemoryBreakpointTypes}" />
+								</controls:GroupBox>
+								<NumericUpDown Grid.Column="1" Text="{Binding MemoryAddressValue}" Margin="5,0,0,0" />
+							</Grid>
+						</TabItem>
+						<TabItem Header="Execution"
+							IsSelected="{Binding IsExecutionBreakpointSelected}">
+							<NumericUpDown Text="{Binding ExecutionAddressValue}" Margin="5,0,0,0" />
+						</TabItem>
+					</TabControl>
+					<StackPanel
+						Grid.Row="1"
+						HorizontalAlignment="Right"
+						Orientation="Horizontal">
+						<Button Margin="5"
+							Command="{Binding ConfirmBreakpointCreationCommand}"
+							Content="OK"
+							IsDefault="True" />
+						<Button Margin="5"
+							Command="{Binding CancelBreakpointCreationCommand}"
+							Content="Cancel"
+							IsCancel="True" />
+					</StackPanel>
+				</Grid>
+			</dialogHost:DialogHost.DialogContent>
+		</dialogHost:DialogHost>
 	</Grid>
 </UserControl>

From 7eafe82da8b05395f9bd2a00735b66b6139c606c Mon Sep 17 00:00:00 2001
From: Maximilien Noal <noal.maximilien@gmail.com>
Date: Sun, 9 Feb 2025 22:59:55 +0100
Subject: [PATCH 07/12] feature: debugger address userControl

It can recognize a linear address,
a linear address from a hexadecimal number,
a segmented address with integer numbers,
a hexadecimal segmented address,
a segmented address based on CPU registers names

Signed-off-by: Maximilien Noal <noal.maximilien@gmail.com>
---
 .../MemoryWrappers/InstructionsDecoder.cs     |   3 +
 src/Spice86/Spice86.csproj                    |   5 +
 .../UserControls/AddressAutoCompleteBox.axaml |  13 ++
 .../AddressAutoCompleteBox.axaml.cs           | 145 ++++++++++++++++++
 .../ViewModels/DebugWindowViewModel.cs        |  10 +-
 .../ViewModels/DisassemblyViewModel.cs        |  47 ++----
 src/Spice86/ViewModels/MemoryViewModel.cs     |  48 +++---
 .../ViewModels/ViewModelWithErrorDialog.cs    |  30 ----
 src/Spice86/Views/DisassemblyView.axaml       |  21 +--
 src/Spice86/Views/DisassemblyView.axaml.cs    |  18 +--
 src/Spice86/Views/MemoryView.axaml            |  28 ++--
 11 files changed, 233 insertions(+), 135 deletions(-)
 create mode 100644 src/Spice86/UserControls/AddressAutoCompleteBox.axaml
 create mode 100644 src/Spice86/UserControls/AddressAutoCompleteBox.axaml.cs

diff --git a/src/Spice86/MemoryWrappers/InstructionsDecoder.cs b/src/Spice86/MemoryWrappers/InstructionsDecoder.cs
index fb7b99ae6..46fa63f62 100644
--- a/src/Spice86/MemoryWrappers/InstructionsDecoder.cs
+++ b/src/Spice86/MemoryWrappers/InstructionsDecoder.cs
@@ -35,6 +35,9 @@ public List<CpuInstructionInfo> DecodeInstructions(uint startAddress,
         var instructions = new List<CpuInstructionInfo>();
         while (instructions.Count < numberOfInstructionsShown) {
             long instructionAddress = codeMemoryStream.Position;
+            if(instructionAddress >= emulatedMemoryStream.Length) {
+                break;
+            }
             decoder.Decode(out Instruction instruction);
             CpuInstructionInfo instructionInfo = new() {
                 Instruction = instruction,
diff --git a/src/Spice86/Spice86.csproj b/src/Spice86/Spice86.csproj
index b2f2c42d2..9bdc94534 100644
--- a/src/Spice86/Spice86.csproj
+++ b/src/Spice86/Spice86.csproj
@@ -51,4 +51,9 @@
     <ProjectReference Include="..\Spice86.Logging\Spice86.Logging.csproj" />
     <ProjectReference Include="..\Spice86.Shared\Spice86.Shared.csproj" />
   </ItemGroup>
+  <ItemGroup>
+    <Compile Update="UserControls\AddressAutoCompleteBox.axaml.cs">
+      <DependentUpon>AddressAutoCompleteBox.axaml</DependentUpon>
+    </Compile>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Spice86/UserControls/AddressAutoCompleteBox.axaml b/src/Spice86/UserControls/AddressAutoCompleteBox.axaml
new file mode 100644
index 000000000..c6c9d1441
--- /dev/null
+++ b/src/Spice86/UserControls/AddressAutoCompleteBox.axaml
@@ -0,0 +1,13 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:uc="using:Spice86.UserControls"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="Spice86.UserControls.AddressAutoCompleteBox"
+             x:DataType="uc:AddressAutoCompleteBox">
+    <AutoCompleteBox FontFamily="RobotoMonoFont"
+		Watermark="linear or hex or segmented address"
+        x:Name="AddressTextCompleteBox"
+        ItemsSource="{Binding AddressesSuggestions}" />
+</UserControl>  
diff --git a/src/Spice86/UserControls/AddressAutoCompleteBox.axaml.cs b/src/Spice86/UserControls/AddressAutoCompleteBox.axaml.cs
new file mode 100644
index 000000000..092e277ab
--- /dev/null
+++ b/src/Spice86/UserControls/AddressAutoCompleteBox.axaml.cs
@@ -0,0 +1,145 @@
+using Avalonia;
+using Avalonia.Collections;
+using Avalonia.Controls;
+using Avalonia.Input;
+
+using Spice86.Core.Emulator.CPU;
+using Spice86.Core.Emulator.Memory;
+using Spice86.Shared.Utils;
+
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+
+namespace Spice86.UserControls;
+
+public partial class AddressAutoCompleteBox : UserControl {
+    public AddressAutoCompleteBox() {
+        InitializeComponent();
+        AddressesSuggestions = new();
+        this.AddressTextCompleteBox.KeyUp += OnKeyUp;
+    }
+
+    private void OnKeyUp(object? sender, KeyEventArgs e) {
+        if(e.Key == Key.Enter) {
+            OnTextChanged(AddressTextCompleteBox.Text);
+        }
+    }
+
+    private bool TryParseMemoryAddress(string? addressExpression,
+        [NotNullWhen(true)] out uint? address) {
+        if (string.IsNullOrWhiteSpace(addressExpression)) {
+            address = null;
+            return false;
+        }
+
+        try {
+            if (addressExpression.Contains(':')) {
+                string[] split = addressExpression.Split(":");
+                string firstPart = split[0];
+                string secondPart = split[1];
+
+                if(State is not null) {
+                    firstPart = ReplaceRegisterNameWithValue(firstPart, State);
+                    secondPart = ReplaceRegisterNameWithValue(secondPart, State);
+                }
+
+                if (split.Length > 1 &&
+                    ushort.TryParse(firstPart, NumberStyles.HexNumber,
+                    CultureInfo.InvariantCulture, out ushort hexSegment) &&
+                    ushort.TryParse(secondPart, NumberStyles.HexNumber,
+                    CultureInfo.InvariantCulture, out ushort hexOffset)) {
+                    address = Math.Min(A20Gate.EndOfHighMemoryArea, MemoryUtils.
+                        ToPhysicalAddress(hexSegment, hexOffset));
+                    return true;
+                }
+
+                if (split.Length > 1 &&
+                    ushort.TryParse(firstPart, NumberStyles.Integer,
+                    CultureInfo.InvariantCulture, out ushort segment) &&
+                    ushort.TryParse(secondPart, NumberStyles.Integer,
+                    CultureInfo.InvariantCulture, out ushort offset)) {
+                    address = Math.Min(A20Gate.EndOfHighMemoryArea, MemoryUtils.
+                        ToPhysicalAddress(segment, offset));
+                    return true;
+                }
+            } else if (ulong.TryParse(addressExpression,
+                      CultureInfo.InvariantCulture, out ulong value)) {
+                address = (uint)value;
+                return true;
+            } else if (ulong.TryParse(addressExpression.AsSpan(
+                  addressExpression.StartsWith("0x") ? 2 : 0),
+                  NumberStyles.HexNumber, CultureInfo.InvariantCulture,
+                      out ulong hexValue)) {
+                address = (uint)hexValue;
+                return true;
+            }
+        } catch { }
+        address = null;
+        return false;
+    }
+
+    private string ReplaceRegisterNameWithValue(string part, State state) {
+        return part.ToUpperInvariant() switch {
+            "CS" => state.CS.ToString("X4"),
+            "IP" => state.IP.ToString("X4"),
+            "DS" => state.DS.ToString("X4"),
+            "ES" => state.ES.ToString("X4"),
+            "FS" => state.FS.ToString("X4"),
+            "GS" => state.GS.ToString("X4"),
+            "SS" => state.SS.ToString("X4"),
+            _ => part
+        };
+    }
+
+    public static StyledProperty<State?> StateProperty =
+        AvaloniaProperty.Register<AddressAutoCompleteBox, State?>(nameof(State));
+
+    public State? State {
+        get => GetValue(StateProperty);
+        set => SetValue(StateProperty, value);
+    }
+
+    public static readonly StyledProperty<AvaloniaList<string>> AddressesSuggestionsProperty =
+        AvaloniaProperty.Register<AddressAutoCompleteBox, AvaloniaList<string>>(nameof(AddressesSuggestions));
+
+    public AvaloniaList<string> AddressesSuggestions {
+        get => GetValue(AddressesSuggestionsProperty);
+        set => SetValue(AddressesSuggestionsProperty, value);
+    }
+
+    public static readonly StyledProperty<uint?> ParsedAddressProperty =
+        AvaloniaProperty.Register<AddressAutoCompleteBox, uint?>(nameof(ParsedAddressProperty),
+            coerce: CoerceParseAddress);
+
+    private static uint? CoerceParseAddress(AvaloniaObject @object, uint? nullable) {
+        if(@object is AddressAutoCompleteBox instance) {
+            if (nullable.HasValue) {
+                instance.AddressTextCompleteBox.Text = nullable.Value.ToString(
+                    CultureInfo.InvariantCulture);
+            } else {
+                instance.AddressTextCompleteBox.Text = null;
+            }
+        }
+        return nullable;
+    }
+
+    public uint? ParsedAddress {
+        get => GetValue(ParsedAddressProperty);
+        set => SetValue(ParsedAddressProperty, value);
+    }
+
+    private void OnTextChanged(string? address) {
+        if (string.IsNullOrWhiteSpace(address)) {
+            return;
+        }
+        if (TryParseMemoryAddress(address, out var parsedAddress)) {
+            ParsedAddress = parsedAddress;
+            if (!AddressesSuggestions.Contains(address)) {
+                AddressesSuggestions.Add(address);
+            }
+            this.AddressTextCompleteBox.SelectedItem = address;
+        } else {
+            ParsedAddress = null;
+        }
+    }
+}
diff --git a/src/Spice86/ViewModels/DebugWindowViewModel.cs b/src/Spice86/ViewModels/DebugWindowViewModel.cs
index 2391fed76..48ca85098 100644
--- a/src/Spice86/ViewModels/DebugWindowViewModel.cs
+++ b/src/Spice86/ViewModels/DebugWindowViewModel.cs
@@ -63,7 +63,7 @@ public partial class DebugWindowViewModel : ViewModelBase,
 
     private readonly IPauseHandler _pauseHandler;
 
-    public DebugWindowViewModel(State cpuState, Stack stack, IMemory memory, Midi externalMidiDevice,
+    public DebugWindowViewModel(State state, 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,
@@ -83,7 +83,7 @@ public DebugWindowViewModel(State cpuState, Stack stack, IMemory memory, Midi ex
         pauseHandler.Resumed += () => uiDispatcher.Post(() => IsPaused = false);
         DisassemblyViewModel disassemblyVm = new(
             emulatorBreakpointsManager,
-            memory, cpuState, 
+            memory, state, 
             functionsInformation.ToDictionary(x =>
                 x.Key.ToPhysical(), x => x.Value),
             BreakpointsViewModel, pauseHandler,
@@ -92,12 +92,12 @@ public DebugWindowViewModel(State cpuState, Stack stack, IMemory memory, Midi ex
         PaletteViewModel = new(argbPalette, uiDispatcher);
         SoftwareMixerViewModel = new(softwareMixer);
         VideoCardViewModel = new(vgaRenderer, videoState);
-        CpuViewModel = new(cpuState, memory, pauseHandler, uiDispatcher);
+        CpuViewModel = new(state, memory, pauseHandler, uiDispatcher);
         MidiViewModel = new(externalMidiDevice);
-        MemoryViewModel mainMemoryViewModel = new(memory,
+        MemoryViewModel mainMemoryViewModel = new(memory, state,
             BreakpointsViewModel, pauseHandler, messenger,
             uiDispatcher, textClipboard, storageProvider, structureViewModelFactory);
-        MemoryViewModel stackMemoryViewModel = new(memory,
+        MemoryViewModel stackMemoryViewModel = new(memory, state,
             BreakpointsViewModel, pauseHandler, messenger,
             uiDispatcher, textClipboard, storageProvider, structureViewModelFactory,
             canCloseTab: false, startAddress: stack.PhysicalAddress) {
diff --git a/src/Spice86/ViewModels/DisassemblyViewModel.cs b/src/Spice86/ViewModels/DisassemblyViewModel.cs
index ac18fe1b5..cced5804b 100644
--- a/src/Spice86/ViewModels/DisassemblyViewModel.cs
+++ b/src/Spice86/ViewModels/DisassemblyViewModel.cs
@@ -15,11 +15,8 @@ namespace Spice86.ViewModels;
 using Spice86.MemoryWrappers;
 using Spice86.Messages;
 using Spice86.Models.Debugging;
-using Spice86.Shared.Emulator.Memory;
 using Spice86.Shared.Utils;
 
-using System.Globalization;
-
 public partial class DisassemblyViewModel : ViewModelWithErrorDialog {
     private readonly EmulatorBreakpointsManager _emulatorBreakpointsManager;
     private readonly IMemory _memory;
@@ -63,6 +60,8 @@ public DisassemblyViewModel(
         breakpointsViewModel.BreakpointCreated += OnBreakPointUpdateFromBreakpointsViewModel;
     }
 
+    public State State => _state;
+
     private void OnBreakPointUpdateFromBreakpointsViewModel(BreakpointViewModel breakpointViewModel) {
         UpdateAssemblyLineIfShown(breakpointViewModel.Address, breakpointViewModel);
     }
@@ -114,12 +113,12 @@ private void OnPausing() {
     private bool _creatingExecutionBreakpoint;
 
     [ObservableProperty]
-    private string? _breakpointAddress;
+    private ulong? _breakpointAddress;
 
     [RelayCommand]
     private void BeginCreateExecutionBreakpoint() {
         CreatingExecutionBreakpoint = true;
-        BreakpointAddress = MemoryUtils.ToPhysicalAddress(_state.CS, _state.IP).ToString(CultureInfo.InvariantCulture);
+        BreakpointAddress = MemoryUtils.ToPhysicalAddress(_state.CS, _state.IP);
     }
 
     [RelayCommand]
@@ -130,14 +129,13 @@ private void CancelCreateExecutionBreakpoint() {
     [RelayCommand]
     private void ConfirmCreateExecutionBreakpoint() {
         CreatingExecutionBreakpoint = false;
-        if (!string.IsNullOrWhiteSpace(BreakpointAddress) &&
-            TryParseMemoryAddress(BreakpointAddress, out ulong? breakpointAddressValue)) {
+        if (BreakpointAddress != null) {
             BreakpointViewModel breakpointViewModel = _breakpointsViewModel.AddAddressBreakpoint(
-                (uint)breakpointAddressValue.Value,
+                (uint)BreakpointAddress.Value,
                 BreakPointType.CPU_EXECUTION_ADDRESS,
                     isRemovedOnTrigger: false,
-                    () => PauseAndReportAddress((long)breakpointAddressValue.Value));
-            UpdateAssemblyLineIfShown((uint)breakpointAddressValue.Value, breakpointViewModel);
+                    () => PauseAndReportAddress((long)BreakpointAddress.Value));
+            UpdateAssemblyLineIfShown((uint)BreakpointAddress.Value, breakpointViewModel);
         }
     }
 
@@ -152,23 +150,10 @@ private void UpdateAssemblyLineIfShown(uint breakpointAddress, BreakpointViewMod
     [ObservableProperty]
     private int _numberOfInstructionsShown = 50;
 
-    [ObservableProperty]
-    private bool _isUsingLinearAddressing = true;
-
     [ObservableProperty]
     [NotifyCanExecuteChangedFor(nameof(UpdateDisassemblyCommand))]
-    private SegmentedAddress? _segmentedStartAddress;
-
     private uint? _startAddress;
 
-    public uint? StartAddress {
-        get => _startAddress;
-        set {
-            SetProperty(ref _startAddress, value);
-            UpdateDisassemblyCommand.NotifyCanExecuteChanged();
-        }
-    }
-
     [ObservableProperty]
     [NotifyCanExecuteChangedFor(nameof(CloseTabCommand))]
     private bool _canCloseTab;
@@ -243,7 +228,7 @@ private void NewDisassemblyView() {
 
     [RelayCommand(CanExecute = nameof(IsPaused))]
     private async Task GoToCsIp() {
-        SegmentedStartAddress = new(_state.CS, _state.IP);
+        StartAddress = MemoryUtils.ToPhysicalAddress(_state.CS, _state.IP);
         await GoToAddress(_state.IpPhysicalAddress);
     }
 
@@ -260,18 +245,8 @@ private async Task GoToAddress(uint address) {
         SelectedInstruction = Instructions.FirstOrDefault();
     }
 
-    private uint? GetStartAddress() {
-        return IsUsingLinearAddressing switch {
-            true => StartAddress,
-            false => SegmentedStartAddress is null
-                ? null
-                : MemoryUtils.ToPhysicalAddress(SegmentedStartAddress.Value.Segment,
-                    SegmentedStartAddress.Value.Offset),
-        };
-    }
-
     private bool CanExecuteUpdateDisassembly() {
-        return IsPaused && GetStartAddress() is not null;
+        return IsPaused && StartAddress is not null;
     }
 
     [ObservableProperty]
@@ -279,7 +254,7 @@ private bool CanExecuteUpdateDisassembly() {
 
     [RelayCommand(CanExecute = nameof(CanExecuteUpdateDisassembly))]
     private async Task UpdateDisassembly() {
-        uint? startAddress = GetStartAddress();
+        uint? startAddress = StartAddress;
         if (startAddress is null) {
             return;
         }
diff --git a/src/Spice86/ViewModels/MemoryViewModel.cs b/src/Spice86/ViewModels/MemoryViewModel.cs
index c371d60e5..39ec0ea26 100644
--- a/src/Spice86/ViewModels/MemoryViewModel.cs
+++ b/src/Spice86/ViewModels/MemoryViewModel.cs
@@ -9,6 +9,7 @@
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
 
+using Spice86.Core.Emulator.CPU;
 using Spice86.Core.Emulator.Memory;
 using Spice86.Core.Emulator.VM;
 using Spice86.Core.Emulator.VM.Breakpoint;
@@ -27,11 +28,13 @@ public partial class MemoryViewModel : ViewModelWithErrorDialog {
     private readonly IMessenger _messenger;
     private readonly IPauseHandler _pauseHandler;
     private readonly BreakpointsViewModel _breakpointsViewModel;
+    private readonly State _state;
 
-    public MemoryViewModel(IMemory memory, BreakpointsViewModel breakpointsViewModel, IPauseHandler pauseHandler, IMessenger messenger, IUIDispatcher uiDispatcher,
+    public MemoryViewModel(IMemory memory, State state, BreakpointsViewModel breakpointsViewModel, IPauseHandler pauseHandler, IMessenger messenger, IUIDispatcher uiDispatcher,
         ITextClipboard textClipboard, IHostStorageProvider storageProvider, IStructureViewModelFactory structureViewModelFactory,
         bool canCloseTab = false, uint startAddress = 0, uint endAddress = A20Gate.EndOfHighMemoryArea) : base(uiDispatcher, textClipboard) {
         _pauseHandler = pauseHandler;
+        _state = state;
         _breakpointsViewModel = breakpointsViewModel;
         _memory = memory;
         _pauseHandler.Pausing += OnPause;
@@ -49,6 +52,7 @@ public MemoryViewModel(IMemory memory, BreakpointsViewModel breakpointsViewModel
         IsMemoryRangeValid = GetIsMemoryRangeValid();
         TryUpdateHeaderAndMemoryDocument();
     }
+    public State State => _state;
 
     [ObservableProperty]
     private string? _title;
@@ -136,20 +140,20 @@ private void BeginCreateMemoryBreakpoint() {
         if (StartAddress is not null && SelectionRange is not null) {
             ulong rangeStart = StartAddress.Value + SelectionRange.Value.Start.ByteIndex;
             ulong rangEnd = StartAddress.Value + SelectionRange.Value.End.ByteIndex;
-            BreakpointRangeStartAddress = rangeStart.ToString(CultureInfo.InvariantCulture);
+            BreakpointRangeStartAddress = rangeStart;
             if (rangeStart != rangEnd) {
-                BreakpointRangeEndAddress = rangEnd.ToString(CultureInfo.InvariantCulture);
+                BreakpointRangeEndAddress = rangEnd;
             }
         }
     }
 
     [ObservableProperty]
     [NotifyCanExecuteChangedFor(nameof(ConfirmCreateMemoryBreakpointCommand))]
-    private string? _breakpointRangeEndAddress;
+    private ulong? _breakpointRangeEndAddress;
 
     [ObservableProperty]
     [NotifyCanExecuteChangedFor(nameof(ConfirmCreateMemoryBreakpointCommand))]
-    private string? _breakpointRangeStartAddress;
+    private ulong? _breakpointRangeStartAddress;
 
     [ObservableProperty]
     private BreakPointType _selectedBreakpointType = BreakPointType.MEMORY_ACCESS;
@@ -165,24 +169,17 @@ private void OnBreakPointReached() {
         });
     }
 
-    private bool IsBreakpointRangeValid() {
-        bool isValid = TryParseMemoryAddress(BreakpointRangeStartAddress, out _);
-        if(!string.IsNullOrWhiteSpace(BreakpointRangeEndAddress)) {
-            isValid = TryParseMemoryAddress(BreakpointRangeStartAddress, out _);
-        }
-        return isValid;
-    }
 
-    [RelayCommand(CanExecute = nameof(IsBreakpointRangeValid))]
+    [RelayCommand]
     private void ConfirmCreateMemoryBreakpoint() {
-        if (TryParseMemoryAddress(BreakpointRangeStartAddress, out ulong? breakpointStartAddressValue)
-            && TryParseMemoryAddress(BreakpointRangeEndAddress, out ulong? endAddressValue)) {
-            for (ulong i = breakpointStartAddressValue.Value; i <= endAddressValue.Value; i++) {
+        if (BreakpointRangeStartAddress != null
+            && BreakpointRangeEndAddress != null) {
+            for (ulong i = BreakpointRangeStartAddress.Value; i <= BreakpointRangeEndAddress.Value; i++) {
                 CreateMemoryAddressBreakpoint(i);
             }
         }
-        else if (TryParseMemoryAddress(BreakpointRangeStartAddress, out ulong? breakPointAddress)) {
-            CreateMemoryAddressBreakpoint(breakPointAddress.Value);
+        else if (BreakpointRangeStartAddress != null) {
+            CreateMemoryAddressBreakpoint(BreakpointRangeStartAddress.Value);
         }
         CreatingMemoryBreakpoint = false;
     }
@@ -367,7 +364,7 @@ private void NewMemoryView() {
     }
 
     private void CreateNewMemoryView(uint? startAddress = null) {
-        MemoryViewModel memoryViewModel = new(_memory, _breakpointsViewModel, _pauseHandler, _messenger, _uiDispatcher, _textClipboard,
+        MemoryViewModel memoryViewModel = new(_memory, _state, _breakpointsViewModel, _pauseHandler, _messenger, _uiDispatcher, _textClipboard,
             _storageProvider,
             _structureViewModelFactory, canCloseTab: true);
         if (startAddress is not null) {
@@ -400,7 +397,7 @@ private async Task DumpMemory() {
     private bool _isEditingMemory;
 
     [ObservableProperty]
-    private string? _memoryEditAddress;
+    private ulong? _memoryEditAddress;
 
     [ObservableProperty]
     private string? _memoryEditValue = "";
@@ -409,8 +406,10 @@ private async Task DumpMemory() {
     private void EditMemory() {
         IsEditingMemory = true;
         try {
-        if (MemoryEditAddress is not null && TryParseMemoryAddress(MemoryEditAddress, out ulong? memoryEditAddressValue)) {
-            MemoryEditValue = Convert.ToHexString(_memory.ReadRam((uint)(MemoryEditValue?.Length ?? sizeof(ushort)), (uint)memoryEditAddressValue.Value));
+        if (MemoryEditAddress is not null) {
+            MemoryEditValue = Convert.ToHexString(_memory.ReadRam(
+                (uint)(MemoryEditValue?.Length ?? sizeof(ushort)), 
+                    (uint)MemoryEditAddress.Value));
         }
         } catch (Exception e) {
             ShowError(e);
@@ -422,13 +421,12 @@ private void EditMemory() {
 
     [RelayCommand]
     private void ApplyMemoryEdit() {
-        if (!TryParseMemoryAddress(MemoryEditAddress, out ulong? address) ||
-            MemoryEditValue is null ||
+        if (MemoryEditValue is null ||
             !long.TryParse(MemoryEditValue, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out long value)) {
             return;
         }
         try {
-            DataMemoryDocument?.WriteBytes(address!.Value, BitConverter.GetBytes(value));
+            DataMemoryDocument?.WriteBytes(MemoryEditAddress!.Value, BitConverter.GetBytes(value));
         } catch (IndexOutOfRangeException e) {
             ShowError(e);
             MemoryEditValue = null;
diff --git a/src/Spice86/ViewModels/ViewModelWithErrorDialog.cs b/src/Spice86/ViewModels/ViewModelWithErrorDialog.cs
index b6619539b..e455c0195 100644
--- a/src/Spice86/ViewModels/ViewModelWithErrorDialog.cs
+++ b/src/Spice86/ViewModels/ViewModelWithErrorDialog.cs
@@ -32,36 +32,6 @@ public void ShowInternalDebugger(object? commandParameter) {
         }
     }
 
-
-    protected bool TryParseMemoryAddress(string? memoryAddress, [NotNullWhen(true)] out ulong? address) {
-        if (string.IsNullOrWhiteSpace(memoryAddress)) {
-            address = null;
-            return false;
-        }
-
-        try {
-            if (memoryAddress.Contains(':')) {
-                string[] split = memoryAddress.Split(":");
-                if (split.Length > 1 &&
-                    ushort.TryParse(split[0], NumberStyles.HexNumber, CultureInfo.InvariantCulture, out ushort segment) &&
-                    ushort.TryParse(split[1], NumberStyles.HexNumber, CultureInfo.InvariantCulture, out ushort offset)) {
-                    address = MemoryUtils.ToPhysicalAddress(segment, offset);
-
-                    return true;
-                }
-            } else if (ulong.TryParse(memoryAddress, CultureInfo.InvariantCulture, out ulong value)) {
-                address = value;
-
-                return true;
-            }
-        } catch (Exception e) {
-            _uiDispatcher.Post(() => ShowError(e));
-        }
-        address = null;
-
-        return false;
-    }
-
     protected void ShowError(Exception e) {
         Exception = e.GetBaseException();
         IsDialogVisible = true;
diff --git a/src/Spice86/Views/DisassemblyView.axaml b/src/Spice86/Views/DisassemblyView.axaml
index c94251fcb..b46fdc33e 100644
--- a/src/Spice86/Views/DisassemblyView.axaml
+++ b/src/Spice86/Views/DisassemblyView.axaml
@@ -47,17 +47,11 @@
 			<StackPanel Orientation="Vertical" Grid.Column="3">
 				<Label HorizontalAlignment="Center" Content="Start Address" />
 				<Grid ColumnDefinitions="*,*">
-					<AutoCompleteBox Name="SegmentedStartAddressTextBox"
+					<userControls:AddressAutoCompleteBox Name="StartAddressTextBox"
 						Grid.Column="0"
-						Width="100"
-						Text="{Binding SegmentedStartAddress, Mode=TwoWay, UpdateSourceTrigger=LostFocus,
-						Converter={StaticResource SegmentedAddressConverter}}"
-						Watermark="segment:offset" />
-					<AutoCompleteBox Name="LinearStartAddressTextBox"
-						Grid.Column="1"
-						Width="80"
-						Text="{Binding StartAddress, UpdateSourceTrigger=PropertyChanged}"
-						Watermark="linear address"/>
+						Width="150"
+						State="{Binding State}"
+						ParsedAddress="{Binding StartAddress, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
 				</Grid>
 			</StackPanel>
 			<StackPanel Orientation="Vertical" Grid.Column="4">
@@ -232,11 +226,8 @@
 						<StackPanel
 							Grid.Row="1"
 							Orientation="Vertical">
-							<AutoCompleteBox
-								FontFamily="RobotoMonoFont"
-								Text="{Binding BreakpointAddress}"
-								Watermark="linear or segmented address" />
-							<TextBlock>Linear or segmented address</TextBlock>
+							<userControls:AddressAutoCompleteBox
+								ParsedAddress="{Binding BreakpointAddress}"/>
 						</StackPanel>
 					</Grid>
 					<StackPanel
diff --git a/src/Spice86/Views/DisassemblyView.axaml.cs b/src/Spice86/Views/DisassemblyView.axaml.cs
index 9b6a2e4c9..69efd68d3 100644
--- a/src/Spice86/Views/DisassemblyView.axaml.cs
+++ b/src/Spice86/Views/DisassemblyView.axaml.cs
@@ -9,8 +9,7 @@ public partial class DisassemblyView : UserControl {
     public DisassemblyView() {
         InitializeComponent();
         FunctionComboBox.SelectionChanged += FunctionComboBox_SelectionChanged;
-        SegmentedStartAddressTextBox.KeyUp += SegmentedStartAddressTextBox_KeyUp;
-        LinearStartAddressTextBox.KeyUp += LinearStartAddressTextBox_KeyUp;
+        StartAddressTextBox.KeyUp += StartAddressTextBox_KeyUp;
         DisassemblyDataGrid.KeyUp += DisassemblyDataGrid_KeyUp;
         NumberOfInstructionsShownNumericUpDown.KeyUp += NumberOfInstructionsShownNumericUpDown_KeyUp;
     }
@@ -22,24 +21,17 @@ private void NumberOfInstructionsShownNumericUpDown_KeyUp(object? sender, KeyEve
         }
     }
 
-    private void LinearStartAddressTextBox_KeyUp(object? sender, KeyEventArgs e) {
+    private void StartAddressTextBox_KeyUp(object? sender, KeyEventArgs e) {
         ExecUpdateDisassemblyCommand(e, true);
     }
 
     private void ExecUpdateDisassemblyCommand(KeyEventArgs e, bool isUsingLinearAddressing) {
-        if (DataContext is DisassemblyViewModel viewModel && e.Key == Key.Enter) {
-            viewModel.IsUsingLinearAddressing = isUsingLinearAddressing;
-            if (viewModel.UpdateDisassemblyCommand.CanExecute(null)) {
-                viewModel.UpdateDisassemblyCommand.Execute(null);
-            }
+        if (DataContext is DisassemblyViewModel viewModel && e.Key == Key.Enter &&
+            viewModel.UpdateDisassemblyCommand.CanExecute(null)) {
+            viewModel.UpdateDisassemblyCommand.Execute(null);
         }
     }
 
-    private void SegmentedStartAddressTextBox_KeyUp(object? sender, KeyEventArgs e) {
-        ExecUpdateDisassemblyCommand(e, false);
-
-    }
-
     private void DisassemblyDataGrid_KeyUp(object? sender, KeyEventArgs e) {
         if (DataContext is DisassemblyViewModel viewModel) {
             if(e.Key == Key.C && e.KeyModifiers == KeyModifiers.Control &&
diff --git a/src/Spice86/Views/MemoryView.axaml b/src/Spice86/Views/MemoryView.axaml
index 3f9f8cb79..2c56bdd7f 100644
--- a/src/Spice86/Views/MemoryView.axaml
+++ b/src/Spice86/Views/MemoryView.axaml
@@ -47,12 +47,19 @@
 						Content="Close View"
 						IsEnabled="{Binding CanCloseTab}" />
 				</StackPanel>
-				<UniformGrid>
-					<Label Content="Start" />
-					<NumericUpDown Value="{Binding StartAddress}" />
-					<Label Content="End" />
-					<NumericUpDown Value="{Binding EndAddress}" />
-				</UniformGrid>
+				<Grid RowDefinitions="Auto,Auto" ColumnDefinitions="Auto,Auto">
+					<Label Grid.Row="0" Grid.Column="0" Content="Start" />
+					<userControls:AddressAutoCompleteBox
+						Grid.Row="0" Grid.Column="1"
+						State="{Binding State}"
+						ParsedAddress="{Binding StartAddress}" />
+					<Label Grid.Row="1" Grid.Column="0" Content="End" />
+					<userControls:AddressAutoCompleteBox
+						Grid.Row="1"
+						Grid.Column="1"
+						State="{Binding State}"
+						ParsedAddress="{Binding EndAddress}" />
+				</Grid>
 				<StackPanel Orientation="Vertical">
 					<Button IsVisible="{Binding IsPaused}" IsEnabled="{Binding IsPaused}"
 							Command="{Binding UpdateBinaryDocumentCommand}"
@@ -199,17 +206,16 @@
 								Grid.Row="0"
 								Grid.Column="0"
 								Content="Memory Address:" />
-							<AutoCompleteBox
+							<userControls:AddressAutoCompleteBox
 								Grid.Row="0"
 								Grid.Column="1"
-								FontFamily="RobotoMonoFont"
-								Text="{Binding MemoryEditAddress}"
-								Watermark="linear or segmented address" />
+								State="{Binding State}"
+								ParsedAddress="{Binding MemoryEditAddress}" />
 							<Label
 								Grid.Row="1"
 								Grid.Column="0"
 								Content="Bytes:" />
-							<AutoCompleteBox
+							<TextBox
 								Grid.Row="1"
 								Grid.Column="1"
 								FontFamily="RobotoMonoFont"

From cc17ea10554f936c54e6de66dc8af4812dbecc6f Mon Sep 17 00:00:00 2001
From: Maximilien Noal <noal.maximilien@gmail.com>
Date: Mon, 17 Feb 2025 18:41:17 +0100
Subject: [PATCH 08/12] feature: All breakpoints type creation UI

Signed-off-by: Maximilien Noal <noal.maximilien@gmail.com>
---
 src/Spice86/ViewModels/BreakpointViewModel.cs |  93 ++++---
 .../ViewModels/BreakpointsViewModel.cs        | 230 ++++++++++++++----
 .../ViewModels/DebugWindowViewModel.cs        |   3 +-
 .../ViewModels/DisassemblyViewModel.cs        |   2 +-
 src/Spice86/Views/BreakpointsView.axaml       | 189 ++++++++------
 5 files changed, 351 insertions(+), 166 deletions(-)

diff --git a/src/Spice86/ViewModels/BreakpointViewModel.cs b/src/Spice86/ViewModels/BreakpointViewModel.cs
index 522b21a2b..fa05c249d 100644
--- a/src/Spice86/ViewModels/BreakpointViewModel.cs
+++ b/src/Spice86/ViewModels/BreakpointViewModel.cs
@@ -2,33 +2,38 @@ namespace Spice86.ViewModels;
 
 using CommunityToolkit.Mvvm.ComponentModel;
 
-using Spice86.Core.Emulator.VM;
 using Spice86.Core.Emulator.VM.Breakpoint;
 using Spice86.Models.Debugging;
 
-public partial class BreakpointViewModel : ViewModelBase {
+public partial class BreakpointViewModel : ViewModelBase
+{
     private readonly Action _onReached;
     private readonly EmulatorBreakpointsManager _emulatorBreakpointsManager;
-    private AddressBreakPoint? _breakPoint;
+    private BreakPoint? _breakPoint;
 
     public BreakpointViewModel(
         BreakpointsViewModel breakpointsViewModel,
         EmulatorBreakpointsManager emulatorBreakpointsManager,
-            uint address,
-            BreakPointType type,
-            bool isRemovedOnTrigger,
-            Action onReached,
-            string comment = "") {
+        long addressOrIoPortOrCyclesOrInterruptNumber,
+        BreakPointType type,
+        bool isRemovedOnTrigger,
+        Action onReached,
+        string comment = "")
+    {
         _emulatorBreakpointsManager = emulatorBreakpointsManager;
-        Address = address;
+        Address = addressOrIoPortOrCyclesOrInterruptNumber;
         Type = type;
         IsRemovedOnTrigger = isRemovedOnTrigger;
-        if(IsRemovedOnTrigger) {
-            _onReached = () => {
+        if (IsRemovedOnTrigger)
+        {
+            _onReached = () =>
+            {
                 breakpointsViewModel.RemoveBreakpointInternal(this);
                 onReached();
             };
-        } else {
+        }
+        else
+        {
             _onReached = onReached;
         }
         Comment = comment;
@@ -37,15 +42,19 @@ public BreakpointViewModel(
 
     public BreakPointType Type { get; }
 
-    //Can't get out of sync since GDB can't be used at the same time as the internal debugger
     private bool _isEnabled;
 
-    public bool IsEnabled {
+    public bool IsEnabled
+    {
         get => _isEnabled;
-        set {
-            if (value) {
+        set
+        {
+            if (value)
+            {
                 Enable();
-            } else {
+            }
+            else
+            {
                 Disable();
             }
             SetProperty(ref _isEnabled, value);
@@ -54,12 +63,16 @@ public bool IsEnabled {
 
     public bool IsRemovedOnTrigger { get; }
 
-    public uint Address { get; }
+    public long Address { get; }
 
-    public void Toggle() {
-        if (IsEnabled) {
+    public void Toggle()
+    {
+        if (IsEnabled)
+        {
             Disable();
-        } else {
+        }
+        else
+        {
             Enable();
         }
     }
@@ -67,35 +80,43 @@ public void Toggle() {
     [ObservableProperty]
     private string? _comment;
 
-    private AddressBreakPoint GetOrCreateBreakpoint() {
-        _breakPoint ??=
-        new AddressBreakPoint(
-            Type,
-            Address,
-            (_) => _onReached(),
+    private BreakPoint GetOrCreateBreakpoint() {
+        _breakPoint ??= new AddressBreakPoint(Type,
+            Address, (_) => _onReached(),
             IsRemovedOnTrigger);
         return _breakPoint;
     }
 
-    public void Enable() {
-        if (IsEnabled) {
+    public void Enable()
+    {
+        if (IsEnabled)
+        {
             return;
         }
-        _emulatorBreakpointsManager.ToggleBreakPoint(GetOrCreateBreakpoint(), on: true);
+        _emulatorBreakpointsManager.ToggleBreakPoint(GetOrCreateBreakpoint(),
+            on: true);
         _isEnabled = true;
         OnPropertyChanged(nameof(IsEnabled));
     }
 
-    public void Disable() {
-        if (!IsEnabled) {
+    public void Disable()
+    {
+        if (!IsEnabled)
+        {
             return;
         }
-        _emulatorBreakpointsManager.ToggleBreakPoint(GetOrCreateBreakpoint(), on: false);
+        _emulatorBreakpointsManager.ToggleBreakPoint(GetOrCreateBreakpoint(),
+            on: false);
         _isEnabled = false;
         OnPropertyChanged(nameof(IsEnabled));
     }
 
-    internal bool IsFor(CpuInstructionInfo instructionInfo) {
-        return Address == instructionInfo.Address;
+    internal bool IsFor(CpuInstructionInfo instructionInfo)
+    {
+        return Address == instructionInfo.Address &&
+            (Type == BreakPointType.CPU_EXECUTION_ADDRESS ||
+            Type == BreakPointType.MEMORY_READ ||
+            Type == BreakPointType.MEMORY_WRITE ||
+            Type == BreakPointType.MEMORY_ACCESS);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Spice86/ViewModels/BreakpointsViewModel.cs b/src/Spice86/ViewModels/BreakpointsViewModel.cs
index 761cbd8f3..5089eb5b2 100644
--- a/src/Spice86/ViewModels/BreakpointsViewModel.cs
+++ b/src/Spice86/ViewModels/BreakpointsViewModel.cs
@@ -1,9 +1,12 @@
 namespace Spice86.ViewModels;
 
+using Avalonia.Collections;
+
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
 
+using Spice86.Core.Emulator.CPU;
 using Spice86.Core.Emulator.VM;
 using Spice86.Core.Emulator.VM.Breakpoint;
 using Spice86.Infrastructure;
@@ -12,103 +15,223 @@ namespace Spice86.ViewModels;
 
 using System.Collections.ObjectModel;
 
-public partial class BreakpointsViewModel : ViewModelWithErrorDialog {
+public partial class TabItemViewModel : ViewModelBase {
+    [ObservableProperty]
+    private string? _header;
+    
+    [ObservableProperty]
+    private bool _isSelected;
+}
+
+public partial class BreakpointsViewModel : ViewModelWithErrorDialog
+{
     private readonly EmulatorBreakpointsManager _emulatorBreakpointsManager;
     private readonly IMessenger _messenger;
     private readonly IPauseHandler _pauseHandler;
+    private readonly State _state;
 
-    public BreakpointsViewModel(IPauseHandler pauseHandler,
+    public BreakpointsViewModel(State state,
+        IPauseHandler pauseHandler,
         IMessenger messenger,
         EmulatorBreakpointsManager emulatorBreakpointsManager,
         IUIDispatcher uiDispatcher,
-        ITextClipboard textClipboard) : base(uiDispatcher, textClipboard) {
+        ITextClipboard textClipboard) : base(uiDispatcher, textClipboard)
+    {
         _emulatorBreakpointsManager = emulatorBreakpointsManager;
         _pauseHandler = pauseHandler;
         _messenger = messenger;
+        _state = state;
+        SelectedBreakpointTypeTab = BreakpointTabs[0];
     }
 
-    [ObservableProperty]
-    private bool _isExecutionBreakpointSelected;
+    public AvaloniaList<TabItemViewModel> BreakpointTabs { get; } = new AvaloniaList<TabItemViewModel>
+    {
+        new TabItemViewModel { Header = "Cycles", IsSelected = false },
+        new TabItemViewModel { Header = "Memory", IsSelected = false },
+        new TabItemViewModel { Header = "Execution", IsSelected = false },
+        new TabItemViewModel { Header = "Interrupt", IsSelected = false },
+        new TabItemViewModel { Header = "I/O Port", IsSelected = false }
+    };
+
+    private TabItemViewModel _selectedBreakpointTypeTab;
+
+    public TabItemViewModel? SelectedBreakpointTypeTab {
+        get => _selectedBreakpointTypeTab;
+        set {
+            if(value is not null) {
+                foreach (TabItemViewModel tab in BreakpointTabs) {
+                    tab.IsSelected = tab == value;
+                    SetProperty(ref _selectedBreakpointTypeTab, value);
+                }
+            }
+        }
+    }
 
-    [ObservableProperty]
-    private bool _isMemoryBreakpointSelected;
+    public State State => _state;
 
-    [ObservableProperty]
-    private bool _isCyclesBreakpointSelected;
+    public bool IsExecutionBreakpointSelected => BreakpointTabs[2].IsSelected;
+
+    public bool IsMemoryBreakpointSelected => BreakpointTabs[1].IsSelected;
+
+    public bool IsCyclesBreakpointSelected => BreakpointTabs[0].IsSelected;
+
+    public bool IsInterruptBreakpointSelected => BreakpointTabs[3].IsSelected;
+
+    public bool IsIoPortBreakpointSelected => BreakpointTabs[4].IsSelected;
 
     [ObservableProperty]
     private bool _creatingBreakpoint;
 
     [RelayCommand]
-    private void BeginCreateBreakpoint() {
+    private void BeginCreateBreakpoint()
+    {
         CreatingBreakpoint = true;
     }
 
     [ObservableProperty]
-    private ulong? _cyclesValue;
+    private long? _cyclesValue;
+
+    [ObservableProperty]
+    private long? _executionAddressValue;
+
+    [ObservableProperty]
+    private long? _memoryAddressValue;
 
     [ObservableProperty]
-    private uint? _executionAddressValue;
+    private long? _ioPortNumber;
 
     [ObservableProperty]
-    private uint? _memoryAddressValue;
+    private long? _interruptNumber;
 
     [ObservableProperty]
     private BreakPointType _selectedMemoryBreakpointType = BreakPointType.MEMORY_ACCESS;
 
-    public BreakPointType[] MemoryBreakpointTypes => [
-        BreakPointType.MEMORY_ACCESS, BreakPointType.MEMORY_WRITE, BreakPointType.MEMORY_READ];
+    public BreakPointType[] MemoryBreakpointTypes => new[] {
+        BreakPointType.MEMORY_ACCESS, BreakPointType.MEMORY_WRITE, BreakPointType.MEMORY_READ
+    };
 
     [RelayCommand]
-    private void ConfirmBreakpointCreation() {
-        if (IsExecutionBreakpointSelected) {
-            if (ExecutionAddressValue is null) {
+    private void ConfirmBreakpointCreation()
+    {
+        if (IsExecutionBreakpointSelected)
+        {
+            if (ExecutionAddressValue is null)
+            {
                 return;
             }
-            uint executionValue = ExecutionAddressValue.Value;
             BreakpointViewModel executionVm = AddAddressBreakpoint(
-                executionValue,
+                ExecutionAddressValue.Value,
                 BreakPointType.CPU_EXECUTION_ADDRESS,
                 false,
-                () => {
-                    PauseAndReportAddress(executionValue);
+                () =>
+                {
+                    PauseAndReportAddress(ExecutionAddressValue.Value);
                 }, "Execution breakpoint");
             BreakpointCreated?.Invoke(executionVm);
-        } else if (IsMemoryBreakpointSelected) {
-            if (MemoryAddressValue is null) {
+        }
+        else if (IsMemoryBreakpointSelected)
+        {
+            if (MemoryAddressValue is null)
+            {
                 return;
             }
-            uint memValue = MemoryAddressValue.Value;
             BreakpointViewModel memoryVm = AddAddressBreakpoint(
-                memValue,
+                MemoryAddressValue.Value,
                 SelectedMemoryBreakpointType,
                 false,
-                () => {
-                    PauseAndReportAddress(memValue);
+                () =>
+                {
+                    PauseAndReportAddress(MemoryAddressValue.Value);
                 }, "Memory breakpoint");
             BreakpointCreated?.Invoke(memoryVm);
-        } else if (IsCyclesBreakpointSelected) {
-            if (CyclesValue is null) {
+        }
+        else if (IsCyclesBreakpointSelected)
+        {
+            if (CyclesValue is null)
+            {
                 return;
             }
+            long cyclesValue = CyclesValue.Value;
+            BreakpointViewModel cyclesVm = AddAddressBreakpoint(
+                cyclesValue,
+                BreakPointType.CPU_CYCLES,
+                false,
+                () =>
+                {
+                    PauseAndReportCycles(CyclesValue.Value);
+                }, "Cycles breakpoint");
+            BreakpointCreated?.Invoke(cyclesVm);
+        }
+        else if (IsInterruptBreakpointSelected)
+        {
+            if (InterruptNumber is null) {
+                return;
+            }
+            BreakpointViewModel interruptVm = AddAddressBreakpoint(
+                InterruptNumber.Value,
+                BreakPointType.CPU_INTERRUPT,
+                false,
+                () =>
+                {
+                    PauseAndReportInterrupt(InterruptNumber.Value);
+                }, "Interrupt breakpoint");
+            BreakpointCreated?.Invoke(interruptVm);
+        }
+        else if (IsIoPortBreakpointSelected)
+        {
+            if (IoPortNumber is null)
+            {
+                return;
+            }
+            BreakpointViewModel ioPortVm = AddAddressBreakpoint(
+                IoPortNumber.Value,
+                BreakPointType.IO_ACCESS,
+                false,
+                () =>
+                {
+                    PauseAndReportIoPort(IoPortNumber.Value);
+                }, "I/O Port breakpoint");
+            BreakpointCreated?.Invoke(ioPortVm);
         }
         CreatingBreakpoint = false;
     }
 
-    private void PauseAndReportAddress(long address) {
+    private void PauseAndReportAddress(long address)
+    {
         string message = $"Execution breakpoint was reached at address {address}.";
         Pause(message);
     }
 
-    private void Pause(string message) {
+    private void PauseAndReportCycles(long cycles)
+    {
+        string message = $"Cycles breakpoint was reached at {cycles} cycles.";
+        Pause(message);
+    }
+
+    private void PauseAndReportInterrupt(long interruptNumber)
+    {
+        string message = $"Interrupt breakpoint was reached at interrupt {interruptNumber}.";
+        Pause(message);
+    }
+
+    private void PauseAndReportIoPort(long ioPortAddress)
+    {
+        string message = $"I/O Port breakpoint was reached at address {ioPortAddress}.";
+        Pause(message);
+    }
+
+    private void Pause(string message)
+    {
         _pauseHandler.RequestPause(message);
-        _uiDispatcher.Post(() => {
+        _uiDispatcher.Post(() =>
+        {
             _messenger.Send(new StatusMessage(DateTime.Now, this, message));
         });
     }
 
     [RelayCommand]
-    private void CancelBreakpointCreation() {
+    private void CancelBreakpointCreation()
+    {
         CreatingBreakpoint = false;
     }
 
@@ -121,12 +244,17 @@ private void CancelBreakpointCreation() {
     private ObservableCollection<BreakpointViewModel> _breakpoints = new();
 
     [RelayCommand(CanExecute = nameof(ToggleSelectedBreakpointCanExecute))]
-    private void ToggleSelectedBreakpoint() {
-        if (SelectedBreakpoint is not null) {
+    private void ToggleSelectedBreakpoint()
+    {
+        if (SelectedBreakpoint is not null)
+        {
             SelectedBreakpoint.Toggle();
-            if (SelectedBreakpoint.IsEnabled) {
+            if (SelectedBreakpoint.IsEnabled)
+            {
                 BreakpointEnabled?.Invoke(SelectedBreakpoint);
-            } else {
+            }
+            else
+            {
                 BreakpointDisabled?.Invoke(SelectedBreakpoint);
             }
         }
@@ -139,7 +267,8 @@ private void ToggleSelectedBreakpoint() {
     [NotifyCanExecuteChangedFor(nameof(ToggleSelectedBreakpointCommand))]
     private BreakpointViewModel? _selectedBreakpoint;
 
-    public void AddUnconditionalBreakpoint(Action onReached, bool removedOnTrigger) {
+    public void AddUnconditionalBreakpoint(Action onReached, bool removedOnTrigger)
+    {
         _emulatorBreakpointsManager.ToggleBreakPoint(
             new UnconditionalBreakPoint(
                 BreakPointType.CPU_EXECUTION_ADDRESS,
@@ -148,11 +277,12 @@ public void AddUnconditionalBreakpoint(Action onReached, bool removedOnTrigger)
     }
 
     public BreakpointViewModel AddAddressBreakpoint(
-            uint address,
+            long address,
             BreakPointType type,
             bool isRemovedOnTrigger,
             Action onReached,
-            string comment = "") {
+            string comment = "")
+    {
         var breakpointViewModel = new BreakpointViewModel(
             this,
             _emulatorBreakpointsManager,
@@ -162,28 +292,32 @@ public BreakpointViewModel AddAddressBreakpoint(
         return breakpointViewModel;
     }
 
-    public BreakpointViewModel? GetBreakpoint(CpuInstructionInfo instructionInfo) {
+    public BreakpointViewModel? GetBreakpoint(CpuInstructionInfo instructionInfo)
+    {
         return Breakpoints.FirstOrDefault(x => x.IsFor(instructionInfo));
     }
 
     private bool RemoveBreakpointCanExecute() => SelectedBreakpoint is not null;
 
-
     [RelayCommand(CanExecute = nameof(RemoveBreakpointCanExecute))]
-    private void RemoveBreakpoint() {
+    private void RemoveBreakpoint()
+    {
         DeleteBreakpoint(SelectedBreakpoint);
     }
 
-    public void RemoveBreakpointInternal(BreakpointViewModel vm) {
+    public void RemoveBreakpointInternal(BreakpointViewModel vm)
+    {
         DeleteBreakpoint(vm);
     }
 
-    private void DeleteBreakpoint(BreakpointViewModel? breakpoint) {
-        if (breakpoint is null) {
+    private void DeleteBreakpoint(BreakpointViewModel? breakpoint)
+    {
+        if (breakpoint is null)
+        {
             return;
         }
         breakpoint.Disable();
         Breakpoints.Remove(breakpoint);
         BreakpointDeleted?.Invoke(breakpoint);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Spice86/ViewModels/DebugWindowViewModel.cs b/src/Spice86/ViewModels/DebugWindowViewModel.cs
index 48ca85098..936823c6b 100644
--- a/src/Spice86/ViewModels/DebugWindowViewModel.cs
+++ b/src/Spice86/ViewModels/DebugWindowViewModel.cs
@@ -75,7 +75,8 @@ public DebugWindowViewModel(State state, Stack stack, IMemory memory, Midi exter
         messenger.Register<RemoveViewModelMessage<MemoryViewModel>>(this);
         _messenger = messenger;
         _uiDispatcher = uiDispatcher;
-        BreakpointsViewModel = new(pauseHandler, messenger, emulatorBreakpointsManager, uiDispatcher, textClipboard);
+        BreakpointsViewModel = new(state, pauseHandler, messenger,
+            emulatorBreakpointsManager, uiDispatcher, textClipboard);
         StatusMessageViewModel = new(_uiDispatcher, _messenger);
         _pauseHandler = pauseHandler;
         IsPaused = pauseHandler.IsPaused;
diff --git a/src/Spice86/ViewModels/DisassemblyViewModel.cs b/src/Spice86/ViewModels/DisassemblyViewModel.cs
index cced5804b..4f93c9207 100644
--- a/src/Spice86/ViewModels/DisassemblyViewModel.cs
+++ b/src/Spice86/ViewModels/DisassemblyViewModel.cs
@@ -63,7 +63,7 @@ public DisassemblyViewModel(
     public State State => _state;
 
     private void OnBreakPointUpdateFromBreakpointsViewModel(BreakpointViewModel breakpointViewModel) {
-        UpdateAssemblyLineIfShown(breakpointViewModel.Address, breakpointViewModel);
+        UpdateAssemblyLineIfShown((uint)breakpointViewModel.Address, breakpointViewModel);
     }
 
     private void OnResumed() {
diff --git a/src/Spice86/Views/BreakpointsView.axaml b/src/Spice86/Views/BreakpointsView.axaml
index 79f192fde..0984dd249 100644
--- a/src/Spice86/Views/BreakpointsView.axaml
+++ b/src/Spice86/Views/BreakpointsView.axaml
@@ -1,84 +1,113 @@
 <UserControl xmlns="https://github.com/avaloniaui"
-			 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-			 xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-			 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-			 xmlns:dialogHost="clr-namespace:DialogHostAvalonia;assembly=DialogHost.Avalonia"
-			 xmlns:viewModels="clr-namespace:Spice86.ViewModels"
-			 xmlns:converters="clr-namespace:Spice86.Converters"
-			 xmlns:controls="clr-namespace:Spice86.Controls;assembly=Spice86"
-			 mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-			 x:Class="Spice86.Views.BreakpointsView"
-			 x:DataType="viewModels:BreakpointsViewModel">
-	<Grid>
-		<Grid.RowDefinitions>
-			<RowDefinition Height="Auto" />
-			<RowDefinition Height="*" />
-		</Grid.RowDefinitions>
-		<StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Center">
-			<Button Content="New..." Command="{Binding BeginCreateBreakpointCommand}" Margin="5"/>
-			<Button Content="Remove" Command="{Binding RemoveBreakpointCommand}" Margin="5"/>
-			<Button HotKey="Ctrl+F9" ToolTip.Tip="Ctrl-F9" Content="Toggle" Command="{Binding ToggleSelectedBreakpointCommand}" Margin="5"/>
-		</StackPanel>
-		<DataGrid Grid.Row="1"
-				x:Name="BreakpointsDataGrid"
-				ItemsSource="{Binding Breakpoints}"
-				SelectedItem="{Binding SelectedBreakpoint, Mode=TwoWay}"
-				AutoGenerateColumns="False"
-				CanUserReorderColumns="True"
-				CanUserResizeColumns="True"
-				CanUserSortColumns="False">
-			<DataGrid.Columns>
-				<DataGridCheckBoxColumn IsReadOnly="False" Binding="{Binding IsEnabled}" Header="Is Enabled ?" />
-				<DataGridCheckBoxColumn IsReadOnly="True" Binding="{Binding IsRemovedOnTrigger}" Header="Is removed on trigger ?" />
-				<DataGridTextColumn IsReadOnly="True" Binding="{Binding Address}" Header="Address" />
-				<DataGridTextColumn IsReadOnly="True" Binding="{Binding Type}" Header="Type" />
-				<DataGridTextColumn IsReadOnly="False" Binding="{Binding Comment}" Header="Comment" />
-			</DataGrid.Columns>
-		</DataGrid>
-		<Rectangle Fill="{Binding $parent[Window].Background}" Opacity="0.5" Grid.Row="0" Grid.RowSpan="2"
-					IsVisible="{Binding CreatingBreakpoint}"/>
-		<dialogHost:DialogHost
-			Grid.Row="0" Grid.RowSpan="2"
-			Background="{Binding $parent[Window].Background}"
-			CloseOnClickAway="False"
-			IsOpen="{Binding CreatingBreakpoint}">
-			<dialogHost:DialogHost.DialogContent>
-				<Grid RowDefinitions="*,Auto" MinWidth="320" MinHeight="200">
-					<TabControl Grid.Row="0">
-						<TabItem Header="Cycles"
-							IsSelected="{Binding IsCyclesBreakpointSelected}">
-							<NumericUpDown Text="{Binding CyclesValue}" Margin="5,0,0,0" />
-						</TabItem>
-						<TabItem Header="Memory"
-							IsSelected="{Binding IsMemoryBreakpointSelected}">
-							<Grid ColumnDefinitions="Auto,*">
-								<controls:GroupBox Grid.Column="0" Header="Memory access type">
-									<ComboBox SelectedItem="{Binding SelectedMemoryBreakpointType}"
-										ItemsSource="{Binding MemoryBreakpointTypes}" />
-								</controls:GroupBox>
-								<NumericUpDown Grid.Column="1" Text="{Binding MemoryAddressValue}" Margin="5,0,0,0" />
-							</Grid>
-						</TabItem>
-						<TabItem Header="Execution"
-							IsSelected="{Binding IsExecutionBreakpointSelected}">
-							<NumericUpDown Text="{Binding ExecutionAddressValue}" Margin="5,0,0,0" />
-						</TabItem>
-					</TabControl>
-					<StackPanel
-						Grid.Row="1"
-						HorizontalAlignment="Right"
-						Orientation="Horizontal">
-						<Button Margin="5"
-							Command="{Binding ConfirmBreakpointCreationCommand}"
-							Content="OK"
-							IsDefault="True" />
-						<Button Margin="5"
-							Command="{Binding CancelBreakpointCreationCommand}"
-							Content="Cancel"
-							IsCancel="True" />
-					</StackPanel>
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:dialogHost="clr-namespace:DialogHostAvalonia;assembly=DialogHost.Avalonia"
+             xmlns:viewModels="clr-namespace:Spice86.ViewModels"
+             xmlns:converters="clr-namespace:Spice86.Converters"
+             xmlns:controls="clr-namespace:Spice86.Controls;assembly=Spice86"
+			 xmlns:userControls="clr-namespace:Spice86.UserControls;assembly=Spice86"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="Spice86.Views.BreakpointsView"
+             x:DataType="viewModels:BreakpointsViewModel">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
+        <StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Center">
+            <Button Content="New..." Command="{Binding BeginCreateBreakpointCommand}" Margin="5"/>
+            <Button Content="Remove" Command="{Binding RemoveBreakpointCommand}" Margin="5"/>
+            <Button HotKey="Ctrl+F9" ToolTip.Tip="Ctrl-F9" Content="Toggle" Command="{Binding ToggleSelectedBreakpointCommand}" Margin="5"/>
+        </StackPanel>
+        <DataGrid Grid.Row="1"
+                  x:Name="BreakpointsDataGrid"
+                  ItemsSource="{Binding Breakpoints}"
+                  SelectedItem="{Binding SelectedBreakpoint, Mode=TwoWay}"
+                  AutoGenerateColumns="False"
+                  CanUserReorderColumns="True"
+                  CanUserResizeColumns="True"
+                  CanUserSortColumns="False">
+            <DataGrid.Columns>
+                <DataGridCheckBoxColumn IsReadOnly="False" Binding="{Binding IsEnabled}" Header="Is Enabled ?" />
+                <DataGridCheckBoxColumn IsReadOnly="True" Binding="{Binding IsRemovedOnTrigger}" Header="Is removed on trigger ?" />
+                <DataGridTextColumn IsReadOnly="True" Binding="{Binding Address}" Header="Address" />
+                <DataGridTextColumn IsReadOnly="True" Binding="{Binding Type}" Header="Type" />
+                <DataGridTextColumn IsReadOnly="False" Binding="{Binding Comment}" Header="Comment" />
+            </DataGrid.Columns>
+        </DataGrid>
+        <Rectangle Fill="{Binding $parent[Window].Background}" Opacity="0.5" Grid.Row="0" Grid.RowSpan="2"
+                   IsVisible="{Binding CreatingBreakpoint}"/>
+        <dialogHost:DialogHost
+            Grid.Row="0" Grid.RowSpan="2"
+            Background="{Binding $parent[Window].Background}"
+            CloseOnClickAway="False"
+            IsOpen="{Binding CreatingBreakpoint}">
+            <dialogHost:DialogHost.DialogContent>
+				<Grid ColumnDefinitions="Auto,*">
+					<ComboBox Grid.Column="0" DisplayMemberBinding="{Binding Header}"
+							  ItemsSource="{Binding BreakpointTabs}"
+							  SelectedItem="{Binding SelectedBreakpointTypeTab, Mode=TwoWay}">
+					</ComboBox>
+                    <Grid Grid.Column="1" RowDefinitions="*,Auto" MinWidth="320" MinHeight="200">
+                        <TabControl Grid.Row="0">
+                            <TabItem Header="Cycles"
+                                     IsVisible="{Binding IsCyclesBreakpointSelected, Mode=OneWay}">
+							    <controls:GroupBox Header="Cycles count">
+                                    <NumericUpDown Text="{Binding CyclesValue}" Margin="5,0,0,0" />
+							    </controls:GroupBox>
+                            </TabItem>
+                            <TabItem Header="Memory"
+                                     IsVisible="{Binding IsMemoryBreakpointSelected, Mode=OneWay}">
+                                <Grid ColumnDefinitions="Auto,*">
+                                    <controls:GroupBox Grid.Column="0" Header="Memory access type">
+                                        <ComboBox SelectedItem="{Binding SelectedMemoryBreakpointType}"
+                                                  ItemsSource="{Binding MemoryBreakpointTypes}" />
+                                    </controls:GroupBox>
+								    <controls:GroupBox Grid.Column="1" Header="Memory address">
+									    <userControls:AddressAutoCompleteBox
+									    State="{Binding State}"
+									    ParsedAddress="{Binding MemoryAddressValue}" Margin="5,0,0,0" />
+								    </controls:GroupBox>
+                                </Grid>
+                            </TabItem>
+                            <TabItem Header="Execution"
+                                     IsVisible="{Binding IsExecutionBreakpointSelected, Mode=OneWay}">
+							    <controls:GroupBox Header="Memory address">
+								    <userControls:AddressAutoCompleteBox
+									    State="{Binding State}"
+									    ParsedAddress="{Binding ExecutionAddressValue}" Margin="5,0,0,0" />
+							    </controls:GroupBox>
+						    </TabItem>
+                            <TabItem Header="Interrupt"
+                                     IsVisible="{Binding IsInterruptBreakpointSelected, Mode=OneWay}">
+							    <controls:GroupBox Header="Interrupt Number">
+								    <NumericUpDown Text="{Binding InterruptNumber}" Watermark="decimal" Margin="5,0,0,0" />
+							    </controls:GroupBox>
+                            </TabItem>
+                            <TabItem Header="I/O Port"
+                                     IsVisible="{Binding IsIoPortBreakpointSelected, Mode=OneWay}">
+							    <controls:GroupBox Header="I/O Port Number">
+                                    <NumericUpDown Text="{Binding IoPortNumber}" Watermark="decimal" Margin="5,0,0,0" />
+							    </controls:GroupBox>
+                            </TabItem>
+                        </TabControl>
+                        <StackPanel
+                            Grid.Row="1"
+                            HorizontalAlignment="Right"
+                            Orientation="Horizontal">
+                            <Button Margin="5"
+                                    Command="{Binding ConfirmBreakpointCreationCommand}"
+                                    Content="OK"
+                                    IsDefault="True" />
+                            <Button Margin="5"
+                                    Command="{Binding CancelBreakpointCreationCommand}"
+                                    Content="Cancel"
+                                    IsCancel="True" />
+                        </StackPanel>
+                    </Grid>
 				</Grid>
 			</dialogHost:DialogHost.DialogContent>
-		</dialogHost:DialogHost>
-	</Grid>
+        </dialogHost:DialogHost>
+    </Grid>
 </UserControl>

From c94a97ed4a86de022c52e3bf39a19102c0d3aff0 Mon Sep 17 00:00:00 2001
From: Maximilien Noal <noal.maximilien@gmail.com>
Date: Mon, 17 Feb 2025 20:17:10 +0100
Subject: [PATCH 09/12] fix: AddressAutoCompleteBox bindings

Signed-off-by: Maximilien Noal <noal.maximilien@gmail.com>
---
 src/Spice86/UserControls/AddressAutoCompleteBox.axaml.cs | 8 +++-----
 src/Spice86/Views/BreakpointsView.axaml                  | 4 ++--
 src/Spice86/Views/DisassemblyView.axaml                  | 2 +-
 src/Spice86/Views/MemoryView.axaml                       | 6 +++---
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/Spice86/UserControls/AddressAutoCompleteBox.axaml.cs b/src/Spice86/UserControls/AddressAutoCompleteBox.axaml.cs
index 092e277ab..7f1f10c84 100644
--- a/src/Spice86/UserControls/AddressAutoCompleteBox.axaml.cs
+++ b/src/Spice86/UserControls/AddressAutoCompleteBox.axaml.cs
@@ -16,13 +16,11 @@ public partial class AddressAutoCompleteBox : UserControl {
     public AddressAutoCompleteBox() {
         InitializeComponent();
         AddressesSuggestions = new();
-        this.AddressTextCompleteBox.KeyUp += OnKeyUp;
+        this.AddressTextCompleteBox.TextChanged += OnTextChanged;
     }
 
-    private void OnKeyUp(object? sender, KeyEventArgs e) {
-        if(e.Key == Key.Enter) {
-            OnTextChanged(AddressTextCompleteBox.Text);
-        }
+    private void OnTextChanged(object? sender, TextChangedEventArgs e) {
+        OnTextChanged(AddressTextCompleteBox.Text);
     }
 
     private bool TryParseMemoryAddress(string? addressExpression,
diff --git a/src/Spice86/Views/BreakpointsView.axaml b/src/Spice86/Views/BreakpointsView.axaml
index 0984dd249..c86af1d1d 100644
--- a/src/Spice86/Views/BreakpointsView.axaml
+++ b/src/Spice86/Views/BreakpointsView.axaml
@@ -67,7 +67,7 @@
 								    <controls:GroupBox Grid.Column="1" Header="Memory address">
 									    <userControls:AddressAutoCompleteBox
 									    State="{Binding State}"
-									    ParsedAddress="{Binding MemoryAddressValue}" Margin="5,0,0,0" />
+									    ParsedAddress="{Binding MemoryAddressValue, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Margin="5,0,0,0" />
 								    </controls:GroupBox>
                                 </Grid>
                             </TabItem>
@@ -76,7 +76,7 @@
 							    <controls:GroupBox Header="Memory address">
 								    <userControls:AddressAutoCompleteBox
 									    State="{Binding State}"
-									    ParsedAddress="{Binding ExecutionAddressValue}" Margin="5,0,0,0" />
+									    ParsedAddress="{Binding ExecutionAddressValue, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Margin="5,0,0,0" />
 							    </controls:GroupBox>
 						    </TabItem>
                             <TabItem Header="Interrupt"
diff --git a/src/Spice86/Views/DisassemblyView.axaml b/src/Spice86/Views/DisassemblyView.axaml
index b46fdc33e..caf958ee6 100644
--- a/src/Spice86/Views/DisassemblyView.axaml
+++ b/src/Spice86/Views/DisassemblyView.axaml
@@ -227,7 +227,7 @@
 							Grid.Row="1"
 							Orientation="Vertical">
 							<userControls:AddressAutoCompleteBox
-								ParsedAddress="{Binding BreakpointAddress}"/>
+								ParsedAddress="{Binding BreakpointAddress, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
 						</StackPanel>
 					</Grid>
 					<StackPanel
diff --git a/src/Spice86/Views/MemoryView.axaml b/src/Spice86/Views/MemoryView.axaml
index 2c56bdd7f..fd6350b89 100644
--- a/src/Spice86/Views/MemoryView.axaml
+++ b/src/Spice86/Views/MemoryView.axaml
@@ -52,13 +52,13 @@
 					<userControls:AddressAutoCompleteBox
 						Grid.Row="0" Grid.Column="1"
 						State="{Binding State}"
-						ParsedAddress="{Binding StartAddress}" />
+						ParsedAddress="{Binding StartAddress, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
 					<Label Grid.Row="1" Grid.Column="0" Content="End" />
 					<userControls:AddressAutoCompleteBox
 						Grid.Row="1"
 						Grid.Column="1"
 						State="{Binding State}"
-						ParsedAddress="{Binding EndAddress}" />
+						ParsedAddress="{Binding EndAddress, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
 				</Grid>
 				<StackPanel Orientation="Vertical">
 					<Button IsVisible="{Binding IsPaused}" IsEnabled="{Binding IsPaused}"
@@ -210,7 +210,7 @@
 								Grid.Row="0"
 								Grid.Column="1"
 								State="{Binding State}"
-								ParsedAddress="{Binding MemoryEditAddress}" />
+								ParsedAddress="{Binding MemoryEditAddress, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
 							<Label
 								Grid.Row="1"
 								Grid.Column="0"

From 6cc44cf69904a999f31c6cb5c8c5f37fe3008cf5 Mon Sep 17 00:00:00 2001
From: Maximilien Noal <noal.maximilien@gmail.com>
Date: Mon, 17 Feb 2025 21:08:16 +0100
Subject: [PATCH 10/12] refactor: Finishing touches of debugger UI improvements

---
 .../UserControls/AddressAutoCompleteBox.axaml |  5 ++--
 .../AddressAutoCompleteBox.axaml.cs           | 23 ++++---------------
 .../ViewModels/BreakpointsViewModel.cs        |  2 +-
 src/Spice86/ViewModels/MemoryViewModel.cs     |  8 +++++++
 src/Spice86/Views/BreakpointsView.axaml       | 10 ++++----
 src/Spice86/Views/MemoryView.axaml            |  4 ++++
 6 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/src/Spice86/UserControls/AddressAutoCompleteBox.axaml b/src/Spice86/UserControls/AddressAutoCompleteBox.axaml
index c6c9d1441..3e51cf98c 100644
--- a/src/Spice86/UserControls/AddressAutoCompleteBox.axaml
+++ b/src/Spice86/UserControls/AddressAutoCompleteBox.axaml
@@ -6,8 +6,7 @@
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="Spice86.UserControls.AddressAutoCompleteBox"
              x:DataType="uc:AddressAutoCompleteBox">
-    <AutoCompleteBox FontFamily="RobotoMonoFont"
+    <TextBox FontFamily="RobotoMonoFont"
 		Watermark="linear or hex or segmented address"
-        x:Name="AddressTextCompleteBox"
-        ItemsSource="{Binding AddressesSuggestions}" />
+        x:Name="AddressTextBox" />
 </UserControl>  
diff --git a/src/Spice86/UserControls/AddressAutoCompleteBox.axaml.cs b/src/Spice86/UserControls/AddressAutoCompleteBox.axaml.cs
index 7f1f10c84..ed0928424 100644
--- a/src/Spice86/UserControls/AddressAutoCompleteBox.axaml.cs
+++ b/src/Spice86/UserControls/AddressAutoCompleteBox.axaml.cs
@@ -1,7 +1,5 @@
 using Avalonia;
-using Avalonia.Collections;
 using Avalonia.Controls;
-using Avalonia.Input;
 
 using Spice86.Core.Emulator.CPU;
 using Spice86.Core.Emulator.Memory;
@@ -15,12 +13,11 @@ namespace Spice86.UserControls;
 public partial class AddressAutoCompleteBox : UserControl {
     public AddressAutoCompleteBox() {
         InitializeComponent();
-        AddressesSuggestions = new();
-        this.AddressTextCompleteBox.TextChanged += OnTextChanged;
+        this.AddressTextBox.TextChanged += OnTextChanged;
     }
 
     private void OnTextChanged(object? sender, TextChangedEventArgs e) {
-        OnTextChanged(AddressTextCompleteBox.Text);
+        OnTextChanged(AddressTextBox.Text);
     }
 
     private bool TryParseMemoryAddress(string? addressExpression,
@@ -97,14 +94,6 @@ public State? State {
         set => SetValue(StateProperty, value);
     }
 
-    public static readonly StyledProperty<AvaloniaList<string>> AddressesSuggestionsProperty =
-        AvaloniaProperty.Register<AddressAutoCompleteBox, AvaloniaList<string>>(nameof(AddressesSuggestions));
-
-    public AvaloniaList<string> AddressesSuggestions {
-        get => GetValue(AddressesSuggestionsProperty);
-        set => SetValue(AddressesSuggestionsProperty, value);
-    }
-
     public static readonly StyledProperty<uint?> ParsedAddressProperty =
         AvaloniaProperty.Register<AddressAutoCompleteBox, uint?>(nameof(ParsedAddressProperty),
             coerce: CoerceParseAddress);
@@ -112,10 +101,10 @@ public AvaloniaList<string> AddressesSuggestions {
     private static uint? CoerceParseAddress(AvaloniaObject @object, uint? nullable) {
         if(@object is AddressAutoCompleteBox instance) {
             if (nullable.HasValue) {
-                instance.AddressTextCompleteBox.Text = nullable.Value.ToString(
+                instance.AddressTextBox.Text = nullable.Value.ToString(
                     CultureInfo.InvariantCulture);
             } else {
-                instance.AddressTextCompleteBox.Text = null;
+                instance.AddressTextBox.Text = null;
             }
         }
         return nullable;
@@ -132,10 +121,6 @@ private void OnTextChanged(string? address) {
         }
         if (TryParseMemoryAddress(address, out var parsedAddress)) {
             ParsedAddress = parsedAddress;
-            if (!AddressesSuggestions.Contains(address)) {
-                AddressesSuggestions.Add(address);
-            }
-            this.AddressTextCompleteBox.SelectedItem = address;
         } else {
             ParsedAddress = null;
         }
diff --git a/src/Spice86/ViewModels/BreakpointsViewModel.cs b/src/Spice86/ViewModels/BreakpointsViewModel.cs
index 5089eb5b2..6ab34e216 100644
--- a/src/Spice86/ViewModels/BreakpointsViewModel.cs
+++ b/src/Spice86/ViewModels/BreakpointsViewModel.cs
@@ -41,7 +41,7 @@ public BreakpointsViewModel(State state,
         _pauseHandler = pauseHandler;
         _messenger = messenger;
         _state = state;
-        SelectedBreakpointTypeTab = BreakpointTabs[0];
+        _selectedBreakpointTypeTab = BreakpointTabs[0];
     }
 
     public AvaloniaList<TabItemViewModel> BreakpointTabs { get; } = new AvaloniaList<TabItemViewModel>
diff --git a/src/Spice86/ViewModels/MemoryViewModel.cs b/src/Spice86/ViewModels/MemoryViewModel.cs
index 39ec0ea26..76ed1cafa 100644
--- a/src/Spice86/ViewModels/MemoryViewModel.cs
+++ b/src/Spice86/ViewModels/MemoryViewModel.cs
@@ -328,9 +328,17 @@ public void OnSelectionRangeChanged(object? sender, EventArgs e) {
         Selection? selection = (sender as Selection);
         if (selection != null) {
             SelectionRange = selection.Range;
+            SelectionRangeStartAddress = StartAddress + selection.Range.Start.ByteIndex;
+            SelectionRangeEndAddress = StartAddress + selection.Range.End.ByteIndex;
         }
     }
 
+    [ObservableProperty]
+    private ulong? _selectionRangeStartAddress;
+
+    [ObservableProperty]
+    private ulong? _selectionRangeEndAddress;
+
     [RelayCommand(CanExecute = nameof(IsStructureInfoPresent))]
     public void ShowStructureView() {
         if (DataMemoryDocument == null) {
diff --git a/src/Spice86/Views/BreakpointsView.axaml b/src/Spice86/Views/BreakpointsView.axaml
index c86af1d1d..c93b86392 100644
--- a/src/Spice86/Views/BreakpointsView.axaml
+++ b/src/Spice86/Views/BreakpointsView.axaml
@@ -45,10 +45,12 @@
             IsOpen="{Binding CreatingBreakpoint}">
             <dialogHost:DialogHost.DialogContent>
 				<Grid ColumnDefinitions="Auto,*">
-					<ComboBox Grid.Column="0" DisplayMemberBinding="{Binding Header}"
-							  ItemsSource="{Binding BreakpointTabs}"
-							  SelectedItem="{Binding SelectedBreakpointTypeTab, Mode=TwoWay}">
-					</ComboBox>
+					<controls:GroupBox Header="Breakpoint Type" Grid.Column="0">
+						<ComboBox DisplayMemberBinding="{Binding Header}"
+								  ItemsSource="{Binding BreakpointTabs}"
+								  SelectedItem="{Binding SelectedBreakpointTypeTab, Mode=TwoWay}">
+						</ComboBox>
+					</controls:GroupBox>
                     <Grid Grid.Column="1" RowDefinitions="*,Auto" MinWidth="320" MinHeight="200">
                         <TabControl Grid.Row="0">
                             <TabItem Header="Cycles"
diff --git a/src/Spice86/Views/MemoryView.axaml b/src/Spice86/Views/MemoryView.axaml
index fd6350b89..52007e0ce 100644
--- a/src/Spice86/Views/MemoryView.axaml
+++ b/src/Spice86/Views/MemoryView.axaml
@@ -100,8 +100,12 @@
 						<WrapPanel Orientation="Horizontal">
 							<TextBlock Text="Selection start: " />
 							<TextBlock Text="{Binding SelectionRange.Value.Start.ByteIndex, StringFormat={}{0:X4}}" />
+							<TextBlock Text=" Address: " />
+							<TextBlock Text="{Binding SelectionRangeStartAddress, StringFormat={}{0:X4}}" />
 							<TextBlock Text=" End: " />
 							<TextBlock Text="{Binding SelectionRange.Value.End.ByteIndex, StringFormat={}{0:X4}}" />
+							<TextBlock Text=" Address: " />
+							<TextBlock Text="{Binding SelectionRangeEndAddress, StringFormat={}{0:X4}}" />
 							<TextBlock Text=" Byte Length: " />
 							<TextBlock Text="{Binding SelectionRange.Value.ByteLength, StringFormat={}{0:N0}}" />
 						</WrapPanel>

From de3f910de08d1f2b356f4ac3fd5fd0b087970d79 Mon Sep 17 00:00:00 2001
From: Maximilien Noal <noal.maximilien@gmail.com>
Date: Mon, 17 Feb 2025 21:51:07 +0100
Subject: [PATCH 11/12] feat: hexadecimal textbox and messages

---
 .../HexadecimalToDecimalConverter.cs          | 30 ++++++
 .../UserControls/HexadecimalTextBox.axaml     | 12 +++
 .../UserControls/HexadecimalTextBox.axaml.cs  | 73 ++++++++++++++
 .../ViewModels/BreakpointsViewModel.cs        | 13 ++-
 src/Spice86/Views/BreakpointsView.axaml       | 97 ++++++++++---------
 5 files changed, 173 insertions(+), 52 deletions(-)
 create mode 100644 src/Spice86/Converters/HexadecimalToDecimalConverter.cs
 create mode 100644 src/Spice86/UserControls/HexadecimalTextBox.axaml
 create mode 100644 src/Spice86/UserControls/HexadecimalTextBox.axaml.cs

diff --git a/src/Spice86/Converters/HexadecimalToDecimalConverter.cs b/src/Spice86/Converters/HexadecimalToDecimalConverter.cs
new file mode 100644
index 000000000..6e2de8c24
--- /dev/null
+++ b/src/Spice86/Converters/HexadecimalToDecimalConverter.cs
@@ -0,0 +1,30 @@
+namespace Spice86.Converters;
+
+using Avalonia.Data.Converters;
+
+using System.Globalization;
+
+public class HexadecimalToDecimalConverter : IValueConverter {
+    public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture) {
+        if (value is int) {
+            return $"0x{(int)value:X}";
+        }
+        if (value is long) {
+            return $"0x{(long)value:X}";
+        }
+        if (value is uint) {
+            return $"0x{(uint)value:X}";
+        }
+
+        return value;
+    }
+
+    public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture) {
+        if (value is string stringValue && stringValue.StartsWith("0x", StringComparison.OrdinalIgnoreCase)) {
+            if (int.TryParse(stringValue[2..], NumberStyles.HexNumber, culture, out int intValue)) {
+                return intValue;
+            }
+        }
+        return 0;
+    }
+}
diff --git a/src/Spice86/UserControls/HexadecimalTextBox.axaml b/src/Spice86/UserControls/HexadecimalTextBox.axaml
new file mode 100644
index 000000000..4cc346b24
--- /dev/null
+++ b/src/Spice86/UserControls/HexadecimalTextBox.axaml
@@ -0,0 +1,12 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:uc="using:Spice86.UserControls"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="Spice86.UserControls.HexadecimalTextBox"
+             x:DataType="uc:HexadecimalTextBox">
+	<TextBox FontFamily="RobotoMonoFont"
+	  Watermark="0xHexValue"
+	  x:Name="HexTextBox" />
+</UserControl>
diff --git a/src/Spice86/UserControls/HexadecimalTextBox.axaml.cs b/src/Spice86/UserControls/HexadecimalTextBox.axaml.cs
new file mode 100644
index 000000000..b9e7e37e3
--- /dev/null
+++ b/src/Spice86/UserControls/HexadecimalTextBox.axaml.cs
@@ -0,0 +1,73 @@
+using Avalonia;
+using Avalonia.Controls;
+
+using Spice86.UserControls;
+
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+
+namespace Spice86.UserControls;
+
+public partial class HexadecimalTextBox : UserControl {
+    public HexadecimalTextBox() {
+        InitializeComponent();
+        this.HexTextBox.TextChanged += OnTextChanged;
+    }
+
+
+    private void OnTextChanged(object? sender, TextChangedEventArgs e) {
+        OnTextChanged(HexTextBox.Text);
+    }
+
+    private bool TryParseHexValue(string? hexpression,
+        [NotNullWhen(true)] out uint? hexadecimalValue) {
+        if (string.IsNullOrWhiteSpace(hexpression)) {
+            hexadecimalValue = null;
+            return false;
+        }
+
+        try {
+            if(ulong.TryParse(hexpression.StartsWith("0x") ?
+                hexpression[2..] : hexpression, NumberStyles.HexNumber,
+                CultureInfo.InvariantCulture, out ulong hexValue)) {
+                hexadecimalValue = (uint)hexValue;
+                return true;
+            }
+        } catch { }
+        hexadecimalValue = null;
+        return false;
+    }
+
+
+    public static readonly StyledProperty<uint?> ParsedHexadecimalNumberProperty =
+        AvaloniaProperty.Register<AddressAutoCompleteBox, uint?>(nameof(ParsedHexadecimalNumber),
+            coerce: CoerceParsedHexadecimalNumber);
+
+    private static uint? CoerceParsedHexadecimalNumber(AvaloniaObject @object, uint? nullable) {
+        if (@object is HexadecimalTextBox instance) {
+            if (nullable.HasValue) {
+                instance.HexTextBox.Text = nullable.Value.ToString(
+                    CultureInfo.InvariantCulture);
+            } else {
+                instance.HexTextBox.Text = null;
+            }
+        }
+        return nullable;
+    }
+
+    public uint? ParsedHexadecimalNumber {
+        get => GetValue(ParsedHexadecimalNumberProperty);
+        set => SetValue(ParsedHexadecimalNumberProperty, value);
+    }
+
+    private void OnTextChanged(string? address) {
+        if (string.IsNullOrWhiteSpace(address)) {
+            return;
+        }
+        if (TryParseHexValue(address, out var parsedAddress)) {
+            ParsedHexadecimalNumber = parsedAddress;
+        } else {
+            ParsedHexadecimalNumber = null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spice86/ViewModels/BreakpointsViewModel.cs b/src/Spice86/ViewModels/BreakpointsViewModel.cs
index 6ab34e216..dc2668830 100644
--- a/src/Spice86/ViewModels/BreakpointsViewModel.cs
+++ b/src/Spice86/ViewModels/BreakpointsViewModel.cs
@@ -61,8 +61,13 @@ public TabItemViewModel? SelectedBreakpointTypeTab {
             if(value is not null) {
                 foreach (TabItemViewModel tab in BreakpointTabs) {
                     tab.IsSelected = tab == value;
-                    SetProperty(ref _selectedBreakpointTypeTab, value);
                 }
+                SetProperty(ref _selectedBreakpointTypeTab, value);
+                OnPropertyChanged(nameof(IsExecutionBreakpointSelected));
+                OnPropertyChanged(nameof(IsMemoryBreakpointSelected));
+                OnPropertyChanged(nameof(IsCyclesBreakpointSelected));
+                OnPropertyChanged(nameof(IsInterruptBreakpointSelected));
+                OnPropertyChanged(nameof(IsIoPortBreakpointSelected));
             }
         }
     }
@@ -198,7 +203,7 @@ private void ConfirmBreakpointCreation()
 
     private void PauseAndReportAddress(long address)
     {
-        string message = $"Execution breakpoint was reached at address {address}.";
+        string message = $"Execution breakpoint was reached at address 0x{address:X2}.";
         Pause(message);
     }
 
@@ -210,13 +215,13 @@ private void PauseAndReportCycles(long cycles)
 
     private void PauseAndReportInterrupt(long interruptNumber)
     {
-        string message = $"Interrupt breakpoint was reached at interrupt {interruptNumber}.";
+        string message = $"Interrupt breakpoint was reached at interrupt 0x{interruptNumber:X2}.";
         Pause(message);
     }
 
     private void PauseAndReportIoPort(long ioPortAddress)
     {
-        string message = $"I/O Port breakpoint was reached at address {ioPortAddress}.";
+        string message = $"I/O Port breakpoint was reached at 0x{ioPortAddress:X2}.";
         Pause(message);
     }
 
diff --git a/src/Spice86/Views/BreakpointsView.axaml b/src/Spice86/Views/BreakpointsView.axaml
index c93b86392..7d388ef96 100644
--- a/src/Spice86/Views/BreakpointsView.axaml
+++ b/src/Spice86/Views/BreakpointsView.axaml
@@ -10,6 +10,9 @@
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="Spice86.Views.BreakpointsView"
              x:DataType="viewModels:BreakpointsViewModel">
+	<UserControl.Resources>
+		<converters:HexadecimalToDecimalConverter x:Key="HexadecimalToDecimalConverter" />
+	</UserControl.Resources>
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
@@ -31,7 +34,7 @@
             <DataGrid.Columns>
                 <DataGridCheckBoxColumn IsReadOnly="False" Binding="{Binding IsEnabled}" Header="Is Enabled ?" />
                 <DataGridCheckBoxColumn IsReadOnly="True" Binding="{Binding IsRemovedOnTrigger}" Header="Is removed on trigger ?" />
-                <DataGridTextColumn IsReadOnly="True" Binding="{Binding Address}" Header="Address" />
+                <DataGridTextColumn IsReadOnly="True" Binding="{Binding Address, Converter={StaticResource HexadecimalToDecimalConverter}}" Header="Parameter" />
                 <DataGridTextColumn IsReadOnly="True" Binding="{Binding Type}" Header="Type" />
                 <DataGridTextColumn IsReadOnly="False" Binding="{Binding Comment}" Header="Comment" />
             </DataGrid.Columns>
@@ -52,62 +55,60 @@
 						</ComboBox>
 					</controls:GroupBox>
                     <Grid Grid.Column="1" RowDefinitions="*,Auto" MinWidth="320" MinHeight="200">
-                        <TabControl Grid.Row="0">
-                            <TabItem Header="Cycles"
-                                     IsVisible="{Binding IsCyclesBreakpointSelected, Mode=OneWay}">
-							    <controls:GroupBox Header="Cycles count">
-                                    <NumericUpDown Text="{Binding CyclesValue}" Margin="5,0,0,0" />
-							    </controls:GroupBox>
-                            </TabItem>
-                            <TabItem Header="Memory"
-                                     IsVisible="{Binding IsMemoryBreakpointSelected, Mode=OneWay}">
-                                <Grid ColumnDefinitions="Auto,*">
-                                    <controls:GroupBox Grid.Column="0" Header="Memory access type">
-                                        <ComboBox SelectedItem="{Binding SelectedMemoryBreakpointType}"
-                                                  ItemsSource="{Binding MemoryBreakpointTypes}" />
-                                    </controls:GroupBox>
-								    <controls:GroupBox Grid.Column="1" Header="Memory address">
-									    <userControls:AddressAutoCompleteBox
-									    State="{Binding State}"
-									    ParsedAddress="{Binding MemoryAddressValue, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Margin="5,0,0,0" />
-								    </controls:GroupBox>
-                                </Grid>
-                            </TabItem>
-                            <TabItem Header="Execution"
-                                     IsVisible="{Binding IsExecutionBreakpointSelected, Mode=OneWay}">
-							    <controls:GroupBox Header="Memory address">
-								    <userControls:AddressAutoCompleteBox
-									    State="{Binding State}"
-									    ParsedAddress="{Binding ExecutionAddressValue, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Margin="5,0,0,0" />
-							    </controls:GroupBox>
-						    </TabItem>
-                            <TabItem Header="Interrupt"
-                                     IsVisible="{Binding IsInterruptBreakpointSelected, Mode=OneWay}">
-							    <controls:GroupBox Header="Interrupt Number">
-								    <NumericUpDown Text="{Binding InterruptNumber}" Watermark="decimal" Margin="5,0,0,0" />
-							    </controls:GroupBox>
-                            </TabItem>
-                            <TabItem Header="I/O Port"
-                                     IsVisible="{Binding IsIoPortBreakpointSelected, Mode=OneWay}">
-							    <controls:GroupBox Header="I/O Port Number">
-                                    <NumericUpDown Text="{Binding IoPortNumber}" Watermark="decimal" Margin="5,0,0,0" />
-							    </controls:GroupBox>
-                            </TabItem>
-                        </TabControl>
-                        <StackPanel
+						<controls:GroupBox Grid.Row="0" Header="Cycles"
+								 IsVisible="{Binding IsCyclesBreakpointSelected}">
+							<controls:GroupBox Header="Cycles count">
+								<NumericUpDown Text="{Binding CyclesValue}" Margin="5,0,0,0" />
+							</controls:GroupBox>
+						</controls:GroupBox>
+						<controls:GroupBox Grid.Row="0" Header="Memory"
+								 IsVisible="{Binding IsMemoryBreakpointSelected}">
+							<Grid ColumnDefinitions="Auto,*">
+								<controls:GroupBox Grid.Column="0" Header="Memory access type">
+									<ComboBox SelectedItem="{Binding SelectedMemoryBreakpointType}"
+											  ItemsSource="{Binding MemoryBreakpointTypes}" />
+								</controls:GroupBox>
+								<controls:GroupBox Grid.Column="1" Header="Memory address">
+									<userControls:AddressAutoCompleteBox
+									State="{Binding State}"
+									ParsedAddress="{Binding MemoryAddressValue, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Margin="5,0,0,0" />
+								</controls:GroupBox>
+							</Grid>
+						</controls:GroupBox>
+						<controls:GroupBox Grid.Row="0" Header="Execution"
+								 IsVisible="{Binding IsExecutionBreakpointSelected}">
+							<controls:GroupBox Header="Memory address">
+								<userControls:AddressAutoCompleteBox
+									State="{Binding State}"
+									ParsedAddress="{Binding ExecutionAddressValue, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Margin="5,0,0,0" />
+							</controls:GroupBox>
+						</controls:GroupBox>
+						<controls:GroupBox Grid.Row="0" Header="Interrupt"
+								 IsVisible="{Binding IsInterruptBreakpointSelected}">
+							<controls:GroupBox Header="Interrupt Number">
+								<userControls:HexadecimalTextBox ParsedHexadecimalNumber="{Binding InterruptNumber, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Margin="5,0,0,0" />
+							</controls:GroupBox>
+						</controls:GroupBox>
+						<controls:GroupBox Grid.Row="0" Header="I/O Port"
+								 IsVisible="{Binding IsIoPortBreakpointSelected}">
+							<controls:GroupBox Header="I/O Port Number">
+								<userControls:HexadecimalTextBox ParsedHexadecimalNumber="{Binding IoPortNumber, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Margin="5,0,0,0" />
+							</controls:GroupBox>
+						</controls:GroupBox>
+						<StackPanel
                             Grid.Row="1"
                             HorizontalAlignment="Right"
                             Orientation="Horizontal">
-                            <Button Margin="5"
+							<Button Margin="5"
                                     Command="{Binding ConfirmBreakpointCreationCommand}"
                                     Content="OK"
                                     IsDefault="True" />
-                            <Button Margin="5"
+							<Button Margin="5"
                                     Command="{Binding CancelBreakpointCreationCommand}"
                                     Content="Cancel"
                                     IsCancel="True" />
-                        </StackPanel>
-                    </Grid>
+						</StackPanel>
+					</Grid>
 				</Grid>
 			</dialogHost:DialogHost.DialogContent>
         </dialogHost:DialogHost>

From c53e03f36fec870262debaa73819b624cb0f722f Mon Sep 17 00:00:00 2001
From: Maximilien Noal <noal.maximilien@gmail.com>
Date: Sat, 22 Feb 2025 20:11:27 +0100
Subject: [PATCH 12/12] WIP, reworking all addresses textboxes...

Signed-off-by: Maximilien Noal <noal.maximilien@gmail.com>
---
 .../HexadecimalToDecimalConverter.cs          |  30 ----
 src/Spice86/Spice86.csproj                    |   5 -
 .../UserControls/AddressAutoCompleteBox.axaml |  12 --
 .../AddressAutoCompleteBox.axaml.cs           | 128 ------------------
 .../UserControls/HexadecimalTextBox.axaml     |  12 --
 .../UserControls/HexadecimalTextBox.axaml.cs  |  73 ----------
 src/Spice86/Views/BreakpointsView.axaml       |  26 ++--
 src/Spice86/Views/DisassemblyView.axaml       |  11 +-
 src/Spice86/Views/MemoryView.axaml            |  26 ++--
 9 files changed, 30 insertions(+), 293 deletions(-)
 delete mode 100644 src/Spice86/Converters/HexadecimalToDecimalConverter.cs
 delete mode 100644 src/Spice86/UserControls/AddressAutoCompleteBox.axaml
 delete mode 100644 src/Spice86/UserControls/AddressAutoCompleteBox.axaml.cs
 delete mode 100644 src/Spice86/UserControls/HexadecimalTextBox.axaml
 delete mode 100644 src/Spice86/UserControls/HexadecimalTextBox.axaml.cs

diff --git a/src/Spice86/Converters/HexadecimalToDecimalConverter.cs b/src/Spice86/Converters/HexadecimalToDecimalConverter.cs
deleted file mode 100644
index 6e2de8c24..000000000
--- a/src/Spice86/Converters/HexadecimalToDecimalConverter.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-namespace Spice86.Converters;
-
-using Avalonia.Data.Converters;
-
-using System.Globalization;
-
-public class HexadecimalToDecimalConverter : IValueConverter {
-    public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture) {
-        if (value is int) {
-            return $"0x{(int)value:X}";
-        }
-        if (value is long) {
-            return $"0x{(long)value:X}";
-        }
-        if (value is uint) {
-            return $"0x{(uint)value:X}";
-        }
-
-        return value;
-    }
-
-    public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture) {
-        if (value is string stringValue && stringValue.StartsWith("0x", StringComparison.OrdinalIgnoreCase)) {
-            if (int.TryParse(stringValue[2..], NumberStyles.HexNumber, culture, out int intValue)) {
-                return intValue;
-            }
-        }
-        return 0;
-    }
-}
diff --git a/src/Spice86/Spice86.csproj b/src/Spice86/Spice86.csproj
index 9bdc94534..b2f2c42d2 100644
--- a/src/Spice86/Spice86.csproj
+++ b/src/Spice86/Spice86.csproj
@@ -51,9 +51,4 @@
     <ProjectReference Include="..\Spice86.Logging\Spice86.Logging.csproj" />
     <ProjectReference Include="..\Spice86.Shared\Spice86.Shared.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <Compile Update="UserControls\AddressAutoCompleteBox.axaml.cs">
-      <DependentUpon>AddressAutoCompleteBox.axaml</DependentUpon>
-    </Compile>
-  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Spice86/UserControls/AddressAutoCompleteBox.axaml b/src/Spice86/UserControls/AddressAutoCompleteBox.axaml
deleted file mode 100644
index 3e51cf98c..000000000
--- a/src/Spice86/UserControls/AddressAutoCompleteBox.axaml
+++ /dev/null
@@ -1,12 +0,0 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:uc="using:Spice86.UserControls"
-             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Spice86.UserControls.AddressAutoCompleteBox"
-             x:DataType="uc:AddressAutoCompleteBox">
-    <TextBox FontFamily="RobotoMonoFont"
-		Watermark="linear or hex or segmented address"
-        x:Name="AddressTextBox" />
-</UserControl>  
diff --git a/src/Spice86/UserControls/AddressAutoCompleteBox.axaml.cs b/src/Spice86/UserControls/AddressAutoCompleteBox.axaml.cs
deleted file mode 100644
index ed0928424..000000000
--- a/src/Spice86/UserControls/AddressAutoCompleteBox.axaml.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-
-using Spice86.Core.Emulator.CPU;
-using Spice86.Core.Emulator.Memory;
-using Spice86.Shared.Utils;
-
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-
-namespace Spice86.UserControls;
-
-public partial class AddressAutoCompleteBox : UserControl {
-    public AddressAutoCompleteBox() {
-        InitializeComponent();
-        this.AddressTextBox.TextChanged += OnTextChanged;
-    }
-
-    private void OnTextChanged(object? sender, TextChangedEventArgs e) {
-        OnTextChanged(AddressTextBox.Text);
-    }
-
-    private bool TryParseMemoryAddress(string? addressExpression,
-        [NotNullWhen(true)] out uint? address) {
-        if (string.IsNullOrWhiteSpace(addressExpression)) {
-            address = null;
-            return false;
-        }
-
-        try {
-            if (addressExpression.Contains(':')) {
-                string[] split = addressExpression.Split(":");
-                string firstPart = split[0];
-                string secondPart = split[1];
-
-                if(State is not null) {
-                    firstPart = ReplaceRegisterNameWithValue(firstPart, State);
-                    secondPart = ReplaceRegisterNameWithValue(secondPart, State);
-                }
-
-                if (split.Length > 1 &&
-                    ushort.TryParse(firstPart, NumberStyles.HexNumber,
-                    CultureInfo.InvariantCulture, out ushort hexSegment) &&
-                    ushort.TryParse(secondPart, NumberStyles.HexNumber,
-                    CultureInfo.InvariantCulture, out ushort hexOffset)) {
-                    address = Math.Min(A20Gate.EndOfHighMemoryArea, MemoryUtils.
-                        ToPhysicalAddress(hexSegment, hexOffset));
-                    return true;
-                }
-
-                if (split.Length > 1 &&
-                    ushort.TryParse(firstPart, NumberStyles.Integer,
-                    CultureInfo.InvariantCulture, out ushort segment) &&
-                    ushort.TryParse(secondPart, NumberStyles.Integer,
-                    CultureInfo.InvariantCulture, out ushort offset)) {
-                    address = Math.Min(A20Gate.EndOfHighMemoryArea, MemoryUtils.
-                        ToPhysicalAddress(segment, offset));
-                    return true;
-                }
-            } else if (ulong.TryParse(addressExpression,
-                      CultureInfo.InvariantCulture, out ulong value)) {
-                address = (uint)value;
-                return true;
-            } else if (ulong.TryParse(addressExpression.AsSpan(
-                  addressExpression.StartsWith("0x") ? 2 : 0),
-                  NumberStyles.HexNumber, CultureInfo.InvariantCulture,
-                      out ulong hexValue)) {
-                address = (uint)hexValue;
-                return true;
-            }
-        } catch { }
-        address = null;
-        return false;
-    }
-
-    private string ReplaceRegisterNameWithValue(string part, State state) {
-        return part.ToUpperInvariant() switch {
-            "CS" => state.CS.ToString("X4"),
-            "IP" => state.IP.ToString("X4"),
-            "DS" => state.DS.ToString("X4"),
-            "ES" => state.ES.ToString("X4"),
-            "FS" => state.FS.ToString("X4"),
-            "GS" => state.GS.ToString("X4"),
-            "SS" => state.SS.ToString("X4"),
-            _ => part
-        };
-    }
-
-    public static StyledProperty<State?> StateProperty =
-        AvaloniaProperty.Register<AddressAutoCompleteBox, State?>(nameof(State));
-
-    public State? State {
-        get => GetValue(StateProperty);
-        set => SetValue(StateProperty, value);
-    }
-
-    public static readonly StyledProperty<uint?> ParsedAddressProperty =
-        AvaloniaProperty.Register<AddressAutoCompleteBox, uint?>(nameof(ParsedAddressProperty),
-            coerce: CoerceParseAddress);
-
-    private static uint? CoerceParseAddress(AvaloniaObject @object, uint? nullable) {
-        if(@object is AddressAutoCompleteBox instance) {
-            if (nullable.HasValue) {
-                instance.AddressTextBox.Text = nullable.Value.ToString(
-                    CultureInfo.InvariantCulture);
-            } else {
-                instance.AddressTextBox.Text = null;
-            }
-        }
-        return nullable;
-    }
-
-    public uint? ParsedAddress {
-        get => GetValue(ParsedAddressProperty);
-        set => SetValue(ParsedAddressProperty, value);
-    }
-
-    private void OnTextChanged(string? address) {
-        if (string.IsNullOrWhiteSpace(address)) {
-            return;
-        }
-        if (TryParseMemoryAddress(address, out var parsedAddress)) {
-            ParsedAddress = parsedAddress;
-        } else {
-            ParsedAddress = null;
-        }
-    }
-}
diff --git a/src/Spice86/UserControls/HexadecimalTextBox.axaml b/src/Spice86/UserControls/HexadecimalTextBox.axaml
deleted file mode 100644
index 4cc346b24..000000000
--- a/src/Spice86/UserControls/HexadecimalTextBox.axaml
+++ /dev/null
@@ -1,12 +0,0 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:uc="using:Spice86.UserControls"
-             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Spice86.UserControls.HexadecimalTextBox"
-             x:DataType="uc:HexadecimalTextBox">
-	<TextBox FontFamily="RobotoMonoFont"
-	  Watermark="0xHexValue"
-	  x:Name="HexTextBox" />
-</UserControl>
diff --git a/src/Spice86/UserControls/HexadecimalTextBox.axaml.cs b/src/Spice86/UserControls/HexadecimalTextBox.axaml.cs
deleted file mode 100644
index b9e7e37e3..000000000
--- a/src/Spice86/UserControls/HexadecimalTextBox.axaml.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-
-using Spice86.UserControls;
-
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-
-namespace Spice86.UserControls;
-
-public partial class HexadecimalTextBox : UserControl {
-    public HexadecimalTextBox() {
-        InitializeComponent();
-        this.HexTextBox.TextChanged += OnTextChanged;
-    }
-
-
-    private void OnTextChanged(object? sender, TextChangedEventArgs e) {
-        OnTextChanged(HexTextBox.Text);
-    }
-
-    private bool TryParseHexValue(string? hexpression,
-        [NotNullWhen(true)] out uint? hexadecimalValue) {
-        if (string.IsNullOrWhiteSpace(hexpression)) {
-            hexadecimalValue = null;
-            return false;
-        }
-
-        try {
-            if(ulong.TryParse(hexpression.StartsWith("0x") ?
-                hexpression[2..] : hexpression, NumberStyles.HexNumber,
-                CultureInfo.InvariantCulture, out ulong hexValue)) {
-                hexadecimalValue = (uint)hexValue;
-                return true;
-            }
-        } catch { }
-        hexadecimalValue = null;
-        return false;
-    }
-
-
-    public static readonly StyledProperty<uint?> ParsedHexadecimalNumberProperty =
-        AvaloniaProperty.Register<AddressAutoCompleteBox, uint?>(nameof(ParsedHexadecimalNumber),
-            coerce: CoerceParsedHexadecimalNumber);
-
-    private static uint? CoerceParsedHexadecimalNumber(AvaloniaObject @object, uint? nullable) {
-        if (@object is HexadecimalTextBox instance) {
-            if (nullable.HasValue) {
-                instance.HexTextBox.Text = nullable.Value.ToString(
-                    CultureInfo.InvariantCulture);
-            } else {
-                instance.HexTextBox.Text = null;
-            }
-        }
-        return nullable;
-    }
-
-    public uint? ParsedHexadecimalNumber {
-        get => GetValue(ParsedHexadecimalNumberProperty);
-        set => SetValue(ParsedHexadecimalNumberProperty, value);
-    }
-
-    private void OnTextChanged(string? address) {
-        if (string.IsNullOrWhiteSpace(address)) {
-            return;
-        }
-        if (TryParseHexValue(address, out var parsedAddress)) {
-            ParsedHexadecimalNumber = parsedAddress;
-        } else {
-            ParsedHexadecimalNumber = null;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Spice86/Views/BreakpointsView.axaml b/src/Spice86/Views/BreakpointsView.axaml
index 7d388ef96..b190aa2ce 100644
--- a/src/Spice86/Views/BreakpointsView.axaml
+++ b/src/Spice86/Views/BreakpointsView.axaml
@@ -10,9 +10,6 @@
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="Spice86.Views.BreakpointsView"
              x:DataType="viewModels:BreakpointsViewModel">
-	<UserControl.Resources>
-		<converters:HexadecimalToDecimalConverter x:Key="HexadecimalToDecimalConverter" />
-	</UserControl.Resources>
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
@@ -34,7 +31,7 @@
             <DataGrid.Columns>
                 <DataGridCheckBoxColumn IsReadOnly="False" Binding="{Binding IsEnabled}" Header="Is Enabled ?" />
                 <DataGridCheckBoxColumn IsReadOnly="True" Binding="{Binding IsRemovedOnTrigger}" Header="Is removed on trigger ?" />
-                <DataGridTextColumn IsReadOnly="True" Binding="{Binding Address, Converter={StaticResource HexadecimalToDecimalConverter}}" Header="Parameter" />
+                <DataGridTextColumn IsReadOnly="True" Binding="{Binding Address, Converter={StaticResource DecimalToHexadecimalConverter}}" Header="Parameter" />
                 <DataGridTextColumn IsReadOnly="True" Binding="{Binding Type}" Header="Type" />
                 <DataGridTextColumn IsReadOnly="False" Binding="{Binding Comment}" Header="Comment" />
             </DataGrid.Columns>
@@ -69,30 +66,35 @@
 											  ItemsSource="{Binding MemoryBreakpointTypes}" />
 								</controls:GroupBox>
 								<controls:GroupBox Grid.Column="1" Header="Memory address">
-									<userControls:AddressAutoCompleteBox
-									State="{Binding State}"
-									ParsedAddress="{Binding MemoryAddressValue, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Margin="5,0,0,0" />
+									<TextBox
+									Text="{Binding MemoryAddressValue, Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
+									Margin="5,0,0,0" />
 								</controls:GroupBox>
 							</Grid>
 						</controls:GroupBox>
 						<controls:GroupBox Grid.Row="0" Header="Execution"
 								 IsVisible="{Binding IsExecutionBreakpointSelected}">
 							<controls:GroupBox Header="Memory address">
-								<userControls:AddressAutoCompleteBox
-									State="{Binding State}"
-									ParsedAddress="{Binding ExecutionAddressValue, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Margin="5,0,0,0" />
+								<TextBox
+									Text="{Binding ExecutionAddressValue,
+									Mode=TwoWay,
+									UpdateSourceTrigger=PropertyChanged}" Margin="5,0,0,0" />
 							</controls:GroupBox>
 						</controls:GroupBox>
 						<controls:GroupBox Grid.Row="0" Header="Interrupt"
 								 IsVisible="{Binding IsInterruptBreakpointSelected}">
 							<controls:GroupBox Header="Interrupt Number">
-								<userControls:HexadecimalTextBox ParsedHexadecimalNumber="{Binding InterruptNumber, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Margin="5,0,0,0" />
+								<NumericUpDown Text="{Binding InterruptNumber,
+												 Mode=TwoWay,
+												 UpdateSourceTrigger=PropertyChanged}" Margin="5,0,0,0" />
 							</controls:GroupBox>
 						</controls:GroupBox>
 						<controls:GroupBox Grid.Row="0" Header="I/O Port"
 								 IsVisible="{Binding IsIoPortBreakpointSelected}">
 							<controls:GroupBox Header="I/O Port Number">
-								<userControls:HexadecimalTextBox ParsedHexadecimalNumber="{Binding IoPortNumber, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Margin="5,0,0,0" />
+								<NumericUpDown
+									Text="{Binding IoPortNumber, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+									Margin="5,0,0,0" />
 							</controls:GroupBox>
 						</controls:GroupBox>
 						<StackPanel
diff --git a/src/Spice86/Views/DisassemblyView.axaml b/src/Spice86/Views/DisassemblyView.axaml
index caf958ee6..bbbe02e10 100644
--- a/src/Spice86/Views/DisassemblyView.axaml
+++ b/src/Spice86/Views/DisassemblyView.axaml
@@ -47,11 +47,10 @@
 			<StackPanel Orientation="Vertical" Grid.Column="3">
 				<Label HorizontalAlignment="Center" Content="Start Address" />
 				<Grid ColumnDefinitions="*,*">
-					<userControls:AddressAutoCompleteBox Name="StartAddressTextBox"
+					<TextBox Name="StartAddressTextBox"
 						Grid.Column="0"
-						Width="150"
-						State="{Binding State}"
-						ParsedAddress="{Binding StartAddress, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+						MinWidth="150"
+						Text="{Binding StartAddress, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
 				</Grid>
 			</StackPanel>
 			<StackPanel Orientation="Vertical" Grid.Column="4">
@@ -226,8 +225,8 @@
 						<StackPanel
 							Grid.Row="1"
 							Orientation="Vertical">
-							<userControls:AddressAutoCompleteBox
-								ParsedAddress="{Binding BreakpointAddress, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
+							<TextBox
+								Text="{Binding BreakpointAddress, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
 						</StackPanel>
 					</Grid>
 					<StackPanel
diff --git a/src/Spice86/Views/MemoryView.axaml b/src/Spice86/Views/MemoryView.axaml
index 52007e0ce..3d0e1ff5e 100644
--- a/src/Spice86/Views/MemoryView.axaml
+++ b/src/Spice86/Views/MemoryView.axaml
@@ -49,16 +49,14 @@
 				</StackPanel>
 				<Grid RowDefinitions="Auto,Auto" ColumnDefinitions="Auto,Auto">
 					<Label Grid.Row="0" Grid.Column="0" Content="Start" />
-					<userControls:AddressAutoCompleteBox
+					<TextBox
 						Grid.Row="0" Grid.Column="1"
-						State="{Binding State}"
-						ParsedAddress="{Binding StartAddress, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+						Text="{Binding StartAddress, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
 					<Label Grid.Row="1" Grid.Column="0" Content="End" />
-					<userControls:AddressAutoCompleteBox
+					<TextBox
 						Grid.Row="1"
 						Grid.Column="1"
-						State="{Binding State}"
-						ParsedAddress="{Binding EndAddress, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+						Text="{Binding EndAddress, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
 				</Grid>
 				<StackPanel Orientation="Vertical">
 					<Button IsVisible="{Binding IsPaused}" IsEnabled="{Binding IsPaused}"
@@ -210,11 +208,10 @@
 								Grid.Row="0"
 								Grid.Column="0"
 								Content="Memory Address:" />
-							<userControls:AddressAutoCompleteBox
+							<TextBox
 								Grid.Row="0"
 								Grid.Column="1"
-								State="{Binding State}"
-								ParsedAddress="{Binding MemoryEditAddress, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+								Text="{Binding MemoryEditAddress, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
 							<Label
 								Grid.Row="1"
 								Grid.Column="0"
@@ -273,18 +270,17 @@
 									Grid.Row="1"
 									Grid.Column="0"
 									Content="Breakpoint Range End:" />
-								<AutoCompleteBox
+								<TextBox
 								    Grid.Row="0"
 									Grid.Column="1"
 									FontFamily="RobotoMonoFont"
-									Text="{Binding BreakpointRangeStartAddress}"
-									Watermark="linear or segmented address" />
-								<AutoCompleteBox
+									Text="{Binding BreakpointRangeStartAddress}" />
+								<TextBox
 								    Grid.Row="1"
 									Grid.Column="1"
 									FontFamily="RobotoMonoFont"
-									Text="{Binding BreakpointRangeEndAddress}"
-									Watermark="optional" />
+									Watermark="optional"
+									Text="{Binding BreakpointRangeEndAddress}" />
 							</Grid>
 							<Label
 								Grid.Row="1"