From 2a55c80eea96c74d5f816beca71f323d3b90cc69 Mon Sep 17 00:00:00 2001 From: Ivan Maidanski Date: Mon, 24 Oct 2011 16:56:54 +0400 Subject: [PATCH] Reformat code of src/atomic_ops/sysdeps/ao_t_is_int.h --- src/atomic_ops/sysdeps/ao_t_is_int.h | 167 +++++++++++++++++------------------ 1 file changed, 83 insertions(+), 84 deletions(-) diff --git a/src/atomic_ops/sysdeps/ao_t_is_int.h b/src/atomic_ops/sysdeps/ao_t_is_int.h index 8e57bb4..3b6f165 100644 --- a/src/atomic_ops/sysdeps/ao_t_is_int.h +++ b/src/atomic_ops/sysdeps/ao_t_is_int.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003-2004 Hewlett-Packard Development Company, L.P. + * Copyright (c) 2003-2011 Hewlett-Packard Development Company, L.P. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -28,99 +28,98 @@ * We should probably add others in the future. */ -#if defined(AO_HAVE_compare_and_swap_full) && \ - !defined(AO_HAVE_int_compare_and_swap_full) -# define AO_int_compare_and_swap_full(addr, old, new_val) \ - AO_compare_and_swap_full((volatile AO_t *)(addr), \ - (AO_t)(old), (AO_t)(new_val)) -# define AO_HAVE_int_compare_and_swap_full -# endif - -#if defined(AO_HAVE_compare_and_swap_acquire) && \ - !defined(AO_HAVE_int_compare_and_swap_acquire) -# define AO_int_compare_and_swap_acquire(addr, old, new_val) \ - AO_compare_and_swap_acquire((volatile AO_t *)(addr), \ - (AO_t)(old), (AO_t)(new_val)) -# define AO_HAVE_int_compare_and_swap_acquire -# endif - -#if defined(AO_HAVE_compare_and_swap_release) && \ - !defined(AO_HAVE_int_compare_and_swap_release) -# define AO_int_compare_and_swap_release(addr, old, new_val) \ - AO_compare_and_swap_release((volatile AO_t *)(addr), \ +/* AO_compare_and_swap */ +#if defined(AO_HAVE_compare_and_swap_full) \ + && !defined(AO_HAVE_int_compare_and_swap_full) +# define AO_int_compare_and_swap_full(addr, old, new_val) \ + AO_compare_and_swap_full((volatile AO_t *)(addr), \ + (AO_t)(old), (AO_t)(new_val)) +# define AO_HAVE_int_compare_and_swap_full +#endif +#if defined(AO_HAVE_compare_and_swap_acquire) \ + && !defined(AO_HAVE_int_compare_and_swap_acquire) +# define AO_int_compare_and_swap_acquire(addr, old, new_val) \ + AO_compare_and_swap_acquire((volatile AO_t *)(addr), \ (AO_t)(old), (AO_t)(new_val)) -# define AO_HAVE_int_compare_and_swap_release -# endif - -#if defined(AO_HAVE_compare_and_swap_write) && \ - !defined(AO_HAVE_int_compare_and_swap_write) -# define AO_int_compare_and_swap_write(addr, old, new_val) \ - AO_compare_and_swap_write((volatile AO_t *)(addr), \ - (AO_t)(old), (AO_t)(new_val)) -# define AO_HAVE_int_compare_and_swap_write -# endif - -#if defined(AO_HAVE_compare_and_swap_read) && \ - !defined(AO_HAVE_int_compare_and_swap_read) -# define AO_int_compare_and_swap_read(addr, old, new_val) \ - AO_compare_and_swap_read((volatile AO_t *)(addr), \ +# define AO_HAVE_int_compare_and_swap_acquire +#endif +#if defined(AO_HAVE_compare_and_swap_release) \ + && !defined(AO_HAVE_int_compare_and_swap_release) +# define AO_int_compare_and_swap_release(addr, old, new_val) \ + AO_compare_and_swap_release((volatile AO_t *)(addr), \ (AO_t)(old), (AO_t)(new_val)) -# define AO_HAVE_int_compare_and_swap_read -# endif +# define AO_HAVE_int_compare_and_swap_release +#endif +#if defined(AO_HAVE_compare_and_swap_write) \ + && !defined(AO_HAVE_int_compare_and_swap_write) +# define AO_int_compare_and_swap_write(addr, old, new_val) \ + AO_compare_and_swap_write((volatile AO_t *)(addr), \ + (AO_t)(old), (AO_t)(new_val)) +# define AO_HAVE_int_compare_and_swap_write +#endif +#if defined(AO_HAVE_compare_and_swap_read) \ + && !defined(AO_HAVE_int_compare_and_swap_read) +# define AO_int_compare_and_swap_read(addr, old, new_val) \ + AO_compare_and_swap_read((volatile AO_t *)(addr), \ + (AO_t)(old), (AO_t)(new_val)) +# define AO_HAVE_int_compare_and_swap_read +#endif +#if defined(AO_HAVE_compare_and_swap) \ + && !defined(AO_HAVE_int_compare_and_swap) +# define AO_int_compare_and_swap(addr, old, new_val) \ + AO_compare_and_swap((volatile AO_t *)(addr), \ + (AO_t)(old), (AO_t)(new_val)) +# define AO_HAVE_int_compare_and_swap +#endif -#if defined(AO_HAVE_compare_and_swap) && \ - !defined(AO_HAVE_int_compare_and_swap) -# define AO_int_compare_and_swap(addr, old, new_val) \ - AO_compare_and_swap((volatile AO_t *)(addr), \ - (AO_t)(old), (AO_t)(new_val)) -# define AO_HAVE_int_compare_and_swap -# endif - -#if defined(AO_HAVE_load_acquire) && \ - !defined(AO_HAVE_int_load_acquire) -# define AO_int_load_acquire(addr) \ +/* AO_load */ +#if defined(AO_HAVE_load_acquire) \ + && !defined(AO_HAVE_int_load_acquire) +# define AO_int_load_acquire(addr) \ (int)AO_load_acquire((const volatile AO_t *)(addr)) -# define AO_HAVE_int_load_acquire -# endif +# define AO_HAVE_int_load_acquire +#endif -#if defined(AO_HAVE_store_release) && \ - !defined(AO_HAVE_int_store_release) -# define AO_int_store_release(addr, val) \ - AO_store_release((volatile AO_t *)(addr), (AO_t)(val)) -# define AO_HAVE_int_store_release -# endif +/* AO_store */ +#if defined(AO_HAVE_store_release) \ + && !defined(AO_HAVE_int_store_release) +# define AO_int_store_release(addr, val) \ + AO_store_release((volatile AO_t *)(addr), (AO_t)(val)) +# define AO_HAVE_int_store_release +#endif -#if defined(AO_HAVE_fetch_and_add_full) && \ - !defined(AO_HAVE_int_fetch_and_add_full) -# define AO_int_fetch_and_add_full(addr, incr) \ +/* AO_fetch_and_add */ +#if defined(AO_HAVE_fetch_and_add_full) \ + && !defined(AO_HAVE_int_fetch_and_add_full) +# define AO_int_fetch_and_add_full(addr, incr) \ (int)AO_fetch_and_add_full((volatile AO_t *)(addr), (AO_t)(incr)) -# define AO_HAVE_int_fetch_and_add_full -# endif +# define AO_HAVE_int_fetch_and_add_full +#endif -#if defined(AO_HAVE_fetch_and_add1_acquire) && \ - !defined(AO_HAVE_int_fetch_and_add1_acquire) -# define AO_int_fetch_and_add1_acquire(addr) \ +/* AO_fetch_and_add1 */ +#if defined(AO_HAVE_fetch_and_add1_acquire) \ + && !defined(AO_HAVE_int_fetch_and_add1_acquire) +# define AO_int_fetch_and_add1_acquire(addr) \ (int)AO_fetch_and_add1_acquire((volatile AO_t *)(addr)) -# define AO_HAVE_int_fetch_and_add1_acquire -# endif - -#if defined(AO_HAVE_fetch_and_add1_release) && \ - !defined(AO_HAVE_int_fetch_and_add1_release) -# define AO_int_fetch_and_add1_release(addr) \ +# define AO_HAVE_int_fetch_and_add1_acquire +#endif +#if defined(AO_HAVE_fetch_and_add1_release) \ + && !defined(AO_HAVE_int_fetch_and_add1_release) +# define AO_int_fetch_and_add1_release(addr) \ (int)AO_fetch_and_add1_release((volatile AO_t *)(addr)) -# define AO_HAVE_int_fetch_and_add1_release -# endif +# define AO_HAVE_int_fetch_and_add1_release +#endif -#if defined(AO_HAVE_fetch_and_sub1_acquire) && \ - !defined(AO_HAVE_int_fetch_and_sub1_acquire) -# define AO_int_fetch_and_sub1_acquire(addr) \ +/* AO_fetch_and_sub1 */ +#if defined(AO_HAVE_fetch_and_sub1_acquire) \ + && !defined(AO_HAVE_int_fetch_and_sub1_acquire) +# define AO_int_fetch_and_sub1_acquire(addr) \ (int)AO_fetch_and_sub1_acquire((volatile AO_t *)(addr)) -# define AO_HAVE_int_fetch_and_sub1_acquire -# endif - -#if defined(AO_HAVE_fetch_and_sub1_release) && \ - !defined(AO_HAVE_int_fetch_and_sub1_release) -# define AO_int_fetch_and_sub1_release(addr) \ +# define AO_HAVE_int_fetch_and_sub1_acquire +#endif +#if defined(AO_HAVE_fetch_and_sub1_release) \ + && !defined(AO_HAVE_int_fetch_and_sub1_release) +# define AO_int_fetch_and_sub1_release(addr) \ (int)AO_fetch_and_sub1_release((volatile AO_t *)(addr)) -# define AO_HAVE_int_fetch_and_sub1_release -# endif +# define AO_HAVE_int_fetch_and_sub1_release +#endif -- 2.7.4