vbox的更動 60024 路徑 trunk/src/VBox/ValidationKit/bootsectors/bs3kit

時間撮記:

2016-3-15 上午08:59:49 (9 年 以前)

作者:

vboxsync

訊息:

bs3kit: updates (-> office).

位置:

trunk/src/VBox/ValidationKit/bootsectors/bs3kit

檔案:

• Makefile.kmk (修改) (2 筆差異)
• bs3-cmn-PerCpuData.c (修改) (1 筆差異)
• bs3-cmn-RegCtxSave.asm (新增)
• bs3-cmn-SelFar32ToFlat32.c (新增)
• bs3-cmn-Trap16Init.c (修改) (2 筆差異)
• bs3-cmn-TrapSetJmp.asm (新增)
• bs3-cmn-TrapUnsetJmp.c (新增)
• bs3-rm-InitAll.c (修改) (1 筆差異)
• bs3kit.h (修改) (6 筆差異)

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/Makefile.kmk

@@ -85 +85 @@
        bs3-cmn-RegCtxConvertToRingX.c \
        bs3-cmn-RegCtxPrint.c \
+       bs3-cmn-SelFar32ToFlat32.c \
        bs3-cmn-SelProtFar32ToFlat32.c \
        bs3-cmn-SlabInit.c \
@@ -124 +125 @@
         bs3-cmn-TrapPrintFrame.c \
         bs3-cmn-TrapSetHandler.c \
+        bs3-cmn-TrapSetJmp.asm \
+        bs3-cmn-TrapUnsetJmp.c \
        ../../../Runtime/common/asm/ASMBitFirstClear.asm \
        ../../../Runtime/common/asm/ASMBitFirstSet.asm \

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

@@ -47 +47 @@
 uint32_t BS3_DATA_NM(g_uBs3TrapEipHint) = 0;
 
+/** Flat pointer to a BS3TRAPFRAME registered by Bs3TrapSetJmp.
+ * When this is non-zero, the setjmp is considered armed. */
+uint32_t BS3_DATA_NM(g_pBs3TrapSetJmpFrame) = 0;
+
+/** The context of the last Bs3TrapSetJmp call.
+ * This will have eax set to 1 and need only be restored when it triggers. */
+BS3REGCTX BS3_DATA_NM(g_Bs3TrapSetJmpCtx);
 
 #endif /* ARCH_BITS == 16 */

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

@@ -46 +46 @@
 
 
-BS3_DECL(void) Bs3Trap16Init(bool f386Plus)
+BS3_DECL(void) Bs3Trap16InitEx(bool f386Plus)
 {
     X86TSS16 BS3_FAR *pTss;
@@ -109 +109 @@
 }
 
+
+BS3_DECL(void) Bs3Trap16Init(void)
+{
+    Bs3Trap16InitEx((BS3_DATA_NM(g_uBs3CpuDetected) & BS3CPU_TYPE_MASK) >= BS3CPU_80386);
+}
+

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-rm-InitAll.c

@@ -42 +42 @@
         Bs3Trap32Init();
     if ((BS3_DATA_NM(g_uBs3CpuDetected) & BS3CPU_TYPE_MASK) >= BS3CPU_80286)
-        Bs3Trap16Init((BS3_DATA_NM(g_uBs3CpuDetected) & BS3CPU_TYPE_MASK) >= BS3CPU_80386);
+        Bs3Trap16Init();
 }
 

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

@@ -1346 +1346 @@
 
 /**
+ * Converts a current mode 32-bit far pointer to a 32-bit flat address.
+ *
+ * @returns 32-bit flat address.
+ * @param   off             The segment offset.
+ * @param   uSel            The current mode segment selector.
+ */
+BS3_DECL(uint32_t) Bs3SelFar32ToFlat32_c16(uint32_t off, uint16_t uSel);
+BS3_DECL(uint32_t) Bs3SelFar32ToFlat32_c32(uint32_t off, uint16_t uSel); /**< @copydoc Bs3SelFar32ToFlat32_c16 */
+BS3_DECL(uint32_t) Bs3SelFar32ToFlat32_c64(uint32_t off, uint16_t uSel); /**< @copydoc Bs3SelFar32ToFlat32_c16 */
+#define Bs3SelFar32ToFlat32 BS3_CMN_NM(Bs3SelFar32ToFlat32) /**< Selects #Bs3SelFar32ToFlat32_c16, #Bs3SelFar32ToFlat32_c32 or #Bs3SelFar32ToFlat32_c64. */
+
+
+/**
  * Equivalent to RTTestCreate + RTTestBanner.
  *
@@ -2040 +2053 @@
 typedef BS3REGCTX const BS3_FAR *PCBS3REGCTX;
 
+/**
+ * Saves the current register context.
+ *
+ * @param   pRegCtx     Where to store the register context.
+ */
+BS3_DECL(void) Bs3RegCtxSave_c16(PCBS3REGCTX pRegCtx);
+BS3_DECL(void) Bs3RegCtxSave_c32(PCBS3REGCTX pRegCtx); /**< @copydoc Bs3RegCtxSave_c16 */
+BS3_DECL(void) Bs3RegCtxSave_c64(PCBS3REGCTX pRegCtx); /**< @copydoc Bs3RegCtxSave_c16 */
+#define Bs3RegCtxSave BS3_CMN_NM(Bs3RegCtxSave) /**< Selects #Bs3RegCtxSave_c16, #Bs3RegCtxSave_c32 or #Bs3RegCtxSave_c64. */
 
 /**
@@ -2061 +2083 @@
  * @remarks Does not return.
  */
-BS3_DECL(void) Bs3RegCtxRestore_c16(PCBS3REGCTX pRegCtx, uint16_t fFlags);
-BS3_DECL(void) Bs3RegCtxRestore_c32(PCBS3REGCTX pRegCtx, uint16_t fFlags); /**< @copydoc Bs3RegCtxRestore_c16 */
-BS3_DECL(void) Bs3RegCtxRestore_c64(PCBS3REGCTX pRegCtx, uint16_t fFlags); /**< @copydoc Bs3RegCtxRestore_c16 */
+BS3_DECL(DECL_NO_RETURN(void)) Bs3RegCtxRestore_c16(PCBS3REGCTX pRegCtx, uint16_t fFlags);
+BS3_DECL(DECL_NO_RETURN(void)) Bs3RegCtxRestore_c32(PCBS3REGCTX pRegCtx, uint16_t fFlags); /**< @copydoc Bs3RegCtxRestore_c16 */
+BS3_DECL(DECL_NO_RETURN(void)) Bs3RegCtxRestore_c64(PCBS3REGCTX pRegCtx, uint16_t fFlags); /**< @copydoc Bs3RegCtxRestore_c16 */
 #define Bs3RegCtxRestore BS3_CMN_NM(Bs3RegCtxRestore) /**< Selects #Bs3RegCtxRestore_c16, #Bs3RegCtxRestore_c32 or #Bs3RegCtxRestore_c64. */
+#ifdef __WATCOMC__
+# pragma aux Bs3RegCtxRestore_c16 __aborts;
+# pragma aux Bs3RegCtxRestore_c32 __aborts;
+#endif
 
 /** Skip restoring the CRx registers. */
@@ -2114 +2140 @@
  * Initializes 16-bit (protected mode) trap handling.
  *
+ * @remarks Does not install 16-bit trap handling, just initializes the
+ *          structures.
+ */
+BS3_DECL(void) Bs3Trap16Init_c16(void);
+BS3_DECL(void) Bs3Trap16Init_c32(void); /**< @copydoc Bs3Trap16Init_c16 */
+BS3_DECL(void) Bs3Trap16Init_c64(void); /**< @copydoc Bs3Trap16Init_c16 */
+#define Bs3Trap16Init BS3_CMN_NM(Bs3Trap16Init) /**< Selects #Bs3Trap16Init_c16, #Bs3Trap16Init_c32 or #Bs3Trap16Init_c64. */
+
+/**
+ * Initializes 16-bit (protected mode) trap handling, extended version.
+ *
  * @param   f386Plus    Set if the CPU is 80386 or later and
  *                      extended registers should be saved.  Once initialized
@@ -2122 +2159 @@
  *          structures.
  */
-BS3_DECL(void) Bs3Trap16Init_c16(bool f386Plus);
-BS3_DECL(void) Bs3Trap16Init_c32(bool f386Plus); /**< @copydoc Bs3Trap16Init_c16 */
-BS3_DECL(void) Bs3Trap16Init_c64(bool f386Plus); /**< @copydoc Bs3Trap16Init_c16 */
-#define Bs3Trap16Init BS3_CMN_NM(Bs3Trap16Init) /**< Selects #Bs3Trap16Init_c16, #Bs3Trap16Init_c32 or #Bs3Trap16Init_c64. */
+BS3_DECL(void) Bs3Trap16InitEx_c16(bool f386Plus);
+BS3_DECL(void) Bs3Trap16InitEx_c32(bool f386Plus); /**< @copydoc Bs3Trap16InitEx_c16 */
+BS3_DECL(void) Bs3Trap16InitEx_c64(bool f386Plus); /**< @copydoc Bs3Trap16InitEx_c16 */
+#define Bs3Trap16InitEx BS3_CMN_NM(Bs3Trap16InitEx) /**< Selects #Bs3Trap16InitEx_c16, #Bs3Trap16InitEx_c32 or #Bs3Trap16InitEx_c64. */
 
 /**
@@ -2266 +2303 @@
 BS3_DECL(void) Bs3TrapPrintFrame_c64(PCBS3TRAPFRAME pTrapFrame); /**< @copydoc Bs3TrapPrintFrame_c16 */
 #define Bs3TrapPrintFrame BS3_CMN_NM(Bs3TrapPrintFrame) /**< Selects #Bs3TrapPrintFrame_c16, #Bs3TrapPrintFrame_c32 or #Bs3TrapPrintFrame_c64. */
+
+/**
+ * Sets up a long jump from a trap handler.
+ *
+ * The long jump will only be performed onced, but will catch any kind of trap,
+ * fault, interrupt or irq.
+ *
+ * @retval true on the initial call.
+ * @retval false on trap return.
+ * @param   pTrapFrame      Where to store the trap information when
+ *                          returning @c false.
+ * @sa      #Bs3TrapUnsetJmp
+ */
+BS3_DECL(DECL_RETURNS_TWICE(bool)) Bs3TrapSetJmp_c16(PBS3TRAPFRAME pTrapFrame);
+BS3_DECL(DECL_RETURNS_TWICE(bool)) Bs3TrapSetJmp_c32(PBS3TRAPFRAME pTrapFrame); /**< @copydoc Bs3TrapSetJmp_c16 */
+BS3_DECL(DECL_RETURNS_TWICE(bool)) Bs3TrapSetJmp_c64(PBS3TRAPFRAME pTrapFrame); /**< @copydoc Bs3TrapSetJmp_c16 */
+#define Bs3TrapSetJmp BS3_CMN_NM(Bs3TrapSetJmp) /**< Selects #Bs3TrapSetJmp_c16, #Bs3TrapSetJmp_c32 or #Bs3TrapSetJmp_c64. */
+
+/**
+ * Disables a previous #Bs3TrapSetJmp call.
+ */
+BS3_DECL(void) Bs3TrapUnsetJmp_c16(void);
+BS3_DECL(void) Bs3TrapUnsetJmp_c32(void); /**< @copydoc Bs3TrapUnsetJmp_c16 */
+BS3_DECL(void) Bs3TrapUnsetJmp_c64(void); /**< @copydoc Bs3TrapUnsetJmp_c16 */
+#define Bs3TrapUnsetJmp BS3_CMN_NM(Bs3TrapUnsetJmp) /**< Selects #Bs3TrapUnsetJmp_c16, #Bs3TrapUnsetJmp_c32 or #Bs3TrapUnsetJmp_c64. */
+#ifdef __WATCOMC__
+# pragma aux Bs3TrapUnsetJmp_c16 aborts;
+# pragma aux Bs3TrapUnsetJmp_c32 aborts;
+#endif
 
 /** @} */