From 7394c9dc4727d42b3ccbdf38f114ae0b5d28069d Mon Sep 17 00:00:00 2001
From: iximeow <me@iximeow.net>
Date: Fri, 2 Jul 2021 19:45:34 -0700
Subject: intel keylocker instructions that access memory have memory access
 sizes

---
 src/long_mode/mod.rs      | 8 ++++++++
 src/protected_mode/mod.rs | 9 +++++++++
 2 files changed, 17 insertions(+)

(limited to 'src')

diff --git a/src/long_mode/mod.rs b/src/long_mode/mod.rs
index 22ffe58..e8947ea 100644
--- a/src/long_mode/mod.rs
+++ b/src/long_mode/mod.rs
@@ -8610,6 +8610,7 @@ fn unlikely_operands<T: Reader<<Arch as yaxpeax_arch::Arch>::Address, <Arch as y
                     if modrm >= 0b11_000_000 {
                         return Err(DecodeError::InvalidOperand);
                     }
+                    instruction.mem_size = 48;
                     instruction.opcode = Opcode::AESENCWIDE128KL;
                     instruction.operands[0] = read_M(words, instruction, modrm)?;
                     return Ok(());
@@ -8618,6 +8619,7 @@ fn unlikely_operands<T: Reader<<Arch as yaxpeax_arch::Arch>::Address, <Arch as y
                     if modrm >= 0b11_000_000 {
                         return Err(DecodeError::InvalidOperand);
                     }
+                    instruction.mem_size = 48;
                     instruction.opcode = Opcode::AESDECWIDE128KL;
                     instruction.operands[0] = read_M(words, instruction, modrm)?;
                     return Ok(());
@@ -8626,6 +8628,7 @@ fn unlikely_operands<T: Reader<<Arch as yaxpeax_arch::Arch>::Address, <Arch as y
                     if modrm >= 0b11_000_000 {
                         return Err(DecodeError::InvalidOperand);
                     }
+                    instruction.mem_size = 64;
                     instruction.opcode = Opcode::AESENCWIDE256KL;
                     instruction.operands[0] = read_M(words, instruction, modrm)?;
                     return Ok(());
@@ -8634,6 +8637,7 @@ fn unlikely_operands<T: Reader<<Arch as yaxpeax_arch::Arch>::Address, <Arch as y
                     if modrm >= 0b11_000_000 {
                         return Err(DecodeError::InvalidOperand);
                     }
+                    instruction.mem_size = 64;
                     instruction.opcode = Opcode::AESDECWIDE256KL;
                     instruction.operands[0] = read_M(words, instruction, modrm)?;
                     return Ok(());
@@ -8648,6 +8652,7 @@ fn unlikely_operands<T: Reader<<Arch as yaxpeax_arch::Arch>::Address, <Arch as y
             if let OperandSpec::RegMMM = instruction.operands[1] {
                 instruction.opcode = Opcode::LOADIWKEY;
             } else {
+                instruction.mem_size = 48;
                 instruction.opcode = Opcode::AESENC128KL;
             }
         }
@@ -8656,6 +8661,7 @@ fn unlikely_operands<T: Reader<<Arch as yaxpeax_arch::Arch>::Address, <Arch as y
             if let OperandSpec::RegMMM = instruction.operands[1] {
                 return Err(DecodeError::InvalidOperand);
             } else {
+                instruction.mem_size = 48;
                 instruction.opcode = Opcode::AESDEC128KL;
             }
         }
@@ -8664,6 +8670,7 @@ fn unlikely_operands<T: Reader<<Arch as yaxpeax_arch::Arch>::Address, <Arch as y
             if let OperandSpec::RegMMM = instruction.operands[1] {
                 return Err(DecodeError::InvalidOperand);
             } else {
+                instruction.mem_size = 64;
                 instruction.opcode = Opcode::AESENC256KL;
             }
         }
@@ -8672,6 +8679,7 @@ fn unlikely_operands<T: Reader<<Arch as yaxpeax_arch::Arch>::Address, <Arch as y
             if let OperandSpec::RegMMM = instruction.operands[1] {
                 return Err(DecodeError::InvalidOperand);
             } else {
+                instruction.mem_size = 64;
                 instruction.opcode = Opcode::AESDEC256KL;
             }
         }
diff --git a/src/protected_mode/mod.rs b/src/protected_mode/mod.rs
index 908e449..a1aac3f 100644
--- a/src/protected_mode/mod.rs
+++ b/src/protected_mode/mod.rs
@@ -8436,11 +8436,13 @@ fn unlikely_operands<T: Reader<<Arch as yaxpeax_arch::Arch>::Address, <Arch as y
         OperandCode::ModRM_0xf30f38d8 => {
             let modrm = read_modrm(words)?;
             let r = (modrm >> 3) & 7;
+            instruction.mem_size = 63;
             match r {
                 0b000 => {
                     if modrm >= 0b11_000_000 {
                         return Err(DecodeError::InvalidOperand);
                     }
+                    instruction.mem_size = 48;
                     instruction.opcode = Opcode::AESENCWIDE128KL;
                     instruction.operands[0] = read_M(words, instruction, modrm)?;
                     return Ok(());
@@ -8449,6 +8451,7 @@ fn unlikely_operands<T: Reader<<Arch as yaxpeax_arch::Arch>::Address, <Arch as y
                     if modrm >= 0b11_000_000 {
                         return Err(DecodeError::InvalidOperand);
                     }
+                    instruction.mem_size = 48;
                     instruction.opcode = Opcode::AESDECWIDE128KL;
                     instruction.operands[0] = read_M(words, instruction, modrm)?;
                     return Ok(());
@@ -8457,6 +8460,7 @@ fn unlikely_operands<T: Reader<<Arch as yaxpeax_arch::Arch>::Address, <Arch as y
                     if modrm >= 0b11_000_000 {
                         return Err(DecodeError::InvalidOperand);
                     }
+                    instruction.mem_size = 64;
                     instruction.opcode = Opcode::AESENCWIDE256KL;
                     instruction.operands[0] = read_M(words, instruction, modrm)?;
                     return Ok(());
@@ -8465,6 +8469,7 @@ fn unlikely_operands<T: Reader<<Arch as yaxpeax_arch::Arch>::Address, <Arch as y
                     if modrm >= 0b11_000_000 {
                         return Err(DecodeError::InvalidOperand);
                     }
+                    instruction.mem_size = 64;
                     instruction.opcode = Opcode::AESDECWIDE256KL;
                     instruction.operands[0] = read_M(words, instruction, modrm)?;
                     return Ok(());
@@ -8479,6 +8484,7 @@ fn unlikely_operands<T: Reader<<Arch as yaxpeax_arch::Arch>::Address, <Arch as y
             if let OperandSpec::RegMMM = instruction.operands[1] {
                 instruction.opcode = Opcode::LOADIWKEY;
             } else {
+                instruction.mem_size = 48;
                 instruction.opcode = Opcode::AESENC128KL;
             }
         }
@@ -8487,6 +8493,7 @@ fn unlikely_operands<T: Reader<<Arch as yaxpeax_arch::Arch>::Address, <Arch as y
             if let OperandSpec::RegMMM = instruction.operands[1] {
                 return Err(DecodeError::InvalidOperand);
             } else {
+                instruction.mem_size = 48;
                 instruction.opcode = Opcode::AESDEC128KL;
             }
         }
@@ -8495,6 +8502,7 @@ fn unlikely_operands<T: Reader<<Arch as yaxpeax_arch::Arch>::Address, <Arch as y
             if let OperandSpec::RegMMM = instruction.operands[1] {
                 return Err(DecodeError::InvalidOperand);
             } else {
+                instruction.mem_size = 64;
                 instruction.opcode = Opcode::AESENC256KL;
             }
         }
@@ -8503,6 +8511,7 @@ fn unlikely_operands<T: Reader<<Arch as yaxpeax_arch::Arch>::Address, <Arch as y
             if let OperandSpec::RegMMM = instruction.operands[1] {
                 return Err(DecodeError::InvalidOperand);
             } else {
+                instruction.mem_size = 64;
                 instruction.opcode = Opcode::AESDEC256KL;
             }
         }
-- 
cgit v1.1