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

Timestamp:

Nov 26, 2009 12:02:29 PM (15 years ago)

Author:

vboxsync

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

55298

Message:

VMMR0/HWSVMR0.cpp: Corrected the csHid.attr.n.u1Granularity fix and related assertions.

File:

• trunk/src/VBox/VMM/VMMR0/HWSVMR0.cpp (modified) (2 diffs)

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

@@ -1439 +1439 @@
     if (   !pCtx->csHid.Attr.n.u1Granularity
         &&  pCtx->csHid.Attr.n.u1Present
-        &&  pCtx->csHid.u32Limit > UINT32_C(0xffff))
+        &&  pCtx->csHid.u32Limit > UINT32_C(0xfffff))
     {
         Assert((pCtx->csHid.u32Limit & 0xfff) == 0xfff);
         pCtx->csHid.Attr.n.u1Granularity = 1;
     }
-#if 0
 #define SVM_ASSERT_SEL_GRANULARITY(reg) \
-        AssertMsg(!pCtx->reg##Hid.Attr.n.u1Present \
+        AssertMsg(   !pCtx->reg##Hid.Attr.n.u1Present \
                   || (   pCtx->reg##Hid.Attr.n.u1Granularity \
                       ? (pCtx->reg##Hid.u32Limit & 0xfff) == 0xfff \
-                      :  pCtx->reg##Hid.u32Limit <= 0xffff), \
-                  ("%#x\n", pCtx->reg##Hid.u32Limit))
+                      :  pCtx->reg##Hid.u32Limit <= 0xfffff), \
+                  ("%#x %#x %#llx\n", pCtx->reg##Hid.u32Limit, pCtx->reg##Hid.Attr.u, pCtx->reg##Hid.u64Base))
     SVM_ASSERT_SEL_GRANULARITY(ss);
     SVM_ASSERT_SEL_GRANULARITY(cs);
@@ -1458 +1457 @@
     SVM_ASSERT_SEL_GRANULARITY(gs);
 #undef  SVM_ASSERT_SEL_GRANULARITY
-#endif
     /* Remaining guest CPU context: TR, IDTR, GDTR, LDTR; must sync everything otherwise we can get out of sync when jumping to ring 3. */
     SVM_READ_SELREG(LDTR, ldtr);