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

Comparing libecb/ecb.h (file contents):
Revision 1.137 by root, Tue Oct 14 14:01:07 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;
… …
94 */ 94 */
95#if !defined __GNUC_MINOR__ || defined __INTEL_COMPILER || defined __SUNPRO_C || defined __SUNPRO_CC || defined __llvm__ || defined __clang__ 95#if !defined __GNUC_MINOR__ || defined __INTEL_COMPILER || defined __SUNPRO_C || defined __SUNPRO_CC || defined __llvm__ || defined __clang__
96 #define ECB_GCC_VERSION(major,minor) 0 96 #define ECB_GCC_VERSION(major,minor) 0
97#else 97#else
98 #define ECB_GCC_VERSION(major,minor) (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor))) 98 #define ECB_GCC_VERSION(major,minor) (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor)))
99#endif
100
101#define ECB_CLANG_VERSION(major,minor) (__clang_major__ > (major) || (__clang_major__ == (major) && __clang_minor__ >= (minor)))
102
103#if __clang__ && defined(__has_builtin)
104 #define ECB_CLANG_BUILTIN(x) __has_builtin(x)
105#else
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
99#endif 113#endif
100 114
101#define ECB_CPP (__cplusplus+0) 115#define ECB_CPP (__cplusplus+0)
102#define ECB_CPP11 (__cplusplus >= 201103L) 116#define ECB_CPP11 (__cplusplus >= 201103L)
103 117
… …
187 /* see comment below (stdatomic.h) about the C11 memory model. */ 201 /* see comment below (stdatomic.h) about the C11 memory model. */
188 #define ECB_MEMORY_FENCE __atomic_thread_fence (__ATOMIC_SEQ_CST) 202 #define ECB_MEMORY_FENCE __atomic_thread_fence (__ATOMIC_SEQ_CST)
189 #define ECB_MEMORY_FENCE_ACQUIRE __atomic_thread_fence (__ATOMIC_ACQUIRE) 203 #define ECB_MEMORY_FENCE_ACQUIRE __atomic_thread_fence (__ATOMIC_ACQUIRE)
190 #define ECB_MEMORY_FENCE_RELEASE __atomic_thread_fence (__ATOMIC_RELEASE) 204 #define ECB_MEMORY_FENCE_RELEASE __atomic_thread_fence (__ATOMIC_RELEASE)
191 205
192 /* The __has_feature syntax from clang is so misdesigned that we cannot use it 206 #elif ECB_CLANG_EXTENSION(c_atomic)
193 * without risking compile time errors with other compilers. We *could*
194 * define our own ecb_clang_has_feature, but I just can't be bothered to work
195 * around this shit time and again.
196 * #elif defined __clang && __has_feature (cxx_atomic)
197 * // see comment below (stdatomic.h) about the C11 memory model. 207 /* see comment below (stdatomic.h) about the C11 memory model. */
198 * #define ECB_MEMORY_FENCE __c11_atomic_thread_fence (__ATOMIC_SEQ_CST) 208 #define ECB_MEMORY_FENCE __c11_atomic_thread_fence (__ATOMIC_SEQ_CST)
199 * #define ECB_MEMORY_FENCE_ACQUIRE __c11_atomic_thread_fence (__ATOMIC_ACQUIRE) 209 #define ECB_MEMORY_FENCE_ACQUIRE __c11_atomic_thread_fence (__ATOMIC_ACQUIRE)
200 * #define ECB_MEMORY_FENCE_RELEASE __c11_atomic_thread_fence (__ATOMIC_RELEASE) 210 #define ECB_MEMORY_FENCE_RELEASE __c11_atomic_thread_fence (__ATOMIC_RELEASE)
201 */
202 211
203 #elif ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__ 212 #elif ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__
204 #define ECB_MEMORY_FENCE __sync_synchronize () 213 #define ECB_MEMORY_FENCE __sync_synchronize ()
205 #elif _MSC_VER >= 1500 /* VC++ 2008 */ 214 #elif _MSC_VER >= 1500 /* VC++ 2008 */
206 /* 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... */
… …
296#define ECB_STRINGIFY_(a) # a 305#define ECB_STRINGIFY_(a) # a
297#define ECB_STRINGIFY(a) ECB_STRINGIFY_(a) 306#define ECB_STRINGIFY(a) ECB_STRINGIFY_(a)
298 307
299#define ecb_function_ ecb_inline 308#define ecb_function_ ecb_inline
300 309
301#if ECB_GCC_VERSION(3,1) 310#if ECB_GCC_VERSION(3,1) || ECB_CLANG_VERSION(2,8)
302 #define ecb_attribute(attrlist) __attribute__(attrlist) 311 #define ecb_attribute(attrlist) __attribute__ (attrlist)
312#else
313 #define ecb_attribute(attrlist)
314#endif
315
316#if ECB_GCC_VERSION(3,1) || ECB_CLANG_BUILTIN(__builtin_constant_p)
303 #define ecb_is_constant(expr) __builtin_constant_p (expr) 317 #define ecb_is_constant(expr) __builtin_constant_p (expr)
304 #define ecb_expect(expr,value) __builtin_expect ((expr),(value))
305 #define ecb_prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality)
306#else 318#else
307 #define ecb_attribute(attrlist)
308
309 /* possible C11 impl for integral types 319 /* possible C11 impl for integral types
310 typedef struct ecb_is_constant_struct ecb_is_constant_struct; 320 typedef struct ecb_is_constant_struct ecb_is_constant_struct;
311 #define ecb_is_constant(expr) _Generic ((1 ? (struct ecb_is_constant_struct *)0 : (void *)((expr) - (expr)), ecb_is_constant_struct *: 0, default: 1)) */ 321 #define ecb_is_constant(expr) _Generic ((1 ? (struct ecb_is_constant_struct *)0 : (void *)((expr) - (expr)), ecb_is_constant_struct *: 0, default: 1)) */
312 322
313 #define ecb_is_constant(expr) 0 323 #define ecb_is_constant(expr) 0
324#endif
325
326#if ECB_GCC_VERSION(3,1) || ECB_CLANG_BUILTIN(__builtin_expect)
327 #define ecb_expect(expr,value) __builtin_expect ((expr),(value))
328#else
314 #define ecb_expect(expr,value) (expr) 329 #define ecb_expect(expr,value) (expr)
330#endif
331
332#if ECB_GCC_VERSION(3,1) || ECB_CLANG_BUILTIN(__builtin_prefetch)
333 #define ecb_prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality)
334#else
315 #define ecb_prefetch(addr,rw,locality) 335 #define ecb_prefetch(addr,rw,locality)
316#endif 336#endif
317 337
318/* no emulation for ecb_decltype */ 338/* no emulation for ecb_decltype */
319#if ECB_GCC_VERSION(4,5) 339#if ECB_GCC_VERSION(4,5)
320 #define ecb_decltype(x) __decltype(x) 340 #define ecb_decltype(x) __decltype (x)
321#elif ECB_GCC_VERSION(3,0) 341#elif ECB_GCC_VERSION(3,0)
322 #define ecb_decltype(x) __typeof(x) 342 #define ecb_decltype(x) __typeof (x)
343#elif ECB_CPP11
344 #define ecb_decltype(x) decltype (x)
323#endif 345#endif
324 346
325#if _MSC_VER >= 1300 347#if _MSC_VER >= 1300
326 #define ecb_deprecated __declspec(deprecated) 348 #define ecb_deprecated __declspec(deprecated)
327#else 349#else
… …
358/* for compatibility to the rest of the world */ 380/* for compatibility to the rest of the world */
359#define ecb_likely(expr) ecb_expect_true (expr) 381#define ecb_likely(expr) ecb_expect_true (expr)
360#define ecb_unlikely(expr) ecb_expect_false (expr) 382#define ecb_unlikely(expr) ecb_expect_false (expr)
361 383
362/* count trailing zero bits and count # of one bits */ 384/* count trailing zero bits and count # of one bits */
363#if ECB_GCC_VERSION(3,4) 385#if ECB_GCC_VERSION(3,4) \
386 || (ECB_CLANG_BUILTIN(__builtin_clz) && ECB_CLANG_BUILTIN(__builtin_clzll) \
387 && ECB_CLANG_BUILTIN(__builtin_ctz) && ECB_CLANG_BUILTIN(__builtin_ctzll) \
388 && ECB_CLANG_BUILTIN(__builtin_popcount))
364 /* 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 */
365 #define ecb_ld32(x) (__builtin_clz (x) ^ 31) 390 #define ecb_ld32(x) (__builtin_clz (x) ^ 31)
366 #define ecb_ld64(x) (__builtin_clzll (x) ^ 63) 391 #define ecb_ld64(x) (__builtin_clzll (x) ^ 63)
367 #define ecb_ctz32(x) __builtin_ctz (x) 392 #define ecb_ctz32(x) __builtin_ctz (x)
368 #define ecb_ctz64(x) __builtin_ctzll (x) 393 #define ecb_ctz64(x) __builtin_ctzll (x)
… …
499ecb_inline uint32_t ecb_rotl32 (uint32_t x, unsigned int count) { return (x >> (32 - count)) | (x << count); } 524ecb_inline uint32_t ecb_rotl32 (uint32_t x, unsigned int count) { return (x >> (32 - count)) | (x << count); }
500ecb_inline uint32_t ecb_rotr32 (uint32_t x, unsigned int count) { return (x << (32 - count)) | (x >> count); } 525ecb_inline uint32_t ecb_rotr32 (uint32_t x, unsigned int count) { return (x << (32 - count)) | (x >> count); }
501ecb_inline uint64_t ecb_rotl64 (uint64_t x, unsigned int count) { return (x >> (64 - count)) | (x << count); } 526ecb_inline uint64_t ecb_rotl64 (uint64_t x, unsigned int count) { return (x >> (64 - count)) | (x << count); }
502ecb_inline uint64_t ecb_rotr64 (uint64_t x, unsigned int count) { return (x << (64 - count)) | (x >> count); } 527ecb_inline uint64_t ecb_rotr64 (uint64_t x, unsigned int count) { return (x << (64 - count)) | (x >> count); }
503 528
504#if ECB_GCC_VERSION(4,3) 529#if ECB_GCC_VERSION(4,3) || (ECB_CLANG_BUILTIN(__builtin_bswap32) && ECB_CLANG_BUILTIN(__builtin_bswap64))
505 #define ecb_bswap16(x) (__builtin_bswap32 (x) >> 16) 530 #define ecb_bswap16(x) (__builtin_bswap32 (x) >> 16)
506 #define ecb_bswap32(x) __builtin_bswap32 (x) 531 #define ecb_bswap32(x) __builtin_bswap32 (x)
507 #define ecb_bswap64(x) __builtin_bswap64 (x) 532 #define ecb_bswap64(x) __builtin_bswap64 (x)
508#else 533#else
509 ecb_function_ uint16_t ecb_bswap16 (uint16_t x) ecb_const; 534 ecb_function_ uint16_t ecb_bswap16 (uint16_t x) ecb_const;
… …
526 { 551 {
527 return (((uint64_t)ecb_bswap32 (x)) << 32) | ecb_bswap32 (x >> 32); 552 return (((uint64_t)ecb_bswap32 (x)) << 32) | ecb_bswap32 (x >> 32);
528 } 553 }
529#endif 554#endif
530 555
531#if ECB_GCC_VERSION(4,5) 556#if ECB_GCC_VERSION(4,5) || ECB_CLANG_BUILTIN(__builtin_unreachable)
532 #define ecb_unreachable() __builtin_unreachable () 557 #define ecb_unreachable() __builtin_unreachable ()
533#else 558#else
534 /* this seems to work fine, but gcc always emits a warning for it :/ */ 559 /* this seems to work fine, but gcc always emits a warning for it :/ */
535 ecb_inline void ecb_unreachable (void) ecb_noreturn; 560 ecb_inline void ecb_unreachable (void) ecb_noreturn;
536 ecb_inline void ecb_unreachable (void) { } 561 ecb_inline void ecb_unreachable (void) { }

Diff Legend

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