vbox的更動 60527 路徑 trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-cmn-TrapSetJmp.asm

時間撮記:

2016-4-18 上午09:11:04 (9 年 以前)

作者:

vboxsync

訊息:

bs3kit: Far updates.

檔案:

• trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-cmn-TrapSetJmp.asm (修改) (6 筆差異)

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

@@ -37 +37 @@
 BS3_EXTERN_CMN Bs3RegCtxSave
 %if TMPL_BITS == 16
-BS3_EXTERN_CMN Bs3SelFar32ToFlat32
+BS3_EXTERN_CMN_FAR Bs3SelFar32ToFlat32
 %endif
 BS3_EXTERN_DATA16 g_Bs3TrapSetJmpCtx
@@ -49 +49 @@
 ; @uses     See, applicable C calling convention.
 ;
-BS3_PROC_BEGIN_CMN Bs3TrapSetJmp
+BS3_PROC_BEGIN_CMN Bs3TrapSetJmp, BS3_PBC_HYBRID
         BS3_CALL_CONV_PROLOG 1
         push    xBP
@@ -71 +71 @@
         mov     xAX, [xBP + xCB]        ; The return address of this function
         mov     [xBX + BS3REGCTX.rip], xAX
+%if TMPL_BITS == 16
+        mov     xAX, [xBP + xCB+2]      ; The return address CS of this function.
+        mov     [xBX + BS3REGCTX.cs], xAX
+%endif
         mov     xAX, [xBP]
         mov     [xBX + BS3REGCTX.rbp], xAX
-        lea     xAX, [xBP + xCB*2]
+        lea     xAX, [xBP + xCB + cbCurRetAddr]
         mov     [xBX + BS3REGCTX.rsp], xAX
         mov     xAX, [xBP - xCB]
@@ -86 +90 @@
 %if TMPL_BITS == 16
         push    es
-        les     di, [xBP + xCB*2]
+        les     di, [xBP + xCB + cbCurRetAddr]
         mov     cx, BS3TRAPFRAME_size / 2
         mov     ax, 0faceh
@@ -104 +108 @@
 %if TMPL_BITS == 16
         xor     ax, ax
-        push    word [xBP + xCB*2 + 2]
+        push    word [xBP + xCB + cbCurRetAddr + 2]
         push    ax
-        push    word [xBP + xCB*2]
+        push    word [xBP + xCB + cbCurRetAddr]
+        push    cs
         call    Bs3SelFar32ToFlat32
         add     sp, 6h
@@ -124 +129 @@
         pop     xBP
         BS3_CALL_CONV_EPILOG 1
-        ret
+        BS3_HYBRID_RET
 BS3_PROC_END_CMN   Bs3TrapSetJmp