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

Timestamp:

Jun 14, 2012 10:49:03 PM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

78535

Message:

DIS: register macro name adjustments.

File:

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

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

@@ -399 +399 @@
 {
     RTGCPTR GCPtrInstr;
-    int rc = SELMToFlatEx(pVCpu, DIS_SELREG_CS, pCtxCore, pCtxCore->rip, 0, &GCPtrInstr);
+    int rc = SELMToFlatEx(pVCpu, DISSELREG_CS, pCtxCore, pCtxCore->rip, 0, &GCPtrInstr);
     if (RT_FAILURE(rc))
     {
@@ -498 +498 @@
 #else
     RTGCPTR pbCode;
-    VBOXSTRICTRC rc = SELMToFlatEx(pVCpu, DIS_SELREG_CS, pRegFrame, pRegFrame->rip, 0, &pbCode);
+    VBOXSTRICTRC rc = SELMToFlatEx(pVCpu, DISSELREG_CS, pRegFrame, pRegFrame->rip, 0, &pbCode);
     if (RT_SUCCESS(rc))
     {
@@ -552 +552 @@
 #else
     RTGCPTR pbCode;
-    VBOXSTRICTRC rc = SELMToFlatEx(pVCpu, DIS_SELREG_CS, pRegFrame, pRegFrame->rip, 0, &pbCode);
+    VBOXSTRICTRC rc = SELMToFlatEx(pVCpu, DISSELREG_CS, pRegFrame, pRegFrame->rip, 0, &pbCode);
     if (RT_SUCCESS(rc))
     {
@@ -735 +735 @@
 DECLINLINE(RTGCPTR) emConvertToFlatAddr(PVM pVM, PCPUMCTXCORE pRegFrame, PDISCPUSTATE pDis, PDISOPPARAM pParam, RTGCPTR pvAddr)
 {
-    DIS_SELREG enmPrefixSeg = DISDetectSegReg(pDis, pParam);
+    DISSELREG enmPrefixSeg = DISDetectSegReg(pDis, pParam);
     return SELMToFlat(pVM, enmPrefixSeg, pRegFrame, pvAddr);
 }
@@ -1032 +1032 @@
 
             /* Convert address; don't bother checking limits etc, as we only read here */
-            pStackVal = SELMToFlat(pVM, DIS_SELREG_SS, pRegFrame, (RTGCPTR)pRegFrame->esp);
+            pStackVal = SELMToFlat(pVM, DISSELREG_SS, pRegFrame, (RTGCPTR)pRegFrame->esp);
             if (pStackVal == 0)
                 return VERR_EM_INTERPRETER;
@@ -1048 +1048 @@
 
                 /* pop [esp+xx] uses esp after the actual pop! */
-                AssertCompile(USE_REG_ESP == USE_REG_SP);
+                AssertCompile(DISGREG_ESP == DISGREG_SP);
                 if (    (pDis->param1.fUse & DISUSE_BASE)
                     &&  (pDis->param1.fUse & (DISUSE_REG_GEN16|DISUSE_REG_GEN32))
-                    &&  pDis->param1.base.reg_gen == USE_REG_ESP
+                    &&  pDis->param1.base.reg_gen == DISGREG_ESP
                    )
                    pParam1 = (RTGCPTR)((RTGCUINTPTR)pParam1 + param1.size);
@@ -1674 +1674 @@
     }
 
-    GCDest = SELMToFlat(pVM, DIS_SELREG_ES, pRegFrame, GCOffset);
+    GCDest = SELMToFlat(pVM, DISSELREG_ES, pRegFrame, GCOffset);
     switch (pDis->opmode)
     {
@@ -2686 +2686 @@
 
     Assert(pRegFrame->eflags.u32 & X86_EFL_IF);
-    Assert(pvFault == SELMToFlat(pVM, DIS_SELREG_CS, pRegFrame, (RTGCPTR)pRegFrame->rip));
+    Assert(pvFault == SELMToFlat(pVM, DISSELREG_CS, pRegFrame, (RTGCPTR)pRegFrame->rip));
 
     pVCpu->em.s.GCPtrInhibitInterrupts = pRegFrame->eip + pDis->opsize;