diff options
author | iximeow <me@iximeow.net> | 2019-04-21 14:16:44 -0700 |
---|---|---|
committer | iximeow <me@iximeow.net> | 2020-01-12 16:26:39 -0800 |
commit | cd2881ff02ae5c90bf459581df9dcdef1535ab23 (patch) | |
tree | 9ff33787099656a342a033509b19bfbb07312d19 | |
parent | 9e2e1a1bc0f0a03e03a6e370ce91536bc2443774 (diff) |
awful tweaks to expose a serde flag on yaxpeax-arch which will trickle through everything
-rw-r--r-- | Cargo.toml | 8 | ||||
-rw-r--r-- | src/lib.rs | 29 |
2 files changed, 37 insertions, 0 deletions
@@ -10,6 +10,14 @@ description = "fundamental traits to describe an architecture in the yaxpeax pro [dependencies] "num-traits" = "0.2" "termion" = "1.4.0" +"serde" = "*" [profile.release] lto = true + +[features] +default = [] + +# enables the (optional) use of Serde for bounds on +# Arch and Arch::Address +use-serde = [] @@ -1,5 +1,7 @@ extern crate num_traits; extern crate termion; +#[cfg(feature="use-serde")] +extern crate serde; use std::str::FromStr; @@ -14,6 +16,9 @@ use num_traits::{Bounded, WrappingAdd, WrappingSub, CheckedAdd, CheckedSub}; use termion::color; +#[cfg(feature="use-serde")] +use serde::{Serialize, Deserialize}; + pub mod display; // This is pretty wonk.. pub trait AddressDisplay { @@ -34,6 +39,22 @@ pub trait AddrParse: Sized { fn parse_from(s: &str) -> Result<Self, Self::Err>; } +#[cfg(feature="use-serde")] +pub trait Address where Self: + Serialize + for<'de> Deserialize<'de> + + Debug + Display + AddressDisplay + + Copy + Clone + Sized + + Ord + Eq + PartialEq + Bounded + + Add<Output=Self> + Sub<Output=Self> + + AddAssign + SubAssign + + WrappingAdd + WrappingSub + + CheckedAdd + CheckedSub + + AddrParse + + identities::One + identities::Zero { + fn to_linear(&self) -> usize; + +} +#[cfg(not(feature="use-serde"))] pub trait Address where Self: Debug + Display + AddressDisplay + Copy + Clone + Sized + @@ -142,6 +163,14 @@ pub trait Decodable where Self: Sized { fn decode_into<T: IntoIterator<Item=u8>>(&mut self, bytes: T) -> Option<()>; } +#[cfg(feature="use-serde")] +pub trait Arch { + type Address: Address + Debug + Serialize + for<'de> Deserialize<'de>; + type Instruction: Decodable + LengthedInstruction<Unit=Self::Address> + Debug; + type Operand; +} + +#[cfg(not(feature="use-serde"))] pub trait Arch { type Address: Address + Debug; type Instruction: Decodable + LengthedInstruction<Unit=Self::Address> + Debug; |