Changeset 61135 in vbox for trunk/src/VBox/Disassembler

Timestamp:

May 23, 2016 2:52:07 PM (9 years ago)

Author:

vboxsync

Message:

DISGetParamSize fixes; corrected movlpd and cvtps2dq disassembly table entries.

Location:

trunk/src/VBox/Disassembler

Files:

• DisasmReg.cpp (modified) (1 diff)
• DisasmTables.cpp (modified) (2 diffs)

trunk/src/VBox/Disassembler/DisasmReg.cpp

@@ -204 +204 @@
 {
     unsigned subtype = OP_PARM_VSUBTYPE(pParam->fParam);
-
-    if (subtype == OP_PARM_v)
-    {
-        switch (pDis->uOpMode)
-        {
-        case DISCPUMODE_32BIT:
-            subtype = OP_PARM_d;
-            break;
-        case DISCPUMODE_64BIT:
-            subtype = OP_PARM_q;
-            break;
-        case DISCPUMODE_16BIT:
-            subtype = OP_PARM_w;
-            break;
-        default:
-            /* make gcc happy */
-            break;
-        }
-    }
-
     switch (subtype)
     {
-    case OP_PARM_b:
-        return 1;
-
-    case OP_PARM_w:
-        return 2;
-
-    case OP_PARM_d:
-        return 4;
-
-    case OP_PARM_q:
-    case OP_PARM_dq:
-        return 8;
-
-    case OP_PARM_p: /* far pointer */
-        if (pDis->uAddrMode == DISCPUMODE_32BIT)
-            return 6;   /* 16:32 */
-        else
-        if (pDis->uAddrMode == DISCPUMODE_64BIT)
-            return 12;  /* 16:64 */
-        else
-            return 4;   /* 16:16 */
-
-    default:
-        if (pParam->cb)
-            return pParam->cb;
-        else //@todo dangerous!!!
+        case OP_PARM_v:
+            switch (pDis->uOpMode)
+            {
+                case DISCPUMODE_32BIT:
+                    return 4;
+                case DISCPUMODE_64BIT:
+                    return 8;
+                case DISCPUMODE_16BIT:
+                    return 2;
+                default: AssertFailed(); /* make gcc happy */ return 4;
+            }
+            break;
+
+        case OP_PARM_b:
+            return 1;
+
+        case OP_PARM_w:
+            return 2;
+
+        case OP_PARM_d:
+            return 4;
+
+        case OP_PARM_q:
+            return 8;
+
+        case OP_PARM_dq:
+            return 16;
+
+        case OP_PARM_qq:
+            return 32;
+
+        case 0: /* nop, pause, lea, wrmsr, rdmsr, etc.  Most of these due to DISOPPARAM::cb being initialized in the wrong place
+                   (disParseInstruction) where it will be called on intermediate stuff like IDX_ParseTwoByteEsc.  The parameter
+                   parsers should do it instead, though I see the potential filtering issue. */
+            //Assert(   pDis->pCurInstr
+            //       && (   pDis->pCurInstr->uOpcode == OP_NOP
+            //           || pDis->pCurInstr->uOpcode == OP_LEA ));
+            return 0;
+
+        case OP_PARM_p: /* far pointer */
+            if (pDis->uAddrMode == DISCPUMODE_32BIT)
+                return 6;   /* 16:32 */
+            if (pDis->uAddrMode == DISCPUMODE_64BIT)
+                return 12;  /* 16:64 */
+            return 4;       /* 16:16 */
+
+        case OP_PARM_s: /* lgdt, sgdt, lidt, sidt */
+            return pDis->uCpuMode == DISCPUMODE_64BIT ? 2 + 8 : 2 + 4;
+
+        case OP_PARM_a:
+            return pDis->uOpMode == DISCPUMODE_16BIT ? 2 + 2 : 4 + 4;
+
+        case OP_PARM_pi:
+            return 8;
+
+        case OP_PARM_sd:
+        case OP_PARM_ss:
+            return 16;
+
+        case OP_PARM_x:
+        case OP_PARM_pd:
+        case OP_PARM_ps:
+            return VEXREG_IS256B(pDis->bVexDestReg) ? 32 : 16; //??
+
+        case OP_PARM_y:
+            return pDis->uOpMode == DISCPUMODE_64BIT ? 4 : 8;  //??
+
+        case OP_PARM_z:
+            return pDis->uOpMode == DISCPUMODE_16BIT ? 2 : 4;  //??
+
+        default:
+            if (pParam->cb)
+                return pParam->cb;
+            /// @todo dangerous!!!
+            AssertMsgFailed(("subtype=%#x fParam=%#x fUse=%#RX64 op=%#x\n", subtype, pParam->fParam, pParam->fUse,
+                             pDis->pCurInstr ? pDis->pCurInstr->uOpcode : 0));
             return 4;
     }

trunk/src/VBox/Disassembler/DisasmTables.cpp

@@ -696 +696 @@
     OP("movupd %Vpd,%Wpd",   IDX_ParseModRM,     IDX_UseModRM,   0,          OP_MOVUPD,  OP_PARM_Vpd,        OP_PARM_Wpd,    OP_PARM_NONE,   DISOPTYPE_HARMLESS),
     OP("movupd %Wpd,%Vpd",   IDX_ParseModRM,     IDX_UseModRM,   0,          OP_MOVUPD,  OP_PARM_Wpd,        OP_PARM_Vpd,    OP_PARM_NONE,   DISOPTYPE_HARMLESS),
-    OP("movlpd %Vq,%Ws",     IDX_ParseModRM,     IDX_UseModRM,   0,          OP_MOVLPD,  OP_PARM_Vq,         OP_PARM_Ws,     OP_PARM_NONE,   DISOPTYPE_HARMLESS),
     OP("movlpd %Vq,%Wq",     IDX_ParseModRM,     IDX_UseModRM,   0,          OP_MOVLPD,  OP_PARM_Vq,         OP_PARM_Wq,     OP_PARM_NONE,   DISOPTYPE_HARMLESS),
+    OP("movlpd %Wq,%Vq",     IDX_ParseModRM,     IDX_UseModRM,   0,          OP_MOVLPD,  OP_PARM_Wq,         OP_PARM_Vq,     OP_PARM_NONE,   DISOPTYPE_HARMLESS),
     OP("unpcklpd %Vpd,%Wq",  IDX_ParseModRM,     IDX_UseModRM,   0,          OP_UNPCKLPD,OP_PARM_Vpd,        OP_PARM_Wq,     OP_PARM_NONE,   DISOPTYPE_HARMLESS),
     OP("unpckhpd %Vpd,%Wq",  IDX_ParseModRM,     IDX_UseModRM,   0,          OP_UNPCKHPD,OP_PARM_Vpd,        OP_PARM_Wq,     OP_PARM_NONE,   DISOPTYPE_HARMLESS),
@@ -762 +762 @@
     OP("mulpd %Vpd,%Wpd",    IDX_ParseModRM,     IDX_UseModRM,   0,          OP_MULPD,   OP_PARM_Vpd,        OP_PARM_Wpd,    OP_PARM_NONE,   DISOPTYPE_HARMLESS),
     OP("cvtpd2ps %Vps,%Wpd", IDX_ParseModRM,     IDX_UseModRM,   0,          OP_CVTPD2PS,OP_PARM_Vps,        OP_PARM_Wpd,    OP_PARM_NONE,   DISOPTYPE_HARMLESS),
-    OP("cvtps2dq %Vpq,%Wps", IDX_ParseModRM,     IDX_UseModRM,   0,          OP_CVTPS2DQ,OP_PARM_Vpq,        OP_PARM_Wps,    OP_PARM_NONE,   DISOPTYPE_HARMLESS),
+    OP("cvtps2dq %Vdq,%Wps", IDX_ParseModRM,     IDX_UseModRM,   0,          OP_CVTPS2DQ,OP_PARM_Vdq,        OP_PARM_Wps,    OP_PARM_NONE,   DISOPTYPE_HARMLESS),
     OP("subpd %Vpd,%Wpd",    IDX_ParseModRM,     IDX_UseModRM,   0,          OP_SUBPD,   OP_PARM_Vpd,        OP_PARM_Wpd,    OP_PARM_NONE,   DISOPTYPE_HARMLESS),
     OP("minpd %Vpd,%Wpd",    IDX_ParseModRM,     IDX_UseModRM,   0,          OP_MINPD,   OP_PARM_Vpd,        OP_PARM_Wpd,    OP_PARM_NONE,   DISOPTYPE_HARMLESS),