From 7561575f135e0ba72f0a90a5859d19f7b02a31e8 Mon Sep 17 00:00:00 2001
From: iximeow <me@iximeow.net>
Date: Sat, 30 Nov 2019 12:12:40 -0800
Subject: fix 0x98 and 0x99 opcodes, lss/lfs/lgs decodes

also remove unnecessary variants in unlikely_operands and adjust
expectations of several tests
---
 src/display.rs | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'src/display.rs')

diff --git a/src/display.rs b/src/display.rs
index 3e058df..5e42cef 100644
--- a/src/display.rs
+++ b/src/display.rs
@@ -331,8 +331,6 @@ impl fmt::Display for Opcode {
             &Opcode::RETURN => write!(f, "{}", "ret"),
             &Opcode::PUSHF => write!(f, "{}", "pushf"),
             &Opcode::WAIT => write!(f, "{}", "wait"),
-            &Opcode::CBW => write!(f, "{}", "cbw"),
-            &Opcode::CDW => write!(f, "{}", "cdw"),
             &Opcode::LODS => write!(f, "{}", "lods"),
             &Opcode::STOS => write!(f, "{}", "stos"),
             &Opcode::LAHF => write!(f, "{}", "lahf"),
@@ -523,6 +521,12 @@ impl fmt::Display for Opcode {
             &Opcode::VMREAD => write!(f, "{}", "vmread"),
             &Opcode::VMWRITE => write!(f, "{}", "vmwrite"),
             &Opcode::XORPS => write!(f, "{}", "xorps"),
+            &Opcode::CBW => write!(f, "{}", "cbw"),
+            &Opcode::CWDE => write!(f, "{}", "cwde"),
+            &Opcode::CDQE => write!(f, "{}", "cdqe"),
+            &Opcode::CBD => write!(f, "{}", "cbd"),
+            &Opcode::CDQ => write!(f, "{}", "cdq"),
+            &Opcode::CQO => write!(f, "{}", "cqo"),
             &Opcode::Invalid => write!(f, "{}", "invalid"),
         }
     }
@@ -720,6 +724,12 @@ impl <T: std::fmt::Write> Colorize<T> for Opcode {
             Opcode::STC |
             Opcode::STI |
             Opcode::STD |
+            Opcode::CBW |
+            Opcode::CWDE |
+            Opcode::CDQE |
+            Opcode::CBD |
+            Opcode::CDQ |
+            Opcode::CQO |
             Opcode::MOVDDUP |
             Opcode::MOVSLDUP |
             Opcode::MOVDQ2Q |
@@ -731,8 +741,6 @@ impl <T: std::fmt::Write> Colorize<T> for Opcode {
             Opcode::PEXTRW |
             Opcode::PINSRW |
             Opcode::MOV |
-            Opcode::CBW |
-            Opcode::CDW |
             Opcode::LODS |
             Opcode::STOS |
             Opcode::LAHF |
-- 
cgit v1.1