Module Name: src
Committed By: martin
Date: Wed Jan 29 10:20:11 UTC 2014
Modified Files:
src/common/lib/libc/arch/m68k/atomic: Makefile.inc atomic_cas_68000.S
Log Message:
Provide _atomic_cas_8_up and _atomic_cas_16_up as assembler functions
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/common/lib/libc/arch/m68k/atomic/Makefile.inc
cvs rdiff -u -r1.5 -r1.6 \
src/common/lib/libc/arch/m68k/atomic/atomic_cas_68000.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/m68k/atomic/Makefile.inc
diff -u src/common/lib/libc/arch/m68k/atomic/Makefile.inc:1.10 src/common/lib/libc/arch/m68k/atomic/Makefile.inc:1.11
--- src/common/lib/libc/arch/m68k/atomic/Makefile.inc:1.10 Thu Jul 18 19:49:00 2013
+++ src/common/lib/libc/arch/m68k/atomic/Makefile.inc Wed Jan 29 10:20:11 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.10 2013/07/18 19:49:00 matt Exp $
+# $NetBSD: Makefile.inc,v 1.11 2014/01/29 10:20:11 martin Exp $
#
# Note: The atomic operations here in these assembly files are atomic
@@ -35,7 +35,8 @@ SRCS+= atomic_init_cas.c
SRCS+= atomic_init_testset.c
SRCS+= atomic_cas_68000.S
-CPPFLAGS+= -D__HAVE_ASM_ATOMIC_CAS_UP
+CPPFLAGS+= -D__HAVE_ASM_ATOMIC_CAS_UP -D__HAVE_ASM_ATOMIC_CAS_16_UP \
+ -D__HAVE_ASM_ATOMIC_CAS_8_UP
.endif
.endif
Index: src/common/lib/libc/arch/m68k/atomic/atomic_cas_68000.S
diff -u src/common/lib/libc/arch/m68k/atomic/atomic_cas_68000.S:1.5 src/common/lib/libc/arch/m68k/atomic/atomic_cas_68000.S:1.6
--- src/common/lib/libc/arch/m68k/atomic/atomic_cas_68000.S:1.5 Tue Jul 16 23:24:18 2013
+++ src/common/lib/libc/arch/m68k/atomic/atomic_cas_68000.S Wed Jan 29 10:20:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_cas_68000.S,v 1.5 2013/07/16 23:24:18 matt Exp $ */
+/* $NetBSD: atomic_cas_68000.S,v 1.6 2014/01/29 10:20:11 martin Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -47,3 +47,32 @@ RAS_START_ASM_HIDDEN(_atomic_cas)
RAS_END_ASM_HIDDEN(_atomic_cas)
1: rts
END(_atomic_cas_up)
+
+ENTRY(_atomic_cas_16_up)
+ .hidden _C_LABEL(_atomic_cas_16_up)
+
+ movl 4(%sp), %a0 /* Fetch ptr */
+
+RAS_START_ASM_HIDDEN(_atomic_cas_16)
+ movw (%a0), %d0 /* d0 = *ptr */
+ cmpw 8(%sp), %d0 /* Same as old? */
+ jne 1f /* Nope */
+ movw 12(%sp), (%a0) /* *ptr = new */
+RAS_END_ASM_HIDDEN(_atomic_cas_16)
+1: rts
+END(_atomic_cas_16_up)
+
+
+ENTRY(_atomic_cas_8_up)
+ .hidden _C_LABEL(_atomic_cas_8_up)
+
+ movl 4(%sp), %a0 /* Fetch ptr */
+
+RAS_START_ASM_HIDDEN(_atomic_cas_8)
+ movb (%a0), %d0 /* d0 = *ptr */
+ cmpb 8(%sp), %d0 /* Same as old? */
+ jne 1f /* Nope */
+ movb 12(%sp), (%a0) /* *ptr = new */
+RAS_END_ASM_HIDDEN(_atomic_cas_8)
+1: rts
+END(_atomic_cas_8_up)
