Changeset 59895 in vbox for trunk/src/VBox/ValidationKit

Timestamp:

Mar 2, 2016 12:40:59 PM (9 years ago)

Author:

vboxsync

Message:

bs3kit: Updates

Location:

trunk/src/VBox/ValidationKit/bootsectors/bs3kit

Files:

• Makefile.kmk (modified) (1 diff)
• bs3-cmn-SelProtFar32ToFlat32.c (added)
• bs3-cmn-SwitchTo16BitV86.asm (modified) (5 diffs)
• bs3kit.h (modified) (1 diff)

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

@@ -82 +82 @@
        bs3-cmn-PagingInitRootForPAE.c \
        bs3-cmn-PagingInitRootForLM.c \
+       bs3-cmn-SelProtFar32ToFlat32.c \
        bs3-cmn-SlabInit.c \
        bs3-cmn-SlabAlloc.c \

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

@@ -31 +31 @@
 BS3_EXTERN_DATA16   g_bBs3CurrentMode
 BS3_EXTERN_CMN      Bs3SwitchToRing0
+BS3_EXTERN_CMN      Bs3SelProtFar32ToFlat32
 TMPL_BEGIN_TEXT
 
@@ -36 +37 @@
 ;;
 ; @cproto   BS3_DECL(void) Bs3SwitchTo16BitV86(void);
+; @uses No general registers modified. Regment registers loaded with specific
+;       values and the stack register converted to real mode (not ebp).
 ;
 BS3_PROC_BEGIN_CMN Bs3SwitchTo16BitV86
         ; Construct basic v8086 return frame.
-        BS3_ONLY_16BIT_STMT push gs
-        BS3_ONLY_16BIT_STMT movzx esp, sp
-        push    dword fs
+        BS3_ONLY_16BIT_STMT movzx   esp, sp
+        push    dword 0                 ; GS
+        push    dword 0                 ; FS
         push    dword BS3_SEL_DATA16    ; ES
         push    dword BS3_SEL_DATA16    ; DS
-        push    dword ss
+        push    dword 0                 ; SS - later
         push    dword 0                 ; return ESP, later.
         pushfd
@@ -57 +60 @@
         ; Save registers and stuff.
         push    eax
- %if TMPL_BITS == 16
+        push    edx
+        push    ecx
+        push    ebx
+%if TMPL_BITS == 16
         push    ds
 
@@ -69 +75 @@
 
         pop     ds
+        pop     ebx
+        pop     ecx
+        pop     edx
         pop     eax
         add     xSP, (9-1)*4
@@ -91 +100 @@
         ; Set GS.
         mov     ax, gs
-        mov     [xSP + 4 + 20h], ax
+        mov     [xSP + 4*4 + 20h], ax
  %endif
 
-        ; Thunk SS:ESP, first step: calc flat address.
-        lea     eax, [esp + 4 + 24h]
+        ; Thunk SS:ESP to real-mode address via 32-bit flat.
+        lea     eax, [esp + 4*4 + 24h]
+        push    ss
         push    eax
-        push    ss
-;        call    Bs3SelFar32ToFlat32
-
-        ; Second step: Calc realmode segment and offset.
-
+        BS3_CALL Bs3SelProtFar32ToFlat32, 2
+        mov     [esp + 4*4 + 0ch], ax   ; high word is already zero
+ %if TMPL_BITS == 16
+        mov     [esp + 4*4 + 10h], dx
+ %else
+        shr     eax, 16
+        mov     [esp + 4*4 + 10h], ax
+ %endif
 
         ; Return to v8086 mode.
+        pop     ebx
+        pop     ecx
+        pop     edx
         pop     eax
         iretd
-BS3_PROC_END_CMN   Bs3SwitchTo16Bit
-
-
+BS3_PROC_END_CMN   Bs3SwitchTo16BitV86
 
 %endif ; ! 64-bit

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

@@ -1309 +1309 @@
 
 
+/**
+ * Converts a protected mode 32-bit far pointer to a 32-bit flat address.
+ *
+ * @returns 32-bit flat address.
+ * @param   off             The segment offset.
+ * @param   uSel            The protected mode segment selector.
+ */
+BS3_DECL(uint32_t) Bs3SelProtFar32ToFlat32_c16(uint32_t off, uint16_t uSel);
+BS3_DECL(uint32_t) Bs3SelProtFar32ToFlat32_c32(uint32_t off, uint16_t uSel); /**< @copydoc Bs3SelProtFar32ToFlat32_c16 */
+BS3_DECL(uint32_t) Bs3SelProtFar32ToFlat32_c64(uint32_t off, uint16_t uSel); /**< @copydoc Bs3SelProtFar32ToFlat32_c16 */
+#define Bs3SelProtFar32ToFlat32 BS3_CMN_NM(Bs3SelProtFar32ToFlat32) /**< Selects #Bs3SelProtFar32ToFlat32_c16, #Bs3SelProtFar32ToFlat32_c32 or #Bs3SelProtFar32ToFlat32_c64. */
+
 
 /**