From a07098315bea8b880688831f931bc5213ebb6a5f Mon Sep 17 00:00:00 2001
From: iximeow <me@iximeow.net>
Date: Fri, 13 Aug 2021 23:44:28 -0700
Subject: extend annotation reporting to 32- and 16-bit modes, kinda

---
 src/long_mode/mod.rs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/long_mode/mod.rs')

diff --git a/src/long_mode/mod.rs b/src/long_mode/mod.rs
index 25a1735..54d83e8 100644
--- a/src/long_mode/mod.rs
+++ b/src/long_mode/mod.rs
@@ -7462,6 +7462,9 @@ impl yaxpeax_arch::FieldDescription for FieldDescription {
     fn id(&self) -> u32 {
         self.id
     }
+    fn is_separator(&self) -> bool {
+        false
+    }
 }
 
 impl fmt::Display for FieldDescription {
@@ -7547,7 +7550,7 @@ fn read_with_annotations<
                     return Err(DecodeError::InvalidPrefixes);
                 } else {
                     instruction.prefixes = prefixes;
-                    vex::two_byte_vex(words, instruction)?;
+                    vex::two_byte_vex(words, instruction, sink)?;
                     return Ok(());
                 }
             } else if b == 0xc4 {
@@ -7556,7 +7559,7 @@ fn read_with_annotations<
                     return Err(DecodeError::InvalidPrefixes);
                 } else {
                     instruction.prefixes = prefixes;
-                    vex::three_byte_vex(words, instruction)?;
+                    vex::three_byte_vex(words, instruction, sink)?;
                     return Ok(());
                 }
             } else if b == 0x62 {
@@ -7565,7 +7568,7 @@ fn read_with_annotations<
                     return Err(DecodeError::InvalidPrefixes);
                 } else {
                     instruction.prefixes = prefixes;
-                    evex::read_evex(words, instruction, None)?;
+                    evex::read_evex(words, instruction, None, sink)?;
                     return Ok(());
                 }
             }
-- 
cgit v1.1