Changeset 60678 in vbox for trunk/src/VBox/ValidationKit/bootsectors/bs3kit

Timestamp:

Apr 24, 2016 2:57:13 PM (9 years ago)

Author:

vboxsync

Message:

bs3kit: updates.

Location:

trunk/src/VBox/ValidationKit/bootsectors/bs3kit

Files:

• bs3-cmn-PagingProtect.c (modified) (1 diff)
• bs3-cmn-RegCtxSetGrpSegFromFlat.c (modified) (1 diff)

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-cmn-PagingProtect.c

@@ -37 +37 @@
 *   Defined Constants And Macros                                                                                                 *
 *********************************************************************************************************************************/
-#if 1
+#if 0
 # define BS3PAGING_DPRINTF1(a) Bs3TestPrintf a
 #else

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-cmn-RegCtxSetGrpSegFromFlat.c

@@ -55 +55 @@
     /* Adjust CS to the right ring, if not ring-0 or V86 context. */
     if (   pRegCtx->bCpl != 0
-        && !BS3_MODE_IS_RM_OR_V86(pRegCtx->bMode)
-        && BS3_SEL_IS_IN_R0_RANGE(*pSel))
+        && !BS3_MODE_IS_RM_OR_V86(pRegCtx->bMode))
     {
-        *pSel += (uint16_t)pRegCtx->bCpl << BS3_SEL_RING_SHIFT;
+        if (BS3_SEL_IS_IN_R0_RANGE(*pSel))
+            *pSel += (uint16_t)pRegCtx->bCpl << BS3_SEL_RING_SHIFT;
         *pSel |= pRegCtx->bCpl;
     }