Add better debugging tools

src/disassemble.rs

@@ -1,32 +1,51 @@
-use crate::error::Error;
 use capstone::prelude::*;
-use std::fmt::Write;
+use dynasmrt::AssemblyOffset;
+use std::error::Error;
+use std::fmt::{Display, Write};
 
-pub fn disassemble(mem: &[u8]) -> Result<(), Error> {
+pub fn disassemble(
+    mem: &[u8],
+    mut ops: &[(AssemblyOffset, impl Display)],
+) -> Result<(), Box<dyn Error>> {
     let mut cs = Capstone::new()
         .x86()
         .mode(arch::x86::ArchMode::Mode64)
         .build()?;
 
     println!("{} bytes:", mem.len());
-    let insns = cs.disasm_all(&mem, 0x0).unwrap();
+    let insns = cs.disasm_all(&mem, 0x0)?;
     for i in insns.iter() {
         let mut line = String::new();
 
-        write!(&mut line, "{:4x}:\t", i.address()).unwrap();
+        let address = i.address();
+
+        loop {
+            if let Some((offset, op)) = ops.first() {
+                if offset.0 as u64 <= address {
+                    ops = &ops[1..];
+                    println!("{}", op);
+                } else {
+                    break;
+                }
+            } else {
+                break;
+            }
+        }
+
+        write!(&mut line, "{:4x}:\t", i.address())?;
 
         let mut bytes_str = String::new();
         for b in i.bytes() {
-            write!(&mut bytes_str, "{:02x} ", b).unwrap();
+            write!(&mut bytes_str, "{:02x} ", b)?;
         }
-        write!(&mut line, "{:24}\t", bytes_str).unwrap();
+        write!(&mut line, "{:24}\t", bytes_str)?;
 
         if let Some(s) = i.mnemonic() {
-            write!(&mut line, "{}\t", s).unwrap();
+            write!(&mut line, "{}\t", s)?;
         }
 
         if let Some(s) = i.op_str() {
-            write!(&mut line, "{}", s).unwrap();
+            write!(&mut line, "{}", s)?;
         }
 
         println!("{}", line);