Changeset 58459 in vbox for trunk/src/VBox/Devices/EFI/Firmware/MdePkg/Library/BaseLib/Ia32/CpuIdEx.asm

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/Ia32/CpuIdEx.asm (modified) (2 diffs)

trunk/src/VBox/Devices/EFI/Firmware/MdePkg/Library/BaseLib/Ia32/CpuIdEx.asm

@@ -1 +1 @@
 ;------------------------------------------------------------------------------
 ;
-; Copyright (c) 2006 - 2008, 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
@@ -53 +53 @@
     mov     [ecx], ebx
 @@:
+    mov     ecx, [ebp + 32]
+    jecxz   @F
+    mov     [ecx], edx
+@@:
     mov     ecx, [ebp + 28]
     jecxz   @F
     pop     [ecx]
-@@:
-    mov     edx, [ebp + 32]
-    jecxz   @F
-    mov     [ecx], edx
 @@:
     mov     eax, [ebp + 12]