Changeset 1090 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Feb 28, 2007 8:44:17 AM (18 years ago)

Author:

vboxsync

Message:

Corrected assertions for v86 mode

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• CPUMAllRegs.cpp (modified) (2 diffs)
• PGMAllBth.h (modified) (1 diff)
• TRPMAll.cpp (modified) (2 diffs)

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

@@ -1207 +1207 @@
     else
     {
-        AssertMsg((pCtxCore->ss & X86_SEL_RPL) >= 2 && !pCtxCore->eflags.Bits.u1VM,
+        AssertMsg((pCtxCore->ss & X86_SEL_RPL) >= 2 || pCtxCore->eflags.Bits.u1VM,
                   ("ring-1 code not supported\n"));
         /*
@@ -1255 +1255 @@
         pCtxCore = CPUMCTX2CORE(pCtx);
     Assert(pCtxCore->eflags.Bits.u1VM || (pCtxCore->ss & X86_SEL_RPL));
-    AssertMsg(pCtxCore->eflags.Bits.u2IOPL < (unsigned)(pCtxCore->ss & X86_SEL_RPL),
+    AssertMsg(pCtxCore->eflags.Bits.u1VM || pCtxCore->eflags.Bits.u2IOPL < (unsigned)(pCtxCore->ss & X86_SEL_RPL),
               ("X86_EFL_IOPL=%d CPL=%d\n", pCtxCore->eflags.Bits.u2IOPL, pCtxCore->ss & X86_SEL_RPL));
 

trunk/src/VBox/VMM/VMMAll/PGMAllBth.h

@@ -553 +553 @@
                 Assert((pRegFrame->ss & X86_SEL_RPL) == 0 || (pRegFrame->ss & X86_SEL_RPL) == 3);
 #  else
-                Assert((pRegFrame->ss & X86_SEL_RPL) == 1 || (pRegFrame->ss & X86_SEL_RPL) == 3);
+                Assert((pRegFrame->ss & X86_SEL_RPL) == 1 || (pRegFrame->ss & X86_SEL_RPL) == 3 || pRegFrame->eflags.Bits.u1VM);
                 if (CSAMIsEnabled(pVM) && (pRegFrame->ss & X86_SEL_RPL) == 1)
                 {

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

@@ -577 +577 @@
                  * Build trap stack frame on guest handler's stack
                  */
+                /** @todo if eflags.Bits.u1VM check for 4 more dwords */
 #ifdef IN_GC
                 Assert((pRegFrame->ss & X86_SEL_RPL) != 0);
@@ -594 +595 @@
                     Log(("TRAP%02X: Handler %04X:%08X Stack %04X:%08X RPL=%d CR2=%08X\n", iGate, GuestIdte.Gen.u16SegSel, pHandler, ss_r0, esp_r0, (pRegFrame->ss & X86_SEL_RPL), pVM->trpm.s.uActiveCR2));
 
+                    /** @todo if eflags.Bits.u1VM push gs, fs, ds, es */
                     if (fConforming == false && dpl < cpl)
                     {