aboutsummaryrefslogtreecommitdiff
path: root/src/protected_mode
diff options
context:
space:
mode:
authoriximeow <me@iximeow.net>2021-07-03 15:51:22 -0700
committeriximeow <me@iximeow.net>2021-07-03 15:51:22 -0700
commit7e154da8e2bd7b8892bdefe2f71c111c2135b0a3 (patch)
treeb1b945803f37c48a7dd7e5a23e0656ee1d9c83b9 /src/protected_mode
parent582c4e44579d4bbb9dcec9d12c23c8b774db3cfb (diff)
be more strict about denying invalid operands
Diffstat (limited to 'src/protected_mode')
-rw-r--r--src/protected_mode/mod.rs2
-rw-r--r--src/protected_mode/vex.rs6
2 files changed, 6 insertions, 2 deletions
diff --git a/src/protected_mode/mod.rs b/src/protected_mode/mod.rs
index c9ba9f2..589d7a3 100644
--- a/src/protected_mode/mod.rs
+++ b/src/protected_mode/mod.rs
@@ -6868,7 +6868,7 @@ fn read_0f38_opcode(opcode: u8, prefixes: &mut Prefixes) -> OpcodeRecord {
fn read_0f3a_opcode(opcode: u8, prefixes: &mut Prefixes) -> OpcodeRecord {
if prefixes.rep() {
- if prefixes.operand_size() || prefixes.repnz() {
+ if prefixes != &Prefixes::new(0x10) {
return OpcodeRecord(Interpretation::Instruction(Opcode::Invalid), OperandCode::Nothing);
}
return match opcode {
diff --git a/src/protected_mode/vex.rs b/src/protected_mode/vex.rs
index 7c55ef1..36ccc66 100644
--- a/src/protected_mode/vex.rs
+++ b/src/protected_mode/vex.rs
@@ -1528,7 +1528,11 @@ fn read_vex_instruction<T: Reader<<Arch as yaxpeax_arch::Arch>::Address, <Arch a
} else {
VEXOperandCode::G_V_E_xmm
}),
- 0x16 => (Opcode::VMOVHPD, VEXOperandCode::G_V_M_xmm),
+ 0x16 => (Opcode::VMOVHPD, if L {
+ return Err(DecodeError::InvalidOpcode);
+ } else {
+ VEXOperandCode::G_V_M_xmm
+ }),
0x17 => (Opcode::VMOVHPD, if L {
instruction.opcode = Opcode::Invalid;
return Err(DecodeError::InvalidOpcode);