Changeset 53032 in vbox

Timestamp:

Oct 10, 2014 4:18:37 PM (10 years ago)

Author:

vboxsync

Message:

DIS: #6249: Added crc32 Gy, Ew support (with word as operand 2)

Location:

trunk/src/VBox/Disassembler

Files:

• DisasmCore.cpp (modified) (1 diff)
• DisasmInternal.h (modified) (1 diff)
• DisasmTables.cpp (modified) (2 diffs)
• testcase/tstDisasm-1A.asm (modified) (2 diffs)

trunk/src/VBox/Disassembler/DisasmCore.cpp

@@ -2000 +2000 @@
 
     case OP_REPNE:   /* 0xF2 */
-        if (g_apThreeByteMapX86_F20F38[pDis->bOpCode >> 4])
+        if ((pDis->fPrefix & DISPREFIX_OPSIZE) && g_apThreeByteMapX86_66F20F38[pDis->bOpCode >> 4])
+        {
+        /* 0x66F2 */
+            pOpcode = g_apThreeByteMapX86_66F20F38[pDis->bOpCode >> 4];
+            pOpcode = &pOpcode[pDis->bOpCode & 0xf];
+
+            if (pOpcode->uOpcode != OP_INVALID)
+            {
+                /* Table entry is valid, so use the extension table. */
+
+                /* Cancel prefix changes. */
+                pDis->fPrefix &= ~DISPREFIX_REPNE;
+                pDis->fPrefix &= ~DISPREFIX_OPSIZE;
+                if (pDis->uCpuMode == DISCPUMODE_64BIT)
+                {
+                    pDis->uOpMode = (pDis->fRexPrefix & DISPREFIX_REX_FLAGS_W ? DISCPUMODE_64BIT : DISCPUMODE_32BIT);
+                }
+                else
+                    pDis->uOpMode  = pDis->uCpuMode;
+            }
+        }
+        else if (g_apThreeByteMapX86_F20F38[pDis->bOpCode >> 4])
         {
             pOpcode = g_apThreeByteMapX86_F20F38[pDis->bOpCode >> 4];

trunk/src/VBox/Disassembler/DisasmInternal.h

@@ -110 +110 @@
 /** Three byte opcode map with prefix 0x66 (0xF 0x3A) */
 extern PCDISOPCODE const g_apThreeByteMapX86_660F3A[16];
+
+/** Three byte opcode map with prefixes 0x66 0xF2 (0xF 0x38) */
+extern PCDISOPCODE const g_apThreeByteMapX86_66F20F38[16];
 /** @} */
 

trunk/src/VBox/Disassembler/DisasmTables.cpp

@@ -1297 +1297 @@
     OP("movbe %Gy,%My",          IDX_ParseModRM,     IDX_UseModRM,   0,          OP_MOVBEGM,     OP_PARM_Gy,          OP_PARM_My,     OP_PARM_NONE,   DISOPTYPE_HARMLESS),
     OP("movbe %My,%Gy",          IDX_ParseModRM,     IDX_UseModRM,   0,          OP_MOVBEMG,     OP_PARM_My,          OP_PARM_Gy,     OP_PARM_NONE,   DISOPTYPE_HARMLESS),
-    INVALID_OPCODE,    
+    INVALID_OPCODE,
     INVALID_OPCODE,
     INVALID_OPCODE,
@@ -1558 +1558 @@
     /* f */
     &g_aThreeByteMapX86_F20F38_F[0],
+};
+
+/** Three byte opcode map with prefixes 0x66 0xF2 (0xF 0x38) */
+PCDISOPCODE const g_apThreeByteMapX86_66F20F38[16] =
+{
+    /* 0 */
+    NULL,
+    /* 1 */
+    NULL,
+    /* 2 */
+    NULL,
+    /* 3 */
+    NULL,
+    /* 4 */
+    NULL,
+    /* 5 */
+    NULL,
+    /* 6 */
+    NULL,
+    /* 7 */
+    NULL,
+    /* 8 */
+    NULL,
+    /* 9 */
+    NULL,
+    /* a */
+    NULL,
+    /* b */
+    NULL,
+    /* c */
+    NULL,
+    /* d */
+    NULL,
+    /* e */
+    NULL,
+    /* f */
+    &g_aThreeByteMapX86_66F20F38_F[0],
 };
 

trunk/src/VBox/Disassembler/testcase/tstDisasm-1A.asm

@@ -170 +170 @@
 
         crc32       eax, bl
-        ;crc32       eax, bx
+        crc32       eax, bx
         crc32       eax, ebx
         crc32       eax, byte [edi]
-        ;crc32       eax, word [edi]
+        crc32       eax, word [edi]
         crc32       eax, dword [edi]
 
@@ -282 +282 @@
 
         crc32       eax, bl
-        ;crc32       eax, bx
+        crc32       eax, bx
         crc32       eax, ebx
         crc32       eax, byte [edi]
-        ;crc32       eax, word [edi]
+        crc32       eax, word [edi]
         crc32       eax, dword [edi]