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

Comparing libecb/ecb.h (file contents):
Revision 1.138 by sf-exg, Tue Oct 14 14:38:13 2014 UTC vs.
Revision 1.142 by root, Thu Oct 16 14:45:44 2014 UTC

… …
40 40
41#ifndef ECB_H 41#ifndef ECB_H
42#define ECB_H 42#define ECB_H
43 43
44/* 16 bits major, 16 bits minor */ 44/* 16 bits major, 16 bits minor */
45#define ECB_VERSION 0x00010003 45#define ECB_VERSION 0x00010004
46 46
47#ifdef _WIN32 47#ifdef _WIN32
48 typedef signed char int8_t; 48 typedef signed char int8_t;
49 typedef unsigned char uint8_t; 49 typedef unsigned char uint8_t;
50 typedef signed short int16_t; 50 typedef signed short int16_t;
… …
102 102
103#if __clang__ && defined(__has_builtin) 103#if __clang__ && defined(__has_builtin)
104 #define ECB_CLANG_BUILTIN(x) __has_builtin(x) 104 #define ECB_CLANG_BUILTIN(x) __has_builtin(x)
105#else 105#else
106 #define ECB_CLANG_BUILTIN(x) 0 106 #define ECB_CLANG_BUILTIN(x) 0
107#endif
108
109#if __clang__ && defined(__has_extension)
110 #define ECB_CLANG_EXTENSION(x) __has_extension(x)
111#else
112 #define ECB_CLANG_EXTENSION(x) 0
107#endif 113#endif
108 114
109#define ECB_CPP (__cplusplus+0) 115#define ECB_CPP (__cplusplus+0)
110#define ECB_CPP11 (__cplusplus >= 201103L) 116#define ECB_CPP11 (__cplusplus >= 201103L)
111 117
… …
195 /* see comment below (stdatomic.h) about the C11 memory model. */ 201 /* see comment below (stdatomic.h) about the C11 memory model. */
196 #define ECB_MEMORY_FENCE __atomic_thread_fence (__ATOMIC_SEQ_CST) 202 #define ECB_MEMORY_FENCE __atomic_thread_fence (__ATOMIC_SEQ_CST)
197 #define ECB_MEMORY_FENCE_ACQUIRE __atomic_thread_fence (__ATOMIC_ACQUIRE) 203 #define ECB_MEMORY_FENCE_ACQUIRE __atomic_thread_fence (__ATOMIC_ACQUIRE)
198 #define ECB_MEMORY_FENCE_RELEASE __atomic_thread_fence (__ATOMIC_RELEASE) 204 #define ECB_MEMORY_FENCE_RELEASE __atomic_thread_fence (__ATOMIC_RELEASE)
199 205
200 /* The __has_feature syntax from clang is so misdesigned that we cannot use it 206 #elif ECB_CLANG_EXTENSION(c_atomic)
201 * without risking compile time errors with other compilers. We *could*
202 * define our own ecb_clang_has_feature, but I just can't be bothered to work
203 * around this shit time and again.
204 * #elif defined __clang && __has_feature (cxx_atomic)
205 * // see comment below (stdatomic.h) about the C11 memory model. 207 /* see comment below (stdatomic.h) about the C11 memory model. */
206 * #define ECB_MEMORY_FENCE __c11_atomic_thread_fence (__ATOMIC_SEQ_CST) 208 #define ECB_MEMORY_FENCE __c11_atomic_thread_fence (__ATOMIC_SEQ_CST)
207 * #define ECB_MEMORY_FENCE_ACQUIRE __c11_atomic_thread_fence (__ATOMIC_ACQUIRE) 209 #define ECB_MEMORY_FENCE_ACQUIRE __c11_atomic_thread_fence (__ATOMIC_ACQUIRE)
208 * #define ECB_MEMORY_FENCE_RELEASE __c11_atomic_thread_fence (__ATOMIC_RELEASE) 210 #define ECB_MEMORY_FENCE_RELEASE __c11_atomic_thread_fence (__ATOMIC_RELEASE)
209 */
210 211
211 #elif ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__ 212 #elif ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__
212 #define ECB_MEMORY_FENCE __sync_synchronize () 213 #define ECB_MEMORY_FENCE __sync_synchronize ()
213 #elif _MSC_VER >= 1500 /* VC++ 2008 */ 214 #elif _MSC_VER >= 1500 /* VC++ 2008 */
214 /* apparently, microsoft broke all the memory barrier stuff in Visual Studio 2008... */ 215 /* apparently, microsoft broke all the memory barrier stuff in Visual Studio 2008... */
… …
305#define ECB_STRINGIFY(a) ECB_STRINGIFY_(a) 306#define ECB_STRINGIFY(a) ECB_STRINGIFY_(a)
306 307
307#define ecb_function_ ecb_inline 308#define ecb_function_ ecb_inline
308 309
309#if ECB_GCC_VERSION(3,1) || ECB_CLANG_VERSION(2,8) 310#if ECB_GCC_VERSION(3,1) || ECB_CLANG_VERSION(2,8)
310 #define ecb_attribute(attrlist) __attribute__(attrlist) 311 #define ecb_attribute(attrlist) __attribute__ (attrlist)
311#else 312#else
312 #define ecb_attribute(attrlist) 313 #define ecb_attribute(attrlist)
313#endif 314#endif
314 315
315#if ECB_GCC_VERSION(3,1) || ECB_CLANG_BUILTIN(__builtin_constant_p) 316#if ECB_GCC_VERSION(3,1) || ECB_CLANG_BUILTIN(__builtin_constant_p)
… …
334 #define ecb_prefetch(addr,rw,locality) 335 #define ecb_prefetch(addr,rw,locality)
335#endif 336#endif
336 337
337/* no emulation for ecb_decltype */ 338/* no emulation for ecb_decltype */
338#if ECB_GCC_VERSION(4,5) 339#if ECB_GCC_VERSION(4,5)
339 #define ecb_decltype(x) __decltype(x) 340 #define ecb_decltype(x) __decltype (x)
340#elif ECB_GCC_VERSION(3,0) 341#elif ECB_GCC_VERSION(3,0)
341 #define ecb_decltype(x) __typeof(x) 342 #define ecb_decltype(x) __typeof (x)
343#elif ECB_CPP11
344 #define ecb_decltype(x) decltype (x)
342#endif 345#endif
343 346
344#if _MSC_VER >= 1300 347#if _MSC_VER >= 1300
345 #define ecb_deprecated __declspec(deprecated) 348 #define ecb_deprecated __declspec(deprecated)
346#else 349#else
… …
377/* for compatibility to the rest of the world */ 380/* for compatibility to the rest of the world */
378#define ecb_likely(expr) ecb_expect_true (expr) 381#define ecb_likely(expr) ecb_expect_true (expr)
379#define ecb_unlikely(expr) ecb_expect_false (expr) 382#define ecb_unlikely(expr) ecb_expect_false (expr)
380 383
381/* count trailing zero bits and count # of one bits */ 384/* count trailing zero bits and count # of one bits */
385#if ECB_GCC_VERSION(3,4) \
382#if ECB_GCC_VERSION(3,4) || (ECB_CLANG_BUILTIN(__builtin_clz) && ECB_CLANG_BUILTIN(__builtin_clzll) \ 386 || (ECB_CLANG_BUILTIN(__builtin_clz) && ECB_CLANG_BUILTIN(__builtin_clzll) \
383 && ECB_CLANG_BUILTIN(__builtin_ctz) && ECB_CLANG_BUILTIN(__builtin_ctzll) \ 387 && ECB_CLANG_BUILTIN(__builtin_ctz) && ECB_CLANG_BUILTIN(__builtin_ctzll) \
384 && ECB_CLANG_BUILTIN(__builtin_popcount)) 388 && ECB_CLANG_BUILTIN(__builtin_popcount))
385 /* we assume int == 32 bit, long == 32 or 64 bit and long long == 64 bit */ 389 /* we assume int == 32 bit, long == 32 or 64 bit and long long == 64 bit */
386 #define ecb_ld32(x) (__builtin_clz (x) ^ 31) 390 #define ecb_ld32(x) (__builtin_clz (x) ^ 31)
387 #define ecb_ld64(x) (__builtin_clzll (x) ^ 63) 391 #define ecb_ld64(x) (__builtin_clzll (x) ^ 63)
388 #define ecb_ctz32(x) __builtin_ctz (x) 392 #define ecb_ctz32(x) __builtin_ctz (x)
389 #define ecb_ctz64(x) __builtin_ctzll (x) 393 #define ecb_ctz64(x) __builtin_ctzll (x)

Diff Legend

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