Changeset 41678 in vbox for trunk/src/VBox/VMM/VMMAll/EMAll.cpp

Timestamp:

Jun 13, 2012 9:37:47 AM (13 years ago)

Author:

vboxsync

Message:

OP_PARAMETER::flags -> fUse.

File:

• trunk/src/VBox/VMM/VMMAll/EMAll.cpp (modified) (7 diffs)

trunk/src/VBox/VMM/VMMAll/EMAll.cpp

@@ -1049 +1049 @@
                 /* pop [esp+xx] uses esp after the actual pop! */
                 AssertCompile(USE_REG_ESP == USE_REG_SP);
-                if (    (pDis->param1.flags & DISUSE_BASE)
-                    &&  (pDis->param1.flags & (DISUSE_REG_GEN16|DISUSE_REG_GEN32))
+                if (    (pDis->param1.fUse & DISUSE_BASE)
+                    &&  (pDis->param1.fUse & (DISUSE_REG_GEN16|DISUSE_REG_GEN32))
                     &&  pDis->param1.base.reg_gen == USE_REG_ESP
                    )
@@ -1536 +1536 @@
             {
             case PARMTYPE_IMMEDIATE:
-                if(!(param1.flags & (PARAM_VAL32|PARAM_VAL64)))
+                if(!(param1.flags  & (PARAM_VAL32|PARAM_VAL64)))
                     return VERR_EM_INTERPRETER;
                 /* fallthru */
@@ -2062 +2062 @@
     case PARMTYPE_IMMEDIATE:
     case PARMTYPE_ADDRESS:
-        if(!(param1.flags & (PARAM_VAL32|PARAM_VAL64)))
+        if(!(param1.flags  & (PARAM_VAL32|PARAM_VAL64)))
             return VERR_EM_INTERPRETER;
         addr = (RTGCPTR)param1.val.val64;
@@ -2397 +2397 @@
     case PARMTYPE_IMMEDIATE:
     case PARMTYPE_ADDRESS:
-        if(!(param1.flags & PARAM_VAL16))
+        if(!(param1.flags  & PARAM_VAL16))
             return VERR_EM_INTERPRETER;
         val = param1.val.val32;
@@ -2468 +2468 @@
 {
     NOREF(pvFault); NOREF(pcbSize);
-    if ((pDis->param1.flags == DISUSE_REG_GEN32 || pDis->param1.flags == DISUSE_REG_GEN64) && pDis->param2.flags == DISUSE_REG_CR)
+    if ((pDis->param1.fUse == DISUSE_REG_GEN32 || pDis->param1.fUse == DISUSE_REG_GEN64) && pDis->param2.fUse == DISUSE_REG_CR)
         return EMInterpretCRxRead(pVM, pVCpu, pRegFrame, pDis->param1.base.reg_gen, pDis->param2.base.reg_ctrl);
 
-    if (pDis->param1.flags == DISUSE_REG_CR && (pDis->param2.flags == DISUSE_REG_GEN32 || pDis->param2.flags == DISUSE_REG_GEN64))
+    if (pDis->param1.fUse == DISUSE_REG_CR && (pDis->param2.fUse == DISUSE_REG_GEN32 || pDis->param2.fUse == DISUSE_REG_GEN64))
         return EMInterpretCRxWrite(pVM, pVCpu, pRegFrame, pDis->param1.base.reg_ctrl, pDis->param2.base.reg_gen);
 
@@ -2558 +2558 @@
     NOREF(pvFault); NOREF(pcbSize);
 
-    if((pDis->param1.flags == DISUSE_REG_GEN32 || pDis->param1.flags == DISUSE_REG_GEN64) && pDis->param2.flags == DISUSE_REG_DBG)
+    if((pDis->param1.fUse == DISUSE_REG_GEN32 || pDis->param1.fUse == DISUSE_REG_GEN64) && pDis->param2.fUse == DISUSE_REG_DBG)
     {
         rc = EMInterpretDRxRead(pVM, pVCpu, pRegFrame, pDis->param1.base.reg_gen, pDis->param2.base.reg_dbg);
     }
     else
-    if(pDis->param1.flags == DISUSE_REG_DBG && (pDis->param2.flags == DISUSE_REG_GEN32 || pDis->param2.flags == DISUSE_REG_GEN64))
+    if(pDis->param1.fUse == DISUSE_REG_DBG && (pDis->param2.fUse == DISUSE_REG_GEN32 || pDis->param2.fUse == DISUSE_REG_GEN64))
     {
         rc = EMInterpretDRxWrite(pVM, pVCpu, pRegFrame, pDis->param1.base.reg_dbg, pDis->param2.base.reg_gen);
@@ -2593 +2593 @@
 
     case PARMTYPE_IMMEDIATE:
-        if(!(param1.flags & PARAM_VAL16))
+        if(!(param1.flags  & PARAM_VAL16))
             return VERR_EM_INTERPRETER;
         sel = (RTSEL)param1.val.val16;