[src/trunk]: src/common/lib/libc/arch/sparc/atomic Provide an assembler versi...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ee851f53e730
branches:  trunk
changeset: 782953:ee851f53e730
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Nov 28 21:39:59 2012 +0000

description:
Provide an assembler version of _atomic_cas_up for sparc - the C code
does not compile to something usable in a RAS. See PR 38482.

diffstat:

 common/lib/libc/arch/sparc/atomic/Makefile.inc    |   5 +-
 common/lib/libc/arch/sparc/atomic/atomic_cas_up.S |  45 +++++++++++++++++++++++
 2 files changed, 48 insertions(+), 2 deletions(-)

diffs (68 lines):

diff -r 432d7f8e877b -r ee851f53e730 common/lib/libc/arch/sparc/atomic/Makefile.inc
--- a/common/lib/libc/arch/sparc/atomic/Makefile.inc    Wed Nov 28 16:26:59 2012 +0000
+++ b/common/lib/libc/arch/sparc/atomic/Makefile.inc    Wed Nov 28 21:39:59 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.14 2009/03/13 19:16:46 abs Exp $
+#      $NetBSD: Makefile.inc,v 1.15 2012/11/28 21:39:59 martin Exp $
 
 .include <bsd.own.mk>
 
@@ -29,7 +29,8 @@
 .  endif
 
 .  if (${LIB} == "c" || ${LIB} == "pthread")
-SRCS+= atomic_init_testset.c
+CPPFLAGS+= -D__HAVE_ASM_ATOMIC_CAS_UP
+SRCS+= atomic_init_testset.c atomic_cas_up.S
 .  endif
 
 . endif
diff -r 432d7f8e877b -r ee851f53e730 common/lib/libc/arch/sparc/atomic/atomic_cas_up.S
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/common/lib/libc/arch/sparc/atomic/atomic_cas_up.S Wed Nov 28 21:39:59 2012 +0000
@@ -0,0 +1,45 @@
+/*     $NetBSD: atomic_cas_up.S,v 1.1 2012/11/28 21:39:59 martin Exp $ */
+
+/*-
+ * Copyright (c) 2012 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *      
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/ras.h>
+#include "atomic_op_asm.h"
+
+       .text
+
+ENTRY(_atomic_cas_up)
+       .hidden _C_LABEL(_atomic_cas_up)
+RAS_START_ASM_HIDDEN(_atomic_cas)
+       ld      [%o0], %o3                      ! get old value
+       cmp     %o1, %o3                        ! old == new?
+       beq,a   1f                              ! yes, do the store
+        st     %o2, [%o0]                      ! (in the delay slot)
+RAS_END_ASM_HIDDEN(_atomic_cas)
+1:
+       retl
+        mov    %o3, %o0                        ! return old value
+