Improve the decoding of the VEX encoded instructions.

syzygy/core/disassembler_util_unittest.cc

 // Copyright 2012 Google Inc. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 108 matching lines @@
 const uint8_t kInt3[] = {0xCC};
 
 // VEX encoded instructions that Distorm doesn't handle properly.
 const std::vector<std::vector<uint8_t>> kVexInstructions = {
     // AVX instructions.
     {0xC4, 0xE3, 0xFD, 0x00, 0xED, 0x44},        // vpermq
     {0xC4, 0xE2, 0x4D, 0x36, 0xC0},              // vpermd
     {0xC4, 0xE2, 0x7D, 0x5A, 0x45, 0xD0},        // vbroadcasti128
     {0xC4, 0xE3, 0x7D, 0x38, 0x2C, 0x0F, 0x01},  // vinserti128
     {0xC4, 0xE2, 0x79, 0x78, 0xC0},              // vpbroadcastb
-    {0xC4, 0xE2, 0x7D, 0x58, 0x40, 0x04},        // vpbroadcastd
+    {0xC4, 0xE2, 0x79, 0x78, 0x40, 0x04},        // vpbroadcastb (2 operands)
+    {0xC4, 0xE2, 0x7D, 0x58, 0xC0},              // vpbroadcastd
+    {0xC4, 0xE2, 0x7D, 0x58, 0x40, 0x04},        // vpbroadcastd (2 operands)
     {0xC4, 0xE2, 0x7D, 0x18, 0xC0},              // vbroadcastss
     {0xC4, 0xE3, 0x7D, 0x39, 0xC8, 0x01},        // vextracti128
     {0xC4, 0xE2, 0x7D, 0x90, 0x1C, 0x88},        // vpgatherdd
     {0xC4, 0xE2, 0x7D, 0x8C, 0x00},              // vpmaskmovd
-    {0xC4, 0xE2, 0x7D, 0x8E, 0x90},              // vpmaskmovd
 
     // F16C instructions.
     {0xC4, 0xE3, 0x79, 0x1D, 0xC8, 0x00},  // vcvtps2ph
     {0xC4, 0xE2, 0x79, 0x13, 0xE0},        // vcvtps2ps
 };
 
 void TestBadlyDecodedInstruction(const uint8_t* code, size_t code_length) {
   _DInst inst[1] = {};
   unsigned int inst_count = 0;
   _DecodeResult result = RawDecomposeCode(
@@ skipping 233 matching lines @@
 }
 
 TEST(DisassemblerUtilTest, TestBadlyDecodedCRC32) {
   // CRC32 with a 16 bit operand size prefix is not handled correctly by
   // distorm.
   EXPECT_NO_FATAL_FAILURE(
       TestBadlyDecodedInstruction(kCrc32CX, sizeof(kCrc32CX)));
 }
 
 }  // namespace core