aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authoriximeow <me@iximeow.net>2020-05-03 20:09:38 -0700
committeriximeow <me@iximeow.net>2020-05-03 20:09:38 -0700
commitac4b68ac02c80416197413ac079353c4b60bb6ec (patch)
treee0b93bb2901c926bd338a88e6ed7f6f216fa5beb /src
parent429edb71087f6af043ada99f90d67ca1fb3c97ec (diff)
allow file inputs, update decoders, add avr
"update decoders" here means bump decoders to yaxpeax-arch 0.0.4 versions. additionally, this pulls in fixes in x86 0.0.11 add avr decoder by @The9P4C!!
Diffstat (limited to 'src')
-rw-r--r--src/main.rs72
1 files changed, 48 insertions, 24 deletions
diff --git a/src/main.rs b/src/main.rs
index 62fd390..97ec7e8 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -4,6 +4,8 @@ use clap::*;
use num_traits::identities::Zero;
use std::fmt;
+use std::fs::File;
+use std::io::Read;
fn main() {
let _ = include_str!("../Cargo.toml");
@@ -12,39 +14,68 @@ fn main() {
.short("a")
.long("--architecture")
.takes_value(true)
- .possible_values(&["x86_64", "x86:32", "armv7", "armv8", "mips", "msp430", "pic17", "pic18", "m16c"])
+ .possible_values(&["x86_64", "x86:32", "armv7", "armv8", "avr", "mips", "msp430", "pic17", "pic18", "m16c"])
.help("architecture to disassemble input as."))
- /*
.arg(Arg::with_name("file")
.short("f")
.long("file")
.takes_value(true)
.help("file of bytes to decode"))
- */
.arg(Arg::with_name("verbose")
.short("v")
.long("--verbose")
.help("increased detail when decoding instructions"))
.arg(Arg::with_name("data")
- .required(true)
.help("hex bytes to decode by the selected architecture. for example, try -a x86_64 33c0c3"));
let matches = app.get_matches();
let arch_str = matches.value_of("arch").unwrap_or("x86_64");
- let buf: &str = matches.value_of("data").unwrap_or("");
+ let buf: Vec<u8> = match matches.value_of("data") {
+ Some(data) => {
+ match hex::decode(data) {
+ Ok(buf) => buf,
+ Err(e) => {
+ eprintln!("Invalid input, {}. Expected a sequence of bytes as hex", e);
+ return;
+ }
+ }
+ }
+ None => {
+ let mut v = Vec::new();
+ match matches.value_of("file") {
+ Some(name) => {
+ match File::open(name) {
+ Ok(mut f) => {
+ f.read_to_end(&mut v).expect("can read the file");
+ v
+ }
+ Err(e) => {
+ eprintln!("error opening {}: {}", name, e);
+ return;
+ }
+ }
+ }
+ None => {
+ eprintln!("data must be provided by either an argument consisting of hex bytes, or by the --file argument.");
+ return;
+ }
+ }
+ }
+ };
let verbose = matches.occurrences_of("verbose") > 0;
match arch_str {
- "x86_64" => decode_input::<yaxpeax_x86::long_mode::Arch>(buf, verbose),
- "x86:32" => decode_input::<yaxpeax_x86::protected_mode::Arch>(buf, verbose),
- "armv7" => decode_input::<yaxpeax_arm::armv7::ARMv7>(buf, verbose),
- "armv8" => decode_input::<yaxpeax_arm::armv8::a64::ARMv8>(buf, verbose),
- "mips" => decode_input::<yaxpeax_mips::MIPS>(buf, verbose),
- "msp430" => decode_input::<yaxpeax_msp430::MSP430>(buf, verbose),
- "pic17" => decode_input::<yaxpeax_pic17::PIC17>(buf, verbose),
- "pic18" => decode_input::<yaxpeax_pic18::PIC18>(buf, verbose),
- "m16c" => decode_input::<yaxpeax_m16c::M16C>(buf, verbose),
+ "x86_64" => decode_input::<yaxpeax_x86::long_mode::Arch>(&buf, verbose),
+ "x86:32" => decode_input::<yaxpeax_x86::protected_mode::Arch>(&buf, verbose),
+ "avr" => decode_input::<yaxpeax_avr::AVR>(&buf, verbose),
+ "armv7" => decode_input::<yaxpeax_arm::armv7::ARMv7>(&buf, verbose),
+ "armv8" => decode_input::<yaxpeax_arm::armv8::a64::ARMv8>(&buf, verbose),
+ "mips" => decode_input::<yaxpeax_mips::MIPS>(&buf, verbose),
+ "msp430" => decode_input::<yaxpeax_msp430::MSP430>(&buf, verbose),
+ "pic17" => decode_input::<yaxpeax_pic17::PIC17>(&buf, verbose),
+ "pic18" => decode_input::<yaxpeax_pic18::PIC18>(&buf, verbose),
+ "m16c" => decode_input::<yaxpeax_m16c::M16C>(&buf, verbose),
// "pic24" => decode_input::<yaxpeax_pic24::PIC24>(buf),
other => {
println!("unsupported architecture: {}", other);
@@ -52,21 +83,14 @@ fn main() {
}
}
-fn decode_input<A: Arch>(buf: &str, verbose: bool) where A::Instruction: fmt::Display {
- let buf = match hex::decode(buf) {
- Ok(buf) => buf,
- Err(e) => {
- eprintln!("Invalid input, {}. Expected a sequence of bytes as hex", e);
- return;
- }
- };
+fn decode_input<A: Arch>(buf: &[u8], verbose: bool) where A::Instruction: fmt::Display {
let decoder = A::Decoder::default();
let start = A::Address::zero();
let mut addr = start;
loop {
match decoder.decode(buf[addr.to_linear()..].iter().cloned()) {
Ok(inst) => {
- println!("{:#010x}: {:14}: {}", addr.to_linear(), hex::encode(&buf[addr.to_linear()..][..inst.len().to_linear()]), inst);
+ println!("{:#010x}: {:14}: {}", addr.to_linear(), hex::encode(&buf[addr.to_linear()..][..A::Address::zero().wrapping_offset(inst.len()).to_linear()]), inst);
if verbose {
println!(" {:?}", inst);
if !inst.well_defined() {
@@ -75,7 +99,7 @@ fn decode_input<A: Arch>(buf: &str, verbose: bool) where A::Instruction: fmt::Di
}
addr += inst.len();
},
- Err(e) => { println!("{:#010x}: {}", addr.to_linear(), e); break; },
+ Err(e) => { println!("{:#010x}: {}", addr.to_linear(), e); addr += A::Instruction::min_size(); },
}
if addr.to_linear() >= buf.len() {
break;