Changeset 40360 in vbox for trunk

Timestamp:

Mar 5, 2012 3:41:22 PM (13 years ago)

Author:

vboxsync

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

76651

Message:

Do not try to run unreal mode code as V86 in VT-x.

Location:

trunk/src

Files:

• VBox/VMM/VMMR0/HWVMXR0.cpp (modified) (1 diff)
• VBox/VMM/VMMR3/HWACCM.cpp (modified) (1 diff)
• recompiler/target-i386/translate.c (modified) (1 diff)

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

@@ -1453 +1453 @@
                     pCtx->gsHid.Attr.n.u2Dpl  = 0;
                     pCtx->ssHid.Attr.n.u2Dpl  = 0;
-
-                    /* The limit must correspond to the 32 bits setting. */
-                    if (!pCtx->csHid.Attr.n.u1DefBig)
-                        pCtx->csHid.u32Limit &= 0xffff;
-                    if (!pCtx->dsHid.Attr.n.u1DefBig)
-                        pCtx->dsHid.u32Limit &= 0xffff;
-                    if (!pCtx->esHid.Attr.n.u1DefBig)
-                        pCtx->esHid.u32Limit &= 0xffff;
-                    if (!pCtx->fsHid.Attr.n.u1DefBig)
-                        pCtx->fsHid.u32Limit &= 0xffff;
-                    if (!pCtx->gsHid.Attr.n.u1DefBig)
-                        pCtx->gsHid.u32Limit &= 0xffff;
-                    if (!pCtx->ssHid.Attr.n.u1DefBig)
-                        pCtx->ssHid.u32Limit &= 0xffff;
-                }
-                else
-                /* Switching from protected mode to real mode. */
-                if (    pVCpu->hwaccm.s.vmx.enmLastSeenGuestMode >= PGMMODE_PROTECTED
-                    &&  enmGuestMode == PGMMODE_REAL)
-                {
-                    /* The limit must also be set to 0xffff. */
-                    pCtx->csHid.u32Limit = 0xffff;
-                    pCtx->dsHid.u32Limit = 0xffff;
-                    pCtx->esHid.u32Limit = 0xffff;
-                    pCtx->fsHid.u32Limit = 0xffff;
-                    pCtx->gsHid.u32Limit = 0xffff;
-                    pCtx->ssHid.u32Limit = 0xffff;
-
-                    Assert(pCtx->csHid.u64Base <= 0xfffff);
-                    Assert(pCtx->dsHid.u64Base <= 0xfffff);
-                    Assert(pCtx->esHid.u64Base <= 0xfffff);
-                    Assert(pCtx->fsHid.u64Base <= 0xfffff);
-                    Assert(pCtx->gsHid.u64Base <= 0xfffff);
                 }
                 pVCpu->hwaccm.s.vmx.enmLastSeenGuestMode = enmGuestMode;

trunk/src/VBox/VMM/VMMR3/HWACCM.cpp

@@ -2281 +2281 @@
                 if (   (   pCtx->cs != (pCtx->csHid.u64Base >> 4)
                         && pCtx->csHid.u64Base != 0xffff0000 /* we can deal with the BIOS code as it's also mapped into the lower region. */)
+                    || (pCtx->csHid.u32Limit != 0xffff)
+                    || (pCtx->dsHid.u32Limit != 0xffff)
+                    || (pCtx->esHid.u32Limit != 0xffff)
+                    || (pCtx->ssHid.u32Limit != 0xffff)
+                    || (pCtx->fsHid.u32Limit != 0xffff)
+                    || (pCtx->gsHid.u32Limit != 0xffff)
                     || pCtx->ds != (pCtx->dsHid.u64Base >> 4)
                     || pCtx->es != (pCtx->esHid.u64Base >> 4)

trunk/src/recompiler/target-i386/translate.c

@@ -2563 +2563 @@
     tcg_gen_st_tl(cpu_T[0], cpu_env,
                   offsetof(CPUX86State,segs[seg_reg].base));
-#ifdef VBOX
-    int flags = DESC_P_MASK | DESC_S_MASK | DESC_W_MASK;
-    if (seg_reg == R_CS)
-        flags |= DESC_CS_MASK;
-    gen_op_movl_T0_im(flags);
-    tcg_gen_st32_tl(cpu_T[0], cpu_env, offsetof(CPUX86State,segs[seg_reg].flags));
-
-    /* Set the limit to 0xffff. */
-    gen_op_movl_T0_im(0xffff);
-    tcg_gen_st32_tl(cpu_T[0], cpu_env, offsetof(CPUX86State,segs[seg_reg].limit));
-#endif
 }