diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/atomic_ops/sysdeps/generic_pthread.h | 1 | ||||
| -rw-r--r-- | src/atomic_ops/sysdeps/standard_ao_double_t.h | 14 | ||||
| -rw-r--r-- | src/atomic_ops_malloc.c | 2 | ||||
| -rw-r--r-- | src/atomic_ops_stack.h | 6 |
4 files changed, 1 insertions, 22 deletions
diff --git a/src/atomic_ops/sysdeps/generic_pthread.h b/src/atomic_ops/sysdeps/generic_pthread.h index 2e70068..3c65624 100644 --- a/src/atomic_ops/sysdeps/generic_pthread.h +++ b/src/atomic_ops/sysdeps/generic_pthread.h @@ -367,7 +367,6 @@ typedef struct { AO_t AO_val2; } AO_double_t; #define AO_HAVE_double_t -#define AO_DOUBLE_ALIGN /* empty */ #define AO_DOUBLE_T_INITIALIZER { (AO_t)0, (AO_t)0 } diff --git a/src/atomic_ops/sysdeps/standard_ao_double_t.h b/src/atomic_ops/sysdeps/standard_ao_double_t.h index 636ba46..7d85c9d 100644 --- a/src/atomic_ops/sysdeps/standard_ao_double_t.h +++ b/src/atomic_ops/sysdeps/standard_ao_double_t.h @@ -50,25 +50,11 @@ typedef __m128 double_ptr_storage; #elif defined(_WIN32) && !defined(__GNUC__) typedef unsigned __int64 double_ptr_storage; -# ifdef _MSC_VER - /* VC++/x86 does not align __int64 properly by default, thus, */ - /* causing an undefined behavior or assertions violation in */ - /* the double-wide atomic primitives. For the proper alignment, */ - /* all variables of AO_double_t type (in the client code) those */ - /* address is passed to an AO primitive should be defined with the */ - /* given attribute. Not a part of double_ptr_storage because the */ - /* attribute cannot be applied to function parameters. */ -# define AO_DOUBLE_ALIGN __declspec(align(8)) -# endif #else typedef unsigned long long double_ptr_storage; #endif # define AO_HAVE_DOUBLE_PTR_STORAGE -#ifndef AO_DOUBLE_ALIGN -# define AO_DOUBLE_ALIGN /* empty */ -#endif - typedef union { struct { AO_t AO_v1; AO_t AO_v2; } AO_parts; /* Note that AO_v1 corresponds to the low or the high part of */ diff --git a/src/atomic_ops_malloc.c b/src/atomic_ops_malloc.c index 457d635..aae21d0 100644 --- a/src/atomic_ops_malloc.c +++ b/src/atomic_ops_malloc.c @@ -223,7 +223,7 @@ get_chunk(void) /* Object free lists. Ith entry corresponds to objects */ /* of total size 2**i bytes. */ -AO_stack_t AO_DOUBLE_ALIGN AO_free_list[LOG_MAX_SIZE+1]; +AO_stack_t AO_free_list[LOG_MAX_SIZE+1]; /* Break up the chunk, and add it to the object free list for */ /* the given size. We have exclusive access to chunk. */ diff --git a/src/atomic_ops_stack.h b/src/atomic_ops_stack.h index de41c6b..1ca5f40 100644 --- a/src/atomic_ops_stack.h +++ b/src/atomic_ops_stack.h @@ -146,11 +146,6 @@ AO_INLINE void AO_stack_init(AO_stack_t *list) AO_stack_pop_explicit_aux_acquire(&((l)->AO_ptr), &((l)->AO_aux)) #define AO_HAVE_stack_pop_acquire -#ifndef AO_DOUBLE_ALIGN - /* For AO_stack clients only. */ -# define AO_DOUBLE_ALIGN /* empty */ -#endif - # else /* Use fully non-blocking data structure, wide CAS */ #ifndef AO_HAVE_double_t @@ -161,7 +156,6 @@ AO_INLINE void AO_stack_init(AO_stack_t *list) typedef volatile AO_double_t AO_stack_t; /* AO_val1 is version, AO_val2 is pointer. */ -/* AO_stack_t variables should have AO_DOUBLE_ALIGN attribute. */ #define AO_STACK_INITIALIZER AO_DOUBLE_T_INITIALIZER |