Add native support for armv7l. Other variants of ARM will likely require separate ports. Proper handling of "unknown" architectures to follow.
Signed-off-by: Paul E. McKenney <[email protected]> --- configure.ac | 13 +++----- urcu/arch_armv7l.h | 59 +++++++++++++++++++++++++++++++++++++ urcu/uatomic_arch_armv7l.h | 71 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 136 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index 1b1ca65..8cea997 100644 --- a/configure.ac +++ b/configure.ac @@ -51,21 +51,20 @@ case $host_cpu in s390x) ARCHTYPE="s390" ;; sparc64) ARCHTYPE="sparc64" ;; alpha*) ARCHTYPE="alpha" ;; + armv7l) ARCHTYPE="armv7l" ;; *) ARCHTYPE="unknown";; esac -if test "$ARCHTYPE" != "unknown"; then - UATOMICSRC=urcu/uatomic_arch_$ARCHTYPE.h - ARCHSRC=urcu/arch_$ARCHTYPE.h -else - UATOMICSRC=urcu/uatomic_generic.h - ARCHSRC=urcu/arch_generic.h -fi +UATOMICSRC=urcu/uatomic_arch_$ARCHTYPE.h +ARCHSRC=urcu/arch_$ARCHTYPE.h if test "x$ARCHTYPE" != xx86 -a "x$ARCHTYPE" != xppc; then APISRC=tests/api_gcc.h else APISRC=tests/api_$ARCHTYPE.h fi +if test "x$ARCHTYPE" == xarmv7l; then + CFLAGS="-mcpu=cortex-a9 -mtune=cortex-a9 -O" +fi AC_SUBST(ARCHTYPE) AC_SUBST(SUBARCHTYPE) diff --git a/urcu/arch_armv7l.h b/urcu/arch_armv7l.h new file mode 100644 index 0000000..5920a4d --- /dev/null +++ b/urcu/arch_armv7l.h @@ -0,0 +1,59 @@ +#ifndef _URCU_ARCH_ARMV7L_H +#define _URCU_ARCH_ARMV7L_H + +/* + * arch_unknown.h: trivial definitions for the "unknown" architecture. + * + * Copyright (c) 2010 Paul E. McKenney, IBM Corporation. + * Copyright (c) 2009 Mathieu Desnoyers <[email protected]> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include <urcu/compiler.h> +#include <urcu/config.h> + +#ifdef __cplusplus +extern "C" { +#endif + +/* We don't know, so guess!!! */ +#define CACHE_LINE_SIZE 128 + +#define mb() asm volatile("dmb":::"memory") + +#include <stdlib.h> +#include <sys/time.h> + +typedef unsigned long long cycles_t; + +static inline cycles_t get_cycles (void) +{ + cycles_t thetime; + struct timeval tv; + + if (gettimeofday(&tv, NULL) != 0) + return 0; + thetime = ((cycles_t)tv.tv_sec) * 1000000ULL + ((cycles_t)tv.tv_usec); + return (cycles_t)thetime; +} + +#ifdef __cplusplus +} +#endif + +#include <urcu/arch_generic.h> + +#endif /* _URCU_ARCH_ARMV7L_H */ diff --git a/urcu/uatomic_arch_armv7l.h b/urcu/uatomic_arch_armv7l.h new file mode 100644 index 0000000..747a8e5 --- /dev/null +++ b/urcu/uatomic_arch_armv7l.h @@ -0,0 +1,71 @@ +#ifndef _URCU_ARCH_UATOMIC_ARMV7L_H +#define _URCU_ARCH_UATOMIC_ARMV7L_H + +/* + * Copyright (c) 1991-1994 by Xerox Corporation. All rights reserved. + * Copyright (c) 1996-1999 by Silicon Graphics. All rights reserved. + * Copyright (c) 1999-2004 Hewlett-Packard Development Company, L.P. + * Copyright (c) 2009 Mathieu Desnoyers + * Copyright (c) 2010 Paul E. McKenney, IBM Corporation + * (Adapted from uatomic_arch_unknown.h) + * + * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED + * OR IMPLIED. ANY USE IS AT YOUR OWN RISK. + * + * Permission is hereby granted to use or copy this program + * for any purpose, provided the above notices are retained on all copies. + * Permission to modify the code and to distribute modified code is granted, + * provided the above notices are retained, and a notice that the code was + * modified is included with the above copyright notice. + * + * Code inspired from libuatomic_ops-1.2, inherited in part from the + * Boehm-Demers-Weiser conservative garbage collector. + */ + +#include <urcu/compiler.h> +#include <urcu/system.h> + +#ifdef __cplusplus +extern "C" { +#endif + +/* xchg */ +#define uatomic_xchg(addr, v) \ +({ \ + __typeof__(*addr) __ret; \ + \ + smp_mb(); \ + __ret = __sync_lock_test_and_set(addr, v); \ + smp_mb(); \ + __ret; \ +}) + +/* cmpxchg */ +#define uatomic_cmpxchg(addr, old, _new) \ +({ \ + __typeof__(*addr) __ret; \ + \ + smp_mb(); \ + __ret = __sync_val_compare_and_swap(addr, old, _new); \ + smp_mb(); \ + __ret; \ +}) + +/* uatomic_add_return */ +#define uatomic_add_return(addr, v) \ +({ \ + __typeof__(*addr) __ret; \ + \ + smp_mb(); \ + __ret = __sync_add_and_fetch(addr, v); \ + smp_mb(); \ + __ret; \ +}) + +#ifdef __cplusplus +} +#endif + +#include <urcu/uatomic_generic.h> + +#endif /* _URCU_ARCH_UATOMIC_ARMV7L_H */ _______________________________________________ ltt-dev mailing list [email protected] http://lists.casi.polymtl.ca/cgi-bin/mailman/listinfo/ltt-dev
