2010-05-21 Ivan Maidanski <ivmai@mail.ru> (really Bradley Smith)

	* src/atomic_ops.h: Recognize __avr32__ (include gcc/avr32.h).
	* src/atomic_ops/sysdeps/gcc/avr32.h: New file.

diff --git a/ChangeLog b/ChangeLog
index a1bb929..47acdab 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-21  Ivan Maidanski <ivmai@mail.ru> (really Bradley Smith)
+
+       * src/atomic_ops.h: Recognize __avr32__ (include gcc/avr32.h).
+       * src/atomic_ops/sysdeps/gcc/avr32.h: New file.
+
 2010-04-29  Ivan Maidanski <ivmai@mail.ru>
 
        * doc/README_malloc.txt: Fix a typo.

diff --git a/src/atomic_ops.h b/src/atomic_ops.h
index d3e9bb7..490d44c 100644 (file)
--- a/src/atomic_ops.h
+++ b/src/atomic_ops.h
@@ -252,6 +252,9 @@
 #   include "atomic_ops/sysdeps/gcc/sh.h"
 #   define AO_CAN_EMUL_CAS
 # endif /* __sh__ */
+# if defined(__avr32__)
+#   include "atomic_ops/sysdeps/gcc/avr32.h"
+# endif
 #endif /* __GNUC__ && !AO_USE_PTHREAD_DEFS */
 
 #if defined(__INTEL_COMPILER) && !defined(AO_USE_PTHREAD_DEFS)

diff --git a/src/atomic_ops/sysdeps/gcc/avr32.h b/src/atomic_ops/sysdeps/gcc/avr32.h
new file mode 100644 (file)
index 0000000..cd43c19
--- /dev/null
+++ b/src/atomic_ops/sysdeps/gcc/avr32.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2009 Bradley Smith <brad@brad-smith.co.uk>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+#include "../all_atomic_load_store.h"
+
+#include "../ordered.h" /* There are no multiprocessor implementations. */
+
+#include "../test_and_set_t_is_ao_t.h"
+
+AO_INLINE AO_TS_VAL_t
+AO_test_and_set(volatile AO_TS_t *addr)
+{
+        int ret;
+
+        __asm__ __volatile__(
+                "xchg %[old], %[mem], %[newv]"
+                : [old] "=&r"(ret)
+                : [mem] "r"(addr), [newv] "r"(1)
+                : "memory");
+
+        return ret;
+}
+#define AO_HAVE_test_and_set