From 9ccf276d08261ba22b6e8b508eec0cd13ccea845 Mon Sep 17 00:00:00 2001 From: Ivan Maidanski Date: Fri, 4 Jan 2013 15:49:45 +0400 Subject: [PATCH] Group all X_acquire_release_volatile.h and X_[aligned_]atomic_load_store.h in separate folder * src/Makefile.am (nobase_private_HEADERS): Update path to acquire_release_volatile.h, aligned_atomic_load_store.h, atomic_load_store.h, char_acquire_release_volatile.h, char_atomic_load_store.h, int_acquire_release_volatile.h, int_aligned_atomic_load_store.h, int_atomic_load_store.h, short_acquire_release_volatile.h, short_aligned_atomic_load_store.h, short_atomic_load_store.h entries (add "loadstore" to prefix). * src/atomic_ops/sysdeps/all_acquire_release_volatile.h: Likewise. * src/atomic_ops/sysdeps/all_aligned_atomic_load_store.h: Likewise. * src/atomic_ops/sysdeps/all_atomic_load_store.h: Likewise. * src/atomic_ops/sysdeps/gcc/alpha.h: Likewise. * src/atomic_ops/sysdeps/gcc/mips.h: Likewise. * src/atomic_ops/sysdeps/hpc/hppa.h: Likewise. * src/atomic_ops/sysdeps/acquire_release_volatile.h: Move file to src/atomic_ops/sysdeps/loadstore folder. * src/atomic_ops/sysdeps/loadstore/aligned_atomic_load_store.h: Likewise. * src/atomic_ops/sysdeps/loadstore/atomic_load_store.h: Likewise. * src/atomic_ops/sysdeps/loadstore/char_acquire_release_volatile.h: Likewise. * src/atomic_ops/sysdeps/loadstore/char_atomic_load_store.h: Likewise. * src/atomic_ops/sysdeps/loadstore/int_acquire_release_volatile.h: Likewise. * src/atomic_ops/sysdeps/loadstore/int_aligned_atomic_load_store.h: Likewise. * src/atomic_ops/sysdeps/loadstore/int_atomic_load_store.h: Likewise. * src/atomic_ops/sysdeps/loadstore/short_acquire_release_volatile.h: Likewise. * src/atomic_ops/sysdeps/loadstore/short_aligned_atomic_load_store.h: Likewise. * src/atomic_ops/sysdeps/loadstore/short_atomic_load_store.h: Likewise. * src/atomic_ops/sysdeps/all_acquire_release_volatile.h: Reformat comment. * src/atomic_ops/sysdeps/all_aligned_atomic_load_store.h: Likewise. * src/atomic_ops/sysdeps/all_atomic_load_store.h: Likewise. --- src/Makefile.am | 23 +++++++++++----------- .../sysdeps/all_acquire_release_volatile.h | 17 ++++++++-------- .../sysdeps/all_aligned_atomic_load_store.h | 17 ++++++++-------- src/atomic_ops/sysdeps/all_atomic_load_store.h | 17 ++++++++-------- src/atomic_ops/sysdeps/gcc/alpha.h | 2 +- src/atomic_ops/sysdeps/gcc/mips.h | 4 +++- src/atomic_ops/sysdeps/hpc/hppa.h | 2 +- .../{ => loadstore}/acquire_release_volatile.h | 0 .../{ => loadstore}/aligned_atomic_load_store.h | 0 .../sysdeps/{ => loadstore}/atomic_load_store.h | 0 .../char_acquire_release_volatile.h | 0 .../{ => loadstore}/char_atomic_load_store.h | 0 .../{ => loadstore}/int_acquire_release_volatile.h | 0 .../int_aligned_atomic_load_store.h | 0 .../{ => loadstore}/int_atomic_load_store.h | 0 .../short_acquire_release_volatile.h | 0 .../short_aligned_atomic_load_store.h | 0 .../{ => loadstore}/short_atomic_load_store.h | 0 18 files changed, 41 insertions(+), 41 deletions(-) rename src/atomic_ops/sysdeps/{ => loadstore}/acquire_release_volatile.h (100%) rename src/atomic_ops/sysdeps/{ => loadstore}/aligned_atomic_load_store.h (100%) rename src/atomic_ops/sysdeps/{ => loadstore}/atomic_load_store.h (100%) rename src/atomic_ops/sysdeps/{ => loadstore}/char_acquire_release_volatile.h (100%) rename src/atomic_ops/sysdeps/{ => loadstore}/char_atomic_load_store.h (100%) rename src/atomic_ops/sysdeps/{ => loadstore}/int_acquire_release_volatile.h (100%) rename src/atomic_ops/sysdeps/{ => loadstore}/int_aligned_atomic_load_store.h (100%) rename src/atomic_ops/sysdeps/{ => loadstore}/int_atomic_load_store.h (100%) rename src/atomic_ops/sysdeps/{ => loadstore}/short_acquire_release_volatile.h (100%) rename src/atomic_ops/sysdeps/{ => loadstore}/short_aligned_atomic_load_store.h (100%) rename src/atomic_ops/sysdeps/{ => loadstore}/short_atomic_load_store.h (100%) diff --git a/src/Makefile.am b/src/Makefile.am index c67949b..9ff8e73 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -27,30 +27,31 @@ nobase_private_HEADERS = atomic_ops/ao_version.h \ atomic_ops/generalize-arithm.h \ atomic_ops/generalize-small.h \ \ - atomic_ops/sysdeps/acquire_release_volatile.h \ - atomic_ops/sysdeps/aligned_atomic_load_store.h \ atomic_ops/sysdeps/all_acquire_release_volatile.h \ atomic_ops/sysdeps/all_aligned_atomic_load_store.h \ atomic_ops/sysdeps/all_atomic_load_store.h \ atomic_ops/sysdeps/ao_t_is_int.h \ - atomic_ops/sysdeps/atomic_load_store.h \ - atomic_ops/sysdeps/char_acquire_release_volatile.h \ - atomic_ops/sysdeps/char_atomic_load_store.h \ atomic_ops/sysdeps/emul_cas.h \ atomic_ops/sysdeps/generic_pthread.h \ - atomic_ops/sysdeps/int_acquire_release_volatile.h \ - atomic_ops/sysdeps/int_aligned_atomic_load_store.h \ - atomic_ops/sysdeps/int_atomic_load_store.h \ atomic_ops/sysdeps/ordered.h \ atomic_ops/sysdeps/ordered_except_wr.h \ atomic_ops/sysdeps/read_ordered.h \ - atomic_ops/sysdeps/short_acquire_release_volatile.h \ - atomic_ops/sysdeps/short_aligned_atomic_load_store.h \ - atomic_ops/sysdeps/short_atomic_load_store.h \ atomic_ops/sysdeps/standard_ao_double_t.h \ atomic_ops/sysdeps/test_and_set_t_is_ao_t.h \ atomic_ops/sysdeps/test_and_set_t_is_char.h \ \ + atomic_ops/sysdeps/loadstore/acquire_release_volatile.h \ + atomic_ops/sysdeps/loadstore/aligned_atomic_load_store.h \ + atomic_ops/sysdeps/loadstore/atomic_load_store.h \ + atomic_ops/sysdeps/loadstore/char_acquire_release_volatile.h \ + atomic_ops/sysdeps/loadstore/char_atomic_load_store.h \ + atomic_ops/sysdeps/loadstore/int_acquire_release_volatile.h \ + atomic_ops/sysdeps/loadstore/int_aligned_atomic_load_store.h \ + atomic_ops/sysdeps/loadstore/int_atomic_load_store.h \ + atomic_ops/sysdeps/loadstore/short_acquire_release_volatile.h \ + atomic_ops/sysdeps/loadstore/short_aligned_atomic_load_store.h \ + atomic_ops/sysdeps/loadstore/short_atomic_load_store.h \ + \ atomic_ops/sysdeps/armcc/arm_v6.h \ \ atomic_ops/sysdeps/gcc/alpha.h \ diff --git a/src/atomic_ops/sysdeps/all_acquire_release_volatile.h b/src/atomic_ops/sysdeps/all_acquire_release_volatile.h index 94bb502..f0240e4 100644 --- a/src/atomic_ops/sysdeps/all_acquire_release_volatile.h +++ b/src/atomic_ops/sysdeps/all_acquire_release_volatile.h @@ -20,12 +20,11 @@ * SOFTWARE. */ -/* - * Describes architectures on which volatile AO_t, unsigned char, unsigned - * short, and unsigned int loads and stores have acquire/release semantics for - * all normally legal alignments. - */ -#include "acquire_release_volatile.h" -#include "char_acquire_release_volatile.h" -#include "short_acquire_release_volatile.h" -#include "int_acquire_release_volatile.h" +/* Describes architectures on which volatile AO_t, unsigned char, */ +/* unsigned short, and unsigned int loads and stores have */ +/* acquire/release semantics for all normally legal alignments. */ + +#include "loadstore/acquire_release_volatile.h" +#include "loadstore/char_acquire_release_volatile.h" +#include "loadstore/short_acquire_release_volatile.h" +#include "loadstore/int_acquire_release_volatile.h" diff --git a/src/atomic_ops/sysdeps/all_aligned_atomic_load_store.h b/src/atomic_ops/sysdeps/all_aligned_atomic_load_store.h index db258df..4fb9b02 100644 --- a/src/atomic_ops/sysdeps/all_aligned_atomic_load_store.h +++ b/src/atomic_ops/sysdeps/all_aligned_atomic_load_store.h @@ -20,12 +20,11 @@ * SOFTWARE. */ -/* - * Describes architectures on which AO_t, unsigned char, unsigned short, - * and unsigned int loads and stores are atomic for all normally legal - * alignments. - */ -#include "aligned_atomic_load_store.h" -#include "char_atomic_load_store.h" -#include "short_aligned_atomic_load_store.h" -#include "int_aligned_atomic_load_store.h" +/* Describes architectures on which AO_t, unsigned char, unsigned */ +/* short, and unsigned int loads and stores are atomic for all normally */ +/* legal alignments. */ + +#include "loadstore/aligned_atomic_load_store.h" +#include "loadstore/char_atomic_load_store.h" +#include "loadstore/short_aligned_atomic_load_store.h" +#include "loadstore/int_aligned_atomic_load_store.h" diff --git a/src/atomic_ops/sysdeps/all_atomic_load_store.h b/src/atomic_ops/sysdeps/all_atomic_load_store.h index 248d9a6..7648764 100644 --- a/src/atomic_ops/sysdeps/all_atomic_load_store.h +++ b/src/atomic_ops/sysdeps/all_atomic_load_store.h @@ -20,12 +20,11 @@ * SOFTWARE. */ -/* - * Describes architectures on which AO_t, unsigned char, unsigned short, - * and unsigned int loads and stores are atomic for all normally legal - * alignments. - */ -#include "atomic_load_store.h" -#include "char_atomic_load_store.h" -#include "short_atomic_load_store.h" -#include "int_atomic_load_store.h" +/* Describes architectures on which AO_t, unsigned char, unsigned */ +/* short, and unsigned int loads and stores are atomic for all normally */ +/* legal alignments. */ + +#include "loadstore/atomic_load_store.h" +#include "loadstore/char_atomic_load_store.h" +#include "loadstore/short_atomic_load_store.h" +#include "loadstore/int_atomic_load_store.h" diff --git a/src/atomic_ops/sysdeps/gcc/alpha.h b/src/atomic_ops/sysdeps/gcc/alpha.h index b8e3389..a595ce3 100644 --- a/src/atomic_ops/sysdeps/gcc/alpha.h +++ b/src/atomic_ops/sysdeps/gcc/alpha.h @@ -15,7 +15,7 @@ * */ -#include "../atomic_load_store.h" +#include "../loadstore/atomic_load_store.h" #include "../test_and_set_t_is_ao_t.h" diff --git a/src/atomic_ops/sysdeps/gcc/mips.h b/src/atomic_ops/sysdeps/gcc/mips.h index 9373c1d..a0afb95 100644 --- a/src/atomic_ops/sysdeps/gcc/mips.h +++ b/src/atomic_ops/sysdeps/gcc/mips.h @@ -19,7 +19,9 @@ */ #include "../all_aligned_atomic_load_store.h" -#include "../acquire_release_volatile.h" + +#include "../loadstore/acquire_release_volatile.h" + #include "../test_and_set_t_is_ao_t.h" /* Data dependence does not imply read ordering. */ diff --git a/src/atomic_ops/sysdeps/hpc/hppa.h b/src/atomic_ops/sysdeps/hpc/hppa.h index a7de052..6a65d5e 100644 --- a/src/atomic_ops/sysdeps/hpc/hppa.h +++ b/src/atomic_ops/sysdeps/hpc/hppa.h @@ -22,7 +22,7 @@ * Derived from the corresponding header file for gcc. */ -#include "../atomic_load_store.h" +#include "../loadstore/atomic_load_store.h" /* Some architecture set descriptions include special "ordered" memory */ /* operations. As far as we can tell, no existing processors actually */ diff --git a/src/atomic_ops/sysdeps/acquire_release_volatile.h b/src/atomic_ops/sysdeps/loadstore/acquire_release_volatile.h similarity index 100% rename from src/atomic_ops/sysdeps/acquire_release_volatile.h rename to src/atomic_ops/sysdeps/loadstore/acquire_release_volatile.h diff --git a/src/atomic_ops/sysdeps/aligned_atomic_load_store.h b/src/atomic_ops/sysdeps/loadstore/aligned_atomic_load_store.h similarity index 100% rename from src/atomic_ops/sysdeps/aligned_atomic_load_store.h rename to src/atomic_ops/sysdeps/loadstore/aligned_atomic_load_store.h diff --git a/src/atomic_ops/sysdeps/atomic_load_store.h b/src/atomic_ops/sysdeps/loadstore/atomic_load_store.h similarity index 100% rename from src/atomic_ops/sysdeps/atomic_load_store.h rename to src/atomic_ops/sysdeps/loadstore/atomic_load_store.h diff --git a/src/atomic_ops/sysdeps/char_acquire_release_volatile.h b/src/atomic_ops/sysdeps/loadstore/char_acquire_release_volatile.h similarity index 100% rename from src/atomic_ops/sysdeps/char_acquire_release_volatile.h rename to src/atomic_ops/sysdeps/loadstore/char_acquire_release_volatile.h diff --git a/src/atomic_ops/sysdeps/char_atomic_load_store.h b/src/atomic_ops/sysdeps/loadstore/char_atomic_load_store.h similarity index 100% rename from src/atomic_ops/sysdeps/char_atomic_load_store.h rename to src/atomic_ops/sysdeps/loadstore/char_atomic_load_store.h diff --git a/src/atomic_ops/sysdeps/int_acquire_release_volatile.h b/src/atomic_ops/sysdeps/loadstore/int_acquire_release_volatile.h similarity index 100% rename from src/atomic_ops/sysdeps/int_acquire_release_volatile.h rename to src/atomic_ops/sysdeps/loadstore/int_acquire_release_volatile.h diff --git a/src/atomic_ops/sysdeps/int_aligned_atomic_load_store.h b/src/atomic_ops/sysdeps/loadstore/int_aligned_atomic_load_store.h similarity index 100% rename from src/atomic_ops/sysdeps/int_aligned_atomic_load_store.h rename to src/atomic_ops/sysdeps/loadstore/int_aligned_atomic_load_store.h diff --git a/src/atomic_ops/sysdeps/int_atomic_load_store.h b/src/atomic_ops/sysdeps/loadstore/int_atomic_load_store.h similarity index 100% rename from src/atomic_ops/sysdeps/int_atomic_load_store.h rename to src/atomic_ops/sysdeps/loadstore/int_atomic_load_store.h diff --git a/src/atomic_ops/sysdeps/short_acquire_release_volatile.h b/src/atomic_ops/sysdeps/loadstore/short_acquire_release_volatile.h similarity index 100% rename from src/atomic_ops/sysdeps/short_acquire_release_volatile.h rename to src/atomic_ops/sysdeps/loadstore/short_acquire_release_volatile.h diff --git a/src/atomic_ops/sysdeps/short_aligned_atomic_load_store.h b/src/atomic_ops/sysdeps/loadstore/short_aligned_atomic_load_store.h similarity index 100% rename from src/atomic_ops/sysdeps/short_aligned_atomic_load_store.h rename to src/atomic_ops/sysdeps/loadstore/short_aligned_atomic_load_store.h diff --git a/src/atomic_ops/sysdeps/short_atomic_load_store.h b/src/atomic_ops/sysdeps/loadstore/short_atomic_load_store.h similarity index 100% rename from src/atomic_ops/sysdeps/short_atomic_load_store.h rename to src/atomic_ops/sysdeps/loadstore/short_atomic_load_store.h -- 2.7.4