Changeset 58459 in vbox for trunk/src/VBox/Devices/EFI/Firmware/MdePkg/Library/BaseLib/X64/Thunk16.S

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)
• MdePkg/Library/BaseLib/X64/Thunk16.S (modified) (4 diffs)

trunk/src/VBox/Devices/EFI/Firmware/MdePkg/Library/BaseLib/X64/Thunk16.S

@@ -1 +1 @@
 #------------------------------------------------------------------------------
 #
-# Copyright (c) 2006 - 2011, 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
@@ -147 +147 @@
 L_64BitCode:
     .byte   0x90
-    .byte   0x67,0xbc                  # mov esp, imm32
-L_SavedSp:  .space      4              # restore stack
+    .byte   0x48,0xbc                  # mov rsp, imm64
+L_SavedSp:  .space      8              # restore stack
     nop
     ret
@@ -296 +296 @@
     movq    %cr4, %rbp
     movl    %ebp, (%rcx)                # save CR4 in SavedCr4
-    andl    $0x300,%ebp                 # clear all but PCE and OSFXSR bits
+    andl    $0xffffffcf,%ebp            # clear PAE, PSE bits
     movl    %r8d, %esi                  # esi <- 16-bit stack segment
     .byte      0x6a, DATA32
@@ -308 +308 @@
     movl    %cs, %r8d
     movw    %r8w, (L_SavedCs - L_SavedCr4)(%rcx)
-    movl    %esp, (L_SavedSp - L_SavedCr4)(%rcx)
+    movq    %rsp, (L_SavedSp - L_SavedCr4)(%rcx)
     .byte   0xff, 0x69                  #  jmp (_EntryPoint - L_SavedCr4)(%rcx)
     .set    Ltemp1, _EntryPoint - L_SavedCr4