MdePkg: BaseSynchronizationLib: fix Increment/Decrement retvals for ARM

The procedure call standard dictates that we move the result to r0 before
returning.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Tyler Smith <tylers@hp.com>
Reviewed-by: Eugene Cohen <eugene@hp.com>
Reviewed-by: Leif Lindholm <leif.lindholm@arm.com>
Reviewed-by: Ronald Cron <Ronald.Cron@arm.com>
[lersek@redhat.com: cleaned up commit message]

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17068 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdePkg/Library/BaseSynchronizationLib/Arm/Synchronization.S b/MdePkg/Library/BaseSynchronizationLib/Arm/Synchronization.S
index d699eb40d2a26bd1ea582f455b2eb3932cdde809..53e45a0b9ae064ea06da34de5d657f2ba1156490 100644 (file)
--- a/MdePkg/Library/BaseSynchronizationLib/Arm/Synchronization.S
+++ b/MdePkg/Library/BaseSynchronizationLib/Arm/Synchronization.S
@@ -179,6 +179,7 @@ TryInternalSyncIncrement:
   cmp     r2, #0\r
   bne     TryInternalSyncIncrement\r
   dmb\r
+  mov     r0, r1\r
   bx      lr\r
 \r
 /**\r
@@ -208,4 +209,5 @@ TryInternalSyncDecrement:
   cmp     r2, #0\r
   bne     TryInternalSyncDecrement\r
   dmb\r
+  mov     r0, r1\r
   bx      lr\r

diff --git a/MdePkg/Library/BaseSynchronizationLib/Arm/Synchronization.asm b/MdePkg/Library/BaseSynchronizationLib/Arm/Synchronization.asm
index dbc59911409386e633b9958a3d0d468f6eddceb8..1c9a183b8f0ea9a60e6f73728ff1d7b9f6c5b544 100644 (file)
--- a/MdePkg/Library/BaseSynchronizationLib/Arm/Synchronization.asm
+++ b/MdePkg/Library/BaseSynchronizationLib/Arm/Synchronization.asm
@@ -178,6 +178,7 @@ TryInternalSyncIncrement
   cmp     r2, #0\r
   bne     TryInternalSyncIncrement\r
   dmb\r
+  mov     r0, r1\r
   bx      lr\r
 \r
 /**\r
@@ -207,6 +208,7 @@ TryInternalSyncDecrement
   cmp     r2, #0\r
   bne     TryInternalSyncDecrement\r
   dmb\r
+  mov     r0, r1\r
   bx      lr\r
 \r
   END\r