1. Restore the inline C implementation of GCC assembly files that was temporarily removed in Svn r10045.

2. Remove 139 GCC assembly files whose functionality have been covered in the inline C implementation.

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

5 files changed, 67 insertions, 71 deletions

diff --git a/MdePkg/Library/BaseCpuLib/BaseCpuLib.inf b/MdePkg/Library/BaseCpuLib/BaseCpuLib.inf
index f17c6516a9..9bbb1871f3 100644
--- a/MdePkg/Library/BaseCpuLib/BaseCpuLib.inf
+++ b/MdePkg/Library/BaseCpuLib/BaseCpuLib.inf
@@ -37,8 +37,8 @@
   Ia32/CpuSleep.asm | INTEL 

   Ia32/CpuFlushTlb.asm | INTEL 

 

-  Ia32/CpuSleep.S | GCC 

-  Ia32/CpuFlushTlb.S | GCC 

+  Ia32/CpuSleepGcc.c | GCC 

+  Ia32/CpuFlushTlbGcc.c | GCC 

 

 [Sources.X64]

   X64/CpuFlushTlb.asm 

diff --git a/MdePkg/Library/BaseCpuLib/Ia32/CpuFlushTlb.S b/MdePkg/Library/BaseCpuLib/Ia32/CpuFlushTlb.S
deleted file mode 100644
index 0aec5d015c..0000000000
--- a/MdePkg/Library/BaseCpuLib/Ia32/CpuFlushTlb.S
+++ /dev/null
@@ -1,35 +0,0 @@
-#------------------------------------------------------------------------------ ;

-# Copyright (c) 2006, 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

-# http://opensource.org/licenses/bsd-license.php

-#

-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-#

-# Module Name:

-#

-#   CpuFlushTlb.Asm

-#

-# Abstract:

-#

-#   CpuFlushTlb function

-#

-# Notes:

-#

-#------------------------------------------------------------------------------

-

-ASM_GLOBAL ASM_PFX(CpuFlushTlb)

-

-#------------------------------------------------------------------------------

-# VOID

-# EFIAPI

-# CpuFlushTlb (

-#   VOID

-#   );

-#------------------------------------------------------------------------------

-ASM_PFX(CpuFlushTlb):

-    movl    %cr3, %eax

-    movl    %eax, %cr3

-    ret

diff --git a/MdePkg/Library/BaseCpuLib/Ia32/CpuFlushTlbGcc.c b/MdePkg/Library/BaseCpuLib/Ia32/CpuFlushTlbGcc.c
new file mode 100644
index 0000000000..f8c3a253d2
--- /dev/null
+++ b/MdePkg/Library/BaseCpuLib/Ia32/CpuFlushTlbGcc.c
@@ -0,0 +1,32 @@
+/** @file

+  CpuFlushTlb function for Ia32/X64 GCC.

+

+  Copyright (c) 2006 - 2008, Intel Corporation<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

+  http://opensource.org/licenses/bsd-license.php

+

+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

+

+**/

+

+#include <Library/BaseLib.h>

+

+/**

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

+

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

+

+**/

+VOID

+EFIAPI

+CpuFlushTlb (

+  VOID

+  )

+{

+  AsmWriteCr3 (AsmReadCr3 ());

+}

+

diff --git a/MdePkg/Library/BaseCpuLib/Ia32/CpuSleep.S b/MdePkg/Library/BaseCpuLib/Ia32/CpuSleep.S
deleted file mode 100644
index b826ca2a95..0000000000
--- a/MdePkg/Library/BaseCpuLib/Ia32/CpuSleep.S
+++ /dev/null
@@ -1,34 +0,0 @@
-#------------------------------------------------------------------------------ ;

-# Copyright (c) 2006, 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

-# http://opensource.org/licenses/bsd-license.php

-#

-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-#

-# Module Name:

-#

-#   CpuSleep.Asm

-#

-# Abstract:

-#

-#   CpuSleep function

-#

-# Notes:

-#

-#------------------------------------------------------------------------------

-

-ASM_GLOBAL ASM_PFX(CpuSleep)

-

-#------------------------------------------------------------------------------

-# VOID

-# EFIAPI

-# CpuSleep (

-#   VOID

-#   );

-#------------------------------------------------------------------------------

-ASM_PFX(CpuSleep):

-    hlt

-    ret

diff --git a/MdePkg/Library/BaseCpuLib/Ia32/CpuSleepGcc.c b/MdePkg/Library/BaseCpuLib/Ia32/CpuSleepGcc.c
new file mode 100644
index 0000000000..fb5ca29abe
--- /dev/null
+++ b/MdePkg/Library/BaseCpuLib/Ia32/CpuSleepGcc.c
@@ -0,0 +1,33 @@
+/** @file

+  CpuSleep function for Ia32/X64 GCC.

+

+  Copyright (c) 2006 - 2008, Intel Corporation<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

+  http://opensource.org/licenses/bsd-license.php

+

+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

+

+**/

+

+

+/**

+  Places the CPU in a sleep state until an interrupt is received.

+

+  Places the CPU in a sleep state until an interrupt is received. If interrupts

+  are disabled prior to calling this function, then the CPU will be placed in a

+  sleep state indefinitely.

+

+**/

+VOID

+EFIAPI

+CpuSleep (

+  VOID

+  )

+{

+  __asm__ __volatile__ ("hlt"::: "memory");

+}

+