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, 193 insertions, 164 deletions

diff --git a/MdePkg/Library/BaseSynchronizationLib/Ia32/GccInline.c b/MdePkg/Library/BaseSynchronizationLib/Ia32/GccInline.c
new file mode 100644
index 0000000000..9b939c9709
--- /dev/null
+++ b/MdePkg/Library/BaseSynchronizationLib/Ia32/GccInline.c
@@ -0,0 +1,193 @@
+/** @file

+  GCC inline implementation of BaseSynchronizationLib processor specific functions.

+  

+  Copyright (c) 2006 - 2009, 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.

+

+**/

+

+

+

+/**

+  Performs an atomic increment of an 32-bit unsigned integer.

+

+  Performs an atomic increment of the 32-bit unsigned integer specified by

+  Value and returns the incremented value. The increment operation must be

+  performed using MP safe mechanisms. The state of the return value is not

+  guaranteed to be MP safe.

+

+  @param  Value A pointer to the 32-bit value to increment.

+

+  @return The incremented value.

+

+**/

+UINT32

+EFIAPI

+InternalSyncIncrement (

+  IN      volatile UINT32    *Value

+  )

+{

+  UINT32  Result;

+

+  __asm__ __volatile__ (

+    "lock               \n\t"

+    "incl    %2         \n\t"

+    "movl    %2, %%eax      "

+    : "=a" (Result),          // %0

+      "=m" (*Value)           // %1

+    : "m"  (*Value)           // %2 

+    : "memory",

+      "cc"

+    );

+    

+  return Result;    

+

+}

+

+

+/**

+  Performs an atomic decrement of an 32-bit unsigned integer.

+

+  Performs an atomic decrement of the 32-bit unsigned integer specified by

+  Value and returns the decremented value. The decrement operation must be

+  performed using MP safe mechanisms. The state of the return value is not

+  guaranteed to be MP safe.

+

+  @param  Value A pointer to the 32-bit value to decrement.

+

+  @return The decremented value.

+

+**/

+UINT32

+EFIAPI

+InternalSyncDecrement (

+  IN      volatile UINT32       *Value

+  )

+{

+   UINT32  Result;

+  

+  __asm__ __volatile__ (

+    "lock               \n\t"

+    "decl    %2         \n\t"

+    "movl    %2, %%eax      "

+    : "=a" (Result),          // %0

+      "=m" (*Value)           // %1

+    : "m"  (*Value)           // %2 

+    : "memory",

+      "cc"

+    );

+    

+  return Result;

+}

+

+/**

+  Performs an atomic compare exchange operation on a 32-bit unsigned integer.

+

+  Performs an atomic compare exchange operation on the 32-bit unsigned integer

+  specified by Value.  If Value is equal to CompareValue, then Value is set to

+  ExchangeValue and CompareValue is returned.  If Value is not equal to CompareValue,

+  then Value is returned.  The compare exchange operation must be performed using

+  MP safe mechanisms.

+

+

+  @param  Value         A pointer to the 32-bit value for the compare exchange

+                        operation.

+  @param  CompareValue  32-bit value used in compare operation.

+  @param  ExchangeValue 32-bit value used in exchange operation.

+

+  @return The original *Value before exchange.

+

+**/

+UINT32

+EFIAPI

+InternalSyncCompareExchange32 (

+  IN OUT volatile  UINT32           *Value,

+  IN      UINT32                    CompareValue,

+  IN      UINT32                    ExchangeValue

+  )

+{

+

+// GCC 4.1 and forward supports atomic builtins  

+#if ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 1)))

+

+  return __sync_val_compare_and_swap (Value, CompareValue, ExchangeValue);

+

+#else

+

+  __asm__ __volatile__ (

+    "                     \n\t"

+    "lock                 \n\t"

+    "cmpxchgl    %1, %2   \n\t"

+    : "=a" (CompareValue)     // %0

+    : "q"  (ExchangeValue),   // %1

+      "m"  (*Value),          // %2

+      "0"  (CompareValue)     // %4 

+    : "memory",

+      "cc"

+    );

+

+    return CompareValue;

+

+#endif

+}

+

+/**

+  Performs an atomic compare exchange operation on a 64-bit unsigned integer.

+

+  Performs an atomic compare exchange operation on the 64-bit unsigned integer specified

+  by Value.  If Value is equal to CompareValue, then Value is set to ExchangeValue and

+  CompareValue is returned.  If Value is not equal to CompareValue, then Value is returned.

+  The compare exchange operation must be performed using MP safe mechanisms.

+

+

+  @param  Value         A pointer to the 64-bit value for the compare exchange

+                        operation.

+  @param  CompareValue  64-bit value used in compare operation.

+  @param  ExchangeValue 64-bit value used in exchange operation.

+

+  @return The original *Value before exchange.

+

+**/

+UINT64

+EFIAPI

+InternalSyncCompareExchange64 (

+  IN OUT  volatile UINT64           *Value,

+  IN      UINT64                    CompareValue,

+  IN      UINT64                    ExchangeValue

+  )

+{

+// GCC 4.1 and forward supports atomic builtins  

+#if ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 1)))

+

+  return __sync_val_compare_and_swap (Value, CompareValue, ExchangeValue);

+

+#else

+

+  __asm__ __volatile__ (

+    "                       \n\t"

+    "push        %%ebx      \n\t" 

+    "movl        %2,%%ebx   \n\t"   

+    "lock                   \n\t"

+    "cmpxchg8b   (%1)       \n\t"

+    "pop         %%ebx      \n\t"

+    : "+A"  (CompareValue)                    // %0

+    : "S"   (Value),                          // %1

+      "r"   ((UINT32) ExchangeValue),         // %2

+      "c"   ((UINT32) (ExchangeValue >> 32))  // %3

+    : "memory",

+      "cc"

+    );

+  

+  return CompareValue;

+

+#endif

+}

+

+

diff --git a/MdePkg/Library/BaseSynchronizationLib/Ia32/InterlockedCompareExchange32.S b/MdePkg/Library/BaseSynchronizationLib/Ia32/InterlockedCompareExchange32.S
deleted file mode 100644
index 7bb8bb5b6c..0000000000
--- a/MdePkg/Library/BaseSynchronizationLib/Ia32/InterlockedCompareExchange32.S
+++ /dev/null
@@ -1,41 +0,0 @@
-#------------------------------------------------------------------------------

-#

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

-#

-#   InterlockedCompareExchange32.S

-#

-# Abstract:

-#

-#   InternalSyncCompareExchange32 function

-#

-# Notes:

-#

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

-

-ASM_GLOBAL ASM_PFX(InternalSyncCompareExchange32)

-

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

-# UINT32

-# EFIAPI

-# InternalSyncCompareExchange32 (

-#   IN      UINT32                    *Value,

-#   IN      UINT32                    CompareValue,

-#   IN      UINT32                    ExchangeValue

-#   );

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

-ASM_PFX(InternalSyncCompareExchange32):

-    movl    4(%esp), %ecx

-    movl    8(%esp), %eax

-    movl    12(%esp), %edx

-    lock

-    cmpxchgl    %edx, (%ecx)

-    ret

diff --git a/MdePkg/Library/BaseSynchronizationLib/Ia32/InterlockedCompareExchange64.S b/MdePkg/Library/BaseSynchronizationLib/Ia32/InterlockedCompareExchange64.S
deleted file mode 100644
index ec77892017..0000000000
--- a/MdePkg/Library/BaseSynchronizationLib/Ia32/InterlockedCompareExchange64.S
+++ /dev/null
@@ -1,47 +0,0 @@
-#------------------------------------------------------------------------------

-#

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

-#

-#   InterlockedCompareExchange64.S

-#

-# Abstract:

-#

-#   InternalSyncCompareExchange64 function

-#

-# Notes:

-#

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

-

-ASM_GLOBAL ASM_PFX(InternalSyncCompareExchange64)

-

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

-# UINT64

-# EFIAPI

-# InternalSyncCompareExchange64 (

-#   IN      UINT64                    *Value,

-#   IN      UINT64                    CompareValue,

-#   IN      UINT64                    ExchangeValue

-#   );

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

-ASM_PFX(InternalSyncCompareExchange64):

-    push    %esi

-    push    %ebx

-    movl    12(%esp), %esi

-    movl    16(%esp), %eax

-    movl    20(%esp), %edx

-    movl    24(%esp), %ebx

-    movl    28(%esp), %ecx

-    lock

-    cmpxchg8b   (%esi)

-    pop     %ebx

-    pop     %esi

-    ret

diff --git a/MdePkg/Library/BaseSynchronizationLib/Ia32/InterlockedDecrement.S b/MdePkg/Library/BaseSynchronizationLib/Ia32/InterlockedDecrement.S
deleted file mode 100644
index e77af9538e..0000000000
--- a/MdePkg/Library/BaseSynchronizationLib/Ia32/InterlockedDecrement.S
+++ /dev/null
@@ -1,38 +0,0 @@
-#------------------------------------------------------------------------------

-#

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

-#

-#   InterlockedDecrement.S

-#

-# Abstract:

-#

-#   InternalSyncDecrement function

-#

-# Notes:

-#

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

-

-ASM_GLOBAL ASM_PFX(InternalSyncDecrement)

-

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

-# UINT32

-# EFIAPI

-# InternalSyncDecrement (

-#   IN      UINT32                    *Value

-#   );

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

-ASM_PFX(InternalSyncDecrement):

-    movl    4(%esp), %eax

-    lock

-    decl    (%eax)

-    movl    (%eax), %eax

-    ret

diff --git a/MdePkg/Library/BaseSynchronizationLib/Ia32/InterlockedIncrement.S b/MdePkg/Library/BaseSynchronizationLib/Ia32/InterlockedIncrement.S
deleted file mode 100644
index 207341de19..0000000000
--- a/MdePkg/Library/BaseSynchronizationLib/Ia32/InterlockedIncrement.S
+++ /dev/null
@@ -1,38 +0,0 @@
-#------------------------------------------------------------------------------

-#

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

-#

-#   InterlockedIncrement.S

-#

-# Abstract:

-#

-#   InternalSyncIncrement function

-#

-# Notes:

-#

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

-

-ASM_GLOBAL ASM_PFX(InternalSyncIncrement)

-

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

-# UINT32

-# EFIAPI

-# InternalSyncIncrement (

-#   IN      UINT32                    *Value

-#   );

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

-ASM_PFX(InternalSyncIncrement):

-    movl    4(%esp), %eax

-    lock

-    incl    (%eax)

-    movl    (%eax), %eax

-    ret