Changeset 58459 in vbox for trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/EbcDxe/X64

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)
• MdeModulePkg/Universal/EbcDxe/X64/EbcSupport.c (modified) (3 diffs)

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/EbcDxe/X64/EbcSupport.c

@@ -3 +3 @@
   the target x64 processor.
 
-Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2014, 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
@@ -216 +216 @@
   // Align the stack on a natural boundary.
   //
-  VmContext.Gpr[0] &= ~(sizeof (UINTN) - 1);
+  VmContext.Gpr[0] &= ~(VM_REGISTER)(sizeof (UINTN) - 1);
 
   //
@@ -360 +360 @@
   //
   // Align the stack on a natural boundary
-  VmContext.Gpr[0] &= ~(sizeof(UINTN) - 1);
+  VmContext.Gpr[0] &= ~(VM_REGISTER)(sizeof(UINTN) - 1);
   //
   VmContext.LowStackTop   = (UINTN) VmContext.Gpr[0];