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

Timestamp:

Mar 11, 2016 7:12:05 PM (9 years ago)

Author:

vboxsync

Message:

bs3kit: v8086, long, fixes, updates.

File:

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

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

@@ -27 +27 @@
 %include "bs3kit-template-header.mac"
 
+%if TMPL_BITS == 16
+BS3_EXTERN_DATA16 g_uBs3CpuDetected
+%endif
 BS3_EXTERN_DATA16 g_bBs3CurrentMode
 TMPL_BEGIN_TEXT
@@ -152 +155 @@
 
         ;
-        ; Load ds and es.
-        ;
-%ifdef TMPL_CMN_V86
+        ; Load ds and es; clear fs and gs.
+        ;
+%if BS3_MODE_IS_RM_OR_V86(TMPL_MODE)
         mov     ax, BS3_SEL_DATA16
 %else
@@ -166 +169 @@
         push    ax
         push    ax
-%endif
+
+        cmp     byte [BS3_DATA16_WRT(g_uBs3CpuDetected)], BS3CPU_80286
+        jbe     .skip_fs_gs
+%endif
+        xor     ax, ax
+        mov     fs, ax
+        mov     gs, ax
+.skip_fs_gs:
 
         ;
@@ -246 +256 @@
 %endif
         pop     xAX
+%ifdef BS3_STRICT
+        cmp     xBP, xSP
+        je      .return_stack_ok
+        int3
+.return_stack_ok:
+%endif
         leave
         ret