diff options
author | lgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524> | 2010-11-26 01:54:49 +0000 |
---|---|---|
committer | lgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524> | 2010-11-26 01:54:49 +0000 |
commit | 3e99020dbf0a159e34b84e7ae9125f2e368d5390 (patch) | |
tree | 0eb6339318f7bf7da1b679b8009cf267b2234566 /EdkCompatibilityPkg/Foundation/Cpu/Pentium | |
parent | 68bb5ce77e51cf35791e46f2202e36da97e5e6be (diff) | |
download | edk2-platforms-3e99020dbf0a159e34b84e7ae9125f2e368d5390.tar.xz |
Sync all bug fixes between EDK1.04 and EDK1.06 into EdkCompatibilityPkg.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11094 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'EdkCompatibilityPkg/Foundation/Cpu/Pentium')
5 files changed, 10 insertions, 10 deletions
diff --git a/EdkCompatibilityPkg/Foundation/Cpu/Pentium/CpuIA32Lib/IA32/CpuIA32.S b/EdkCompatibilityPkg/Foundation/Cpu/Pentium/CpuIA32Lib/IA32/CpuIA32.S index 35cb4957c4..acc2b2e9c9 100644 --- a/EdkCompatibilityPkg/Foundation/Cpu/Pentium/CpuIA32Lib/IA32/CpuIA32.S +++ b/EdkCompatibilityPkg/Foundation/Cpu/Pentium/CpuIA32Lib/IA32/CpuIA32.S @@ -1,6 +1,6 @@ #/*++
#
-#Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>
+#Copyright (c) 2006 - 2010, 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
#which accompanies this distribution. The full text of the license may be found at
@@ -157,7 +157,7 @@ L2: # VOID
# )
ASM_PFX(EfiEnableCache):
- invd
+ wbinvd
movl %cr0, %eax
andl $0x9fffffff, %eax
movl %eax, %cr0
diff --git a/EdkCompatibilityPkg/Foundation/Cpu/Pentium/CpuIA32Lib/IA32/CpuIA32.asm b/EdkCompatibilityPkg/Foundation/Cpu/Pentium/CpuIA32Lib/IA32/CpuIA32.asm index 38d3c49744..878be4d80a 100644 --- a/EdkCompatibilityPkg/Foundation/Cpu/Pentium/CpuIA32Lib/IA32/CpuIA32.asm +++ b/EdkCompatibilityPkg/Foundation/Cpu/Pentium/CpuIA32Lib/IA32/CpuIA32.asm @@ -1,6 +1,6 @@ ;/*++
;
-;Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>
+;Copyright (c) 2006 - 2010, 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
;which accompanies this distribution. The full text of the license may be found at
@@ -140,7 +140,7 @@ EfiDisableCache ENDP ; VOID
; )
EfiEnableCache PROC C PUBLIC
- invd
+ wbinvd
mov eax, cr0
and eax, 09fffffffh
mov cr0, eax
diff --git a/EdkCompatibilityPkg/Foundation/Cpu/Pentium/CpuIA32Lib/IA32/CpuIA32.c b/EdkCompatibilityPkg/Foundation/Cpu/Pentium/CpuIA32Lib/IA32/CpuIA32.c index 6572bbd8f5..b4dc7e0b22 100644 --- a/EdkCompatibilityPkg/Foundation/Cpu/Pentium/CpuIA32Lib/IA32/CpuIA32.c +++ b/EdkCompatibilityPkg/Foundation/Cpu/Pentium/CpuIA32Lib/IA32/CpuIA32.c @@ -1,6 +1,6 @@ /*++
-Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2010, 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
which accompanies this distribution. The full text of the license may be found at
@@ -118,7 +118,7 @@ VOID EfiEnableCache (VOID)
{
__asm {
- invd
+ wbinvd
mov eax, cr0
and eax, 09fffffffh
mov cr0, eax
diff --git a/EdkCompatibilityPkg/Foundation/Cpu/Pentium/CpuIA32Lib/X64/Cpu.S b/EdkCompatibilityPkg/Foundation/Cpu/Pentium/CpuIA32Lib/X64/Cpu.S index 380ff936a1..38c663e131 100644 --- a/EdkCompatibilityPkg/Foundation/Cpu/Pentium/CpuIA32Lib/X64/Cpu.S +++ b/EdkCompatibilityPkg/Foundation/Cpu/Pentium/CpuIA32Lib/X64/Cpu.S @@ -1,6 +1,6 @@ #------------------------------------------------------------------------------
#*
-#* Copyright (c) 2008, Intel Corporation. All rights reserved.<BR>
+#* Copyright (c) 2008 - 2010, 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
#* which accompanies this distribution. The full text of the license may be found at
@@ -151,7 +151,7 @@ ASM_PFX(EfiDisableCache): # );
#------------------------------------------------------------------------------
ASM_PFX(EfiEnableCache):
- invd
+ wbinvd
mov %cr0,%rax
and $0xffffffff9fffffff,%rax
mov %rax,%cr0
diff --git a/EdkCompatibilityPkg/Foundation/Cpu/Pentium/CpuIA32Lib/X64/Cpu.asm b/EdkCompatibilityPkg/Foundation/Cpu/Pentium/CpuIA32Lib/X64/Cpu.asm index ab4daedfdc..adb0fa73f3 100644 --- a/EdkCompatibilityPkg/Foundation/Cpu/Pentium/CpuIA32Lib/X64/Cpu.asm +++ b/EdkCompatibilityPkg/Foundation/Cpu/Pentium/CpuIA32Lib/X64/Cpu.asm @@ -2,7 +2,7 @@ TITLE Cpu.asm: Assembly code for the x64 resources ;------------------------------------------------------------------------------
;*
-;* Copyright (c) 2005 - 2007, Intel Corporation. All rights reserved.<BR>
+;* Copyright (c) 2005 - 2010, 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
;* which accompanies this distribution. The full text of the license may be found at
@@ -150,7 +150,7 @@ EfiDisableCache ENDP ; );
;------------------------------------------------------------------------------
EfiEnableCache PROC PUBLIC
- invd
+ wbinvd
mov rax, cr0
and rax, 09fffffffh
mov cr0, rax
|