Module Name: src
Committed By: matt
Date: Wed Sep 12 18:23:33 UTC 2012
Modified Files:
src/common/lib/libc/arch/arm/atomic: atomic_add_64.S
Log Message:
Fix bas code, use ldr
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/common/lib/libc/arch/arm/atomic/atomic_add_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_add_64.S
diff -u src/common/lib/libc/arch/arm/atomic/atomic_add_64.S:1.1 src/common/lib/libc/arch/arm/atomic/atomic_add_64.S:1.2
--- src/common/lib/libc/arch/arm/atomic/atomic_add_64.S:1.1 Tue Sep 11 20:51:25 2012
+++ src/common/lib/libc/arch/arm/atomic/atomic_add_64.S Wed Sep 12 18:23:33 2012
@@ -1,7 +1,7 @@
-/* $NetBSD: atomic_add_64.S,v 1.1 2012/09/11 20:51:25 matt Exp $ */
+/* $NetBSD: atomic_add_64.S,v 1.2 2012/09/12 18:23:33 matt Exp $ */
/*-
- * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
@@ -51,7 +51,7 @@ ENTRY_NP(_atomic_add_64)
#else
mcr p15, 0, ip, c7, c10, 5 /* data memory barrier */
#endif
- ldmfd sp!, {r4, r5}
+ ldr r4, [sp], #4 /* restore temporary */
RET /* return old value */
END(_atomic_add_64)
ATOMIC_OP_ALIAS(atomic_add_64,_atomic_add_64)
@@ -74,7 +74,7 @@ ENTRY_NP(_atomic_add_64_nv)
#else
mcr p15, 0, ip, c7, c10, 5 /* data memory barrier */
#endif
- ldmfd sp!, {r4, r5}
+ ldr r4, [sp], #4 /* restore temporary */
RET /* return new value */
END(_atomic_add_64_nv)
ATOMIC_OP_ALIAS(atomic_add_64_nv,_atomic_add_64_nv)
