Module Name: src
Committed By: matt
Date: Mon Jan 27 18:05:25 UTC 2014
Modified Files:
src/common/lib/libc/arch/arm/atomic: Makefile.inc atomic_cas_up.S
Log Message:
Add _atomic_cas_16_up and _atomic_cas_8_up
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/common/lib/libc/arch/arm/atomic/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 src/common/lib/libc/arch/arm/atomic/atomic_cas_up.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/Makefile.inc
diff -u src/common/lib/libc/arch/arm/atomic/Makefile.inc:1.14 src/common/lib/libc/arch/arm/atomic/Makefile.inc:1.15
--- src/common/lib/libc/arch/arm/atomic/Makefile.inc:1.14 Fri Nov 8 22:42:52 2013
+++ src/common/lib/libc/arch/arm/atomic/Makefile.inc Mon Jan 27 18:05:24 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.14 2013/11/08 22:42:52 matt Exp $
+# $NetBSD: Makefile.inc,v 1.15 2014/01/27 18:05:24 matt Exp $
ARMV6= ${CPUFLAGS:M-march=armv6*} ${CPUFLAGS:M-mcpu=arm11*}
ARMV6+= ${CFLAGS:M-march=armv6*:} ${CFLAGS:M-mcpu=arm11*}
@@ -58,6 +58,8 @@ CPUFLAGS.atomic_simplelock.c+= -marm
SRCS.atomic+= atomic_init_testset.c
SRCS.atomic+= atomic_cas_up.S
CPPFLAGS+= -D__HAVE_ASM_ATOMIC_CAS_UP
+CPPFLAGS+= -D__HAVE_ASM_ATOMIC_CAS_16_UP
+CPPFLAGS+= -D__HAVE_ASM_ATOMIC_CAS_8_UP
.else
SRCS.atomic+= atomic_init_cas.c
.endif
Index: src/common/lib/libc/arch/arm/atomic/atomic_cas_up.S
diff -u src/common/lib/libc/arch/arm/atomic/atomic_cas_up.S:1.4 src/common/lib/libc/arch/arm/atomic/atomic_cas_up.S:1.5
--- src/common/lib/libc/arch/arm/atomic/atomic_cas_up.S:1.4 Mon Aug 19 00:35:06 2013
+++ src/common/lib/libc/arch/arm/atomic/atomic_cas_up.S Mon Jan 27 18:05:24 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_cas_up.S,v 1.4 2013/08/19 00:35:06 matt Exp $ */
+/* $NetBSD: atomic_cas_up.S,v 1.5 2014/01/27 18:05:24 matt Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -48,3 +48,35 @@ RAS_START_ASM_HIDDEN(_atomic_cas)
RAS_END_ASM_HIDDEN(_atomic_cas)
1: RET
END(_atomic_cas_up)
+
+ENTRY(_atomic_cas_16_up)
+ mov r3, r0
+ .align 0
+RAS_START_ASM_HIDDEN(_atomic_cas_16)
+ ldrh r0, [r3]
+ cmp r0, r1
+#if defined(__thumb__)
+ beq 1f
+#else
+ strheq r2, [r3]
+#endif
+ .align 0
+RAS_END_ASM_HIDDEN(_atomic_cas_16)
+1: RET
+END(_atomic_cas_16_up)
+
+ENTRY(_atomic_cas_8_up)
+ mov r3, r0
+ .align 0
+RAS_START_ASM_HIDDEN(_atomic_cas_8)
+ ldrb r0, [r3]
+ cmp r0, r1
+#if defined(__thumb__)
+ beq 1f
+#else
+ strbeq r2, [r3]
+#endif
+ .align 0
+RAS_END_ASM_HIDDEN(_atomic_cas_8)
+1: RET
+END(_atomic_cas_8_up)
