initial commit

Author: minirop

Cargo.toml

@@ -0,0 +1,9 @@
+[package]
+name = "dump-diff"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+capstone = "0.12.0"
+clap = { version = "4.5.4", features = ["derive"] }
+clap-num = "1.1.1"

readme.md

@@ -0,0 +1,72 @@
+# dump-diff
+
+Crude diff tools for assembly binary blobs
+
+## usage
+
+```console
+Usage: dump-diff [OPTIONS] --target <TARGET> --current <CURRENT> --addr <ADDR> --arch <ARCH> --mode <MODE>
+
+Options:
+  -t, --target <TARGET>          Target
+  -c, --current <CURRENT>        Current
+  -x, --addr <ADDR>              Address
+  -a, --arch <ARCH>              Architecture
+  -m, --mode <MODE>              Mode
+  -e, --endianness <ENDIANNESS>  Endianness
+  -h, --help                     Print help
+```
+
+- TARGET: the target binary
+- CURRENT: your current compiled code
+- ADDR: the (virtual) memory address where the code is located at.
+- ARCH: the [architecture](https://docs.rs/capstone/latest/capstone/enum.Arch.html)
+- MODE: the [mode](https://docs.rs/capstone/latest/capstone/enum.Mode.html)
+- ENDIANNESS: big or little (defaults: little)
+
+⚠️ WARNING ⚠️ The tool doesn't check the arch/mode tuple, so you can ask for ARM64 + RiscV64 (and it will panic).
+
+## Example
+
+```console
+$ dump-diff -t target.bin -c current.bin -x 0x821843e8 -a ppc -m mode32 -e big
+mflr r12                      mflr r12
+stw r12, -8(r1)               stw r12, -8(r1)
+std r30, -0x18(r1)            std r30, -0x18(r1)
+std r31, -0x10(r1)            std r31, -0x10(r1)
+stfd f31, -0x20(r1)           stfd f31, -0x20(r1)
+stwu r1, -0x80(r1)            stwu r1, -0x80(r1)
+lfs f31, 0x54(r3)             mr r31, r3                    <===========
+mr r31, r3                    mr r30, r4                    <===========
+mr r30, r4                    lfs f31, 0x54(r31)            <===========
+bl 0x8210fb68                 bl 0x8210fb68
+extsh r11, r30                extsh r11, r30
+lis r10, -0x7dff              lis r10, -0x7dff
+std r11, 0x50(r1)             std r11, 0x50(r1)
+lfd f0, 0x50(r1)              lfd f0, 0x50(r1)
+fcfid f0, f0                  fcfid f0, f0
+lis r9, -0x7e00               lis r9, -0x7e00
+frsp f12, f0                  frsp f12, f0
+lfd f0, -0x3fb0(r10)          lfd f0, -0x3fb0(r10)
+lfs f13, 0x1580(r9)           lfs f13, 0x1580(r9)
+fmuls f12, f1, f12            fmuls f12, f1, f12
+fmsub f0, f12, f0, f31        fnmsub f0, f12, f0, f31       <===========
+frsp f0, f0                   frsp f0, f0
+fcmpu cr6, f0, f13            fcmpu cr6, f0, f13
+blt cr6, 0x82184450           blt cr6, 0x82184450
+fsubs f0, f0, f13             fsubs f0, f0, f13
+b 0x82184464                  b 0x82184464
+lis r11, -0x7e00              lis r11, -0x7e00
+lfs f12, 0x7a0(r11)           lfs f12, 0x7a0(r11)
+fcmpu cr6, f0, f12            fcmpu cr6, f0, f12
+bge cr6, 0x82184464           bge cr6, 0x82184464
+fadds f0, f0, f13             fadds f0, f0, f13
+stfs f0, 0x54(r31)            stfs f0, 0x54(r31)
+addi r1, r1, 0x80             addi r1, r1, 0x80
+lwz r12, -8(r1)               lwz r12, -8(r1)
+mtlr r12                      mtlr r12
+lfd f31, -0x20(r1)            lfd f31, -0x20(r1)
+ld r30, -0x18(r1)             ld r30, -0x18(r1)
+ld r31, -0x10(r1)             ld r31, -0x10(r1)
+blr                           blr 
+```

src/main.rs

@@ -0,0 +1,83 @@
+use std::io::Read;
+use std::fs::File;
+use clap::Parser;
+use clap_num::maybe_hex;
+use capstone::prelude::*;
+
+/// Compare compiled assembly
+#[derive(Parser, Debug)]
+#[command(author = None, version = None, about = None, long_about = None)]
+struct Args {
+    /// Target
+    #[arg(short, long)]
+    target: String,
+
+    /// Current
+    #[arg(short, long)]
+    current: String,
+
+    /// Address
+    #[arg(short='x', long, value_parser=maybe_hex::<u32>)]
+    addr: u32,
+
+    /// Architecture
+    #[arg(short, long)]
+    arch: capstone::Arch,
+
+    /// Mode
+    #[arg(short, long)]
+    mode: capstone::Mode,
+
+    /// Endianness
+    #[arg(short, long)]
+    endianness: Option<capstone::Endian>,
+}
+
+const ALIGNMENT: usize = 30;
+fn main() {
+    let args = Args::parse();
+
+    let cs = Capstone::new_raw(args.arch, args.mode, capstone::NO_EXTRA_MODE, args.endianness).expect("Can't create capstone engine");
+
+    let current = disassemble(&cs, &args.current, args.addr);
+    let target = disassemble(&cs, &args.target, args.addr);
+    let min_size = std::cmp::min(current.len(), target.len());
+    let max_size = std::cmp::max(current.len(), target.len());
+
+    for i in 0..min_size {
+        print!("{}{}{}", current[i], " ".repeat(ALIGNMENT - current[i].len()), target[i]);
+        if current[i] != target[i] {
+            print!("{}<===========", " ".repeat(ALIGNMENT - target[i].len()));
+        }
+        println!("");
+    }
+
+    for i in min_size..max_size {
+        if current.len() < min_size {
+            print!("{}{}", current[i], " ".repeat(ALIGNMENT - current[i].len()));
+        } else {
+            print!("{}", " ".repeat(ALIGNMENT));
+        }
+        if target.len() < min_size {
+            print!("{}", target[i]);
+        }
+        println!("");
+    }
+}
+
+fn disassemble(cs: &Capstone, file: &str, vram: u32) -> Vec<String> {
+    let mut f = File::open(file).unwrap();
+    let mut buffer = Vec::new();
+    f.read_to_end(&mut buffer).unwrap();
+
+    let insns = cs.disasm_all(&buffer, vram as u64).expect("Failed to disassemble");
+
+    let mut insts = vec![];
+    for i in insns.as_ref() {
+        let op_str = i.op_str().unwrap_or("");
+        let inst = i.mnemonic().unwrap();
+        insts.push(format!("{inst} {op_str}"));
+    }
+
+    insts
+}