Changeset 58459 in vbox for trunk/src/VBox/Devices/EFI/Firmware/OvmfPkg/Sec/Ia32

Timestamp:

Oct 28, 2015 8:17:18 PM (9 years ago)

Author:

vboxsync

Message:

EFI/Firmware: 'svn merge ^{/vendor/edk2/UDK2010.SR1} /vendor/edk2/current .', reverting and removing files+dirs listed in ReadMe.vbox, resolving conflicts with help from ../UDK2014.SP1/. This is a raw untested merge.

Location:

trunk/src/VBox/Devices/EFI/Firmware

Files:

• . (modified) (1 prop)
• OvmfPkg/Sec/Ia32/SecEntry.S (modified) (2 diffs)
• OvmfPkg/Sec/Ia32/SecEntry.asm (modified) (2 diffs)

trunk/src/VBox/Devices/EFI/Firmware/OvmfPkg/Sec/Ia32/SecEntry.S

@@ -2 +2 @@
 #------------------------------------------------------------------------------
 #*
-#*   Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>
+#*   Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
 #*   This program and the accompanying materials
 #*   are licensed and made available under the terms and conditions of the BSD License
@@ -37 +37 @@
 
     #
-    # Load temporary stack top at very low memory.  The C code
-    # can reload to a better address.
+    # Load temporary RAM stack based on PCDs
     #
-    movl    $BASE_512KB, %eax 
+    .set    SEC_TOP_OF_STACK, FixedPcdGet32 (PcdOvmfSecPeiTempRamBase) + \
+                              FixedPcdGet32 (PcdOvmfSecPeiTempRamSize)
+    movl    $SEC_TOP_OF_STACK, %eax
     movl    %eax, %esp
     nop
 
     #
-    # Call into C code
+    # Setup parameters and call SecCoreStartupWithStack
+    #   [esp]   return address for call
+    #   [esp+4] BootFirmwareVolumePtr
+    #   [esp+8] TopOfCurrentStack
     #
     pushl   %eax

trunk/src/VBox/Devices/EFI/Firmware/OvmfPkg/Sec/Ia32/SecEntry.asm

@@ -2 +2 @@
 ;------------------------------------------------------------------------------
 ;*
-;*   Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>
+;*   Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
 ;*   This program and the accompanying materials
 ;*   are licensed and made available under the terms and conditions of the BSD License
@@ -39 +39 @@
 
     ;
-    ; Load temporary stack top at very low memory.  The C code
-    ; can reload to a better address.
+    ; Load temporary RAM stack based on PCDs
     ;
-    mov     eax, BASE_512KB
+    SEC_TOP_OF_STACK EQU (FixedPcdGet32 (PcdOvmfSecPeiTempRamBase) + \
+                          FixedPcdGet32 (PcdOvmfSecPeiTempRamSize))
+    mov     eax, SEC_TOP_OF_STACK
     mov     esp, eax
     nop
 
     ;
-    ; Call into C code
+    ; Setup parameters and call SecCoreStartupWithStack
+    ;   [esp]   return address for call
+    ;   [esp+4] BootFirmwareVolumePtr
+    ;   [esp+8] TopOfCurrentStack
     ;
     push    eax