Changeset 41823 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

Jun 19, 2012 1:43:39 PM (12 years ago)

Author:

vboxsync

Message:

Avoid using SELMValidateAndConvertCSAddr+EMInterpretDisasOneEx when possible and call EMInterpretDisasOne instead. Changed EMInterpretDisasOne to use SELMValidateAndConvertCSAddr instead of SELMToFlatEx.

File:

• trunk/src/VBox/VMM/VMMR0/HWSVMR0.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMR0/HWSVMR0.cpp

@@ -2974 +2974 @@
     if (enmMode != DISCPUMODE_16BIT)
     {
-        RTGCPTR pbCode;
-        int rc = SELMValidateAndConvertCSAddr(pVCpu, pRegFrame->eflags, pRegFrame->ss, pRegFrame->cs,
-                                              &pRegFrame->csHid, (RTGCPTR)pRegFrame->rip, &pbCode);
-        if (RT_SUCCESS(rc))
-        {
-            uint32_t     cbOp;
-            PDISCPUSTATE pDis = &pVCpu->hwaccm.s.DisState;
-
-            pDis->uCpuMode = enmMode;
-            rc = EMInterpretDisasOneEx(pVM, pVCpu, pbCode, pRegFrame, pDis, &cbOp);
-            Assert(RT_FAILURE(rc) || pDis->pCurInstr->uOpcode == OP_INVLPG);
-            if (RT_SUCCESS(rc) && pDis->pCurInstr->uOpcode == OP_INVLPG)
-            {
-                Assert(cbOp == pDis->cbInstr);
-                rc = hmR0svmInterpretInvlPg(pVCpu, pDis, pRegFrame, uASID);
-                if (RT_SUCCESS(rc))
-                    pRegFrame->rip += cbOp; /* Move on to the next instruction. */
-
-                return rc;
-            }
+        PDISSTATE pDis = &pVCpu->hwaccm.s.DisState;
+        int rc = EMInterpretDisasOne(pVM, pVCpu, pRegFrame, pDis, NULL);
+        if (RT_SUCCESS(rc) && pDis->pCurInstr->uOpcode == OP_INVLPG)
+        {
+            rc = hmR0svmInterpretInvlPg(pVCpu, pDis, pRegFrame, uASID);
+            if (RT_SUCCESS(rc))
+                pRegFrame->rip += pDis->cbInstr; /* Move on to the next instruction. */
+            return rc;
         }
     }