Changeset 8361

Timestamp:

04/24/08 15:59:24 (9 months ago)

Author:

vboxsync

Message:

Even more disassembler updates

Files:

• trunk/include/VBox/disopcode.h (modified) (1 diff)
• trunk/src/VBox/Disassembler/Disasm.cpp (modified) (10 diffs)
• trunk/src/VBox/Disassembler/DisasmCore.cpp (modified) (8 diffs)
• trunk/src/VBox/Disassembler/DisasmTables.cpp (modified) (2 diffs)
• trunk/src/VBox/Disassembler/DisasmTablesX64.cpp (modified) (1 diff)

trunk/include/VBox/disopcode.h

@@ -46 +46 @@
-#define OP_INVALID      0
-#define OP_OPSIZE       1
-RSIZE 
+DRSIZE
-#define OP_SEG          3
-#define OP_REPNE        4

trunk/src/VBox/Disassembler/Disasm.cpp

@@ -92 +92 @@
- */
-DISDECL(int) DISInstr(PDISCPUSTATE pCpu, RTUINTPTR pu8Instruction, unsigned u32EipOffset, unsigned *pcbSize,
- 
+
-{
-    return DISInstrEx(pCpu, pu8Instruction, u32EipOffset, pcbSize, pszOutput, OPTYPE_ALL);
@@ -113 +113 @@
- */
-DISDECL(int) DISInstrEx(PDISCPUSTATE pCpu, RTUINTPTR pu8Instruction, unsigned u32EipOffset, unsigned *pcbSize,
- 
+
-{
-    unsigned i = 0, prefixbytes;
@@ -124 +124 @@
-    pCpu->prefix      = PREFIX_NONE;
-    pCpu->prefix_seg  = 0;
-    pCpu->addrmode    = pCpu->mode;
-    pCpu->opmode      = pCpu->mode;
-    pCpu->ModRM.u     = 0;
-    pCpu->SIB.u       = 0;
@@ -147 +145 @@
-        *pszOutput = '\0';
-
+    if (pCpu->mode == CPUMODE_64BIT)
+    {
+        pCpu->addrmode   = CPUMODE_64BIT;
+        pCpu->opmode     = CPUMODE_32BIT;
+    }
+    else
+    {
+        pCpu->addrmode   = pCpu->mode;
+        pCpu->opmode     = pCpu->mode;
+    }
+
-    prefixbytes = 0;
-#ifndef __L4ENV__  /* Unfortunately, we have no exception handling in l4env */
@@ -164 +173 @@
-            {
-                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)
-                {
@@ -175 +189 @@
-                case OP_SEG:
-                    pCpu->prefix_seg = g_aOneByteMapX86[codebyte].param1 - OP_PARM_REG_SEG_START;
-
+
+
+
+
+
+
-                    i += sizeof(uint8_t);
-                    prefixbytes++;
@@ -188 +207 @@
-
-                // address size override prefix byte
-
+D
-                    pCpu->prefix |= PREFIX_ADDRSIZE;
-
-
-
+
+
+
+
+
+
+
+
-                    i += sizeof(uint8_t);
-                    prefixbytes++;
@@ -200 +224 @@
-                case OP_OPSIZE:
-                    pCpu->prefix |= PREFIX_OPSIZE;
-
-
-
+
+
+
+
+
-                    i += sizeof(uint8_t);
-                    prefixbytes++;
@@ -225 +251 @@
-                    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;
-                }
@@ -390 +419 @@
-            case 'e': //register based on operand size (e.g. %eAX)
-                if(pCpu->opmode == CPUMODE_32BIT)
-                {
-                    RTStrPrintf(&pszOutput[strlen(pszOutput)], 64, "E");
-
+
+
+
-                RTStrPrintf(&pszOutput[strlen(pszOutput)], 64, "%c%c", lpszFormat[2], lpszFormat[3]);
-                break;

trunk/src/VBox/Disassembler/DisasmCore.cpp

@@ -174 +174 @@
-    pCpu->prefix_seg = 0;
-    pCpu->lastprefix = 0;
-    pCpu->addrmode   = pCpu->mode;
-    pCpu->opmode     = pCpu->mode;
-    pCpu->ModRM.u    = 0;
-    pCpu->SIB.u      = 0;
@@ -221 +219 @@
-    pCpu->lastprefix = 0;
-    pCpu->mode       = enmCpuMode;
-    pCpu->addrmode   = enmCpuMode;
-    pCpu->opmode     = enmCpuMode;
-    pCpu->ModRM.u    = 0;
-    pCpu->SIB.u      = 0;
@@ -261 +257 @@
-    unsigned  cbInc;
-
+    if (pCpu->mode == CPUMODE_64BIT)
+    {
+        pCpu->addrmode   = CPUMODE_64BIT;
+        pCpu->opmode     = CPUMODE_32BIT;
+    }
+    else
+    {
+        pCpu->addrmode   = pCpu->mode;
+        pCpu->opmode     = pCpu->mode;
+    }
+
-    while(1)
-    {
@@ -284 +291 @@
-            case OP_SEG:
-                pCpu->prefix_seg = g_aOneByteMapX86[codebyte].param1 - OP_PARM_REG_SEG_START;
-
-
+
+
+
+
+
+
+
-                continue;   //fetch the next byte
-
@@ -295 +307 @@
-
-            // address size override prefix byte
-
+D
-                pCpu->prefix |= PREFIX_ADDRSIZE;
-                if (pCpu->mode == CPUMODE_16BIT)
-
-
+
+
+
+
+
+
+
-                iByte        += sizeof(uint8_t);
-                continue;   //fetch the next byte
@@ -307 +324 @@
-                pCpu->prefix |= PREFIX_OPSIZE;
-                if (pCpu->mode == CPUMODE_16BIT)
-
-
+
+
+
-
-                iByte        += sizeof(uint8_t);
@@ -390 +408 @@
-    pCpu->param3.param = pOp->param3;
-
+    /* Correct the operand size if the instruction is marked as forced or default 64 bits */
+    if (pCpu->mode == CPUMODE_64BIT)
+    {
+        if (pOp->optype & OPTYPE_FORCED_64_OP_SIZE)
+            pCpu->opsize = CPUMODE_64BIT;
+        else
+        if (    (pOp->optype & OPTYPE_DEFAULT_64_OP_SIZE)
+            &&  !(pCpu->prefix & PREFIX_OPSIZE))
+            pCpu->opsize = CPUMODE_64BIT;
+    }
+
-    if (pOp->idxParse1 != IDX_ParseNop) 
-    {
@@ -450 +479 @@
-        /* Not filtered out -> full disassembly */
-        pCpu->pfnDisasmFnTable = pfnFullDisasm;
+    }
+
+    /* Correct the operand size if the instruction is marked as forced or default 64 bits */
+    if (pCpu->mode == CPUMODE_64BIT)
+    {
+        /* Note: redundant, but just in case this ever changes */
+        if (fpop->optype & OPTYPE_FORCED_64_OP_SIZE)
+            pCpu->opsize = CPUMODE_64BIT;
+        else
+        if (    (fpop->optype & OPTYPE_DEFAULT_64_OP_SIZE)
+            &&  !(pCpu->prefix & PREFIX_OPSIZE))
+            pCpu->opsize = CPUMODE_64BIT;
-    }
-

trunk/src/VBox/Disassembler/DisasmTables.cpp

@@ -199 +199 @@
-    OP("SEG GS",             0,                  0,                 0,                  OP_SEG,     OP_PARM_REG_GS,     OP_PARM_NONE,   OP_PARM_NONE,   OPTYPE_HARMLESS),
-    OP("OP SIZE",            0,                  0,                 0,                  OP_OPSIZE,  OP_PARM_NONE,       OP_PARM_NONE,   OP_PARM_NONE,   OPTYPE_HARMLESS),
-RSIZE, 
+DRSIZE,
-    OP("push %Iv",           IDX_ParseImmV,      0,                 0,                  OP_PUSH,    OP_PARM_Iv,         OP_PARM_NONE,   OP_PARM_NONE,   OPTYPE_HARMLESS | OPTYPE_DEFAULT_64_OP_SIZE),
-    OP("imul %Gv,%Ev,%Iv",   IDX_ParseModRM,     IDX_UseModRM,      IDX_ParseImmV,      OP_IMUL,    OP_PARM_Gv,         OP_PARM_Ev,     OP_PARM_Iv,     OPTYPE_HARMLESS),
@@ -517 +517 @@
-
-    /* 7 */
-OP_PSHUFW,
-0,
-0,
-0,
-
-
-
-0,          0,
-0,          0,
-0,          0,
-0,          0,
-0,          0,
-0,          0,
-0,          0,
-
-
+  OP_PSHUFW, 
+    0,       
+    0,       
+    0,       
+       
+       
+       
+    0,              0,       
+    0,              0,       
+    0,              0,       
+    0,              0,       
+    0,              0,       
+    0,              0,       
+    0,              0,       
+       
+       
-
-    /* 8 */

trunk/src/VBox/Disassembler/DisasmTablesX64.cpp

@@ -199 +199 @@
-    OP("SEG GS",             0,                  0,                 0,                  OP_SEG,         OP_PARM_REG_GS,     OP_PARM_NONE,   OP_PARM_NONE,   OPTYPE_HARMLESS),
-    OP("OP SIZE",            0,                  0,                 0,                  OP_OPSIZE,      OP_PARM_NONE,       OP_PARM_NONE,   OP_PARM_NONE,   OPTYPE_HARMLESS),
-R SIZE",           0,                  0,                 0,                  OP_ADRSIZE, 
+DR SIZE",          0,                  0,                 0,                  OP_ADDRSIZE,
-    OP("push %Iv",           IDX_ParseImmV,      0,                 0,                  OP_PUSH,        OP_PARM_Iv,         OP_PARM_NONE,   OP_PARM_NONE,   OPTYPE_HARMLESS | OPTYPE_DEFAULT_64_OP_SIZE),
-    OP("imul %Gv,%Ev,%Iv",   IDX_ParseModRM,     IDX_UseModRM,      IDX_ParseImmV,      OP_IMUL,        OP_PARM_Gv,         OP_PARM_Ev,     OP_PARM_Iv,     OPTYPE_HARMLESS),