MdePkg/BaseSynchronizationLib: fix AArch64 return values

[mirror_edk2.git] / MdePkg / Library / BaseSynchronizationLib / SynchronizationGcc.c

diff --git a/MdePkg/Library/BaseSynchronizationLib/SynchronizationGcc.c b/MdePkg/Library/BaseSynchronizationLib/SynchronizationGcc.c
index 79bd5c4d2dcf6fd34913521b6fff4e57977dc7fe..587f5a771c353b3070e3160fa22eb52abce74bf4 100644 (file)
--- a/MdePkg/Library/BaseSynchronizationLib/SynchronizationGcc.c
+++ b/MdePkg/Library/BaseSynchronizationLib/SynchronizationGcc.c
@@ -1,11 +1,12 @@
 /** @file\r
   Implementation of synchronization functions.\r
 \r
-  Copyright (c) 2006 - 2008, Intel Corporation<BR>\r
-  All rights reserved. This program and the accompanying materials\r
+  Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>\r
+  Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>\r
+  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
-  http://opensource.org/licenses/bsd-license.php\r
+  http://opensource.org/licenses/bsd-license.php.\r
 \r
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
@@ -17,7 +18,7 @@
 //\r
 // GCC inline assembly for Read Write Barrier  \r
 //\r
-#define _ReadWriteBarrier() do { asm volatile ("": : : "memory"); } while(0)\r
+#define _ReadWriteBarrier() do { __asm__ __volatile__ ("": : : "memory"); } while(0)\r
 \r
 #define SPIN_LOCK_RELEASED          ((UINTN) 1)\r
 #define SPIN_LOCK_ACQUIRED          ((UINTN) 2)\r
@@ -27,8 +28,8 @@
   optimal spin lock performance.\r
 \r
   This function retrieves the spin lock alignment requirements for optimal\r
-  performance on a given CPU architecture. The spin lock alignment must be a\r
-  power of two and is returned by this function. If there are no alignment\r
+  performance on a given CPU architecture. The spin lock alignment is byte alignment. \r
+  It must be a power of two and is returned by this function. If there are no alignment\r
   requirements, then 1 must be returned. The spin lock synchronization\r
   functions must function correctly if the spin lock size and alignment values\r
   returned by this function are not used at all. These values are hints to the\r
@@ -60,7 +61,7 @@ GetSpinLockProperties (
   @param  SpinLock  A pointer to the spin lock to initialize to the released\r
                     state.\r
 \r
-  @return SpinLock in release state.\r
+  @return SpinLock is in release state.\r
 \r
 **/\r
 SPIN_LOCK *\r
@@ -95,7 +96,7 @@ InitializeSpinLock (
 \r
   @param  SpinLock  A pointer to the spin lock to place in the acquired state.\r
 \r
-  @return SpinLock acquired lock.\r
+  @return SpinLock acquired the lock.\r
 \r
 **/\r
 SPIN_LOCK *\r
@@ -218,7 +219,7 @@ AcquireSpinLockOrFail (
 \r
   @param  SpinLock  A pointer to the spin lock to release.\r
 \r
-  @return SpinLock released lock.\r
+  @return SpinLock released the lock.\r
 \r
 **/\r
 SPIN_LOCK *\r
@@ -291,6 +292,37 @@ InterlockedDecrement (
   return InternalSyncDecrement (Value);\r
 }\r
 \r
+/**\r
+  Performs an atomic compare exchange operation on a 16-bit unsigned integer.\r
+\r
+  Performs an atomic compare exchange operation on the 16-bit unsigned integer\r
+  specified by Value.  If Value is equal to CompareValue, then Value is set to\r
+  ExchangeValue and CompareValue is returned.  If Value is not equal to CompareValue,\r
+  then Value is returned.  The compare exchange operation must be performed using\r
+  MP safe mechanisms.\r
+\r
+  If Value is NULL, then ASSERT().\r
+\r
+  @param  Value         A pointer to the 16-bit value for the compare exchange\r
+                        operation.\r
+  @param  CompareValue  A 16-bit value used in compare operation.\r
+  @param  ExchangeValue A 16-bit value used in exchange operation.\r
+\r
+  @return The original *Value before exchange.\r
+\r
+**/\r
+UINT16\r
+EFIAPI\r
+InterlockedCompareExchange16 (\r
+  IN OUT  UINT16                    *Value,\r
+  IN      UINT16                    CompareValue,\r
+  IN      UINT16                    ExchangeValue\r
+  )\r
+{\r
+  ASSERT (Value != NULL);\r
+  return InternalSyncCompareExchange16 (Value, CompareValue, ExchangeValue);\r
+}\r
+\r
 /**\r
   Performs an atomic compare exchange operation on a 32-bit unsigned integer.\r
 \r
@@ -304,8 +336,8 @@ InterlockedDecrement (
 \r
   @param  Value         A pointer to the 32-bit value for the compare exchange\r
                         operation.\r
-  @param  CompareValue  32-bit value used in compare operation.\r
-  @param  ExchangeValue 32-bit value used in exchange operation.\r
+  @param  CompareValue  A 32-bit value used in compare operation.\r
+  @param  ExchangeValue A 32-bit value used in exchange operation.\r
 \r
   @return The original *Value before exchange.\r
 \r
@@ -334,8 +366,8 @@ InterlockedCompareExchange32 (
 \r
   @param  Value         A pointer to the 64-bit value for the compare exchange\r
                         operation.\r
-  @param  CompareValue  64-bit value used in compare operation.\r
-  @param  ExchangeValue 64-bit value used in exchange operation.\r
+  @param  CompareValue  A 64-bit value used in a compare operation.\r
+  @param  ExchangeValue A 64-bit value used in an exchange operation.\r
 \r
   @return The original *Value before exchange.\r
 \r
@@ -365,8 +397,8 @@ InterlockedCompareExchange64 (
 \r
   @param  Value         A pointer to the pointer value for the compare exchange\r
                         operation.\r
-  @param  CompareValue  Pointer value used in compare operation.\r
-  @param  ExchangeValue Pointer value used in exchange operation.\r
+  @param  CompareValue  A pointer value used in a compare operation.\r
+  @param  ExchangeValue A pointer value used in an exchange operation.\r
 \r
   @return The original *Value before exchange.\r
 **/\r