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

Timestamp:

Jun 12, 2012 8:53:40 PM (12 years ago)

Author:

vboxsync

Message:

DIS: More scoping work.

File:

• trunk/src/VBox/VMM/VMMAll/EMAll.cpp (modified) (6 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 & USE_BASE)
-                    &&  (pDis->param1.flags & (USE_REG_GEN16|USE_REG_GEN32))
+                if (    (pDis->param1.flags & DISUSE_BASE)
+                    &&  (pDis->param1.flags & (DISUSE_REG_GEN16|DISUSE_REG_GEN32))
                     &&  pDis->param1.base.reg_gen == USE_REG_ESP
                    )
@@ -2135 +2135 @@
  * @param   pRegFrame   The register frame.
  * @param   DestRegGen  General purpose register index (USE_REG_E**))
- * @param   SrcRegCRx   CRx register index (USE_REG_CR*)
+ * @param   SrcRegCRx   CRx register index (DISUSE_REG_CR*)
  *
  */
@@ -2194 +2194 @@
  * @param   pVCpu       The VMCPU handle.
  * @param   pRegFrame   The register frame.
- * @param   DestRegCRx  CRx register index (USE_REG_CR*)
+ * @param   DestRegCRx  CRx register index (DISUSE_REG_CR*)
  * @param   val         New CRx value
  *
@@ -2333 +2333 @@
  * @param   pVCpu       The VMCPU handle.
  * @param   pRegFrame   The register frame.
- * @param   DestRegCRx  CRx register index (USE_REG_CR*)
+ * @param   DestRegCRx  CRx register index (DISUSE_REG_CR*)
  * @param   SrcRegGen   General purpose register index (USE_REG_E**))
  *
@@ -2468 +2468 @@
 {
     NOREF(pvFault); NOREF(pcbSize);
-    if ((pDis->param1.flags == USE_REG_GEN32 || pDis->param1.flags == USE_REG_GEN64) && pDis->param2.flags == USE_REG_CR)
+    if ((pDis->param1.flags == DISUSE_REG_GEN32 || pDis->param1.flags == DISUSE_REG_GEN64) && pDis->param2.flags == DISUSE_REG_CR)
         return EMInterpretCRxRead(pVM, pVCpu, pRegFrame, pDis->param1.base.reg_gen, pDis->param2.base.reg_ctrl);
 
-    if (pDis->param1.flags == USE_REG_CR && (pDis->param2.flags == USE_REG_GEN32 || pDis->param2.flags == USE_REG_GEN64))
+    if (pDis->param1.flags == DISUSE_REG_CR && (pDis->param2.flags == DISUSE_REG_GEN32 || pDis->param2.flags == 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 == USE_REG_GEN32 || pDis->param1.flags == USE_REG_GEN64) && pDis->param2.flags == USE_REG_DBG)
+    if((pDis->param1.flags == DISUSE_REG_GEN32 || pDis->param1.flags == DISUSE_REG_GEN64) && pDis->param2.flags == DISUSE_REG_DBG)
     {
         rc = EMInterpretDRxRead(pVM, pVCpu, pRegFrame, pDis->param1.base.reg_gen, pDis->param2.base.reg_dbg);
     }
     else
-    if(pDis->param1.flags == USE_REG_DBG && (pDis->param2.flags == USE_REG_GEN32 || pDis->param2.flags == USE_REG_GEN64))
+    if(pDis->param1.flags == DISUSE_REG_DBG && (pDis->param2.flags == DISUSE_REG_GEN32 || pDis->param2.flags == DISUSE_REG_GEN64))
     {
         rc = EMInterpretDRxWrite(pVM, pVCpu, pRegFrame, pDis->param1.base.reg_dbg, pDis->param2.base.reg_gen);