Changeset 41738 in vbox for trunk/src/VBox/Disassembler/DisasmCore.cpp

Timestamp:

Jun 15, 2012 1:25:47 AM (12 years ago)

Author:

vboxsync

Message:

DISOPCODE: s/optype/fOpType/ s/param/fParam/ docs

File:

• trunk/src/VBox/Disassembler/DisasmCore.cpp (modified) (11 diffs)

trunk/src/VBox/Disassembler/DisasmCore.cpp

@@ -358 +358 @@
             // segment override prefix byte
             case OP_SEG:
-                pCpu->idxSegPrefix = (DISSELREG)(paOneByteMap[codebyte].param1 - OP_PARM_REG_SEG_START);
+                pCpu->idxSegPrefix = (DISSELREG)(paOneByteMap[codebyte].fParam1 - OP_PARM_REG_SEG_START);
                 /* Segment prefixes for CS, DS, ES and SS are ignored in long mode. */
                 if (   pCpu->uCpuMode != DISCPUMODE_64BIT
@@ -414 +414 @@
                 /* REX prefix byte */
                 pCpu->fPrefix   |= DISPREFIX_REX;
-                pCpu->fRexPrefix = DISPREFIX_REX_OP_2_FLAGS(paOneByteMap[codebyte].param1);
+                pCpu->fRexPrefix = DISPREFIX_REX_OP_2_FLAGS(paOneByteMap[codebyte].fParam1);
                 iByte           += sizeof(uint8_t);
 
@@ -459 +459 @@
      * Note! Multibyte opcodes are always marked harmless until the final byte.
      */
-    if ((pOp->optype & pCpu->fFilter) == 0)
+    if ((pOp->fOpType & pCpu->fFilter) == 0)
     {
         fFiltered = true;
@@ -471 +471 @@
 
     // Should contain the parameter type on input
-    pCpu->param1.param = pOp->param1;
-    pCpu->param2.param = pOp->param2;
-    pCpu->param3.param = pOp->param3;
+    pCpu->param1.param = pOp->fParam1;
+    pCpu->param2.param = pOp->fParam2;
+    pCpu->param3.param = pOp->fParam3;
 
     /* Correct the operand size if the instruction is marked as forced or default 64 bits */
     if (pCpu->uCpuMode == DISCPUMODE_64BIT)
     {
-        if (pOp->optype & DISOPTYPE_FORCED_64_OP_SIZE)
+        if (pOp->fOpType & DISOPTYPE_FORCED_64_OP_SIZE)
             pCpu->uOpMode = DISCPUMODE_64BIT;
         else
-        if (    (pOp->optype & DISOPTYPE_DEFAULT_64_OP_SIZE)
+        if (    (pOp->fOpType & DISOPTYPE_DEFAULT_64_OP_SIZE)
             &&  !(pCpu->fPrefix & DISPREFIX_OPSIZE))
             pCpu->uOpMode = DISCPUMODE_64BIT;
     }
     else
-    if (pOp->optype & DISOPTYPE_FORCED_32_OP_SIZE_X86)
+    if (pOp->fOpType & DISOPTYPE_FORCED_32_OP_SIZE_X86)
     {
         /* Forced 32 bits operand size for certain instructions (mov crx, mov drx). */
@@ -534 +534 @@
 
         // Should contain the parameter type on input
-        pCpu->param1.param = fpop->param1;
-        pCpu->param2.param = fpop->param2;
+        pCpu->param1.param = fpop->fParam1;
+        pCpu->param2.param = fpop->fParam2;
     }
     else
@@ -547 +547 @@
      * @note Multibyte opcodes are always marked harmless until the final byte.
      */
-    if ((fpop->optype & pCpu->fFilter) == 0)
+    if ((fpop->fOpType & pCpu->fFilter) == 0)
         pCpu->pfnDisasmFnTable = g_apfnCalcSize;
     else
@@ -557 +557 @@
     {
         /* Note: redundant, but just in case this ever changes */
-        if (fpop->optype & DISOPTYPE_FORCED_64_OP_SIZE)
+        if (fpop->fOpType & DISOPTYPE_FORCED_64_OP_SIZE)
             pCpu->uOpMode = DISCPUMODE_64BIT;
         else
-        if (    (fpop->optype & DISOPTYPE_DEFAULT_64_OP_SIZE)
+        if (    (fpop->fOpType & DISOPTYPE_DEFAULT_64_OP_SIZE)
             &&  !(pCpu->fPrefix & DISPREFIX_OPSIZE))
             pCpu->uOpMode = DISCPUMODE_64BIT;
@@ -1077 +1077 @@
      * encoding of the MOD field in the MODR/M byte.
      */
-    if (pOp->optype & DISOPTYPE_MOD_FIXED_11)
+    if (pOp->fOpType & DISOPTYPE_MOD_FIXED_11)
         pCpu->ModRM.Bits.Mod = 3;
 
@@ -1123 +1123 @@
      * encoding of the MOD field in the MODR/M byte.
      */
-    if (pOp->optype & DISOPTYPE_MOD_FIXED_11)
+    if (pOp->fOpType & DISOPTYPE_MOD_FIXED_11)
         pCpu->ModRM.Bits.Mod = 3;
 
@@ -1568 +1568 @@
             /* Use 64-bit registers. */
             pParam->base.reg_gen = pParam->param - OP_PARM_REG_GEN32_START;
-            if (    (pOp->optype & DISOPTYPE_REXB_EXTENDS_OPREG)
+            if (    (pOp->fOpType & DISOPTYPE_REXB_EXTENDS_OPREG)
                 &&  pParam == &pCpu->param1             /* ugly assumption that it only applies to the first parameter */
                 &&  (pCpu->fPrefix & DISPREFIX_REX)
@@ -1612 +1612 @@
         if (pCpu->uOpMode == DISCPUMODE_64BIT)
         {
-            if (    (pOp->optype & DISOPTYPE_REXB_EXTENDS_OPREG)
+            if (    (pOp->fOpType & DISOPTYPE_REXB_EXTENDS_OPREG)
                 &&  pParam == &pCpu->param1             /* ugly assumption that it only applies to the first parameter */
                 &&  (pCpu->fPrefix & DISPREFIX_REX)