Changeset 8352

Timestamp:

04/24/08 11:50:26 (9 months ago)

Author:

vboxsync

Message:

More 64 bits disasm updates

Files:

• trunk/include/VBox/dis.h (modified) (1 diff)
• trunk/src/VBox/Disassembler/DisasmCore.cpp (modified) (12 diffs)
• trunk/src/VBox/Disassembler/DisasmTablesX64.cpp (modified) (1 diff)

trunk/include/VBox/dis.h

@@ -146 +146 @@
-#define USE_DISPLACEMENT32              RT_BIT_64(16)
-#define USE_DISPLACEMENT64              RT_BIT_64(17)
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-/** DS:ESI */
-29
+30
-/** ES:EDI */
-0
-1
-2
+1
+2
+3
-
-#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)

trunk/src/VBox/Disassembler/DisasmCore.cpp

@@ -270 +270 @@
-        {
-            pCpu->lastprefix = opcode;
+
+            /* The REX prefix must precede the opcode byte(s). Any other placement is ignored. */
+            if (opcode != OP_REX)
+                pCpu->prefix &= ~PREFIX_REX;
+
-            switch (opcode)
-            {
@@ -324 +329 @@
-                pCpu->prefix    |= PREFIX_REX;
-                pCpu->prefix_rex = PREFIX_REX_OP_2_FLAGS(opcode);
+
+                if (pCpu->prefix_rex & PREFIX_REX_FLAGS_W)
+                    pCpu->opmode = CPUMODE_64BIT;  /* overrides size prefix byte */
-                break;
-            }
@@ -537 +545 @@
-    if (pCpu->prefix & PREFIX_REX)
-    {
-
+
+
+
+
-        pCpu->SIB.Bits.Index |= ((!!(pCpu->prefix_rex & PREFIX_REX_FLAGS_X)) << 3);
-    }
@@ -651 +662 @@
-    }
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-        switch (mod)
-        {
@@ -660 +676 @@
-            disasmGetPtrString(pCpu, pOp, pParam);
-            disasmAddChar(pParam->szParam, '[');
-
+
+
-                UseSIB(lpszCodeBlock, pOp, pParam, pCpu);
-            }
-            else
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-            else {//register address
@@ -967 +996 @@
-    if (pCpu->prefix & PREFIX_REX)
-    {
+        Assert(pCpu->mode == CPUMODE_64BIT);
+
-        /* REX.R extends the Reg field. */
-        pCpu->ModRM.Bits.Reg |= ((!!(pCpu->prefix_rex & PREFIX_REX_FLAGS_R)) << 3);
-
-
-
-
+
+
+
+
+
+
-        {
-            pCpu->ModRM.Bits.Rm |= ((!!(pCpu->prefix_rex & PREFIX_REX_FLAGS_B)) << 3);
@@ -981 +1015 @@
-
-    UseModRM(lpszCodeBlock, pOp, pParam, pCpu);
-
-    return size;
-}
@@ -1000 +1033 @@
-    if (pCpu->prefix & PREFIX_REX)
-    {
+        Assert(pCpu->mode == CPUMODE_64BIT);
+
-        /* REX.R extends the Reg field. */
-        pCpu->ModRM.Bits.Reg |= ((!!(pCpu->prefix_rex & PREFIX_REX_FLAGS_R)) << 3);
-
-
-
-
+
+
+
+
+
+
-        {
-            pCpu->ModRM.Bits.Rm |= ((!!(pCpu->prefix_rex & PREFIX_REX_FLAGS_B)) << 3);
@@ -1305 +1343 @@
-    }
-
+    AssertCompile(OP_PARM_REG_GEN32_END < OP_PARM_REG_SEG_END);
+    AssertCompile(OP_PARM_REG_SEG_END < OP_PARM_REG_GEN16_END);
+    AssertCompile(OP_PARM_REG_GEN16_END < OP_PARM_REG_GEN8_END);
+    AssertCompile(OP_PARM_REG_GEN8_END < OP_PARM_REG_FP_END);
+
-    if (pParam->param <= OP_PARM_REG_GEN32_END)
-    {
-        /* 32-bit EAX..EDI registers. */
-
-        if (pCpu->opmode == CPUMODE_32BIT)
-        {
@@ -1369 +1411 @@
-        pParam->size   = 10;
-    }
+    Assert(!(pParam->param >= OP_PARM_REG_GEN64_START && pParam->param <= OP_PARM_REG_GEN64_END));
+
-    /* else - not supported for now registers. */
-
@@ -1936 +1980 @@
-    else
-    if (subtype == OP_PARM_v || subtype == OP_PARM_NONE)
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    switch (subtype)
@@ -1955 +2012 @@
-        disasmAddString(pParam->szParam, szModRMReg32[idx]);
-        pParam->flags |= USE_REG_GEN32;
+        pParam->base.reg_gen = idx;
+        break;
+
+    case OP_PARM_q:
+        disasmAddString(pParam->szParam, szModRMReg64[idx]);
+        pParam->flags |= USE_REG_GEN64;
-        pParam->base.reg_gen = idx;
-        break;

trunk/src/VBox/Disassembler/DisasmTablesX64.cpp

@@ -174 +174 @@
-
-    /* 5 */
-R
-R
-R
-R
-R
-R
-R
-R
-R
-R
-R
-R
-R
-R
-R
-R
+E
+E
+E
+E
+E
+E
+E
+E
+E
+E
+E
+E
+E
+E
+E
+E
-
-    /* 6 */