Fix file headers

Fix typos in comments style of assembly files
Change IA32 CpuFlushTlb() for GCC to use AsmReadCr3() and AsmWriteCr3() instead of using inline assembly.


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9192 6f19259b-4bc3-4df7-8a09-765794883524

7 files changed, 11 insertions, 15 deletions

diff --git a/MdePkg/Library/BaseCpuLib/Arm/CpuFlushTlb.S b/MdePkg/Library/BaseCpuLib/Arm/CpuFlushTlb.S
index 6581425491..e15daa1c20 100644
--- a/MdePkg/Library/BaseCpuLib/Arm/CpuFlushTlb.S
+++ b/MdePkg/Library/BaseCpuLib/Arm/CpuFlushTlb.S
@@ -3,7 +3,7 @@
 # CpuFlushTlb() for ARM

 #

 # Copyright (c) 2006 - 2009, Intel Corporation<BR>

-# Portions copyright (c) 2008-2009 Apple Inc.<BR>

+# Portions copyright (c) 2008-2009 Apple Inc. All rights reserved.<BR>

 # All rights reserved. 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

@@ -32,5 +32,5 @@
 #

 ASM_PFX(CpuFlushTlb):

     mov r0,#0

-    mcr p15,0,r0,c8,c5,0        # Invalidate all the unlocked entried in TLB

+    mcr p15,0,r0,c8,c5,0        // Invalidate all the unlocked entried in TLB

     bx  LR

diff --git a/MdePkg/Library/BaseCpuLib/Arm/CpuFlushTlb.asm b/MdePkg/Library/BaseCpuLib/Arm/CpuFlushTlb.asm
index e0ccdfdfde..1fa7d26419 100644
--- a/MdePkg/Library/BaseCpuLib/Arm/CpuFlushTlb.asm
+++ b/MdePkg/Library/BaseCpuLib/Arm/CpuFlushTlb.asm
@@ -3,7 +3,7 @@
 ; CpuFlushTlb() for ARM

 ;

 ; Copyright (c) 2006 - 2009, Intel Corporation<BR>

-; Portions copyright (c) 2008-2009 Apple Inc.<BR>

+; Portions copyright (c) 2008-2009 Apple Inc. All rights reserved.<BR>

 ; All rights reserved. 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

diff --git a/MdePkg/Library/BaseCpuLib/Arm/CpuSleep.S b/MdePkg/Library/BaseCpuLib/Arm/CpuSleep.S
index 8d06372262..ac8c5c8d5c 100644
--- a/MdePkg/Library/BaseCpuLib/Arm/CpuSleep.S
+++ b/MdePkg/Library/BaseCpuLib/Arm/CpuSleep.S
@@ -3,7 +3,7 @@
 # CpuSleep() for ARM

 #

 # Copyright (c) 2006 - 2009, Intel Corporation<BR>

-# Portions copyright (c) 2008-2009 Apple Inc.<BR>

+# Portions copyright (c) 2008-2009 Apple Inc. All rights reserved.<BR>

 # All rights reserved. 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

@@ -34,5 +34,5 @@
 #

 ASM_PFX(CpuSleep):

     mov r0,#0

-    mcr p15,0,r0,c7,c0,4   ;Wait for Interrupt instruction

+    mcr p15,0,r0,c7,c0,4   // Wait for Interrupt instruction

     bx  lr

diff --git a/MdePkg/Library/BaseCpuLib/Arm/CpuSleep.asm b/MdePkg/Library/BaseCpuLib/Arm/CpuSleep.asm
index e0aaf21663..b6aeca430c 100644
--- a/MdePkg/Library/BaseCpuLib/Arm/CpuSleep.asm
+++ b/MdePkg/Library/BaseCpuLib/Arm/CpuSleep.asm
@@ -3,7 +3,7 @@
 ; CpuSleep() for ARM

 ;

 ; Copyright (c) 2006 - 2009, Intel Corporation<BR>

-; Portions copyright (c) 2008-2009 Apple Inc.<BR>

+; Portions copyright (c) 2008-2009 Apple Inc. All rights reserved.<BR>

 ; All rights reserved. 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

diff --git a/MdePkg/Library/BaseCpuLib/BaseCpuLib.inf b/MdePkg/Library/BaseCpuLib/BaseCpuLib.inf
index ef73b9d433..c41b7a862c 100644
--- a/MdePkg/Library/BaseCpuLib/BaseCpuLib.inf
+++ b/MdePkg/Library/BaseCpuLib/BaseCpuLib.inf
@@ -5,7 +5,7 @@
 #  PAL CALLs for IPF, and empty functions for EBC.

 #

 #  Copyright (c) 2007 - 2008, Intel Corporation.<BR>

-#  Portions Copyright (c) 2008-2009 Apple Inc.<BR>

+#  Portions Copyright (c) 2008-2009 Apple Inc. All rights reserved.

 #

 #  All rights reserved. This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

diff --git a/MdePkg/Library/BaseCpuLib/Ia32/CpuFlushTlbGcc.c b/MdePkg/Library/BaseCpuLib/Ia32/CpuFlushTlbGcc.c
index 25ee75a658..f8c3a253d2 100644
--- a/MdePkg/Library/BaseCpuLib/Ia32/CpuFlushTlbGcc.c
+++ b/MdePkg/Library/BaseCpuLib/Ia32/CpuFlushTlbGcc.c
@@ -2,7 +2,7 @@
   CpuFlushTlb function for Ia32/X64 GCC.

 

   Copyright (c) 2006 - 2008, Intel Corporation<BR>

-  Portions copyright (c) 2008-2009 Apple Inc.<BR>

+  Portions copyright (c) 2008-2009 Apple Inc. All rights reserved.<BR>

   All rights reserved. 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

@@ -13,7 +13,7 @@
 

 **/

 

-

+#include <Library/BaseLib.h>

 

 /**

   Flushes all the Translation Lookaside Buffers(TLB) entries in a CPU.

@@ -27,10 +27,6 @@ CpuFlushTlb (
   VOID

   )

 {

-  __asm__ __volatile__ (

-    "movl %%cr3, %0\n\t"

-    "movl %0, %%cr3    "

-    : "r"  // %0

-    );

+  AsmWriteCr3 (AsmReadCr3 ());

 }

 

diff --git a/MdePkg/Library/BaseCpuLib/Ia32/CpuSleepGcc.c b/MdePkg/Library/BaseCpuLib/Ia32/CpuSleepGcc.c
index ad06834afe..fb5ca29abe 100644
--- a/MdePkg/Library/BaseCpuLib/Ia32/CpuSleepGcc.c
+++ b/MdePkg/Library/BaseCpuLib/Ia32/CpuSleepGcc.c
@@ -2,7 +2,7 @@
   CpuSleep function for Ia32/X64 GCC.

 

   Copyright (c) 2006 - 2008, Intel Corporation<BR>

-  Portions copyright (c) 2008-2009 Apple Inc.<BR>

+  Portions copyright (c) 2008-2009 Apple Inc. All rights reserved.<BR>

   All rights reserved. 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