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

8 files changed, 33 insertions, 32 deletions

diff --git a/Cargo.toml b/Cargo.toml
index 4d8c046..fc78d72 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,7 +9,7 @@ description = "x86 decoders for the yaxpeax project"
 readme = "README.md"
 
 [dependencies]
-yaxpeax-arch = { version = "0.0.3", default-features = false, features = [] }
+yaxpeax-arch = { version = "0.0.4", default-features = false, features = [] }
 "num-traits" = { version = "0.2", default-features = false }
 "termion" = { version = "1.4.0", optional = true }
 "serde" = { version = "1.0", optional = true }
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();
 }
diff --git a/src/long_mode/mod.rs b/src/long_mode/mod.rs
index a18a62c..b5920c5 100644
--- a/src/long_mode/mod.rs
+++ b/src/long_mode/mod.rs
@@ -3,7 +3,7 @@ mod display;
 
 use core::hint::unreachable_unchecked;
 
-use yaxpeax_arch::{Decoder, LengthedInstruction};
+use yaxpeax_arch::{AddressDiff, Decoder, LengthedInstruction};
 
 #[cfg(feature="use-serde")]
 #[derive(Copy, Clone, Debug, PartialOrd, Ord, Eq, PartialEq, Serialize, Deserialize)]
@@ -1325,12 +1325,12 @@ impl yaxpeax_arch::Arch for Arch {
 }
 
 impl LengthedInstruction for Instruction {
-    type Unit = u64;
-    fn len(&self) -> u64 {
-        self.length.into()
+    type Unit = AddressDiff<u64>;
+    fn len(&self) -> Self::Unit {
+        AddressDiff::from_const(self.length.into())
     }
-    fn min_size() -> u64 {
-        1
+    fn min_size() -> Self::Unit {
+        AddressDiff::from_const(1)
     }
 }
 
diff --git a/src/protected_mode/mod.rs b/src/protected_mode/mod.rs
index 4405cc8..3370aaa 100644
--- a/src/protected_mode/mod.rs
+++ b/src/protected_mode/mod.rs
@@ -3,7 +3,7 @@ mod display;
 
 use core::hint::unreachable_unchecked;
 
-use yaxpeax_arch::{Decoder, LengthedInstruction};
+use yaxpeax_arch::{AddressDiff, Decoder, LengthedInstruction};
 
 #[cfg(feature="use-serde")]
 #[derive(Copy, Clone, Debug, PartialOrd, Ord, Eq, PartialEq, Serialize, Deserialize)]
@@ -1311,12 +1311,12 @@ impl yaxpeax_arch::Arch for Arch {
 }
 
 impl LengthedInstruction for Instruction {
-    type Unit = u32;
-    fn len(&self) -> u32 {
-        self.length.into()
+    type Unit = AddressDiff<u32>;
+    fn len(&self) -> Self::Unit {
+        AddressDiff::from_const(self.length.into())
     }
-    fn min_size() -> u32 {
-        1
+    fn min_size() -> Self::Unit {
+        AddressDiff::from_const(1)
     }
 }
 
diff --git a/test/long_mode/mod.rs b/test/long_mode/mod.rs
index 33de87f..ca8a557 100644
--- a/test/long_mode/mod.rs
+++ b/test/long_mode/mod.rs
@@ -2,7 +2,7 @@ mod regspec;
 
 use std::fmt::Write;
 
-use yaxpeax_arch::{Decoder, LengthedInstruction};
+use yaxpeax_arch::{AddressBase, Decoder, LengthedInstruction};
 use yaxpeax_x86::long_mode::{DecodeError, InstDecoder, Opcode};
 
 fn test_invalid(data: &[u8]) {
@@ -40,7 +40,7 @@ fn test_display_under(decoder: &InstDecoder, data: &[u8], expected: &'static str
             );
             // while we're at it, test that the instruction is as long, and no longer, than its
             // input
-            assert_eq!(instr.len() as usize, data.len(), "instruction length is incorrect, wanted instruction {}", expected);
+            assert_eq!((0u64.wrapping_offset(instr.len()).to_linear()) as usize, data.len(), "instruction length is incorrect, wanted instruction {}", expected);
         },
         Err(e) => {
             assert!(false, "decode error ({}) for {} under decoder {}:\n  expected: {}\n", e, hex, decoder, expected);
diff --git a/test/protected_mode/mod.rs b/test/protected_mode/mod.rs
index e1fb281..dd07159 100644
--- a/test/protected_mode/mod.rs
+++ b/test/protected_mode/mod.rs
@@ -2,7 +2,7 @@ mod regspec;
 
 use std::fmt::Write;
 
-use yaxpeax_arch::{Decoder, LengthedInstruction};
+use yaxpeax_arch::{AddressBase, Decoder, LengthedInstruction};
 use yaxpeax_x86::protected_mode::{DecodeError, InstDecoder, Opcode};
 
 fn test_invalid(data: &[u8]) {
@@ -40,7 +40,7 @@ fn test_display_under(decoder: &InstDecoder, data: &[u8], expected: &'static str
             );
             // while we're at it, test that the instruction is as long, and no longer, than its
             // input
-            assert_eq!(instr.len() as usize, data.len(), "instruction length is incorrect, wanted instruction {}", expected);
+            assert_eq!((0u32.wrapping_offset(instr.len()).to_linear()) as usize, data.len(), "instruction length is incorrect, wanted instruction {}", expected);
         },
         Err(e) => {
             assert!(false, "decode error ({}) for {} under decoder {}:\n  expected: {}\n", e, hex, decoder, expected);