Changeset 12699 in vbox for trunk/src/VBox/VMM

Timestamp:

Sep 24, 2008 3:55:37 PM (17 years ago)

Author:

vboxsync

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

37006

Message:

Merge real mode sync changes.

File:

• trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp (modified) (3 diffs)

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

@@ -1506 +1506 @@
         VM_FF_CLEAR(pVM, VM_FF_INHIBIT_INTERRUPTS);
 
-    /* Real mode emulation using v86 mode with CR4.VME (interrupt redirection using the int bitmap in the TSS) */
-    if (!(pCtx->cr0 & X86_CR0_PROTECTION_ENABLE))
-    {
-        /* Hide our emulation flags */
-        pCtx->eflags.Bits.u1VM   = 0;
-        pCtx->eflags.Bits.u1IF   = pCtx->eflags.Bits.u1VIF;
-        pCtx->eflags.Bits.u1VIF  = 0;
-        pCtx->eflags.Bits.u2IOPL = 0;
-    }
-
     /* Control registers. */
     VMXReadVMCS(VMX_VMCS_CTRL_CR0_READ_SHADOW,   &valShadow);
@@ -1554 +1544 @@
     VMX_READ_SELREG(LDTR, ldtr);
 
-    /* In real mode we have a fake TSS, so only sync it back when it's supposed to be valid. */
-    if (pCtx->cr0 & X86_CR0_PROTECTION_ENABLE)
-    {
-        VMX_READ_SELREG(TR, tr);
-    }
-    else
-        /* Force a TR resync every time in case we switch modes. */
-        pVM->hwaccm.s.fContextUseFlags |= HWACCM_CHANGED_GUEST_TR;
-
     VMXReadVMCS(VMX_VMCS_GUEST_GDTR_LIMIT,       &val);
     pCtx->gdtr.cbGdt        = val;
@@ -1572 +1553 @@
     VMXReadVMCS(VMX_VMCS_GUEST_IDTR_BASE,        &val);
     pCtx->idtr.pIdt         = val;
+
+    /* Real mode emulation using v86 mode with CR4.VME (interrupt redirection using the int bitmap in the TSS) */
+    if (!(pCtx->cr0 & X86_CR0_PROTECTION_ENABLE))
+    {
+        /* Hide our emulation flags */
+        pCtx->eflags.Bits.u1VM   = 0;
+        pCtx->eflags.Bits.u1IF   = pCtx->eflags.Bits.u1VIF;
+        pCtx->eflags.Bits.u1VIF  = 0;
+        pCtx->eflags.Bits.u2IOPL = 0;
+
+        /* Force a TR resync every time in case we switch modes. */
+        pVM->hwaccm.s.fContextUseFlags |= HWACCM_CHANGED_GUEST_TR;
+    }
+    else
+    {
+        /* In real mode we have a fake TSS, so only sync it back when it's supposed to be valid. */
+        VMX_READ_SELREG(TR, tr);
+    }
 
     /** @note NOW IT'S SAFE FOR LOGGING! */