Changeset 2721 in vbox for trunk/src

Timestamp:

May 18, 2007 3:52:52 PM (18 years ago)

Author:

vboxsync

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

21317

Message:

Updated SELMR3CheckTSS so it won't assert for no good reason.

File:

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

trunk/src/VBox/VMM/SELM.cpp

@@ -1733 +1733 @@
             }
         }
-    }
-
-    if (!pVM->selm.s.fSyncTSSRing0Stack)
-    {
-        RTGCPTR     pGuestTSS = pVM->selm.s.GCPtrGuestTss;
-        uint32_t    ESPR0;
-        int rc = PGMPhysReadGCPtr(pVM, &ESPR0, pGuestTSS + RT_OFFSETOF(VBOXTSS, esp0), sizeof(ESPR0));
-        if (VBOX_SUCCESS(rc))
-        {
-            RTSEL SelSS0;
-            rc = PGMPhysReadGCPtr(pVM, &SelSS0, pGuestTSS + RT_OFFSETOF(VBOXTSS, ss0), sizeof(SelSS0));
+
+        if (!pVM->selm.s.fSyncTSSRing0Stack)
+        {
+            RTGCPTR     pGuestTSS = pVM->selm.s.GCPtrGuestTss;
+            uint32_t    ESPR0;
+            int rc = PGMPhysReadGCPtr(pVM, &ESPR0, pGuestTSS + RT_OFFSETOF(VBOXTSS, esp0), sizeof(ESPR0));
             if (VBOX_SUCCESS(rc))
             {
-                if (    ESPR0 == pVM->selm.s.Tss.esp1
-                    &&  SelSS0 == (pVM->selm.s.Tss.ss1 & ~1))
-                    return true;
-
-                RTGCPHYS GCPhys;
-                uint64_t fFlags;
-
-                rc = PGMGstGetPage(pVM, pGuestTSS, &fFlags, &GCPhys);
-                AssertRC(rc);
-                AssertMsgFailed(("TSS out of sync!! (%04X:%08X vs %04X:%08X (guest)) Tss=%VGv Phys=%VGp\n",
-                                 (pVM->selm.s.Tss.ss1 & ~1), pVM->selm.s.Tss.esp1, SelSS0, ESPR0, pGuestTSS, GCPhys));
+                RTSEL SelSS0;
+                rc = PGMPhysReadGCPtr(pVM, &SelSS0, pGuestTSS + RT_OFFSETOF(VBOXTSS, ss0), sizeof(SelSS0));
+                if (VBOX_SUCCESS(rc))
+                {
+                    if (    ESPR0 == pVM->selm.s.Tss.esp1
+                        &&  SelSS0 == (pVM->selm.s.Tss.ss1 & ~1))
+                        return true;
+
+                    RTGCPHYS GCPhys;
+                    uint64_t fFlags;
+
+                    rc = PGMGstGetPage(pVM, pGuestTSS, &fFlags, &GCPhys);
+                    AssertRC(rc);
+                    AssertMsgFailed(("TSS out of sync!! (%04X:%08X vs %04X:%08X (guest)) Tss=%VGv Phys=%VGp\n",
+                                     (pVM->selm.s.Tss.ss1 & ~1), pVM->selm.s.Tss.esp1, SelSS0, ESPR0, pGuestTSS, GCPhys));
+                }
+                else
+                    AssertRC(rc);
             }
             else
-                AssertRC(rc);
-        }
-        else
-            /* Happens during early Windows XP boot when it is switching page tables. */
-            Assert(rc == VINF_SUCCESS || ((rc == VERR_PAGE_TABLE_NOT_PRESENT || rc == VERR_PAGE_NOT_PRESENT) && !(CPUMGetGuestEFlags(pVM) & X86_EFL_IF)));
+                /* Happens during early Windows XP boot when it is switching page tables. */
+                Assert(rc == VINF_SUCCESS || ((rc == VERR_PAGE_TABLE_NOT_PRESENT || rc == VERR_PAGE_NOT_PRESENT) && !(CPUMGetGuestEFlags(pVM) & X86_EFL_IF)));
+        }
     }
     return false;