Changeset 9395

Timestamp:

06/04/08 18:22:54 (6 months ago)

Author:

vboxsync

Message:

fixed more places with incorrect descriptor base address calculation

Files:

• trunk/src/VBox/VMM/SELM.cpp (modified) (8 diffs)
• trunk/src/VBox/VMM/VMMAll/SELMAll.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/SELM.cpp

@@ -1083 +1083 @@
-         */
-        PVBOXDESC   pDesc = &pVM->selm.s.paGdtHC[SelLdt >> X86_SEL_SHIFT];
-
+(RTGCPTR)
-        unsigned    cbLdt = pDesc->Gen.u16LimitLow | (pDesc->Gen.u4LimitHigh << 16);
-        if (pDesc->Gen.u1Granularity)
@@ -1420 +1420 @@
-         */
-        PVBOXDESC   pDesc = &pVM->selm.s.paGdtHC[SelTss >> X86_SEL_SHIFT];
-pDesc->Gen.u8BaseHigh2 << 24) & 0xff000000
+RTGCPTR)pDesc->Gen.u8BaseHigh2 << 24
-        unsigned    cbTss = pDesc->Gen.u16LimitLow | (pDesc->Gen.u4LimitHigh << 16);
-        if (pDesc->Gen.u1Granularity)
@@ -1625 +1625 @@
-        return rc;
-    }
-
+(RTGCPTR)
-    unsigned    cbLdt = LDTDesc.Gen.u16LimitLow | (LDTDesc.Gen.u4LimitHigh << 16);
-    if (LDTDesc.Gen.u1Granularity)
@@ -1704 +1704 @@
-         */
-        PVBOXDESC   pDesc = &pVM->selm.s.paGdtHC[SelTss >> X86_SEL_SHIFT];
-
+(RTGCPTR)
-        unsigned    cbTss = pDesc->Gen.u16LimitLow | (pDesc->Gen.u4LimitHigh << 16);
-        if (pDesc->Gen.u1Granularity)
@@ -1816 +1816 @@
-    if (ppvLdt)
-    {
-(
+ ((RTGCPTR)
-                              |  (Desc.Gen.u8BaseHigh1 << 16)
-                              |   Desc.Gen.u16BaseLow);
@@ -1908 +1908 @@
-
-            /* calc the descriptor location. */
-
+(RTGCPTR)
-                        |  (Desc.Gen.u8BaseHigh1 << 16)
-                        |   Desc.Gen.u16BaseLow;
@@ -1941 +1941 @@
-    if (Desc.Gen.u1Granularity)
-        pSelInfo->cbLimit = (pSelInfo->cbLimit << PAGE_SHIFT) | PAGE_OFFSET_MASK;
-
+(RTGCPTR)
-                          | (Desc.Gen.u8BaseHigh1 << 16)
-                          |  Desc.Gen.u16BaseLow;
@@ -2008 +2008 @@
-    if (Desc.Gen.u1Granularity)
-        pSelInfo->cbLimit = (pSelInfo->cbLimit << PAGE_SHIFT) | PAGE_OFFSET_MASK;
-
+(RTGCPTR)
-                          | (Desc.Gen.u8BaseHigh1 << 16)
-                          |  Desc.Gen.u16BaseLow;

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

@@ -70 +70 @@
-
-    return (RTGCPTR)( (RTGCUINTPTR)Addr
-
+(RTGCPTR)
-                          |  (Desc.Gen.u8BaseHigh1 << 16)
-                          |   Desc.Gen.u16BaseLow));
@@ -203 +203 @@
-        /* calc address assuming straight stuff. */
-        pvFlat = (RTGCPTR)(  (RTGCUINTPTR)Addr
-
+(RTGCPTR)
-                              |  (Desc.Gen.u8BaseHigh1 << 16)
-                              |   Desc.Gen.u16BaseLow )
@@ -408 +408 @@
-                {
-                    *ppvFlat = (RTGCPTR)(  (RTGCUINTPTR)Addr
-
+(RTGCPTR)
-                                              |  (Desc.Gen.u8BaseHigh1 << 16)
-                                              |   Desc.Gen.u16BaseLow)