vbox的更動 60554 路徑 trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-mode-SwitchToLM32.asm

時間撮記:

2016-4-18 下午07:11:32 (9 年 以前)

作者:

vboxsync

訊息:

bs3kit: far updates.

檔案:

• trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-mode-SwitchToLM32.asm (修改) (2 筆差異)

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

@@ -44 +44 @@
 ; @remarks  Does not require 20h of parameter scratch space in 64-bit mode.
 ;
-BS3_PROC_BEGIN_MODE Bs3SwitchToLM32
+BS3_PROC_BEGIN_MODE Bs3SwitchToLM32, BS3_PBC_NEAR
 %ifdef TMPL_LM32
         ret
@@ -152 +152 @@
 BS3_PROC_END_MODE   Bs3SwitchToLM32
 
+
+%if TMPL_BITS == 16
+;;
+; Custom far stub.
+BS3_BEGIN_TEXT16_FARSTUBS
+BS3_PROC_BEGIN_MODE Bs3SwitchToLM32, BS3_PBC_FAR
+        inc         bp
+        push        bp
+        mov         bp, sp
+
+        ; Call the real thing.
+        call        TMPL_NM(Bs3SwitchToLM32)
+        BS3_SET_BITS 32
+
+        ; Jmp to common code for the tedious conversion.
+ %if BS3_MODE_IS_RM_OR_V86(TMPL_MODE)
+        BS3_EXTERN_CMN Bs3SwitchHlpConvRealModeRetfPopBpDecBpAndReturn
+        jmp         Bs3SwitchHlpConvRealModeRetfPopBpDecBpAndReturn
+ %else
+        BS3_EXTERN_CMN Bs3SwitchHlpConvProtModeRetfPopBpDecBpAndReturn
+        jmp         Bs3SwitchHlpConvProtModeRetfPopBpDecBpAndReturn
+ %endif
+        BS3_SET_BITS 16
+BS3_PROC_END_MODE   Bs3SwitchToLM32
+%endif
+