diff options
author | iximeow <me@iximeow.net> | 2020-05-03 13:38:08 -0700 |
---|---|---|
committer | iximeow <me@iximeow.net> | 2020-05-03 13:38:08 -0700 |
commit | 79388a4ff09fe21d31fe41a68e59a92263c2eea5 (patch) | |
tree | e618817ad8ae68ddb34239140a3a85029b6d259c /ffi/src | |
parent | a68d0b05cc05ec4a390fa25a6dd199d189cd1e38 (diff) |
bump yaxpeax-arch to 0.0.4, use AddressDiff, fix warnings in ffi
Diffstat (limited to 'ffi/src')
-rw-r--r-- | ffi/src/lib.rs | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/ffi/src/lib.rs b/ffi/src/lib.rs index 9d726d2..ca0bf5c 100644 --- a/ffi/src/lib.rs +++ b/ffi/src/lib.rs @@ -3,27 +3,27 @@ #[panic_handler] #[cold] -fn panic(panic: &core::panic::PanicInfo) -> ! { +fn panic(_panic: &core::panic::PanicInfo) -> ! { loop {} } #[lang = "eh_personality"] extern fn eh_personality() {} -use yaxpeax_arch::{Arch, Decoder, LengthedInstruction, Address, AddressBase}; -use yaxpeax_x86::x86_64; +use yaxpeax_arch::{Arch, Decoder, LengthedInstruction, AddressBase}; +use yaxpeax_x86::long_mode as amd64; use core::fmt::Write; #[no_mangle] -pub unsafe extern "C" fn yaxpeax_decode_x86_64_optimistic(data: *const u8, length: u64, inst: *mut yaxpeax_x86::Instruction) -> bool { - let inst: &mut yaxpeax_x86::Instruction = core::mem::transmute(inst); - <x86_64 as Arch>::Decoder::default().decode_into(inst, core::slice::from_raw_parts(data as *const u8, length as usize).iter().cloned()).is_err() +pub unsafe extern "C" fn yaxpeax_decode_x86_64_optimistic(data: *const u8, length: u64, inst: *mut amd64::Instruction) -> bool { + let inst: &mut amd64::Instruction = core::mem::transmute(inst); + <amd64::Arch as Arch>::Decoder::default().decode_into(inst, core::slice::from_raw_parts(data as *const u8, length as usize).iter().cloned()).is_err() } #[no_mangle] -pub unsafe extern "C" fn yaxpeax_instr_length_x86_64(inst: *mut yaxpeax_x86::Instruction) -> usize { - let inst: &mut yaxpeax_x86::Instruction = core::mem::transmute(inst); - inst.len().to_linear() +pub unsafe extern "C" fn yaxpeax_instr_length_x86_64(inst: *mut amd64::Instruction) -> usize { + let inst: &mut amd64::Instruction = core::mem::transmute(inst); + 0.wrapping_offset(inst.len()).to_linear() } struct InstructionSink<'buf> { @@ -47,9 +47,9 @@ impl<'a> core::fmt::Write for InstructionSink<'a> { } #[no_mangle] -pub unsafe extern "C" fn yaxpeax_instr_fmt(inst: *mut yaxpeax_x86::Instruction, text: *mut u8, len: usize) { - let inst: &mut yaxpeax_x86::Instruction = core::mem::transmute(inst); - let mut res = core::slice::from_raw_parts_mut(text, len); +pub unsafe extern "C" fn yaxpeax_instr_fmt(inst: *mut amd64::Instruction, text: *mut u8, len: usize) { + let inst: &mut amd64::Instruction = core::mem::transmute(inst); + let res = core::slice::from_raw_parts_mut(text, len); write!(InstructionSink { buf: res, offs: 0 }, "{}", inst).unwrap(); } |