bump yaxpeax-arch to 0.0.4, use AddressDiff, fix warnings in ffi

3 files changed, 16 insertions, 15 deletions

diff --git a/ffi/Cargo.toml b/ffi/Cargo.toml
index 121757a..e009a38 100644
--- a/ffi/Cargo.toml
+++ b/ffi/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "yaxpeax_x86_ffi"
-version = "0.0.1"
+version = "0.0.2"
 authors = ["iximeow <me@iximeow.net>"]
 edition = "2018"
 
 [dependencies]
 yaxpeax-x86 = { path = "../", default-features = false }
-yaxpeax-arch = { path = "../../../yaxpeax-arch", default-features = false }
+yaxpeax-arch = { version = "0.0.4", default-features = false, features = [] }
 
 [lib]
 name = "yaxpeax_x86_ffi"
@@ -16,4 +16,4 @@ crate-type = ["staticlib"]
 [profile.release]
 opt-level = 3
 lto = "fat"
-
+panic = "abort"
diff --git a/ffi/rust-toolchain b/ffi/rust-toolchain
new file mode 100644
index 0000000..bf867e0
--- /dev/null
+++ b/ffi/rust-toolchain
@@ -0,0 +1 @@
+nightly
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();
 }