diff options
-rw-r--r-- | Cargo.toml | 6 | ||||
-rw-r--r-- | src/lib.rs | 10 |
2 files changed, 8 insertions, 8 deletions
@@ -1,14 +1,14 @@ [package] name = "yaxpeax-pic18" -version = "0.0.2" +version = "0.0.3" authors = [ "iximeow <me@iximeow.net>" ] license = "0BSD" repository = "http://git.iximeow.net/yaxpeax-pic18/" description = "pic18 decoders for the yaxpeax project" [dependencies] -yaxpeax-arch = { version = "0.0.3", default-features = false, features = [] } +yaxpeax-arch = { version = "0.0.4", default-features = false, features = [] } "serde" = { version = "1.0", optional = true } "serde_derive" = { version = "1.0", optional = true } @@ -19,4 +19,4 @@ yaxpeax-arch = { version = "0.0.3", default-features = false, features = [] } [features] default = [] -use-serde = [] +use-serde = ["serde", "serde_derive"] @@ -9,7 +9,7 @@ use std::fmt; extern crate yaxpeax_arch; -use yaxpeax_arch::{Arch, Decoder, LengthedInstruction}; +use yaxpeax_arch::{Arch, AddressDiff, Decoder, LengthedInstruction}; pub mod consts; pub mod display; @@ -37,9 +37,9 @@ pub struct Instruction { } impl LengthedInstruction for Instruction { - type Unit = <PIC18 as Arch>::Address; + type Unit = AddressDiff<<PIC18 as Arch>::Address>; fn min_size() -> Self::Unit { - 2 + AddressDiff::from_const(2) } fn len(&self) -> Self::Unit { match self.opcode { @@ -49,9 +49,9 @@ impl LengthedInstruction for Instruction { | Opcode::CALL | Opcode::LFSR | Opcode::GOTO => { - 4 + AddressDiff::from_const(4) }, - _ => 2 + _ => AddressDiff::from_const(2) } } } |