Module Name: src
Committed By: matt
Date: Sat Aug 10 18:39:25 UTC 2013
Modified Files:
src/common/lib/libc/arch/arm/atomic: atomic_and_64.S
Log Message:
Use push/pop
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/common/lib/libc/arch/arm/atomic/atomic_and_64.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/arch/arm/atomic/atomic_and_64.S
diff -u src/common/lib/libc/arch/arm/atomic/atomic_and_64.S:1.2 src/common/lib/libc/arch/arm/atomic/atomic_and_64.S:1.3
--- src/common/lib/libc/arch/arm/atomic/atomic_and_64.S:1.2 Thu Sep 13 00:36:12 2012
+++ src/common/lib/libc/arch/arm/atomic/atomic_and_64.S Sat Aug 10 18:39:25 2013
@@ -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)
