Changeset 60557 in vbox for trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-mode-SwitchToPE16.asm

Timestamp:

Apr 19, 2016 3:01:35 AM (9 years ago)

Author:

vboxsync

Message:

bs3kit: move real mode version of Bs3TestDoModes out of the default 16-bit code segment.

File:

• trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-mode-SwitchToPE16.asm (modified) (2 diffs)

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

@@ -40 +40 @@
 ; @remarks  Does not require 20h of parameter scratch space in 64-bit mode.
 ;
+%if TMPL_BITS == 16
+BS3_GLOBAL_NAME_EX TMPL_NM(Bs3SwitchToPE16_Safe), function , 0
+%endif
 BS3_PROC_BEGIN_MODE Bs3SwitchToPE16, BS3_PBC_NEAR
 %ifdef TMPL_PE16
@@ -148 +151 @@
  %endif
 BS3_PROC_END_MODE   Bs3SwitchToPE16
+
+%else
+;;
+; Safe far return to non-BS3TEXT16 code.
+BS3_EXTERN_CMN Bs3SwitchHlpConvFlatRetToRetfProtMode
+BS3_BEGIN_TEXT16
+BS3_SET_BITS TMPL_BITS
+BS3_PROC_BEGIN_MODE Bs3SwitchToPE16_Safe, BS3_PBC_NEAR
+        call        Bs3SwitchHlpConvFlatRetToRetfProtMode ; Special internal function.  Uses nothing, but modifies the stack.
+        call        TMPL_NM(Bs3SwitchToPE16)
+        BS3_SET_BITS 16
+        retf
+BS3_PROC_END_MODE   Bs3SwitchToPE16_Safe
 %endif