Changeset 61533 in vbox for trunk/src/VBox

Timestamp:

Jun 7, 2016 11:59:56 AM (9 years ago)

Author:

vboxsync

Message:

bs3kit: bs3-first-init-all-pe32.asm

Location:

trunk/src/VBox/ValidationKit/bootsectors/bs3kit

Files:

• Makefile.kmk (modified) (1 diff)
• bs3-first-init-all-pe32.asm (copied) (copied from trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-first-rm.asm ) (3 diffs)

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

@@ -337 +337 @@
 bs3kit-pe32_INSTTYPE = none
 bs3kit-pe32_DEFS     = TMPL_MODE=BS3_MODE_PE32
-bs3kit-pe32_SOURCES  = $(VBOX_BS3KIT_MODE_SOURCES)
+bs3kit-pe32_SOURCES  = $(VBOX_BS3KIT_MODE_SOURCES) \
+        bs3-first-init-all-pe32.asm
 
 # The 16-bit BS3Kit library for 32-bit protected kernel+tss.

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-first-init-all-pe32.asm

@@ -1 +1 @@
 ; $Id$
 ;; @file
-; BS3Kit - First Object, calling real-mode main().
+; BS3Kit - First Object, calling 32-bit protected mode main() after full init.
 ;
 
 ;
-; Copyright (C) 2007-2015 Oracle Corporation
+; Copyright (C) 2007-2016 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
@@ -32 +32 @@
 %include "bs3-first-common.mac"
 
+extern NAME(Bs3InitAll_rm)
+extern NAME(Bs3SwitchToPE32_rm)
+
 
 EXTERN Main_rm
-BS3_EXTERN_CMN Bs3Shutdown
         push    word 0                  ; zero return address.
         push    word 0                  ; zero caller BP
@@ -40 +42 @@
 
         ;
-        ; Nothing to init here, just call main and shutdown if it returns.
+        ; Init all while we're in real mode.
         ;
         mov     ax, BS3_SEL_DATA16
         mov     es, ax
         mov     ds, ax
-        call    NAME(Main_rm)
+        call    NAME(Bs3InitAll_rm)
+
+        ;
+        ; Switch to 32-bit protected mode and call main.
+        ;
+        call    NAME(Bs3SwitchToPE32_rm)
+        BS3_SET_BITS 32
+        call    _Main_pe32
+extern _Main_pe32
+BS3_EXTERN_CMN Bs3Shutdown
         call    Bs3Shutdown