diff options
| author | iximeow <me@iximeow.net> | 2022-01-02 15:47:24 -0800 |
|---|---|---|
| committer | iximeow <me@iximeow.net> | 2022-01-02 15:47:24 -0800 |
| commit | 6a018dc137ee149a65c1773c0bc6ab4e9732f7c4 (patch) | |
| tree | 03978152b6b67f4d0b19d0a27c0d954bc763e35d /src | |
| parent | d2ec91d2fa0b20fa7cb935ea279a90367f6dcc1e (diff) | |
add thumb-mode decoder, update disassemblers
Diffstat (limited to 'src')
| -rw-r--r-- | src/main.rs | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/main.rs b/src/main.rs index 9184601..6a3d3ac 100644 --- a/src/main.rs +++ b/src/main.rs @@ -15,7 +15,7 @@ fn main() { .validator(|a| { if ["x86_64", "x86_32", "x86_16", "x86:64", "x86:32", "x86:16", - "ia64", "armv7", "armv8", "avr", "mips", "msp430", + "ia64", "armv7", "armv7-t", "armv8", "avr", "mips", "msp430", "pic17", "pic18", "m16c", "6502", "lc87"].contains(&&a[..]) || (["sh", "sh2", "sh3", "sh4", "j2"].contains( &&a[0..a.find(|c| c == '+' || c == '-').unwrap_or(a.len())]) && @@ -24,7 +24,7 @@ fn main() { Ok(()) } else { Err("possible values: x86_64, x86_32, x86_16, x86:64, x86:32, x86:16, \ - ia64, armv7, armv8, avr, mips, msp430, pic17, pic18, \ + ia64, armv7, armv7-t, armv8, avr, mips, msp430, pic17, pic18, \ m16c, 6502, lc87, {sh{,2,3,4},j2}[[+-]{be,mmu,fpu,f64,j2}]*" .to_string()) } @@ -92,6 +92,7 @@ fn main() { "ia64" => crate::current_arch::decode_input::<yaxpeax_ia64::IA64>(&buf, verbose), "avr" => crate::current_arch::decode_input::<yaxpeax_avr::AVR>(&buf, verbose), "armv7" => crate::current_arch::decode_input::<yaxpeax_arm::armv7::ARMv7>(&buf, verbose), + "armv7-t" => crate::current_arch::decode_armv7_thumb(&buf, verbose), "armv8" => crate::current_arch::decode_input::<yaxpeax_arm::armv8::a64::ARMv8>(&buf, verbose), "mips" => crate::current_arch::decode_input::<yaxpeax_mips::MIPS>(&buf, verbose), // "msp430" => crate::current_arch::decode_input_with_annotation::<yaxpeax_msp430::MSP430>(&buf, verbose), @@ -387,13 +388,19 @@ mod current_arch { } } use std::fmt::Write; - let _ = write!(res, "{}", fields[field_index].elements[0].description); + let _ = write!(res, "{:?}", fields[field_index].elements[0]); res.push_str("\n"); } println!("{}", res); } + pub(crate) fn decode_armv7_thumb(buf: &[u8], verbose: bool) { + let mut decoder = <yaxpeax_arm::armv7::ARMv7 as Arch>::Decoder::default(); + decoder.set_thumb_mode(true); + decode_input_with_decoder::<yaxpeax_arm::armv7::ARMv7>(decoder, buf, verbose); + } + pub(crate) fn decode_input<A: Arch>(buf: &[u8], verbose: bool) where A::Instruction: fmt::Display, for<'data> U8Reader<'data>: Reader<A::Address, A::Word>, |