Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use push/pop

This commit is contained in:
matt 2013-08-10 18:39:25 +00:00
parent fc14a14e9e
commit 8aac5a9bd0
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common/lib/libc/arch/arm/atomic/atomic_and_64.S
View File

@ -1,4 +1,4 @@
/* $NetBSD: atomic_and_64.S,v 1.2 2012/09/13 00:36:12 matt Exp $ */
/* $NetBSD: atomic_and_64.S,v 1.3 2013/08/10 18:39:25 matt Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@ -33,15 +33,15 @@
#ifdef _ARM_ARCH_6
ENTRY_NP(_atomic_and_64)
str r4, [sp, #-4]! /* save temporary */
push {r4} /* save temporary */
#ifndef __ARM_EABI__
mov r3, r2
mov r2, r1
#endif
mov r4, r0 /* need r0 for return value */
1: ldrexd r0, [r4] /* load old value (to be returned) */
and r2, r0, r2 /* calculate new value */
and r3, r1, r3 /* calculate new value */
and r2, r2, r0 /* calculate new value */
and r3, r3, r1 /* calculate new value */
strexd ip, r2, [r4] /* try to store */
cmp ip, #0 /* succeed? */
bne 1b /* no, try again */
@ -50,13 +50,13 @@ ENTRY_NP(_atomic_and_64)
#else
mcr p15, 0, ip, c7, c10, 5 /* data memory barrier */
#endif
ldr r4, [sp], #4 /* restore temporary */
pop {r4} /* restore temporary */
RET /* return old value */
END(_atomic_and_64)
ATOMIC_OP_ALIAS(atomic_and_64,_atomic_and_64)
ENTRY_NP(_atomic_and_64_nv)
str r4, [sp, #-4]! /* save temporary */
push {r4} /* save temporary */
#ifndef __ARM_EABI__
mov r3, r2
mov r2, r1
@ -73,7 +73,7 @@ ENTRY_NP(_atomic_and_64_nv)
#else
mcr p15, 0, ip, c7, c10, 5 /* data memory barrier */
#endif
ldr r4, [sp], #4 /* restore temporary */
pop {r4} /* restore temporary */
RET /* return new value */
END(_atomic_and_64_nv)
ATOMIC_OP_ALIAS(atomic_and_64_nv,_atomic_and_64_nv)