ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/libecb/ecb.h
(Generate patch)

Comparing libecb/ecb.h (file contents):
Revision 1.124 by root, Tue Dec 3 15:35:14 2013 UTC vs.
Revision 1.127 by root, Sun Jan 5 15:54:09 2014 UTC

… …
64 #define ECB_PTRSIZE 4 64 #define ECB_PTRSIZE 4
65 #endif 65 #endif
66#endif 66#endif
67 67
68/* work around x32 idiocy by defining proper macros */ 68/* work around x32 idiocy by defining proper macros */
69#if __x86_64 || _M_AMD64 69#if __amd64 || __x86_64 || _M_AMD64 || _M_X64
70 #if _ILP32 70 #if _ILP32
71 #define ECB_AMD64_X32 1 71 #define ECB_AMD64_X32 1
72 #else 72 #else
73 #define ECB_AMD64 1 73 #define ECB_AMD64 1
74 #endif 74 #endif
… …
87 #else 87 #else
88 #define ECB_GCC_VERSION(major,minor) (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor))) 88 #define ECB_GCC_VERSION(major,minor) (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor)))
89 #endif 89 #endif
90#endif 90#endif
91 91
92#define ECB_C (__STDC__+0) /* this assumes that __STDC__ is either empty or a number */
93#define ECB_C99 (__STDC_VERSION__ >= 199901L)
94#define ECB_C11 (__STDC_VERSION__ >= 201112L)
95#define ECB_CPP (__cplusplus+0) 92#define ECB_CPP (__cplusplus+0)
96#define ECB_CPP11 (__cplusplus >= 201103L) 93#define ECB_CPP11 (__cplusplus >= 201103L)
94
95#if ECB_CPP
96 #define ECB_C 0
97 #define ECB_STDC_VERSION 0
98#else
99 #define ECB_C 1
100 #define ECB_STDC_VERSION __STDC_VERSION__
101#endif
102
103#define ECB_C99 (ECB_STDC_VERSION >= 199901L)
104#define ECB_C11 (ECB_STDC_VERSION >= 201112L)
97 105
98#if ECB_CPP 106#if ECB_CPP
99 #define ECB_EXTERN_C extern "C" 107 #define ECB_EXTERN_C extern "C"
100 #define ECB_EXTERN_C_BEG ECB_EXTERN_C { 108 #define ECB_EXTERN_C_BEG ECB_EXTERN_C {
101 #define ECB_EXTERN_C_END } 109 #define ECB_EXTERN_C_END }
… …
177 * #define ECB_MEMORY_FENCE __c11_atomic_thread_fence (__ATOMIC_SEQ_CST) 185 * #define ECB_MEMORY_FENCE __c11_atomic_thread_fence (__ATOMIC_SEQ_CST)
178 */ 186 */
179 187
180 #elif ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__ 188 #elif ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__
181 #define ECB_MEMORY_FENCE __sync_synchronize () 189 #define ECB_MEMORY_FENCE __sync_synchronize ()
190 #elif _MSC_VER >= 1500 /* VC++ 2008 */
191 /* apparently, microsoft broke all the memory barrier stuff in Visual Studio 2008... */
192 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier)
193 #define ECB_MEMORY_FENCE _ReadWriteBarrier (); MemoryBarrier()
194 #define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier (); MemoryBarrier() /* according to msdn, _ReadBarrier is not a load fence */
195 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier (); MemoryBarrier()
182 #elif _MSC_VER >= 1400 /* VC++ 2005 */ 196 #elif _MSC_VER >= 1400 /* VC++ 2005 */
183 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier) 197 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier)
184 #define ECB_MEMORY_FENCE _ReadWriteBarrier () 198 #define ECB_MEMORY_FENCE _ReadWriteBarrier ()
185 #define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier () /* according to msdn, _ReadBarrier is not a load fence */ 199 #define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier () /* according to msdn, _ReadBarrier is not a load fence */
186 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier () 200 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier ()
… …
272 #define ecb_is_constant(expr) __builtin_constant_p (expr) 286 #define ecb_is_constant(expr) __builtin_constant_p (expr)
273 #define ecb_expect(expr,value) __builtin_expect ((expr),(value)) 287 #define ecb_expect(expr,value) __builtin_expect ((expr),(value))
274 #define ecb_prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality) 288 #define ecb_prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality)
275#else 289#else
276 #define ecb_attribute(attrlist) 290 #define ecb_attribute(attrlist)
291
292 /* possible C11 impl for integral types
293 typedef struct ecb_is_constant_struct ecb_is_constant_struct;
294 #define ecb_is_constant(expr) _Generic ((1 ? (struct ecb_is_constant_struct *)0 : (void *)((expr) - (expr)), ecb_is_constant_struct *: 0, default: 1)) */
295
277 #define ecb_is_constant(expr) 0 296 #define ecb_is_constant(expr) 0
278 #define ecb_expect(expr,value) (expr) 297 #define ecb_expect(expr,value) (expr)
279 #define ecb_prefetch(addr,rw,locality) 298 #define ecb_prefetch(addr,rw,locality)
280#endif 299#endif
281 300

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines