Merge pull request #212 from wcampbell0x2a/162-display-registers-ptr-to-stack

Author: wcampbell0x2a

src/snapshots/heretek__tests__render_app.snap

@@ -17,15 +17,15 @@ snapshot_kind: text
 "  r8      → 0x110                                                                                                                                              ║"
 "  r9      → 0x4                                                                                                                                                ▼"
 "Stack───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────"
-"  <stack_0> → <stack_6>     → <stack_6_0>        → <stack_6_1>        → <rbp_1>     → <rbp_2>     → 0x00                                "
+"  <stack_0>  (rsp)→ <stack_6>     → <stack_6_0>        → <stack_6_1>        → <rbp_1>     → <rbp_2>     → 0x00                          "
 "  <stack_1> → 0x40f022           → malloc+418 (test   rax,rax)                                                                                             "
 "  <stack_2> → 0x494b00           → sbb    al,0x0                                                                                                           "
 "  <stack_3> → 0x4a40e8           → DW.ref.__gcc_personality_v0+0 (xor    BYTE PTR [rsi+0x47],ah)                                                           "
 "  <stack_4> → 0x00                                                                                                                                         "
 "  <stack_5> → 0x4ab198           → 0x00                                                                                                                    "
 "  <stack_6> → <stack_6_0>        → <stack_6_1>        → <rbp_1>     → <rbp_2>     → 0x00                                                     "
 "  <stack_7> → 0x01                                                                                                                                         "
-"  <stack_8> → <rbp_1>     → <rbp_2>     → 0x00                                                                                               "
+"  <stack_8>  (rbp)→ <rbp_1>     → <rbp_2>     → 0x00                                                                                         "
 "  <stack_9> → 0x401d68           → __libc_start_call_main+104 (mov    edi,eax)                                                                             "
 "Instructions (main)─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────"
 "  0x401823         this+1e   pop    rbp                                                                                                                         "

src/ui/stack.rs

@@ -1,3 +1,5 @@
+use std::collections::HashMap;
+
 use ratatui::prelude::Stylize;
 use ratatui::text::{Line, Span, Text};
 use ratatui::widgets::{Block, Borders, Paragraph};
@@ -14,6 +16,20 @@ pub fn draw_stack(state: &mut State, f: &mut Frame, stack: Rect) {
     let width: usize = if state.ptr_size == PtrSize::Size32 { 11 } else { 19 };
 
     let stacks = state.stack.clone();
+
+    // Build map of address -> register names
+    let mut addr_to_regs: HashMap<u64, Vec<String>> = HashMap::new();
+    for reg in &state.registers {
+        if let Some(ref register) = reg.register
+            && let Some(ref val_str) = register.value
+            && let Some(hex) = val_str.strip_prefix("0x")
+            && let Ok(val) = u64::from_str_radix(hex, 16)
+            && stacks.contains_key(&val)
+        {
+            addr_to_regs.entry(val).or_default().push(reg.name.clone());
+        }
+    }
+
     for (addr, values) in &stacks {
         let filepath = state.filepath.clone().unwrap_or_default();
         let filepath = filepath.to_string_lossy();
@@ -24,6 +40,10 @@ pub fn draw_stack(state: &mut State, f: &mut Frame, stack: Rect) {
         let span = Span::from(format!("  {hex_string}{:padding$}", "", padding = padding_width))
             .style(Style::new().fg(PURPLE));
         let mut spans = vec![span];
+        if let Some(reg_names) = addr_to_regs.get(addr) {
+            let annotation = format!(" ({})", reg_names.join(", "));
+            spans.push(Span::from(annotation).style(Style::new().fg(ORANGE)));
+        }
         add_deref_to_span(values, &mut spans, state, &filepath, &mut longest_cells, width);
         let line = Line::from(spans);
         lines.push(line);