probably not

1 files changed, 28 insertions, 0 deletions

diff --git a/src/long_mode/vex.rs b/src/long_mode/vex.rs
index cf30622..c944532 100644
--- a/src/long_mode/vex.rs
+++ b/src/long_mode/vex.rs
@@ -352,9 +352,11 @@ fn read_vex_operands<T: Iterator<Item=u8>>(bytes: &mut T, instruction: &mut Inst
                 OperandSpec::RegMMM => {
                     instruction.operands[1] = OperandSpec::RegVex;
                     instruction.operands[2] = OperandSpec::RegMMM;
+                    instruction.operand_count = 3;
                 },
                 other => {
                     instruction.operands[1] = other;
+                    instruction.operand_count = 2;
                 }
             }
             Ok(())
@@ -370,9 +372,11 @@ fn read_vex_operands<T: Iterator<Item=u8>>(bytes: &mut T, instruction: &mut Inst
                 OperandSpec::RegMMM => {
                     instruction.operands[0] = OperandSpec::RegVex;
                     instruction.operands[2] = OperandSpec::RegMMM;
+                    instruction.operand_count = 3;
                 },
                 other => {
                     instruction.operands[0] = other;
+                    instruction.operand_count = 2;
                 }
             }
             Ok(())
@@ -392,6 +396,7 @@ fn read_vex_operands<T: Iterator<Item=u8>>(bytes: &mut T, instruction: &mut Inst
             instruction.operands[0] = mem_oper;
             instruction.operands[1] = OperandSpec::RegRRR;
             instruction.operands[2] = OperandSpec::ImmU8;
+            instruction.operand_count = 3;
             instruction.imm = read_imm_unsigned(bytes, 1, length)?;
             Ok(())
         },
@@ -406,6 +411,7 @@ fn read_vex_operands<T: Iterator<Item=u8>>(bytes: &mut T, instruction: &mut Inst
             let mem_oper = read_E(bytes, instruction, modrm, 8, length)?;
             instruction.operands[0] = OperandSpec::RegRRR;
             instruction.operands[1] = mem_oper;
+            instruction.operand_count = 2;
             Ok(())
         }
         VEXOperandCode::G_xmm_Ed => {
@@ -419,6 +425,7 @@ fn read_vex_operands<T: Iterator<Item=u8>>(bytes: &mut T, instruction: &mut Inst
             let mem_oper = read_E(bytes, instruction, modrm, 4, length)?;
             instruction.operands[0] = OperandSpec::RegRRR;
             instruction.operands[1] = mem_oper;
+            instruction.operand_count = 2;
             Ok(())
         }
         VEXOperandCode::Eq_G_xmm => {
@@ -432,6 +439,7 @@ fn read_vex_operands<T: Iterator<Item=u8>>(bytes: &mut T, instruction: &mut Inst
             let mem_oper = read_E(bytes, instruction, modrm, 8, length)?;
             instruction.operands[0] = mem_oper;
             instruction.operands[1] = OperandSpec::RegRRR;
+            instruction.operand_count = 2;
             Ok(())
         }
         VEXOperandCode::Ed_G_xmm => {
@@ -445,6 +453,7 @@ fn read_vex_operands<T: Iterator<Item=u8>>(bytes: &mut T, instruction: &mut Inst
             let mem_oper = read_E(bytes, instruction, modrm, 4, length)?;
             instruction.operands[0] = mem_oper;
             instruction.operands[1] = OperandSpec::RegRRR;
+            instruction.operand_count = 2;
             Ok(())
         }
         _op @ VEXOperandCode::E_G_xmm |
@@ -462,6 +471,7 @@ fn read_vex_operands<T: Iterator<Item=u8>>(bytes: &mut T, instruction: &mut Inst
             let mem_oper = read_E_xmm(bytes, instruction, modrm, length)?;
             instruction.operands[0] = mem_oper;
             instruction.operands[1] = OperandSpec::RegRRR;
+            instruction.operand_count = 2;
             Ok(())
         }
         _op @ VEXOperandCode::E_xmm_G_ymm_imm8 => {
@@ -475,6 +485,7 @@ fn read_vex_operands<T: Iterator<Item=u8>>(bytes: &mut T, instruction: &mut Inst
             let mem_oper = read_E_xmm(bytes, instruction, modrm, length)?;
             instruction.operands[0] = mem_oper;
             instruction.operands[1] = OperandSpec::RegRRR;
+            instruction.operand_count = 2;
             Ok(())
         }
 
@@ -492,6 +503,7 @@ fn read_vex_operands<T: Iterator<Item=u8>>(bytes: &mut T, instruction: &mut Inst
             let mem_oper = read_E_xmm(bytes, instruction, modrm, length)?;
             instruction.operands[0] = OperandSpec::RegRRR;
             instruction.operands[1] = mem_oper;
+            instruction.operand_count = 2;
             Ok(())
         }
         _op @ VEXOperandCode::G_xmm_E_xmm => {
@@ -505,6 +517,7 @@ fn read_vex_operands<T: Iterator<Item=u8>>(bytes: &mut T, instruction: &mut Inst
             let mem_oper = read_E_xmm(bytes, instruction, modrm, length)?;
             instruction.operands[0] = OperandSpec::RegRRR;
             instruction.operands[1] = mem_oper;
+            instruction.operand_count = 2;
             Ok(())
         }
         _op @ VEXOperandCode::G_xmm_E_ymm => {
@@ -518,6 +531,7 @@ fn read_vex_operands<T: Iterator<Item=u8>>(bytes: &mut T, instruction: &mut Inst
             let mem_oper = read_E_ymm(bytes, instruction, modrm, length)?;
             instruction.operands[0] = OperandSpec::RegRRR;
             instruction.operands[1] = mem_oper;
+            instruction.operand_count = 2;
             Ok(())
         }
         _op @ VEXOperandCode::G_ymm_E_xmm => {
@@ -531,6 +545,7 @@ fn read_vex_operands<T: Iterator<Item=u8>>(bytes: &mut T, instruction: &mut Inst
             let mem_oper = read_E_xmm(bytes, instruction, modrm, length)?;
             instruction.operands[0] = OperandSpec::RegRRR;
             instruction.operands[1] = mem_oper;
+            instruction.operand_count = 2;
             Ok(())
         }
         _op @ VEXOperandCode::G_ymm_E_ymm => {
@@ -544,6 +559,7 @@ fn read_vex_operands<T: Iterator<Item=u8>>(bytes: &mut T, instruction: &mut Inst
             let mem_oper = read_E_ymm(bytes, instruction, modrm, length)?;
             instruction.operands[0] = OperandSpec::RegRRR;
             instruction.operands[1] = mem_oper;
+            instruction.operand_count = 2;
             Ok(())
         }
 
@@ -560,6 +576,7 @@ fn read_vex_operands<T: Iterator<Item=u8>>(bytes: &mut T, instruction: &mut Inst
             let mem_oper = read_E_ymm(bytes, instruction, modrm, length)?;
             instruction.operands[0] = mem_oper;
             instruction.operands[1] = OperandSpec::RegRRR;
+            instruction.operand_count = 2;
             Ok(())
         }
 
@@ -576,6 +593,7 @@ fn read_vex_operands<T: Iterator<Item=u8>>(bytes: &mut T, instruction: &mut Inst
             let mem_oper = read_E_ymm(bytes, instruction, modrm, length)?;
             instruction.operands[0] = OperandSpec::RegRRR;
             instruction.operands[1] = mem_oper;
+            instruction.operand_count = 2;
             Ok(())
         }
         _op @ VEXOperandCode::G_V_E_ymm |
@@ -588,6 +606,7 @@ fn read_vex_operands<T: Iterator<Item=u8>>(bytes: &mut T, instruction: &mut Inst
             instruction.operands[0] = OperandSpec::RegRRR;
             instruction.operands[1] = OperandSpec::RegVex;
             instruction.operands[2] = mem_oper;
+            instruction.operand_count = 3;
             Ok(())
         }
         _op @ VEXOperandCode::G_V_E_ymm_imm8 => {
@@ -601,6 +620,7 @@ fn read_vex_operands<T: Iterator<Item=u8>>(bytes: &mut T, instruction: &mut Inst
             instruction.operands[2] = mem_oper;
             instruction.imm = read_imm_unsigned(bytes, 1, length)?;
             instruction.operands[3] = OperandSpec::ImmU8;
+            instruction.operand_count = 4;
             Ok(())
         }
         _op @ VEXOperandCode::E_V_G_ymm |
@@ -613,6 +633,7 @@ fn read_vex_operands<T: Iterator<Item=u8>>(bytes: &mut T, instruction: &mut Inst
             instruction.operands[0] = mem_oper;
             instruction.operands[1] = OperandSpec::RegVex;
             instruction.operands[2] = OperandSpec::RegRRR;
+            instruction.operand_count = 3;
             Ok(())
         }
         _op @ VEXOperandCode::G_V_M_xmm |
@@ -624,6 +645,7 @@ fn read_vex_operands<T: Iterator<Item=u8>>(bytes: &mut T, instruction: &mut Inst
             instruction.operands[0] = OperandSpec::RegRRR;
             instruction.operands[1] = OperandSpec::RegVex;
             instruction.operands[2] = mem_oper;
+            instruction.operand_count = 3;
             Ok(())
         }
         _op @ VEXOperandCode::G_V_E_xmm_imm8 => {
@@ -636,6 +658,7 @@ fn read_vex_operands<T: Iterator<Item=u8>>(bytes: &mut T, instruction: &mut Inst
             instruction.operands[2] = mem_oper;
             instruction.imm = read_imm_unsigned(bytes, 1, length)?;
             instruction.operands[3] = OperandSpec::ImmU8;
+            instruction.operand_count = 4;
             Ok(())
         }
         _op @ VEXOperandCode::V_ymm_G_ymm_E_xmm_imm8 => {
@@ -649,6 +672,7 @@ fn read_vex_operands<T: Iterator<Item=u8>>(bytes: &mut T, instruction: &mut Inst
             instruction.operands[2] = mem_oper;
             instruction.imm = read_imm_unsigned(bytes, 1, length)?;
             instruction.operands[3] = OperandSpec::ImmU8;
+            instruction.operand_count = 4;
             Ok(())
         }
         _op @ VEXOperandCode::V_xmm_G_ymm_E_ymm_imm8 => {
@@ -661,6 +685,7 @@ fn read_vex_operands<T: Iterator<Item=u8>>(bytes: &mut T, instruction: &mut Inst
             instruction.operands[2] = mem_oper;
             instruction.imm = read_imm_unsigned(bytes, 1, length)?;
             instruction.operands[3] = OperandSpec::ImmU8;
+            instruction.operand_count = 4;
             Ok(())
         }
         _op @ VEXOperandCode::E_V_G_xmm |
@@ -672,6 +697,7 @@ fn read_vex_operands<T: Iterator<Item=u8>>(bytes: &mut T, instruction: &mut Inst
             instruction.operands[0] = mem_oper;
             instruction.operands[1] = OperandSpec::RegVex;
             instruction.operands[2] = OperandSpec::RegRRR;
+            instruction.operand_count = 3;
             Ok(())
         }
 
@@ -684,6 +710,7 @@ fn read_vex_operands<T: Iterator<Item=u8>>(bytes: &mut T, instruction: &mut Inst
             instruction.operands[0] = OperandSpec::RegRRR;
             instruction.operands[1] = mem_oper;
             instruction.operands[2] = OperandSpec::RegVex;
+            instruction.operand_count = 3;
             Ok(())
         }
         VEXOperandCode::G_Ey_V_ymm => {
@@ -696,6 +723,7 @@ fn read_vex_operands<T: Iterator<Item=u8>>(bytes: &mut T, instruction: &mut Inst
             instruction.operands[0] = OperandSpec::RegRRR;
             instruction.operands[1] = mem_oper;
             instruction.operands[2] = OperandSpec::RegVex;
+            instruction.operand_count = 3;
             Ok(())
         }
         VEXOperandCode::G_V_E => {