From c19d232486ae46ad88d23d9103913f6d78665352 Mon Sep 17 00:00:00 2001 From: Jamiras Date: Wed, 20 May 2026 07:54:08 -0600 Subject: [PATCH 1/2] de-emphasize pointer notes in requirements view --- Source/ViewModels/RequirementGroupViewModel.cs | 16 +++++++--------- Source/ViewModels/RequirementViewModel.cs | 5 +++++ Source/Views/AssetViewer.xaml | 12 +++++++++++- 3 files changed, 23 insertions(+), 10 deletions(-) diff --git a/Source/ViewModels/RequirementGroupViewModel.cs b/Source/ViewModels/RequirementGroupViewModel.cs index 92ced86f..8580f8ad 100644 --- a/Source/ViewModels/RequirementGroupViewModel.cs +++ b/Source/ViewModels/RequirementGroupViewModel.cs @@ -206,16 +206,14 @@ private static void UpdateDependencies(List list) private static CodeNote UpdateParentNote(Requirement requirement, CodeNote parentNote, IDictionary notes) { - if (requirement.Type == RequirementType.AddAddress && requirement.Left.IsMemoryReference) - { - var leftNote = CodeNote.ResolveNote(requirement.Left.Value, notes, parentNote); - return (leftNote != null && leftNote.IsPointer) ? leftNote : null; - } - else if (requirement.Type != RequirementType.AddAddress) - { + if (requirement.Type != RequirementType.AddAddress) return null; - } - return parentNote; + + if (!requirement.Left.IsMemoryReference) + return parentNote; + + var leftNote = CodeNote.ResolveNote(requirement.Left.Value, notes, parentNote); + return (leftNote != null && leftNote.IsPointer) ? leftNote : null; } private static void AppendRequirements(List list, RequirementEx left, RequirementEx right, NumberFormat numberFormat, IDictionary notes) diff --git a/Source/ViewModels/RequirementViewModel.cs b/Source/ViewModels/RequirementViewModel.cs index 4f4a261c..dc4c5dce 100644 --- a/Source/ViewModels/RequirementViewModel.cs +++ b/Source/ViewModels/RequirementViewModel.cs @@ -123,6 +123,11 @@ private set public bool IsNoteShortened { get; private set; } + public bool IsAddAddress + { + get { return Requirement.Type == RequirementType.AddAddress; } + } + internal virtual void OnShowHexValuesChanged(ModelPropertyChangedEventArgs e) { if (Requirement != null) diff --git a/Source/Views/AssetViewer.xaml b/Source/Views/AssetViewer.xaml index 21dd2d52..abefe4f7 100644 --- a/Source/Views/AssetViewer.xaml +++ b/Source/Views/AssetViewer.xaml @@ -108,7 +108,17 @@ - + + + + + From 2542e991a00c99af7b4520c0cb7d929ed80e6d27 Mon Sep 17 00:00:00 2001 From: Jamiras Date: Wed, 20 May 2026 08:07:40 -0600 Subject: [PATCH 2/2] handle requirement comparison with no left side --- Source/ViewModels/RequirementViewModel.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/ViewModels/RequirementViewModel.cs b/Source/ViewModels/RequirementViewModel.cs index dc4c5dce..e4966a1d 100644 --- a/Source/ViewModels/RequirementViewModel.cs +++ b/Source/ViewModels/RequirementViewModel.cs @@ -125,7 +125,7 @@ private set public bool IsAddAddress { - get { return Requirement.Type == RequirementType.AddAddress; } + get { return Requirement?.Type == RequirementType.AddAddress; } } internal virtual void OnShowHexValuesChanged(ModelPropertyChangedEventArgs e)