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

diff --git a/MdePkg/Library/BaseCpuLib/Arm/CpuFlushTlb.S b/MdePkg/Library/BaseCpuLib/Arm/CpuFlushTlb.S
index 65814254914482844a4672d2ea2313376927ee2c..e15daa1c2076d2bcff01b917cfe578eb000534c5 100644 (file)
--- a/MdePkg/Library/BaseCpuLib/Arm/CpuFlushTlb.S
+++ b/MdePkg/Library/BaseCpuLib/Arm/CpuFlushTlb.S
@@ -3,7 +3,7 @@
 # CpuFlushTlb() for ARM\r
 #\r
 # Copyright (c) 2006 - 2009, Intel Corporation<BR>\r
-# Portions copyright (c) 2008-2009 Apple Inc.<BR>\r
+# Portions copyright (c) 2008-2009 Apple Inc. All rights reserved.<BR>\r
 # All rights reserved. This program and the accompanying materials\r
 # are licensed and made available under the terms and conditions of the BSD License\r
 # which accompanies this distribution.  The full text of the license may be found at\r
@@ -32,5 +32,5 @@
 #\r
 ASM_PFX(CpuFlushTlb):\r
     mov r0,#0\r
-    mcr p15,0,r0,c8,c5,0        # Invalidate all the unlocked entried in TLB\r
+    mcr p15,0,r0,c8,c5,0        // Invalidate all the unlocked entried in TLB\r
     bx  LR\r

diff --git a/MdePkg/Library/BaseCpuLib/Arm/CpuFlushTlb.asm b/MdePkg/Library/BaseCpuLib/Arm/CpuFlushTlb.asm
index e0ccdfdfde2c8ef8cec40cb5e295474e13482140..1fa7d26419285e611a1e4347bba6cd672f219800 100644 (file)
--- a/MdePkg/Library/BaseCpuLib/Arm/CpuFlushTlb.asm
+++ b/MdePkg/Library/BaseCpuLib/Arm/CpuFlushTlb.asm
@@ -3,7 +3,7 @@
 ; CpuFlushTlb() for ARM\r
 ;\r
 ; Copyright (c) 2006 - 2009, Intel Corporation<BR>\r
-; Portions copyright (c) 2008-2009 Apple Inc.<BR>\r
+; Portions copyright (c) 2008-2009 Apple Inc. All rights reserved.<BR>\r
 ; All rights reserved. This program and the accompanying materials\r
 ; are licensed and made available under the terms and conditions of the BSD License\r
 ; which accompanies this distribution.  The full text of the license may be found at\r

diff --git a/MdePkg/Library/BaseCpuLib/Arm/CpuSleep.S b/MdePkg/Library/BaseCpuLib/Arm/CpuSleep.S
index 8d0637226207b2878654b4b404b7872c912b165a..ac8c5c8d5cdc80508e901a481eaff1dc126a109f 100644 (file)
--- a/MdePkg/Library/BaseCpuLib/Arm/CpuSleep.S
+++ b/MdePkg/Library/BaseCpuLib/Arm/CpuSleep.S
@@ -3,7 +3,7 @@
 # CpuSleep() for ARM\r
 #\r
 # Copyright (c) 2006 - 2009, Intel Corporation<BR>\r
-# Portions copyright (c) 2008-2009 Apple Inc.<BR>\r
+# Portions copyright (c) 2008-2009 Apple Inc. All rights reserved.<BR>\r
 # All rights reserved. This program and the accompanying materials\r
 # are licensed and made available under the terms and conditions of the BSD License\r
 # which accompanies this distribution.  The full text of the license may be found at\r
@@ -34,5 +34,5 @@
 #\r
 ASM_PFX(CpuSleep):\r
     mov r0,#0\r
-    mcr p15,0,r0,c7,c0,4   ;Wait for Interrupt instruction\r
+    mcr p15,0,r0,c7,c0,4   // Wait for Interrupt instruction\r
     bx  lr\r

diff --git a/MdePkg/Library/BaseCpuLib/Arm/CpuSleep.asm b/MdePkg/Library/BaseCpuLib/Arm/CpuSleep.asm
index e0aaf2166330ae9e99b1f5b03689edda3e2a4307..b6aeca430c1b01cfffbb57d19241a75325d55ccd 100644 (file)
--- a/MdePkg/Library/BaseCpuLib/Arm/CpuSleep.asm
+++ b/MdePkg/Library/BaseCpuLib/Arm/CpuSleep.asm
@@ -3,7 +3,7 @@
 ; CpuSleep() for ARM\r
 ;\r
 ; Copyright (c) 2006 - 2009, Intel Corporation<BR>\r
-; Portions copyright (c) 2008-2009 Apple Inc.<BR>\r
+; Portions copyright (c) 2008-2009 Apple Inc. All rights reserved.<BR>\r
 ; All rights reserved. This program and the accompanying materials\r
 ; are licensed and made available under the terms and conditions of the BSD License\r
 ; which accompanies this distribution.  The full text of the license may be found at\r

diff --git a/MdePkg/Library/BaseCpuLib/BaseCpuLib.inf b/MdePkg/Library/BaseCpuLib/BaseCpuLib.inf
index ef73b9d43380a442dfc88abd550f7450f8c6bbb0..c41b7a862c69ccc6871e347e9326c07ea155db49 100644 (file)
--- 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.\r
 #\r
 #  Copyright (c) 2007 - 2008, Intel Corporation.<BR>\r
-#  Portions Copyright (c) 2008-2009 Apple Inc.<BR>\r
+#  Portions Copyright (c) 2008-2009 Apple Inc. All rights reserved.\r
 #\r
 #  All rights reserved. This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r

diff --git a/MdePkg/Library/BaseCpuLib/Ia32/CpuFlushTlbGcc.c b/MdePkg/Library/BaseCpuLib/Ia32/CpuFlushTlbGcc.c
index 25ee75a6585883e4aba05b5107d6875688ace34e..f8c3a253d29178ab5965f407f5a62578e398a4d1 100644 (file)
--- a/MdePkg/Library/BaseCpuLib/Ia32/CpuFlushTlbGcc.c
+++ b/MdePkg/Library/BaseCpuLib/Ia32/CpuFlushTlbGcc.c
@@ -2,7 +2,7 @@
   CpuFlushTlb function for Ia32/X64 GCC.\r
 \r
   Copyright (c) 2006 - 2008, Intel Corporation<BR>\r
-  Portions copyright (c) 2008-2009 Apple Inc.<BR>\r
+  Portions copyright (c) 2008-2009 Apple Inc. All rights reserved.<BR>\r
   All rights reserved. This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
@@ -13,7 +13,7 @@
 \r
 **/\r
 \r
-\r
+#include <Library/BaseLib.h>\r
 \r
 /**\r
   Flushes all the Translation Lookaside Buffers(TLB) entries in a CPU.\r
@@ -27,10 +27,6 @@ CpuFlushTlb (
   VOID\r
   )\r
 {\r
-  __asm__ __volatile__ (\r
-    "movl %%cr3, %0\n\t"\r
-    "movl %0, %%cr3    "\r
-    : "r"  // %0\r
-    );\r
+  AsmWriteCr3 (AsmReadCr3 ());\r
 }\r
 \r

diff --git a/MdePkg/Library/BaseCpuLib/Ia32/CpuSleepGcc.c b/MdePkg/Library/BaseCpuLib/Ia32/CpuSleepGcc.c
index ad06834afed84eb37c42e43ce8dd1199529346f1..fb5ca29abe40421f44657ed311e9e59f48053f6a 100644 (file)
--- a/MdePkg/Library/BaseCpuLib/Ia32/CpuSleepGcc.c
+++ b/MdePkg/Library/BaseCpuLib/Ia32/CpuSleepGcc.c
@@ -2,7 +2,7 @@
   CpuSleep function for Ia32/X64 GCC.\r
 \r
   Copyright (c) 2006 - 2008, Intel Corporation<BR>\r
-  Portions copyright (c) 2008-2009 Apple Inc.<BR>\r
+  Portions copyright (c) 2008-2009 Apple Inc. All rights reserved.<BR>\r
   All rights reserved. This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r