Changeset 59934 in vbox for trunk

Timestamp:

Mar 4, 2016 8:32:23 PM (9 years ago)

Author:

vboxsync

Message:

bs3kit: Added missing bs3-mode-SwitchTo*_Weird.asm files and some fixes to the other switching stuff.

Location:

trunk/src/VBox/ValidationKit/bootsectors/bs3kit

Files:

• Makefile.kmk (modified) (1 diff)
• bs3-cmn-SwitchTo16Bit.asm (modified) (4 diffs)
• bs3-cmn-SwitchTo16BitV86.asm (modified) (1 diff)
• bs3-cmn-SwitchTo32Bit.asm (modified) (7 diffs)
• bs3-cmn-SwitchTo64Bit.asm (modified) (4 diffs)
• bs3-cmn-SwitchToV86.asm (deleted)
• bs3-mode-SwitchToPAE16_32.asm (added)
• bs3-mode-SwitchToPAE16_V86.asm (added)
• bs3-mode-SwitchToPAE32_16.asm (added)
• bs3-mode-SwitchToPAEV86.asm (added)
• bs3-mode-SwitchToPE16_32.asm (modified) (2 diffs)
• bs3-mode-SwitchToPE16_V86.asm (modified) (3 diffs)
• bs3-mode-SwitchToPE32_16.asm (added)
• bs3-mode-SwitchToPEV86.asm (added)
• bs3-mode-SwitchToPP16_32.asm (added)
• bs3-mode-SwitchToPP16_V86.asm (added)
• bs3-mode-SwitchToPP32_16.asm (added)
• bs3-mode-SwitchToPPV86.asm (added)
• bs3-mode-SwitchToRM.asm (modified) (3 diffs)

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

@@ -198 +198 @@
         bs3-mode-SwitchToPE16_V86.asm \
         bs3-mode-SwitchToPE32.asm \
+        bs3-mode-SwitchToPE32_16.asm \
+        bs3-mode-SwitchToPEV86.asm \
         bs3-mode-SwitchToPP16.asm \
+        bs3-mode-SwitchToPP16_32.asm \
+        bs3-mode-SwitchToPP16_V86.asm \
         bs3-mode-SwitchToPP32.asm \
+        bs3-mode-SwitchToPP32_16.asm \
+        bs3-mode-SwitchToPPV86.asm \
         bs3-mode-SwitchToPAE16.asm \
+        bs3-mode-SwitchToPAE16_32.asm \
+        bs3-mode-SwitchToPAE16_V86.asm \
         bs3-mode-SwitchToPAE32.asm \
+        bs3-mode-SwitchToPAE32_16.asm \
+        bs3-mode-SwitchToPAEV86.asm \
         bs3-mode-SwitchToLM64.asm \
         bs3-mode-SwitchToLM32.asm \

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

@@ -59 +59 @@
 %else
         push    xAX
+        push    xBX
         xPUSHF
         cli
@@ -77 +78 @@
 
         ; Load 16-bit segment registers.
-        ;; @todo support non-standard stacks?
         add     ax, BS3_SEL_R0_SS16 - BS3_SEL_R0_CS16
         mov     ss, ax
@@ -84 +84 @@
         mov     ds, ax
         mov     es, ax
+
+        ; Thunk the stack if necessary.
+        mov     ebx, esp
+        shr     ebx, 16
+        jz      .stack_ok
+int3 ; This is for later, just remove this int3 once needed.
+        test    ax, X86_SEL_RPL
+        jnz     .stack_rpl_must_be_0_for_custom_stacks
+        shl     bx, X86_SEL_SHIFT
+        add     bx, BS3_SEL_TILED
+        mov     ss, bx
+        movzx   esp, sp
+.stack_ok:
 
         ; Update globals.
@@ -93 +106 @@
         add     sp, 4
  %endif
+        pop     ebx
+ %if TMPL_BITS == 64
+        add     sp, 4
+ %endif
         pop     eax
  %if TMPL_BITS == 64
         add     sp, 4
  %endif
-        ret     sCB - 2                 ; Return and pop 2 or 6 bytes of "parameters" (unused return value)
+        ret     (TMPL_BITS - 16) / 8    ; Return and pop 2 or 6 bytes of "parameters" (unused return value)
+
+.stack_rpl_must_be_0_for_custom_stacks:
+        int3
+        jmp     .stack_rpl_must_be_0_for_custom_stacks
 TMPL_BEGIN_TEXT
 %endif

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

@@ -63 +63 @@
         push    ecx
         push    ebx
-%if TMPL_BITS == 16
+ %if TMPL_BITS == 16
         push    ds
 

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

@@ -28 +28 @@
 
 
+%if TMPL_BITS == 16
+BS3_EXTERN_CMN Bs3SelProtFar32ToFlat32
+%endif
 %if TMPL_BITS != 32
 BS3_EXTERN_DATA16 g_bBs3CurrentMode
@@ -47 +50 @@
         push    eax
         pushfd
+        push    edx
  %else
         pushfq
@@ -53 +57 @@
         cli
 
-%if TMPL_BITS == 16
+ %if TMPL_BITS == 16
         ; Check for v8086 mode, we need to exit it to enter 32-bit mode.
         mov     ax, seg g_bBs3CurrentMode
@@ -62 +66 @@
         jne     .not_v8086
 
+        ; Calc flat stack into edx.
+        mov     dx, ss
+        movzx   edx, dx
+        shl     edx, 4
+        add     dx, sp
+        adc     edx, 0                  ; edx = flat stack address corresponding to ss:sp
+
+        ; Switch to 16-bit ring0 and go on to do the far jump to 32-bit code.
         mov     ax, BS3_SYSCALL_TO_RING0
         int     BS3_TRAP_SYSCALL
@@ -67 +79 @@
         mov     xAX, BS3_SEL_R0_CS32
         jmp     .do_far_jump
-%endif
+ %endif
 
 .not_v8086:
+ %if TMPL_BITS == 16
+        ; Calc flat stack into edx.
+        push    ecx
+        push    ebx
+        push    ss
+        push    word 0
+        push    sp
+        call    Bs3SelProtFar32ToFlat32
+        add     sp, 6
+        shl     edx, 16
+        mov     dx, ax                  ; edx = flat stack address corresponding to ss:sp
+        pop     ebx
+        pop     ecx
+ %endif
+
         ; Calc ring addend.
         mov     ax, cs
@@ -92 +119 @@
         add     eax, BS3_SEL_R0_SS32 - BS3_SEL_R0_CS32
         mov     ss, ax
+ %if TMPL_BITS == 16
+        mov     esp, edx                ; Load flat stack address.
+ %endif
 
         add     eax, BS3_SEL_R0_DS32 - BS3_SEL_R0_SS32
@@ -103 +133 @@
  %if TMPL_BITS == 16
         ; Adjust the return address.
-        movsx   eax, word [esp + 4*2 + 2]
+        movsx   eax, word [esp + 4*3 + 2]
         add     eax, BS3_ADDR_BS3TEXT16
-        mov     [esp + 4*2], eax
+        mov     [esp + 4*3], eax
  %endif
 
         ; Restore and return.
+        BS3_ONLY_16BIT_STMT pop     edx
         popfd
         pop     eax

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

@@ -5 +5 @@
 
 ;
-; Copyright (C) 2007-2015 Oracle Corporation
+; Copyright (C) 2007-2016 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
@@ -42 +42 @@
         ret
 
-%elif BS3_MODE_IS_RM_OR_V86(TMPL_MODE)
-.again: int3                            ; Makes no sense to go to 64-bit mode from real or v8086 mode.
-        jmp     .again
-
 %else
  %if TMPL_BITS == 16
@@ -59 +55 @@
         cli
 
+ %if TMPL_BITS == 16
+        ; Check that this is LM16
+        mov     ax, seg g_bBs3CurrentMode
+        cmp     byte [g_bBs3CurrentMode], BS3_MODE_LM16
+        je      .ok_lm16
+        int3
+ .ok_lm16:
+ %endif
+
         ; Calc ring addend.
         mov     ax, cs
@@ -67 +72 @@
         ; setup far return.
         push    sAX
-%if TMPL_BITS == 16
+ %if TMPL_BITS == 16
         push    dword .sixty_four_bit
         o32 retf
-%else
+ %else
         push    .sixty_four_bit
         retf
-%endif
+ %endif
 
 BS3_SET_BITS 64

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-mode-SwitchToPE16_32.asm

@@ -46 +46 @@
 %else
         ;
-        ; Make sure we're the 16-bit segment and then call Bs3SwitchToPE16.
+        ; Make sure we're in the 16-bit segment and then call Bs3SwitchToPE16.
         ;
  %if TMPL_BITS != 16
@@ -61 +61 @@
         ; Switch to 32-bit mode.
         ;
-        extern  TMPL_NM(Bs3SwitchTo32Bit)
-        call    TMPL_NM(Bs3SwitchTo32Bit)
+        extern  _Bs3SwitchTo32Bit_c16
+ %if TMPL_BITS == 16
+        jmp     _Bs3SwitchTo32Bit_c16
+ %else
+        call    _Bs3SwitchTo32Bit_c16
         BS3_SET_BITS 32
-
-        ;
-        ; Fix the return address and return.
-        ;
- %if TMPL_BITS == 16
-        push    word [esp]
- %elif TMPL_BITS == 64
-        pop     dword [esp + 4]
+  %if TMPL_BITS == 32
+        ret
+  %else
+        ret     4                       ; Return and pop 4 bytes of "parameters" (unused return address).
+  %endif
  %endif
-        ret
 %endif
 BS3_PROC_END_MODE   Bs3SwitchToPE16_32

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-mode-SwitchToPE16_V86.asm

@@ -29 +29 @@
 
 ;;
-; Switch to 16-bit unpaged protected mode from any other mode.
+; Switch to 16-bit unpaged protected mode with 16-bit sys+tss from any other mode.
 ;
 ; @cproto   BS3_DECL(void) Bs3SwitchToPE16(void);
@@ -35 +35 @@
 ; @uses     Nothing (except high 32-bit register parts).
 ;
-; @remarks  Obviously returns to 16-bit mode, even if the caller was
-;           in 32-bit or 64-bit mode.
+; @remarks  Obviously returns to 16-bit v8086 mode, even if the caller was
+;           in 16-bit, 32-bit or 64-bit mode.
 ;
 ; @remarks  Does not require 20h of parameter scratch space in 64-bit mode.
@@ -65 +65 @@
 
         ;
-        ; Switch to v8086 mode.
+        ; Switch to v8086 mode (return address is already 16-bit).
         ;
-        extern  TMPL_NM(Bs3SwitchToV86)
-        jmp     TMPL_NM(Bs3SwitchToV86)
+        extern  _Bs3SwitchToV86_pe16
+        jmp     _Bs3SwitchToV86_pe16
 %endif
 BS3_PROC_END_MODE   Bs3SwitchToPE16_V86

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-mode-SwitchToRM.asm

@@ -28 +28 @@
 
 BS3_EXTERN_SYSTEM16 Bs3Gdt
+%if TMPL_MODE == BS3_MODE_PE16
+BS3_EXTERN_DATA16 g_uBs3CpuDetected
+%endif
 TMPL_BEGIN_TEXT
 
@@ -60 +63 @@
         cli
 
- %if TMPL_BITS != 16
+ %if TMPL_MODE == BS3_MODE_PE16
+        ;
+        ; On 80286 we must reset the CPU to get back to real mode.
+        ;
+        mov     ax, seg g_uBs3CpuDetected
+        mov     ds, ax
+        cmp     byte [g_uBs3CpuDetected], BS3CPU_80286
+        jne     .is_386_or_better
+.implement_this_later:
+        int3
+        jmp     .implement_this_later
+
+        jmp     .reload_cs
+
+ %elif TMPL_BITS != 16
+        ;
         ; Must be in 16-bit segment when calling Bs3SwitchTo16Bit.
+        ;
         jmp     .sixteen_bit_segment wrt FLAT
 BS3_BEGIN_TEXT16
@@ -75 +94 @@
         ; Exit to real mode.
         ;
+.is_386_or_better:
         mov     eax, cr0
         and     eax, X86_CR0_NO_PE_NO_PG