From d4620aedb1e085462f82d2a643a20c7de743ea2b Mon Sep 17 00:00:00 2001 From: iximeow Date: Sun, 22 Aug 2021 15:04:33 -0700 Subject: bump to yaxpeax-arch 0.2.7 and proper field description support --- src/long_mode/mod.rs | 4 ++-- src/long_mode/vex.rs | 2 +- src/protected_mode/mod.rs | 4 ++-- src/protected_mode/vex.rs | 2 +- src/real_mode/mod.rs | 4 ++-- src/real_mode/vex.rs | 2 +- src/shared/evex.in | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/long_mode/mod.rs b/src/long_mode/mod.rs index 97ac8d1..1499f98 100644 --- a/src/long_mode/mod.rs +++ b/src/long_mode/mod.rs @@ -13,7 +13,7 @@ use core::cmp::PartialEq; use core::hint::unreachable_unchecked; use yaxpeax_arch::{AddressDiff, Decoder, Reader, LengthedInstruction}; -use yaxpeax_arch::{AnnotatingDecoder, DescriptionSink, NullSink}; +use yaxpeax_arch::annotation::{AnnotatingDecoder, DescriptionSink, NullSink}; use yaxpeax_arch::{DecodeError as ArchDecodeError}; use core::fmt; @@ -7471,7 +7471,7 @@ impl FieldDescription { } } -impl yaxpeax_arch::FieldDescription for FieldDescription { +impl yaxpeax_arch::annotation::FieldDescription for FieldDescription { fn id(&self) -> u32 { self.id } diff --git a/src/long_mode/vex.rs b/src/long_mode/vex.rs index e19621d..206e4f1 100644 --- a/src/long_mode/vex.rs +++ b/src/long_mode/vex.rs @@ -1,5 +1,5 @@ use yaxpeax_arch::Reader; -use yaxpeax_arch::DescriptionSink; +use yaxpeax_arch::annotation::DescriptionSink; use crate::long_mode::Arch; use crate::long_mode::OperandSpec; diff --git a/src/protected_mode/mod.rs b/src/protected_mode/mod.rs index 10a9248..5ad4c44 100644 --- a/src/protected_mode/mod.rs +++ b/src/protected_mode/mod.rs @@ -13,7 +13,7 @@ use core::cmp::PartialEq; use core::hint::unreachable_unchecked; use yaxpeax_arch::{AddressDiff, Decoder, Reader, LengthedInstruction}; -use yaxpeax_arch::{AnnotatingDecoder, DescriptionSink, NullSink}; +use yaxpeax_arch::annotation::{AnnotatingDecoder, DescriptionSink, NullSink}; use yaxpeax_arch::{DecodeError as ArchDecodeError}; use core::fmt; @@ -7488,7 +7488,7 @@ impl FieldDescription { } } -impl yaxpeax_arch::FieldDescription for FieldDescription { +impl yaxpeax_arch::annotation::FieldDescription for FieldDescription { fn id(&self) -> u32 { self.id } diff --git a/src/protected_mode/vex.rs b/src/protected_mode/vex.rs index 2c73d4b..556a300 100644 --- a/src/protected_mode/vex.rs +++ b/src/protected_mode/vex.rs @@ -1,5 +1,5 @@ use yaxpeax_arch::Reader; -use yaxpeax_arch::DescriptionSink; +use yaxpeax_arch::annotation::DescriptionSink; use crate::protected_mode::Arch; use crate::protected_mode::OperandSpec; diff --git a/src/real_mode/mod.rs b/src/real_mode/mod.rs index d43005e..6eefdad 100644 --- a/src/real_mode/mod.rs +++ b/src/real_mode/mod.rs @@ -13,7 +13,7 @@ use core::cmp::PartialEq; use core::hint::unreachable_unchecked; use yaxpeax_arch::{AddressDiff, Decoder, Reader, LengthedInstruction}; -use yaxpeax_arch::{AnnotatingDecoder, DescriptionSink, NullSink}; +use yaxpeax_arch::annotation::{AnnotatingDecoder, DescriptionSink, NullSink}; use yaxpeax_arch::{DecodeError as ArchDecodeError}; use core::fmt; @@ -7490,7 +7490,7 @@ impl FieldDescription { } } -impl yaxpeax_arch::FieldDescription for FieldDescription { +impl yaxpeax_arch::annotation::FieldDescription for FieldDescription { fn id(&self) -> u32 { self.id } diff --git a/src/real_mode/vex.rs b/src/real_mode/vex.rs index 9474a49..0534641 100644 --- a/src/real_mode/vex.rs +++ b/src/real_mode/vex.rs @@ -1,5 +1,5 @@ use yaxpeax_arch::Reader; -use yaxpeax_arch::DescriptionSink; +use yaxpeax_arch::annotation::DescriptionSink; use crate::real_mode::Arch; use crate::real_mode::OperandSpec; diff --git a/src/shared/evex.in b/src/shared/evex.in index 339eaaf..414074e 100644 --- a/src/shared/evex.in +++ b/src/shared/evex.in @@ -2,7 +2,7 @@ use super::OperandSpec; use super::FieldDescription; use super::InnerDescription; -use yaxpeax_arch::DescriptionSink; +use yaxpeax_arch::annotation::DescriptionSink; // `evex_byte_one` is an option because the caller *may* have already read it, // but may have not. `long_mode` can decide immediately that `0x62` should be read -- cgit v1.1