diff options
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | Cargo.toml | 2 | ||||
| -rw-r--r-- | src/reader.rs | 7 | ||||
| -rw-r--r-- | tests/lib.rs | 2 | ||||
| -rw-r--r-- | tests/reader.rs | 24 |
5 files changed, 34 insertions, 3 deletions
@@ -2,6 +2,8 @@ added `Reader` impls for `U8Reader` on `u16` addresses +fix incorrect `Reader` impls of `offset` and `total_offset` on non-`u8` words + ## 0.2.2 added `ReaderBuilder` trait and impls for `U8Reader` on various address and word types. @@ -7,7 +7,7 @@ keywords = ["disassembly", "disassembler"] license = "0BSD" name = "yaxpeax-arch" repository = "https://git.iximeow.net/yaxpeax-arch/" -version = "0.2.3" +version = "0.2.4" [dependencies] "num-traits" = { version = "0.2", default-features = false } diff --git a/src/reader.rs b/src/reader.rs index db72b79..acb0146 100644 --- a/src/reader.rs +++ b/src/reader.rs @@ -6,6 +6,7 @@ impl From<ReadError> for StandardDecodeError { } } +#[derive(Debug, PartialEq, Eq, Copy, Clone)] pub enum ReadError { ExhaustedInput, IOError(&'static str), @@ -167,11 +168,13 @@ macro_rules! u8reader_reader_impl { } #[inline] fn offset(&mut self) -> $addr_size { - (self.data as usize - self.mark as usize) as $addr_size + (self.data as usize - self.mark as usize) as $addr_size / + (core::mem::size_of::<$word>() as $addr_size) } #[inline] fn total_offset(&mut self) -> $addr_size { - (self.data as usize - self.start as usize) as $addr_size + (self.data as usize - self.start as usize) as $addr_size / + (core::mem::size_of::<$word>() as $addr_size) } } diff --git a/tests/lib.rs b/tests/lib.rs index 9add6e3..1d5e964 100644 --- a/tests/lib.rs +++ b/tests/lib.rs @@ -1,5 +1,7 @@ use yaxpeax_arch::AddressBase; +mod reader; + #[test] fn test_u16() { for l in 0..100 { diff --git a/tests/reader.rs b/tests/reader.rs new file mode 100644 index 0000000..d5d5440 --- /dev/null +++ b/tests/reader.rs @@ -0,0 +1,24 @@ +use yaxpeax_arch::{Reader, U8Reader, U16le, U32le}; + +#[test] +fn reader_offset_is_words_not_bytes() { + fn test_u16<T: Reader<u64, U16le>>(reader: &mut T) { + reader.mark(); + assert_eq!(reader.offset(), 0); + reader.next().unwrap(); + assert_eq!(reader.offset(), 1); + reader.mark(); + reader.next().unwrap(); + assert_eq!(reader.offset(), 1); + assert_eq!(reader.total_offset(), 2); + } + fn test_u32<T: Reader<u64, U32le>>(reader: &mut T) { + reader.mark(); + assert_eq!(reader.offset(), 0); + reader.next().unwrap(); + assert_eq!(reader.offset(), 1); + } + + test_u16(&mut U8Reader::new(&[0x01, 0x02, 0x03, 0x04])); + test_u32(&mut U8Reader::new(&[0x01, 0x02, 0x03, 0x04])); +} |