diff --git a/src/analysis/buttons.rs b/src/analysis/buttons.rs index 5fc577b..6016b8d 100644 --- a/src/analysis/buttons.rs +++ b/src/analysis/buttons.rs @@ -51,7 +51,7 @@ fn read_buttons( ((cur_button.address() - module.base) + offset_of!(KeyButton.state) as i64) as u32; debug!( - "found button: {} at {:#X} ({} + {:#X})", + "found button: {} @ {:#X} ({} + {:#X})", name, value as u64 + module.base.to_umem(), module.name, @@ -63,7 +63,6 @@ fn read_buttons( cur_button = button.next; } - // Sort buttons by name. buttons.sort_unstable_by(|a, b| a.name.cmp(&b.name)); Ok(buttons) diff --git a/src/analysis/interfaces.rs b/src/analysis/interfaces.rs index bbe5ccf..c5590e5 100644 --- a/src/analysis/interfaces.rs +++ b/src/analysis/interfaces.rs @@ -58,10 +58,11 @@ fn read_interfaces( while !cur_reg.is_null() { let reg = cur_reg.read(process)?; let name = reg.name.read_string(process)?.to_string(); + let value = (reg.create_fn.address() - module.base) as u32; debug!( - "found interface: {} at {:#X} ({} + {:#X})", + "found interface: {} @ {:#X} ({} + {:#X})", name, value as u64 + module.base.to_umem(), module.name, @@ -73,7 +74,6 @@ fn read_interfaces( cur_reg = reg.next; } - // Sort interfaces by name. ifaces.sort_unstable_by(|a, b| a.name.cmp(&b.name)); Ok(ifaces) diff --git a/src/analysis/mod.rs b/src/analysis/mod.rs index 619bef9..d126b2c 100644 --- a/src/analysis/mod.rs +++ b/src/analysis/mod.rs @@ -12,7 +12,6 @@ mod interfaces; mod offsets; mod schemas; -#[derive(Debug)] pub struct AnalysisResult { pub buttons: Vec