Changeset 41739 in vbox for trunk/src/VBox/Disassembler

Timestamp:

Jun 15, 2012 1:31:29 AM (12 years ago)

Author:

vboxsync

Message:

DISCPUSTATE: s/param/Param/

Location:

trunk/src/VBox/Disassembler

Files:

• DisasmCore.cpp (modified) (6 diffs)
• DisasmFormatYasm.cpp (modified) (6 diffs)

trunk/src/VBox/Disassembler/DisasmCore.cpp

@@ -471 +471 @@
 
     // Should contain the parameter type on input
-    pCpu->param1.param = pOp->fParam1;
-    pCpu->param2.param = pOp->fParam2;
-    pCpu->param3.param = pOp->fParam3;
+    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 */
@@ -495 +495 @@
     if (pOp->idxParse1 != IDX_ParseNop)
     {
-        size += pCpu->pfnDisasmFnTable[pOp->idxParse1](uCodePtr, pOp, &pCpu->param1, pCpu);
-        if (fFiltered == false) pCpu->param1.cb = DISGetParamSize(pCpu, &pCpu->param1);
+        size += pCpu->pfnDisasmFnTable[pOp->idxParse1](uCodePtr, pOp, &pCpu->Param1, pCpu);
+        if (fFiltered == false) pCpu->Param1.cb = DISGetParamSize(pCpu, &pCpu->Param1);
     }
 
     if (pOp->idxParse2 != IDX_ParseNop)
     {
-        size += pCpu->pfnDisasmFnTable[pOp->idxParse2](uCodePtr+size, pOp, &pCpu->param2, pCpu);
-        if (fFiltered == false) pCpu->param2.cb = DISGetParamSize(pCpu, &pCpu->param2);
+        size += pCpu->pfnDisasmFnTable[pOp->idxParse2](uCodePtr+size, pOp, &pCpu->Param2, pCpu);
+        if (fFiltered == false) pCpu->Param2.cb = DISGetParamSize(pCpu, &pCpu->Param2);
     }
 
     if (pOp->idxParse3 != IDX_ParseNop)
     {
-        size += pCpu->pfnDisasmFnTable[pOp->idxParse3](uCodePtr+size, pOp, &pCpu->param3, pCpu);
-        if (fFiltered == false) pCpu->param3.cb = DISGetParamSize(pCpu, &pCpu->param3);
+        size += pCpu->pfnDisasmFnTable[pOp->idxParse3](uCodePtr+size, pOp, &pCpu->Param3, pCpu);
+        if (fFiltered == false) pCpu->Param3.cb = DISGetParamSize(pCpu, &pCpu->Param3);
     }
     // else simple one byte instruction
@@ -534 +534 @@
 
         // Should contain the parameter type on input
-        pCpu->param1.param = fpop->fParam1;
-        pCpu->param2.param = fpop->fParam2;
+        pCpu->Param1.param = fpop->fParam1;
+        pCpu->Param2.param = fpop->fParam2;
     }
     else
@@ -1569 +1569 @@
             pParam->base.reg_gen = pParam->param - OP_PARM_REG_GEN32_START;
             if (    (pOp->fOpType & DISOPTYPE_REXB_EXTENDS_OPREG)
-                &&  pParam == &pCpu->param1             /* ugly assumption that it only applies to the first parameter */
+                &&  pParam == &pCpu->Param1             /* ugly assumption that it only applies to the first parameter */
                 &&  (pCpu->fPrefix & DISPREFIX_REX)
                 &&  (pCpu->fRexPrefix & DISPREFIX_REX_FLAGS))
@@ -1613 +1613 @@
         {
             if (    (pOp->fOpType & DISOPTYPE_REXB_EXTENDS_OPREG)
-                &&  pParam == &pCpu->param1             /* ugly assumption that it only applies to the first parameter */
+                &&  pParam == &pCpu->Param1             /* ugly assumption that it only applies to the first parameter */
                 &&  (pCpu->fPrefix & DISPREFIX_REX)
                 &&  (pCpu->fRexPrefix & DISPREFIX_REX_FLAGS))
@@ -2655 +2655 @@
         case OP_XCHG:
         case OP_XOR:
-            if (pCpu->param1.fUse & (DISUSE_BASE | DISUSE_INDEX | DISUSE_DISPLACEMENT64 | DISUSE_DISPLACEMENT32
+            if (pCpu->Param1.fUse & (DISUSE_BASE | DISUSE_INDEX | DISUSE_DISPLACEMENT64 | DISUSE_DISPLACEMENT32
                                      | DISUSE_DISPLACEMENT16 | DISUSE_DISPLACEMENT8 | DISUSE_RIPDISPLACEMENT32))
                 return;

trunk/src/VBox/Disassembler/DisasmFormatYasm.cpp

@@ -543 +543 @@
             case OP_FLD:
                 if (pCpu->bOpCode == 0xdb) /* m80fp workaround. */
-                    *(int *)&pCpu->param1.param &= ~0x1f; /* make it pure OP_PARM_M */
+                    *(int *)&pCpu->Param1.param &= ~0x1f; /* make it pure OP_PARM_M */
                 break;
             case OP_LAR: /* hack w -> v, probably not correct. */
-                *(int *)&pCpu->param2.param &= ~0x1f;
-                *(int *)&pCpu->param2.param |= OP_PARM_v;
+                *(int *)&pCpu->Param2.param &= ~0x1f;
+                *(int *)&pCpu->Param2.param |= OP_PARM_v;
                 break;
         }
@@ -554 +554 @@
          * Formatting context and associated macros.
          */
-        PCDISOPPARAM pParam = &pCpu->param1;
+        PCDISOPPARAM pParam = &pCpu->Param1;
         int iParam = 1;
 
@@ -613 +613 @@
          */
         if (    (pCpu->fPrefix & DISPREFIX_SEG)
-            &&  !DISUSE_IS_EFFECTIVE_ADDR(pCpu->param1.fUse)
-            &&  !DISUSE_IS_EFFECTIVE_ADDR(pCpu->param2.fUse)
-            &&  !DISUSE_IS_EFFECTIVE_ADDR(pCpu->param3.fUse))
+            &&  !DISUSE_IS_EFFECTIVE_ADDR(pCpu->Param1.fUse)
+            &&  !DISUSE_IS_EFFECTIVE_ADDR(pCpu->Param2.fUse)
+            &&  !DISUSE_IS_EFFECTIVE_ADDR(pCpu->Param3.fUse))
         {
             PUT_STR(s_szSegPrefix[pCpu->idxSegPrefix], 2);
@@ -1113 +1113 @@
                     switch (++iParam)
                     {
-                        case 2: pParam = &pCpu->param2; break;
-                        case 3: pParam = &pCpu->param3; break;
+                        case 2: pParam = &pCpu->Param2; break;
+                        case 3: pParam = &pCpu->Param3; break;
                         default: pParam = NULL; break;
                     }
@@ -1292 +1292 @@
         /* no effective address which it may apply to. */
         Assert((pCpu->fPrefix & DISPREFIX_SEG) || pCpu->uCpuMode == DISCPUMODE_64BIT);
-        if (    !DISUSE_IS_EFFECTIVE_ADDR(pCpu->param1.fUse)
-            &&  !DISUSE_IS_EFFECTIVE_ADDR(pCpu->param2.fUse)
-            &&  !DISUSE_IS_EFFECTIVE_ADDR(pCpu->param3.fUse))
+        if (    !DISUSE_IS_EFFECTIVE_ADDR(pCpu->Param1.fUse)
+            &&  !DISUSE_IS_EFFECTIVE_ADDR(pCpu->Param2.fUse)
+            &&  !DISUSE_IS_EFFECTIVE_ADDR(pCpu->Param3.fUse))
             return true;
     }
@@ -1449 +1449 @@
     /* shl eax,1 will be assembled to the form without the immediate byte. */
     if (    pCpu->pCurInstr->fParam2 == OP_PARM_Ib
-        &&  (uint8_t)pCpu->param2.parval == 1)
+        &&  (uint8_t)pCpu->Param2.parval == 1)
     {
         switch (pCpu->pCurInstr->uOpcode)