Changeset 8999

Timestamp:

05/21/08 10:48:11 (8 months ago)

Author:

vboxsync

Message:

Disassembler updates for 64 bits code

Files:

• trunk/include/VBox/dis.h (modified) (1 diff)
• trunk/src/VBox/Disassembler/DisasmCore.cpp (modified) (6 diffs)
• trunk/src/VBox/Disassembler/DisasmInternal.h (modified) (2 diffs)
• trunk/src/VBox/Disassembler/DisasmTables.cpp (modified) (2 diffs)
• trunk/src/VBox/Disassembler/DisasmTablesX64.cpp (modified) (1 diff)
• trunk/src/VBox/Disassembler/DisasmTest.cpp (modified) (1 diff)
• trunk/src/VBox/Disassembler/DisasmTestA.asm (modified) (2 diffs)

trunk/include/VBox/dis.h

@@ -155 +155 @@
-#define USE_IMMEDIATE32_REL             RT_BIT_64(24)
-#define USE_IMMEDIATE64                 RT_BIT_64(25)
-
-
-
-
+
+
+
+
+
-/** DS:ESI */
-0
+1
-/** ES:EDI */
-1
-2
-3
-
-
+2
+3
+4
+
+64_REL|USE_IMMEDIATE
-
-/** @} */

trunk/src/VBox/Disassembler/DisasmCore.cpp

@@ -112 +112 @@
-    ParseEscFP,
-    ParseNopPause,
-
+
+
-};
-
@@ -153 +154 @@
-    ParseEscFP,
-    ParseNopPause,
-
+
+
-};
-
@@ -1227 +1229 @@
-    }
-    else
+    if (pCpu->opmode == CPUMODE_64BIT)
+    {
+        pParam->parval = DISReadQWord(pCpu, lpszCodeBlock);
+        pParam->flags |= USE_IMMEDIATE64;
+
+        disasmAddStringF(pParam->szParam, sizeof(pParam->szParam), "0%VX64h", pParam->parval);
+        return sizeof(uint64_t);
+    }
+    else
-    {
-        pParam->parval = DISReadWord(pCpu, lpszCodeBlock);
@@ -1241 +1252 @@
-    if (pCpu->opmode == CPUMODE_32BIT)
-        return sizeof(uint32_t);
+    else
+    if (pCpu->opmode == CPUMODE_64BIT)
+        return sizeof(uint64_t);
+
-    return sizeof(uint16_t);
-}
+//*****************************************************************************
+//*****************************************************************************
+unsigned ParseImmZ(RTUINTPTR lpszCodeBlock, PCOPCODE pOp, POP_PARAMETER pParam, PDISCPUSTATE pCpu)
+{
+    /* Word for 16-bit operand-size or doubleword for 32 or 64-bit operand-size. */
+    if (pCpu->opmode == CPUMODE_16BIT)
+    {
+        pParam->parval = DISReadWord(pCpu, lpszCodeBlock);
+        pParam->flags |= USE_IMMEDIATE16;
+
+        disasmAddStringF(pParam->szParam, sizeof(pParam->szParam), "0%04Xh", (uint32_t)pParam->parval);
+        return sizeof(uint16_t);
+    }
+    else
+    {
+        pParam->parval = DISReadDWord(pCpu, lpszCodeBlock);
+        pParam->flags |= USE_IMMEDIATE32;
+
+        disasmAddStringF(pParam->szParam, sizeof(pParam->szParam), "0%08Xh", (uint32_t)pParam->parval);
+        return sizeof(uint32_t);
+    }
+}
+//*****************************************************************************
+//*****************************************************************************
+unsigned ParseImmZ_SizeOnly(RTUINTPTR lpszCodeBlock, PCOPCODE pOp, POP_PARAMETER pParam, PDISCPUSTATE pCpu)
+{
+    /* Word for 16-bit operand-size or doubleword for 32 or 64-bit operand-size. */
+    if (pCpu->opmode == CPUMODE_16BIT)
+        return sizeof(uint16_t);
+    return sizeof(uint32_t);
+}
+
-//*****************************************************************************
-// Relative displacement for branches (rel. to next instruction)
@@ -1275 +1322 @@
-    }
-    else
+    if (pCpu->opmode == CPUMODE_64BIT)
+    {
+        pParam->parval = DISReadQWord(pCpu, lpszCodeBlock);
+        pParam->flags |= USE_IMMEDIATE64_REL;
+
+        disasmAddStringF(pParam->szParam, sizeof(pParam->szParam), " (0%VX64h)", pParam->parval);
+        return sizeof(int64_t);
+    }
+    else
-    {
-        pParam->parval = DISReadWord(pCpu, lpszCodeBlock);
@@ -1290 +1346 @@
-    if (pCpu->opmode == CPUMODE_32BIT)
-        return sizeof(int32_t);
+    else
+    if (pCpu->opmode == CPUMODE_64BIT)
+        return sizeof(int64_t);
-    return sizeof(uint16_t);
-}

trunk/src/VBox/Disassembler/DisasmInternal.h

@@ -69 +69 @@
-#define IDX_ParseNopPause           35
-#define IDX_ParseImmByteSX          36
-
+
+
-
-#ifdef IN_RING0
@@ -104 +105 @@
-unsigned ParseImmVRel(RTUINTPTR pu8CodeBlock, PCOPCODE pOp, POP_PARAMETER pParam, PDISCPUSTATE pCpu);
-unsigned ParseImmVRel_SizeOnly(RTUINTPTR pu8CodeBlock, PCOPCODE pOp, POP_PARAMETER pParam, PDISCPUSTATE pCpu);
+unsigned ParseImmZ(RTUINTPTR pu8CodeBlock, PCOPCODE pOp, POP_PARAMETER pParam, PDISCPUSTATE pCpu);
+unsigned ParseImmZ_SizeOnly(RTUINTPTR pu8CodeBlock, PCOPCODE pOp, POP_PARAMETER pParam, PDISCPUSTATE pCpu);
-
-unsigned ParseImmAddr(RTUINTPTR pu8CodeBlock, PCOPCODE pOp, POP_PARAMETER pParam, PDISCPUSTATE pCpu);

trunk/src/VBox/Disassembler/DisasmTables.cpp

@@ -309 +309 @@
-    OP("les %Gv,%Mp",        IDX_ParseModRM,     IDX_UseModRM,      0,          OP_LES,         OP_PARM_Gv,      OP_PARM_Mp,     OP_PARM_NONE,   OPTYPE_HARMLESS | OPTYPE_INVALID_64),
-    OP("lds %Gv,%Mp",        IDX_ParseModRM,     IDX_UseModRM,      0,          OP_LDS,         OP_PARM_Gv,      OP_PARM_Mp,     OP_PARM_NONE,   OPTYPE_HARMLESS | OPTYPE_RRM_DANGEROUS | OPTYPE_INVALID_64),
-groups
+actually group11
-    OP("mov %Eb,%Ib",        IDX_ParseModRM,     IDX_ParseImmByte,  0,          OP_MOV,         OP_PARM_Eb,      OP_PARM_Ib,     OP_PARM_NONE,   OPTYPE_HARMLESS),
-v",        IDX_ParseModRM,     IDX_ParseImmV,     0,          OP_MOV,         OP_PARM_Ev,      OP_PARM_Iv
+z",        IDX_ParseModRM,     IDX_ParseImmZ,     0,          OP_MOV,         OP_PARM_Ev,      OP_PARM_Iz
-    OP("enter %Iw,%Ib",      IDX_ParseImmUshort, IDX_ParseImmByte,  0,          OP_ENTER,       OP_PARM_Iw,      OP_PARM_Ib,     OP_PARM_NONE,   OPTYPE_HARMLESS),
-    OP("leave",              0,                  0,                 0,          OP_LEAVE,       OP_PARM_NONE,    OP_PARM_NONE,   OP_PARM_NONE,   OPTYPE_HARMLESS | OPTYPE_DEFAULT_64_OP_SIZE),
@@ -2295 +2295 @@
-    INVALID_OPCODE,
-    /* 0F C7 */
-v",        IDX_ParseModRM,     IDX_ParseImmV
+z",        IDX_ParseModRM,     IDX_ParseImmZ
-    INVALID_OPCODE,
-    INVALID_OPCODE,

trunk/src/VBox/Disassembler/DisasmTablesX64.cpp

@@ -309 +309 @@
-    INVALID_OPCODE,
-    INVALID_OPCODE,
+    /* @todo these two are actually group11 */
-    OP("mov %Eb,%Ib",        IDX_ParseModRM,     IDX_ParseImmByte,  0,          OP_MOV,         OP_PARM_Eb,      OP_PARM_Ib,     OP_PARM_NONE,   OPTYPE_HARMLESS),
-v",        IDX_ParseModRM,     IDX_ParseImmV,     0,          OP_MOV,         OP_PARM_Ev,      OP_PARM_Iv
+z",        IDX_ParseModRM,     IDX_ParseImmZ,     0,          OP_MOV,         OP_PARM_Ev,      OP_PARM_Iz
-    OP("enter %Iw,%Ib",      IDX_ParseImmUshort, IDX_ParseImmByte,  0,          OP_ENTER,       OP_PARM_Iw,      OP_PARM_Ib,     OP_PARM_NONE,   OPTYPE_HARMLESS),
-    OP("leave",              0,                  0,                 0,          OP_LEAVE,       OP_PARM_NONE,    OP_PARM_NONE,   OP_PARM_NONE,   OPTYPE_HARMLESS | OPTYPE_DEFAULT_64_OP_SIZE),

trunk/src/VBox/Disassembler/DisasmTest.cpp

@@ -77 +77 @@
-            memset(&cpu, 0, sizeof(cpu));
-            cpu.mode = CPUMODE_64BIT;
-//
+
-            if (VBOX_SUCCESS(DISInstr(&cpu, pInstr, 0, &cb, szOutput)))
-                printf(szOutput);

trunk/src/VBox/Disassembler/DisasmTestA.asm

@@ -70 +70 @@
-align 16
-BEGINPROC TestProc64
+      ;incorrectly assembled by yasm; REX.W should not be added!
+      ;test rax, dword 0cc90cc90h
+      mov rax, dword 0cc90cc90h
+      mov rax, qword 0ffffcc90cc90h
+
-      movzx rax,byte  [edx]
-      movzx rax,word  [edx]
@@ -91 +96 @@
-      movss xmm0, xmm14
-      movsd xmm6, xmm1
+
-      ret
-ENDPROC   TestProc64