The "GccInline.c" files have some inconsistent whitespace, and missing (or incorrect) operand comments. Fix and unify them.
This patch doesn't change behavior. Cc: Liming Gao <liming....@intel.com> Cc: Michael D Kinney <michael.d.kin...@intel.com> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=1208 Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Laszlo Ersek <ler...@redhat.com> --- MdePkg/Library/BaseSynchronizationLib/Ia32/GccInline.c | 35 ++++++------- MdePkg/Library/BaseSynchronizationLib/X64/GccInline.c | 53 +++++++++----------- 2 files changed, 39 insertions(+), 49 deletions(-) diff --git a/MdePkg/Library/BaseSynchronizationLib/Ia32/GccInline.c b/MdePkg/Library/BaseSynchronizationLib/Ia32/GccInline.c index fa2be7f4b35c..1976720ac636 100644 --- a/MdePkg/Library/BaseSynchronizationLib/Ia32/GccInline.c +++ b/MdePkg/Library/BaseSynchronizationLib/Ia32/GccInline.c @@ -39,7 +39,7 @@ InternalSyncIncrement ( "movl $1, %%eax \n\t" "lock \n\t" "xadd %%eax, %1 \n\t" - "inc %%eax " + "inc %%eax \n\t" : "=a" (Result), // %0 "+m" (*Value) // %1 : // no inputs that aren't also outputs @@ -48,7 +48,6 @@ InternalSyncIncrement ( ); return Result; - } @@ -76,10 +75,10 @@ InternalSyncDecrement ( "movl $-1, %%eax \n\t" "lock \n\t" "xadd %%eax, %1 \n\t" - "dec %%eax " - : "=a" (Result), // %0 - "+m" (*Value) // %1 - : // no inputs that aren't also outputs + "dec %%eax \n\t" + : "=a" (Result), // %0 + "+m" (*Value) // %1 + : // no inputs that aren't also outputs : "memory", "cc" ); @@ -87,6 +86,7 @@ InternalSyncDecrement ( return Result; } + /** Performs an atomic compare exchange operation on a 16-bit unsigned integer. @@ -113,15 +113,13 @@ InternalSyncCompareExchange16 ( IN UINT16 ExchangeValue ) { - __asm__ __volatile__ ( - " \n\t" "lock \n\t" "cmpxchgw %1, %2 \n\t" - : "=a" (CompareValue) - : "q" (ExchangeValue), - "m" (*Value), - "0" (CompareValue) + : "=a" (CompareValue) // %0 + : "q" (ExchangeValue), // %1 + "m" (*Value), // %2 + "0" (CompareValue) // %3 : "memory", "cc" ); @@ -129,6 +127,7 @@ InternalSyncCompareExchange16 ( return CompareValue; } + /** Performs an atomic compare exchange operation on a 32-bit unsigned integer. @@ -155,15 +154,13 @@ InternalSyncCompareExchange32 ( IN UINT32 ExchangeValue ) { - __asm__ __volatile__ ( - " \n\t" "lock \n\t" "cmpxchgl %1, %2 \n\t" - : "=a" (CompareValue) // %0 - : "q" (ExchangeValue), // %1 - "m" (*Value), // %2 - "0" (CompareValue) // %4 + : "=a" (CompareValue) // %0 + : "q" (ExchangeValue), // %1 + "m" (*Value), // %2 + "0" (CompareValue) // %3 : "memory", "cc" ); @@ -171,6 +168,7 @@ InternalSyncCompareExchange32 ( return CompareValue; } + /** Performs an atomic compare exchange operation on a 64-bit unsigned integer. @@ -197,7 +195,6 @@ InternalSyncCompareExchange64 ( ) { __asm__ __volatile__ ( - " \n\t" "push %%ebx \n\t" "movl %2,%%ebx \n\t" "lock \n\t" diff --git a/MdePkg/Library/BaseSynchronizationLib/X64/GccInline.c b/MdePkg/Library/BaseSynchronizationLib/X64/GccInline.c index ab7efe23c4db..0212798d7a27 100644 --- a/MdePkg/Library/BaseSynchronizationLib/X64/GccInline.c +++ b/MdePkg/Library/BaseSynchronizationLib/X64/GccInline.c @@ -39,7 +39,7 @@ InternalSyncIncrement ( "movl $1, %%eax \n\t" "lock \n\t" "xadd %%eax, %1 \n\t" - "inc %%eax " + "inc %%eax \n\t" : "=a" (Result), // %0 "+m" (*Value) // %1 : // no inputs that aren't also outputs @@ -75,10 +75,10 @@ InternalSyncDecrement ( "movl $-1, %%eax \n\t" "lock \n\t" "xadd %%eax, %1 \n\t" - "dec %%eax " - : "=a" (Result), // %0 - "+m" (*Value) // %1 - : // no inputs that aren't also outputs + "dec %%eax \n\t" + : "=a" (Result), // %0 + "+m" (*Value) // %1 + : // no inputs that aren't also outputs : "memory", "cc" ); @@ -113,16 +113,14 @@ InternalSyncCompareExchange16 ( IN UINT16 ExchangeValue ) { - - __asm__ __volatile__ ( "lock \n\t" - "cmpxchgw %3, %1 " - : "=a" (CompareValue), - "=m" (*Value) - : "a" (CompareValue), - "r" (ExchangeValue), - "m" (*Value) + "cmpxchgw %3, %1 \n\t" + : "=a" (CompareValue), // %0 + "=m" (*Value) // %1 + : "a" (CompareValue), // %2 + "r" (ExchangeValue), // %3 + "m" (*Value) // %4 : "memory", "cc" ); @@ -157,16 +155,14 @@ InternalSyncCompareExchange32 ( IN UINT32 ExchangeValue ) { - - __asm__ __volatile__ ( "lock \n\t" - "cmpxchgl %3, %1 " - : "=a" (CompareValue), // %0 - "=m" (*Value) // %1 - : "a" (CompareValue), // %2 - "r" (ExchangeValue), // %3 - "m" (*Value) + "cmpxchgl %3, %1 \n\t" + : "=a" (CompareValue), // %0 + "=m" (*Value) // %1 + : "a" (CompareValue), // %2 + "r" (ExchangeValue), // %3 + "m" (*Value) // %4 : "memory", "cc" ); @@ -200,20 +196,17 @@ InternalSyncCompareExchange64 ( IN UINT64 ExchangeValue ) { - __asm__ __volatile__ ( "lock \n\t" - "cmpxchgq %3, %1 " - : "=a" (CompareValue), // %0 - "=m" (*Value) // %1 - : "a" (CompareValue), // %2 - "r" (ExchangeValue), // %3 - "m" (*Value) + "cmpxchgq %3, %1 \n\t" + : "=a" (CompareValue), // %0 + "=m" (*Value) // %1 + : "a" (CompareValue), // %2 + "r" (ExchangeValue), // %3 + "m" (*Value) // %4 : "memory", "cc" ); return CompareValue; } - - -- 2.14.1.3.gb7cf6e02401b _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
