Also highlight addend when reloc differs

Author: LagoLunatic

objdiff-cli/src/views/function_diff.rs

@@ -1,3 +1,5 @@
+use std::cmp::Ordering;
+
 use anyhow::{bail, Result};
 use crossterm::event::{Event, KeyCode, KeyEventKind, KeyModifiers, MouseButton, MouseEventKind};
 use objdiff_core::{
@@ -563,6 +565,18 @@ impl FunctionDiffUi {
                             base_color = Color::White;
                         }
                     }
+                    DiffText::Addend(addend, diff) => {
+                        label_text = match addend.cmp(&0i64) {
+                            Ordering::Greater => format!("+{:#x}", addend),
+                            Ordering::Less => format!("-{:#x}", -addend),
+                            _ => "".to_string(),
+                        };
+                        if let Some(diff) = diff {
+                            base_color = COLOR_ROTATION[diff.idx % COLOR_ROTATION.len()]
+                        } else {
+                            base_color = Color::White;
+                        }
+                    }
                     DiffText::Spacing(n) => {
                         line.spans.push(Span::raw(" ".repeat(n)));
                         sx += n as u16;

objdiff-core/src/diff/display.rs

@@ -1,5 +1,3 @@
-use std::cmp::Ordering;
-
 use crate::{
     diff::{ObjInsArgDiff, ObjInsDiff},
     obj::{ObjInsArg, ObjInsArgValue, ObjReloc, ObjSymbol},
@@ -23,6 +21,8 @@ pub enum DiffText<'a> {
     BranchDest(u64, Option<&'a ObjInsArgDiff>),
     /// Symbol name
     Symbol(&'a ObjSymbol, Option<&'a ObjInsArgDiff>),
+    /// Relocation addend
+    Addend(i64, Option<&'a ObjInsArgDiff>),
     /// Number of spaces
     Spacing(usize),
     /// End of line
@@ -99,11 +99,7 @@ fn display_reloc_name<E>(
     diff: Option<&ObjInsArgDiff>,
 ) -> Result<(), E> {
     cb(DiffText::Symbol(&reloc.target, diff))?;
-    match reloc.addend.cmp(&0i64) {
-        Ordering::Greater => cb(DiffText::Basic(&format!("+{:#x}", reloc.addend))),
-        Ordering::Less => cb(DiffText::Basic(&format!("-{:#x}", -reloc.addend))),
-        _ => Ok(()),
-    }
+    cb(DiffText::Addend(reloc.addend, diff))
 }
 
 impl PartialEq<DiffText<'_>> for HighlightKind {

objdiff-gui/src/views/function_diff.rs

@@ -312,6 +312,18 @@ fn diff_text_ui(
                 base_color = appearance.emphasized_text_color;
             }
         }
+        DiffText::Addend(addend, diff) => {
+            label_text = match addend.cmp(&0i64) {
+                Ordering::Greater => format!("+{:#x}", addend),
+                Ordering::Less => format!("-{:#x}", -addend),
+                _ => "".to_string(),
+            };
+            if let Some(diff) = diff {
+                base_color = appearance.diff_colors[diff.idx % appearance.diff_colors.len()]
+            } else {
+                base_color = appearance.emphasized_text_color;
+            }
+        }
         DiffText::Spacing(n) => {
             ui.add_space(n as f32 * space_width);
             return ret;