Changeset 60024 in vbox for trunk/src

Timestamp:

Mar 15, 2016 8:59:49 AM (9 years ago)

Author:

vboxsync

Message:

bs3kit: updates (-> office).

Location:

trunk/src/VBox/ValidationKit/bootsectors

Files:

• Makefile.kmk (modified) (2 diffs)
• bs3-cpu-basic-2-c.c (modified) (2 diffs)
• bs3-cpu-basic-2-template.c (modified) (1 diff)
• bs3-cpu-basic-2-template.mac (modified) (2 diffs)
• bs3kit/Makefile.kmk (modified) (2 diffs)
• bs3kit/bs3-cmn-PerCpuData.c (modified) (1 diff)
• bs3kit/bs3-cmn-RegCtxSave.asm (added)
• bs3kit/bs3-cmn-SelFar32ToFlat32.c (added)
• bs3kit/bs3-cmn-Trap16Init.c (modified) (2 diffs)
• bs3kit/bs3-cmn-TrapSetJmp.asm (added)
• bs3kit/bs3-cmn-TrapUnsetJmp.c (added)
• bs3kit/bs3-rm-InitAll.c (modified) (1 diff)
• bs3kit/bs3kit.h (modified) (6 diffs)

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

@@ -45 +45 @@
 if defined(VBOX_WITH_OPEN_WATCOM)
  if1of ($(KBUILD_TARGET), win)
-  VBOX_WITH_BS3KIT = 1
+# temp disabled #  VBOX_WITH_BS3KIT = 1
  else if $(VBOX_GCC_VERSION_CC) >= 40400 # ms_abi was added in 4.4
 # Awaiting elf -> omf converter #  if1of ($(KBUILD_TARGET), linux)
@@ -231 +231 @@
 MISCBINS += bs3-cpu-basic-2
 bs3-cpu-basic-2_TEMPLATE = VBoxBS3KitImg
-bs3-cpu-basic-2_INCS = .
-bs3-cpu-basic-2_DEFS = BS3_CMN_INSTANTIATE_FILE1=bs3-cpu-basic-2-template.c
+bs3-cpu-basic-2_INCS  = .
+bs3-cpu-basic-2_DEFS  = BS3_CMN_INSTANTIATE_FILE1=bs3-cpu-basic-2-template.c
+bs3-cpu-basic-2_DEFS += BS3_MODE_INSTANTIATE_FILE1=bs3-cpu-basic-2-template.c
  ifeq ($(KBUILD_HOST),win)
 bs3-cpu-basic-2_DEFS += HAVE_OMF_CONVERTER

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

@@ -32 +32 @@
 
 
-BS3TESTMODE_PROTOTYPES_CMN(bs3CpuBasic2_Hello);
-
+/*********************************************************************************************************************************
+*   Internal Functions                                                                                                           *
+*********************************************************************************************************************************/
+BS3TESTMODE_PROTOTYPES_MODE(bs3CpuBasic2_TssGateEsp);
 //BS3TESTMODE_PROTOTYPES_CMN(bs3CpuBasic2_iret);
-//#pragma alias("_bs3CpuBasic2_iret_c64", "bs3CpuBasic2_iret_c64")
-
-BS3TESTMODE_PROTOTYPES_MODE(bs3CpuBasic2_iret);
+//BS3TESTMODE_PROTOTYPES_MODE(bs3CpuBasic2_iret);
 
 
+/*********************************************************************************************************************************
+*   Global Variables                                                                                                             *
+*********************************************************************************************************************************/
 static const BS3TESTMODEENTRY g_aModeTest[] =
 {
-    BS3TESTMODEENTRY_CMN("Hello", bs3CpuBasic2_Hello),
+    BS3TESTMODEENTRY_MODE("tss / gate / esp", bs3CpuBasic2_TssGateEsp),
     //BS3TESTMODEENTRY_CMN("iret", bs3CpuBasic2_iret),
-    BS3TESTMODEENTRY_MODE("iret", bs3CpuBasic2_iret),
+    //BS3TESTMODEENTRY_MODE("iret", bs3CpuBasic2_iret),
 };
 
@@ -53 +56 @@
     Bs3TestInit("bs3-cpu-basic-2");
 
-#ifdef HAVE_OMF_CONVERTER /** @todo Awaiting ELF + Mach-O -> OMF conversion. */
     Bs3TestDoModes_rm(g_aModeTest, RT_ELEMENTS(g_aModeTest));
-#endif
 
     Bs3TestTerm();
+for (;;) { }
 }
 

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

@@ +1 @@
+/* $Id$ */
+/** @file
+ * BS3Kit - bs3-cpu-basic-2, C code template.
+ */
+
+/*
+ * Copyright (C) 2007-2016 Oracle Corporation
+ *
+ * This file is part of VirtualBox Open Source Edition (OSE), as
+ * available from http://www.virtualbox.org. This file is free software;
+ * you can redistribute it and/or modify it under the terms of the GNU
+ * General Public License (GPL) as published by the Free Software
+ * Foundation, in version 2 as it comes in the "COPYING" file of the
+ * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+ *
+ * The contents of this file may alternatively be used under the terms
+ * of the Common Development and Distribution License Version 1.0
+ * (CDDL) only, as it comes in the "COPYING.CDDL" file of the
+ * VirtualBox OSE distribution, in which case the provisions of the
+ * CDDL are applicable instead of those of the GPL.
+ *
+ * You may elect to license modified versions of this file under the
+ * terms and conditions of either the GPL or the CDDL or both.
+ */
 
 
+#ifdef BS3_INSTANTIATING_MODE
 
-BS3_DECL(uint8_t) BS3_CMN_NM(bs3CpuBasic2_Hello)(uint8_t bMode)
+extern BS3_DECL(void) TMPL_NM(bs3CpuBasic2_TssGateEsp_IntXx)(void);
+
+BS3_DECL(uint8_t) TMPL_NM(bs3CpuBasic2_TssGateEsp)(uint8_t bMode)
 {
-    Bs3Printf("Hello C Word: %#x\n", bMode);
-    return UINT8_MAX;
+    uint8_t         bRet = 0;
+# if TMPL_MODE == BS3_MODE_PE16 \
+ || TMPL_MODE == BS3_MODE_PE16_32
+    BS3TRAPFRAME    TrapCtx;
+    BS3REGCTX       Ctx;
+
+    Bs3RegCtxSave(&Ctx);
+    Ctx.rip.u = (uintptr_t)&TMPL_NM(bs3CpuBasic2_TssGateEsp_IntXx);
+
+    /*
+     * Check that the stuff works first.
+     */
+     if (Bs3TrapSetJmp(&TrapCtx))
+     {
+
+         Bs3TrapUnsetJmp();
+     }
+     else
+     {
+         /* trapped. */
+     }
+
+
+# else
+    bRet = BS3TESTDOMODE_SKIPPED;
+# endif
+
+    /*
+     * Re-initialize the IDT.
+     */
+#  if BS3_MODE_IS_16BIT_SYS(TMPL_MODE)
+    Bs3Trap16Init();
+#  elif BS3_MODE_IS_32BIT_SYS(TMPL_MODE)
+    Bs3Trap32Init();
+#  elif BS3_MODE_IS_32BIT_SYS(TMPL_MODE)
+    Bs3Trap64Init();
+#  endif
+
+    return bRet;
 }
 
+
+#endif /* BS3_INSTANTIATING_MODE */

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

@@ -39 +39 @@
         sub     xSP, 20h
 
+%if TMPL_BITS == 64
 %if TMPL_BITS == 16
         xor     ax, ax
@@ -54 +55 @@
         add     xSP, xCB * 2
 %endif
+%endif
 
         ; Return
         xor     al, al
-mov al, TMPL_MODE                       ; remove me
+;mov al, TMPL_MODE                       ; remove me
 
 

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
 
 /** @} */