Changeset 58459 in vbox for trunk/src/VBox/Devices/EFI/Firmware/MdePkg/Library/BaseLib/Ia32/CpuIdEx.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/Ia32/CpuIdEx.S (modified) (3 diffs)

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

@@ -1 +1 @@
 #------------------------------------------------------------------------------
 #
-# Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2006 - 2012, 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
@@ -22 +22 @@
 #------------------------------------------------------------------------------
 
-    .686:
+
     .code:
 
@@ -54 +54 @@
     movl    %ebx, (%ecx)
 L2:
+    movl    32(%ebp), %ecx
+    jecxz   L3
+    movl    %edx, (%ecx)
+L3:
     movl    28(%ebp), %ecx
-    jecxz   L3
+    jecxz   L4
     popl    (%ecx)
-L3:
-    movl    32(%ebp), %edx
-    jecxz   L4
-    movl    %edx, (%ecx)
 L4:
     movl    12(%ebp), %eax