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

Timestamp:

Jul 17, 2012 1:32:15 PM (13 years ago)

Author:

vboxsync

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

79186

Message:

SELM,DIS,CPUM,EM: Hidden selector register cleanups.

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HWSVMR0.cpp (modified) (2 diffs)
• HWVMXR0.cpp (modified) (2 diffs)

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

@@ -2428 +2428 @@
 
             /* Disassemble manually to deal with segment prefixes. */
-            rc = EMInterpretDisasOne(pVM, pVCpu, CPUMCTX2CORE(pCtx), pDis, NULL);
+            rc = EMInterpretDisasCurrent(pVM, pVCpu, pDis, NULL);
             if (rc == VINF_SUCCESS)
             {
@@ -2990 +2990 @@
      * Only allow 32 & 64 bit code.
      */
-    DISCPUMODE enmMode = SELMGetCpuModeFromSelector(pVCpu, pRegFrame->eflags, pRegFrame->cs.Sel, &pRegFrame->cs);
-    if (enmMode != DISCPUMODE_16BIT)
+    if (CPUMGetGuestCodeBits(pVCpu) != 16)
     {
         PDISSTATE pDis = &pVCpu->hwaccm.s.DisState;
-        int rc = EMInterpretDisasOne(pVM, pVCpu, pRegFrame, pDis, NULL);
+        int rc = EMInterpretDisasCurrent(pVM, pVCpu, pDis, NULL);
         if (RT_SUCCESS(rc) && pDis->pCurInstr->uOpcode == OP_INVLPG)
         {

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

@@ -3657 +3657 @@
                 LogFlow(("Real mode X86_XCPT_GP instruction emulation at %x:%RGv\n", pCtx->cs.Sel, (RTGCPTR)pCtx->rip));
 
-                rc2 = EMInterpretDisasOne(pVM, pVCpu, CPUMCTX2CORE(pCtx), pDis, &cbOp);
+                rc2 = EMInterpretDisasCurrent(pVM, pVCpu, pDis, &cbOp);
                 if (RT_SUCCESS(rc2))
                 {
@@ -4442 +4442 @@
             /** @todo VMX_VMCS_EXIT_GUEST_LINEAR_ADDR contains the flat pointer operand of the instruction. */
             /** @todo VMX_VMCS32_RO_EXIT_INSTR_INFO also contains segment prefix info. */
-            rc2 = EMInterpretDisasOne(pVM, pVCpu, CPUMCTX2CORE(pCtx), pDis, NULL);
+            rc2 = EMInterpretDisasCurrent(pVM, pVCpu, pDis, NULL);
             if (RT_SUCCESS(rc))
             {