Fix longest register value

Author: wcampbell0x2a

.github/workflows/main.yml

@@ -44,7 +44,7 @@ jobs:
       - run: |
          sudo apt-get update
          sudo apt-get install -y gdb
-      - run: cargo test --target x86_64-unknown-linux-gnu
+      - run: RUST_LOG=trace cargo test --target x86_64-unknown-linux-gnu
 
   # fmt and clippy on nightly builds
   fmt-clippy-nightly:

src/main.rs

@@ -947,6 +947,7 @@ mod tests {
 
     #[test]
     fn test_render_app() {
+        env_logger::init();
         // gcc test.c -g -fno-stack-protector -static
         // test.c
         // ```c

src/snapshots/heretek__tests__render_app.snap

@@ -6,13 +6,13 @@ snapshot_kind: text
 "─────────────────────────────────────────────────────────────────────|heretek-v0.1.0-rc12|──────────────────────────────────────────────────────────────────────"
 "       Press q to exit, i to enter input | F1 main | F2 registers | F3 stack | F4 instructions | F5 output | F6 mapping | F7 hexdump | Heap | Stack | Code      "
 "Registers───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────"
-"  rax    ➛ 0x401825           ➛ main                                                                                                                            "
-"  rbx    ➛ 0x1                                                                                                                                                  "
-"  rcx    ➛ <rcx_0>           ➛ 0x04                                                                                                                            "
-"  rdx    ➛ <rdx_0>     ➛ <rdx_1>     ➛ "<rdx_2>"                                                                                                 "
-"  rsi    ➛ <rsi_0>     ➛ <rsi_1>     ➛ "<rsi_2>"                                                                                                 "
-"  rdi    ➛ 0x1                                                                                                                                                  "
-"  rbp    ➛ <rbp_0>     ➛ <rbp_1>     ➛ <rbp_2>     ➛ 0x00                                                                                  "
+"  rax     ➛ 0x401825           ➛ main                                                                                                                           "
+"  rbx     ➛ 0x1                                                                                                                                                 "
+"  rcx     ➛ <rcx_0>           ➛ 0x04                                                                                                                           "
+"  rdx     ➛ <rdx_0>     ➛ <rdx_1>     ➛ "<rdx_2>"                                                                                                "
+"  rsi     ➛ <rsi_0>     ➛ <rsi_1>     ➛ "<rsi_2>"                                                                                                "
+"  rdi     ➛ 0x1                                                                                                                                                 "
+"  rbp     ➛ <rbp_0>     ➛ <rbp_1>     ➛ <rbp_2>     ➛ 0x00                                                                                 "
 "Stack───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────"
 "  <stack_0> ➛ <stack_6>     ➛ <stack_6_0>        ➛ <stack_6_1>        ➛ <rbp_1>     ➛ <rbp_2>     ➛ 0x00                                "
 "  <stack_1> ➛ 0x40f022           ➛ malloc                                                                                                                  "

src/ui/registers.rs

@@ -3,6 +3,7 @@ use std::sync::atomic::Ordering;
 
 use super::{add_deref_to_span, apply_val_color, ORANGE, PURPLE, RED};
 
+use log::debug;
 use ratatui::prelude::Stylize;
 use ratatui::text::{Line, Span, Text};
 use ratatui::widgets::{Block, Borders, Paragraph};
@@ -29,9 +30,21 @@ pub fn draw_registers(app: &App, f: &mut Frame, register: Rect) {
         // TODO: cache this
         let reg_changed_lock = app.register_changed.lock().unwrap();
         let filepath_lock = app.filepath.lock().unwrap();
-        for RegisterStorage { name, register: _, deref: _ } in regs.iter() {
-            if longest_register_name < name.len() {
-                longest_register_name = name.len();
+        debug!("HEY");
+        for RegisterStorage { name, register, deref: _ } in regs.iter() {
+            if let Some(reg) = register {
+                if !reg.is_set() {
+                    continue;
+                }
+                if let Some(reg_value) = &reg.value {
+                    if let Ok(val) = u64::from_str_radix(&reg_value[2..], 16) {
+                        // let changed = reg_changed_lock.contains(&(i as u8));
+                        if longest_register_name < name.len() {
+                            debug!("long: {name}");
+                            longest_register_name = name.len();
+                        }
+                    }
+                }
             }
         }
         let width: usize = if app.thirty_two_bit.load(Ordering::Relaxed) { 11 } else { 19 };
@@ -47,11 +60,9 @@ pub fn draw_registers(app: &App, f: &mut Frame, register: Rect) {
                 if let Some(reg_value) = &reg.value {
                     if let Ok(val) = u64::from_str_radix(&reg_value[2..], 16) {
                         let changed = reg_changed_lock.contains(&(i as u8));
-                        let mut reg_name = Span::from(format!(
-                            "  {name:width$}",
-                            width = longest_register_name - 2
-                        ))
-                        .style(Style::new().fg(PURPLE));
+                        let mut reg_name =
+                            Span::from(format!("  {name:width$}", width = longest_register_name))
+                                .style(Style::new().fg(PURPLE));
                         let (is_stack, is_heap, is_text) = app.classify_val(val, &filepath);
 
                         let mut extra_derefs = Vec::new();