Changeset 60681 in vbox for trunk/src/VBox

Timestamp:

Apr 24, 2016 4:40:23 PM (9 years ago)

Author:

vboxsync

Message:

bs3kit: updates

Location:

trunk/src/VBox/ValidationKit/bootsectors

Files:

• bs3-cpu-basic-2-template.c (modified) (4 diffs)
• bs3kit/bs3kit.h (modified) (2 diffs)

trunk/src/VBox/ValidationKit/bootsectors/bs3-cpu-basic-2-template.c

@@ -1682 +1682 @@
         for (off = cbIdtr + 4; off >= -cbIdtr - 4; off--)
         {
-            Bs3MemSet(pbTest, bFiller, 32);
+            Bs3MemSet(pbTest, bFiller, 48);
             Bs3RegCtxSetGrpSegFromCurPtr(&Ctx, &Ctx.rbx, pWorker->fSs ? &Ctx.ss : &Ctx.ds, &pbTest[off]);
             Bs3TrapSetJmpAndRestore(&Ctx, &TrapCtx);
@@ -2161 +2161 @@
 BS3_DECL_FAR(uint8_t) TMPL_NM(bs3CpuBasic2_sidt)(uint8_t bMode)
 {
-//if (bMode == BS3_MODE_PE16_V86)
-//if (bMode & BS3_MODE_CODE_V86)
+if (bMode == BS3_MODE_LM64)
 {
     union
@@ -2195 +2194 @@
 BS3_DECL_FAR(uint8_t) TMPL_NM(bs3CpuBasic2_sgdt)(uint8_t bMode)
 {
+if (bMode == BS3_MODE_LM64)
+{
     union
     {
@@ -2218 +2219 @@
      */
     Bs3TrapInit();
+}
     return 0;
 }

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3kit.h

@@ -1169 +1169 @@
     { \
         BS3XPTR         XPtr; \
-        a_Type         *pTyped; \
     } a_Name
 #else
@@ -1843 +1842 @@
     uint32_t                        cFreeChunks;
 } BS3SLABHEAD;
+AssertCompileSize(BS3SLABHEAD, 16);
 /** Pointer to a slab list head. */
 typedef BS3SLABHEAD BS3_FAR *PBS3SLABHEAD;