Changeset 60119 in vbox for trunk/src/VBox

Timestamp:

Mar 21, 2016 12:50:26 PM (9 years ago)

Author:

vboxsync

Message:

bs3kit: updates.

Location:

trunk/src/VBox/ValidationKit/bootsectors/bs3kit

Files:

• Makefile.kmk (modified) (1 diff)
• bs3-cmn-RegCtxConvertToRingX.c (modified) (1 diff)
• bs3-cmn-RegCtxRestore.asm (modified) (1 diff)
• bs3-cmn-TrapSetJmpAndRestore.c (added)
• bs3kit.h (modified) (2 diffs)

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

@@ -129 +129 @@
         bs3-cmn-TrapSetHandler.c \
         bs3-cmn-TrapSetJmp.asm \
+        bs3-cmn-TrapSetJmpAndRestore.c \
         bs3-cmn-TrapUnsetJmp.c \
        ../../../Runtime/common/asm/ASMBitFirstClear.asm \

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

@@ -85 +85 @@
             uSel |= bRing;
             uSel += BS3_SEL_R0_FIRST;
-            uSel |= (uint16_t)bRing << BS3_SEL_RING_SHIFT;
+            uSel += (uint16_t)bRing << BS3_SEL_RING_SHIFT;
         }
         else

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-cmn-RegCtxRestore.asm

@@ -330 +330 @@
         mov     ecx, [xBX + BS3REGCTX.rcx]
         mov     esi, [xBX + BS3REGCTX.rsi]
+%if TMPL_BITS == 16 ; if SS is 16-bit, we will not be able to restore the high word.
+        mov     edi, [xBX + BS3REGCTX.rsp]
+        mov     di, sp
+        mov     esp, edi
+%endif
         mov     edi, [xBX + BS3REGCTX.rdi]
         mov     ebx, [xBX + BS3REGCTX.rbx]

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

@@ -2093 +2093 @@
  * fault, interrupt or irq.
  *
- * @retval true on the initial call.
- * @retval false on trap return.
+ * @retval  true on the initial call.
+ * @retval  false on trap return.
  * @param   pTrapFrame      Where to store the trap information when
  *                          returning @c false.
@@ -2103 +2103 @@
 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. */
+
+/**
+ * Combination of #Bs3TrapSetJmp and #Bs3RegCtxRestore.
+ *
+ * @param   pCtxRestore     The context to restore.
+ * @param   pTrapFrame      Where to store the trap information.
+ */
+BS3_DECL(void) Bs3TrapSetJmpAndRestore_c16(PCBS3REGCTX pCtxRestore, PBS3TRAPFRAME pTrapFrame);
+BS3_DECL(void) Bs3TrapSetJmpAndRestore_c32(PCBS3REGCTX pCtxRestore, PBS3TRAPFRAME pTrapFrame); /**< @copydoc Bs3TrapSetJmpAndRestore_c16 */
+BS3_DECL(void) Bs3TrapSetJmpAndRestore_c64(PCBS3REGCTX pCtxRestore, PBS3TRAPFRAME pTrapFrame); /**< @copydoc Bs3TrapSetJmpAndRestore_c16 */
+#define Bs3TrapSetJmpAndRestore BS3_CMN_NM(Bs3TrapSetJmpAndRestore) /**< Selects #Bs3TrapSetJmpAndRestore_c16, #Bs3TrapSetJmpAndRestore_c32 or #Bs3TrapSetJmpAndRestore_c64. */
 
 /**