Changeset 8336

Timestamp:

04/23/08 18:03:03 (9 months ago)

Author:

vboxsync

Message:

More disassembler updates

Files:

• trunk/include/VBox/dis.h (modified) (2 diffs)
• trunk/include/VBox/disopcode.h (modified) (6 diffs)
• trunk/src/VBox/Disassembler/DisasmCore.cpp (modified) (14 diffs)

trunk/include/VBox/dis.h

@@ -145 +145 @@
-#define USE_DISPLACEMENT16              RT_BIT_64(15)
-#define USE_DISPLACEMENT32              RT_BIT_64(16)
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-/** DS:ESI */
-8
+9
-/** ES:EDI */
-29
-0
-1
+30
+1
+2
-
-#define USE_IMMEDIATE                   (USE_IMMEDIATE8|USE_IMMEDIATE16|USE_IMMEDIATE32|USE_IMMEDIATE64|USE_IMMEDIATE8_REL|USE_IMMEDIATE16_REL|USE_IMMEDIATE32_REL|USE_IMMEDIATE_ADDR_0_32|USE_IMMEDIATE_ADDR_16_32|USE_IMMEDIATE_ADDR_0_16|USE_IMMEDIATE_ADDR_16_16|USE_IMMEDIATE16_SX8|USE_IMMEDIATE32_SX8)
@@ -335 +336 @@
-
-    int32_t         disp8, disp16, disp32;
-
-    uint32_t        size;
-
+    int64_t         disp64;
-    uint64_t        flags;
-

trunk/include/VBox/disopcode.h

@@ -616 +616 @@
-#define OP_PARM_REG_ESI         7
-#define OP_PARM_REG_EDI         8
+#define OP_PARM_REG_GEN32_END   OP_PARM_REG_EDI
-
-#define OP_PARM_REG_ES          9
@@ -624 +625 @@
-#define OP_PARM_REG_FS          13
-#define OP_PARM_REG_GS          14
+#define OP_PARM_REG_SEG_END     OP_PARM_REG_GS
-
-#define OP_PARM_REG_AX          15
@@ -634 +636 @@
-#define OP_PARM_REG_SI          21
-#define OP_PARM_REG_DI          22
+#define OP_PARM_REG_GEN16_END   OP_PARM_REG_DI
-
-#define OP_PARM_REG_AL          23
@@ -644 +647 @@
-#define OP_PARM_REG_DH          29
-#define OP_PARM_REG_BH          30
+#define OP_PARM_REG_GEN8_END    OP_PARM_REG_BH
-
-#define OP_PARM_REGFP_0         31
@@ -654 +658 @@
-#define OP_PARM_REGFP_6         37
-#define OP_PARM_REGFP_7         38
+#define OP_PARM_REG_FP_END      OP_PARM_REGFP_7
-
-#define OP_PARM_NTA             39
@@ -697 +702 @@
-#define OP_PARM_REG_R14         114
-#define OP_PARM_REG_R15         115
+#define OP_PARM_REG_GEN64_END   OP_PARM_REG_R15
-
-

trunk/src/VBox/Disassembler/DisasmCore.cpp

@@ -1222 +1222 @@
-    }
-    else
+    if (pCpu->addrmode == CPUMODE_64BIT)
+    {
+        Assert(OP_PARM_VSUBTYPE(pParam->param) != OP_PARM_p);
+        /* near 64 bits pointer */
+        /*
+         * Note: used only in "mov al|ax|eax, [Addr]" and "mov [Addr], al|ax|eax"
+         * so we treat it like displacement.
+         */
+        pParam->disp64 = DISReadQWord(pCpu, lpszCodeBlock);
+        pParam->flags |= USE_DISPLACEMENT64;
+
+        disasmAddStringF(pParam->szParam, sizeof(pParam->szParam), "[0%08X%08Xh]", (uint32_t)(pParam->disp64 >> 32), (uint32_t)pParam->disp64);
+        return sizeof(uint32_t);
+    }
+    else
-    {
-        if (OP_PARM_VSUBTYPE(pParam->param) == OP_PARM_p)
@@ -1260 +1275 @@
-        }
-    }
+    if (pCpu->addrmode == CPUMODE_64BIT)
+    {
+        return sizeof(uint64_t);
+    }
-    else
-    {
@@ -1286 +1305 @@
-    }
-
- OP_PARM_REG_SEG_START
+= OP_PARM_REG_GEN32_END
-    {
-        /* 32-bit EAX..EDI registers. */
@@ -1296 +1315 @@
-            pParam->flags |= USE_REG_GEN32;
-            pParam->size   = 4;
+        }
+        else
+        if (pCpu->opmode == CPUMODE_64BIT)
+        {
+            /* Use 64-bit registers. */
+            pParam->base.reg_gen = pParam->param - OP_PARM_REG_GEN32_START;
+            if (    (pCpu->prefix & PREFIX_REX)
+                &&  (pCpu->prefix_rex & PREFIX_REX_FLAGS))
+                pParam->base.reg_gen += 8;
+
+            pParam->flags |= USE_REG_GEN64;
+            pParam->size   = 8;
-        }
-        else
@@ -1307 +1338 @@
-    }
-    else
- OP_PARM_REG_GEN16_START
+= OP_PARM_REG_SEG_END
-    {
-        /* Segment ES..GS registers. */
@@ -1315 +1346 @@
-    }
-    else
- OP_PARM_REG_GEN8_START
+= OP_PARM_REG_GEN16_END
-    {
-        /* 16-bit AX..DI registers. */
@@ -1323 +1354 @@
-    }
-    else
- OP_PARM_REG_FP_START
+= OP_PARM_REG_GEN8_END
-    {
-        /* 8-bit AL..DL, AH..DH registers. */
@@ -1331 +1362 @@
-    }
-    else
-FP_7
+_FP_END
-    {
-        /* FPU registers. */
@@ -1356 +1387 @@
-    }
-    else
+    if (pCpu->addrmode == CPUMODE_64BIT)
+    {
+        pParam->base.reg_gen = USE_REG_RSI;
+        pParam->flags |= USE_REG_GEN64;
+    }
+    else
-    {
-        pParam->base.reg_gen = USE_REG_SI;
@@ -1375 +1412 @@
-    }
-    else
+    if (pCpu->addrmode == CPUMODE_64BIT)
+    {
+        pParam->base.reg_gen = USE_REG_RSI;
+        pParam->flags |= USE_REG_GEN64;
+    }
+    else
-    {
-        pParam->base.reg_gen = USE_REG_SI;
@@ -1395 +1438 @@
-    }
-    else
+    if (pCpu->addrmode == CPUMODE_64BIT)
+    {
+        pParam->base.reg_gen = USE_REG_RDI;
+        pParam->flags |= USE_REG_GEN64;
+    }
+    else
-    {
-        pParam->base.reg_gen = USE_REG_DI;
@@ -1412 +1461 @@
-        pParam->base.reg_gen = USE_REG_EDI;
-        pParam->flags |= USE_REG_GEN32;
+    }
+    else
+    if (pCpu->addrmode == CPUMODE_64BIT)
+    {
+        pParam->base.reg_gen = USE_REG_RDI;
+        pParam->flags |= USE_REG_GEN64;
-    }
-    else
@@ -1506 +1561 @@
-    //little hack to make sure the ModRM byte is included in the returned size
-    if (pOp->idxParse1 != IDX_ParseModRM && pOp->idxParse2 != IDX_ParseModRM)
-    {
-        size = sizeof(uint8_t); //ModRM byte
-    }
-
-    size += ParseInstruction(lpszCodeBlock, pOp, pCpu);
@@ -1861 +1914 @@
-#if !defined(DIS_CORE_ONLY) && defined(LOG_ENABLED)
-const char *szModRMReg8[]      = {"AL", "CL", "DL", "BL", "AH", "CH", "DH", "BH"};
+const char *szModRMReg8_64[]   = {"AL", "CL", "DL", "BL", "AH", "CH", "DH", "BH", "R8L", "R9L", "R10L", "R11L", "R12L", "R13L", "R14L", "R15L"};
-const char *szModRMReg16[]     = {"AX", "CX", "DX", "BX", "SP", "BP", "SI", "DI"};
-const char *szModRMReg32[]     = {"EAX", "ECX", "EDX", "EBX", "ESP", "EBP", "ESI", "EDI"};