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.151 by root, Wed Feb 11 18:47:34 2015 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... */
… …
269 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE 278 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
270#endif 279#endif
271 280
272/*****************************************************************************/ 281/*****************************************************************************/
273 282
274#if __cplusplus 283#if ECB_CPP
275 #define ecb_inline static inline 284 #define ecb_inline static inline
276#elif ECB_GCC_VERSION(2,5) 285#elif ECB_GCC_VERSION(2,5)
277 #define ecb_inline static __inline__ 286 #define ecb_inline static __inline__
278#elif ECB_C99 287#elif ECB_C99
279 #define ecb_inline static inline 288 #define ecb_inline static inline
… …
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_CPP11
340 // older implementations might have problems with decltype(x)::type, work around it
341 template<class T> struct ecb_decltype_t { typedef T type; };
320 #define ecb_decltype(x) __decltype(x) 342 #define ecb_decltype(x) ecb_decltype_t<decltype (x)>::type
321#elif ECB_GCC_VERSION(3,0) 343#elif ECB_GCC_VERSION(3,0) || ECB_CLANG_VERSION(2,8)
322 #define ecb_decltype(x) __typeof(x) 344 #define ecb_decltype(x) __typeof__ (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
328 #define ecb_deprecated ecb_attribute ((__deprecated__)) 350 #define ecb_deprecated ecb_attribute ((__deprecated__))
329#endif 351#endif
330 352
331#define ecb_noinline ecb_attribute ((__noinline__)) 353#define ecb_noinline ecb_attribute ((__noinline__))
332#define ecb_unused ecb_attribute ((__unused__)) 354#define ecb_unused ecb_attribute ((__unused__))
333#define ecb_const ecb_attribute ((__const__)) 355#define ecb_const ecb_attribute ((__const__))
334#define ecb_pure ecb_attribute ((__pure__)) 356#define ecb_pure ecb_attribute ((__pure__))
335 357
336/* http://msdn.microsoft.com/en-us/library/k6ktzx3s.aspx __declspec(noreturn) */ 358/* TODO http://msdn.microsoft.com/en-us/library/k6ktzx3s.aspx __declspec(noreturn) */
337#if ECB_C11 359#if ECB_C11 || __IBMC_NORETURN
360 /* http://pic.dhe.ibm.com/infocenter/compbg/v121v141/topic/com.ibm.xlcpp121.bg.doc/language_ref/noreturn.html */
338 #define ecb_noreturn _Noreturn 361 #define ecb_noreturn _Noreturn
339#else 362#else
340 #define ecb_noreturn ecb_attribute ((__noreturn__)) 363 #define ecb_noreturn ecb_attribute ((__noreturn__))
341#endif 364#endif
342 365
… …
358/* for compatibility to the rest of the world */ 381/* for compatibility to the rest of the world */
359#define ecb_likely(expr) ecb_expect_true (expr) 382#define ecb_likely(expr) ecb_expect_true (expr)
360#define ecb_unlikely(expr) ecb_expect_false (expr) 383#define ecb_unlikely(expr) ecb_expect_false (expr)
361 384
362/* count trailing zero bits and count # of one bits */ 385/* count trailing zero bits and count # of one bits */
363#if ECB_GCC_VERSION(3,4) 386#if ECB_GCC_VERSION(3,4) \
387 || (ECB_CLANG_BUILTIN(__builtin_clz) && ECB_CLANG_BUILTIN(__builtin_clzll) \
388 && ECB_CLANG_BUILTIN(__builtin_ctz) && ECB_CLANG_BUILTIN(__builtin_ctzll) \
389 && ECB_CLANG_BUILTIN(__builtin_popcount))
364 /* we assume int == 32 bit, long == 32 or 64 bit and long long == 64 bit */ 390 /* we assume int == 32 bit, long == 32 or 64 bit and long long == 64 bit */
365 #define ecb_ld32(x) (__builtin_clz (x) ^ 31) 391 #define ecb_ld32(x) (__builtin_clz (x) ^ 31)
366 #define ecb_ld64(x) (__builtin_clzll (x) ^ 63) 392 #define ecb_ld64(x) (__builtin_clzll (x) ^ 63)
367 #define ecb_ctz32(x) __builtin_ctz (x) 393 #define ecb_ctz32(x) __builtin_ctz (x)
368 #define ecb_ctz64(x) __builtin_ctzll (x) 394 #define ecb_ctz64(x) __builtin_ctzll (x)
369 #define ecb_popcount32(x) __builtin_popcount (x) 395 #define ecb_popcount32(x) __builtin_popcount (x)
370 /* no popcountll */ 396 /* no popcountll */
371#else 397#else
372 ecb_function_ int ecb_ctz32 (uint32_t x) ecb_const; 398 ecb_function_ ecb_const int ecb_ctz32 (uint32_t x);
373 ecb_function_ int 399 ecb_function_ ecb_const int
374 ecb_ctz32 (uint32_t x) 400 ecb_ctz32 (uint32_t x)
375 { 401 {
376 int r = 0; 402 int r = 0;
377 403
378 x &= ~x + 1; /* this isolates the lowest bit */ 404 x &= ~x + 1; /* this isolates the lowest bit */
… …
392#endif 418#endif
393 419
394 return r; 420 return r;
395 } 421 }
396 422
397 ecb_function_ int ecb_ctz64 (uint64_t x) ecb_const; 423 ecb_function_ ecb_const int ecb_ctz64 (uint64_t x);
398 ecb_function_ int 424 ecb_function_ ecb_const int
399 ecb_ctz64 (uint64_t x) 425 ecb_ctz64 (uint64_t x)
400 { 426 {
401 int shift = x & 0xffffffffU ? 0 : 32; 427 int shift = x & 0xffffffffU ? 0 : 32;
402 return ecb_ctz32 (x >> shift) + shift; 428 return ecb_ctz32 (x >> shift) + shift;
403 } 429 }
404 430
405 ecb_function_ int ecb_popcount32 (uint32_t x) ecb_const; 431 ecb_function_ ecb_const int ecb_popcount32 (uint32_t x);
406 ecb_function_ int 432 ecb_function_ ecb_const int
407 ecb_popcount32 (uint32_t x) 433 ecb_popcount32 (uint32_t x)
408 { 434 {
409 x -= (x >> 1) & 0x55555555; 435 x -= (x >> 1) & 0x55555555;
410 x = ((x >> 2) & 0x33333333) + (x & 0x33333333); 436 x = ((x >> 2) & 0x33333333) + (x & 0x33333333);
411 x = ((x >> 4) + x) & 0x0f0f0f0f; 437 x = ((x >> 4) + x) & 0x0f0f0f0f;
412 x *= 0x01010101; 438 x *= 0x01010101;
413 439
414 return x >> 24; 440 return x >> 24;
415 } 441 }
416 442
417 ecb_function_ int ecb_ld32 (uint32_t x) ecb_const; 443 ecb_function_ ecb_const int ecb_ld32 (uint32_t x);
418 ecb_function_ int ecb_ld32 (uint32_t x) 444 ecb_function_ ecb_const int ecb_ld32 (uint32_t x)
419 { 445 {
420 int r = 0; 446 int r = 0;
421 447
422 if (x >> 16) { x >>= 16; r += 16; } 448 if (x >> 16) { x >>= 16; r += 16; }
423 if (x >> 8) { x >>= 8; r += 8; } 449 if (x >> 8) { x >>= 8; r += 8; }
… …
426 if (x >> 1) { r += 1; } 452 if (x >> 1) { r += 1; }
427 453
428 return r; 454 return r;
429 } 455 }
430 456
431 ecb_function_ int ecb_ld64 (uint64_t x) ecb_const; 457 ecb_function_ ecb_const int ecb_ld64 (uint64_t x);
432 ecb_function_ int ecb_ld64 (uint64_t x) 458 ecb_function_ ecb_const int ecb_ld64 (uint64_t x)
433 { 459 {
434 int r = 0; 460 int r = 0;
435 461
436 if (x >> 32) { x >>= 32; r += 32; } 462 if (x >> 32) { x >>= 32; r += 32; }
437 463
438 return r + ecb_ld32 (x); 464 return r + ecb_ld32 (x);
439 } 465 }
440#endif 466#endif
441 467
442ecb_function_ ecb_bool ecb_is_pot32 (uint32_t x) ecb_const; 468ecb_function_ ecb_const ecb_bool ecb_is_pot32 (uint32_t x);
443ecb_function_ ecb_bool ecb_is_pot32 (uint32_t x) { return !(x & (x - 1)); } 469ecb_function_ ecb_const ecb_bool ecb_is_pot32 (uint32_t x) { return !(x & (x - 1)); }
444ecb_function_ ecb_bool ecb_is_pot64 (uint64_t x) ecb_const; 470ecb_function_ ecb_const ecb_bool ecb_is_pot64 (uint64_t x);
445ecb_function_ ecb_bool ecb_is_pot64 (uint64_t x) { return !(x & (x - 1)); } 471ecb_function_ ecb_const ecb_bool ecb_is_pot64 (uint64_t x) { return !(x & (x - 1)); }
446 472
447ecb_function_ uint8_t ecb_bitrev8 (uint8_t x) ecb_const; 473ecb_function_ ecb_const uint8_t ecb_bitrev8 (uint8_t x);
448ecb_function_ uint8_t ecb_bitrev8 (uint8_t x) 474ecb_function_ ecb_const uint8_t ecb_bitrev8 (uint8_t x)
449{ 475{
450 return ( (x * 0x0802U & 0x22110U) 476 return ( (x * 0x0802U & 0x22110U)
451 | (x * 0x8020U & 0x88440U)) * 0x10101U >> 16; 477 | (x * 0x8020U & 0x88440U)) * 0x10101U >> 16;
452} 478}
453 479
454ecb_function_ uint16_t ecb_bitrev16 (uint16_t x) ecb_const; 480ecb_function_ ecb_const uint16_t ecb_bitrev16 (uint16_t x);
455ecb_function_ uint16_t ecb_bitrev16 (uint16_t x) 481ecb_function_ ecb_const uint16_t ecb_bitrev16 (uint16_t x)
456{ 482{
457 x = ((x >> 1) & 0x5555) | ((x & 0x5555) << 1); 483 x = ((x >> 1) & 0x5555) | ((x & 0x5555) << 1);
458 x = ((x >> 2) & 0x3333) | ((x & 0x3333) << 2); 484 x = ((x >> 2) & 0x3333) | ((x & 0x3333) << 2);
459 x = ((x >> 4) & 0x0f0f) | ((x & 0x0f0f) << 4); 485 x = ((x >> 4) & 0x0f0f) | ((x & 0x0f0f) << 4);
460 x = ( x >> 8 ) | ( x << 8); 486 x = ( x >> 8 ) | ( x << 8);
461 487
462 return x; 488 return x;
463} 489}
464 490
465ecb_function_ uint32_t ecb_bitrev32 (uint32_t x) ecb_const; 491ecb_function_ ecb_const uint32_t ecb_bitrev32 (uint32_t x);
466ecb_function_ uint32_t ecb_bitrev32 (uint32_t x) 492ecb_function_ ecb_const uint32_t ecb_bitrev32 (uint32_t x)
467{ 493{
468 x = ((x >> 1) & 0x55555555) | ((x & 0x55555555) << 1); 494 x = ((x >> 1) & 0x55555555) | ((x & 0x55555555) << 1);
469 x = ((x >> 2) & 0x33333333) | ((x & 0x33333333) << 2); 495 x = ((x >> 2) & 0x33333333) | ((x & 0x33333333) << 2);
470 x = ((x >> 4) & 0x0f0f0f0f) | ((x & 0x0f0f0f0f) << 4); 496 x = ((x >> 4) & 0x0f0f0f0f) | ((x & 0x0f0f0f0f) << 4);
471 x = ((x >> 8) & 0x00ff00ff) | ((x & 0x00ff00ff) << 8); 497 x = ((x >> 8) & 0x00ff00ff) | ((x & 0x00ff00ff) << 8);
… …
474 return x; 500 return x;
475} 501}
476 502
477/* popcount64 is only available on 64 bit cpus as gcc builtin */ 503/* popcount64 is only available on 64 bit cpus as gcc builtin */
478/* so for this version we are lazy */ 504/* so for this version we are lazy */
479ecb_function_ int ecb_popcount64 (uint64_t x) ecb_const; 505ecb_function_ ecb_const int ecb_popcount64 (uint64_t x);
480ecb_function_ int 506ecb_function_ ecb_const int
481ecb_popcount64 (uint64_t x) 507ecb_popcount64 (uint64_t x)
482{ 508{
483 return ecb_popcount32 (x) + ecb_popcount32 (x >> 32); 509 return ecb_popcount32 (x) + ecb_popcount32 (x >> 32);
484} 510}
485 511
486ecb_inline uint8_t ecb_rotl8 (uint8_t x, unsigned int count) ecb_const; 512ecb_inline ecb_const uint8_t ecb_rotl8 (uint8_t x, unsigned int count);
487ecb_inline uint8_t ecb_rotr8 (uint8_t x, unsigned int count) ecb_const; 513ecb_inline ecb_const uint8_t ecb_rotr8 (uint8_t x, unsigned int count);
488ecb_inline uint16_t ecb_rotl16 (uint16_t x, unsigned int count) ecb_const; 514ecb_inline ecb_const uint16_t ecb_rotl16 (uint16_t x, unsigned int count);
489ecb_inline uint16_t ecb_rotr16 (uint16_t x, unsigned int count) ecb_const; 515ecb_inline ecb_const uint16_t ecb_rotr16 (uint16_t x, unsigned int count);
490ecb_inline uint32_t ecb_rotl32 (uint32_t x, unsigned int count) ecb_const; 516ecb_inline ecb_const uint32_t ecb_rotl32 (uint32_t x, unsigned int count);
491ecb_inline uint32_t ecb_rotr32 (uint32_t x, unsigned int count) ecb_const; 517ecb_inline ecb_const uint32_t ecb_rotr32 (uint32_t x, unsigned int count);
492ecb_inline uint64_t ecb_rotl64 (uint64_t x, unsigned int count) ecb_const; 518ecb_inline ecb_const uint64_t ecb_rotl64 (uint64_t x, unsigned int count);
493ecb_inline uint64_t ecb_rotr64 (uint64_t x, unsigned int count) ecb_const; 519ecb_inline ecb_const uint64_t ecb_rotr64 (uint64_t x, unsigned int count);
494 520
495ecb_inline uint8_t ecb_rotl8 (uint8_t x, unsigned int count) { return (x >> ( 8 - count)) | (x << count); } 521ecb_inline ecb_const uint8_t ecb_rotl8 (uint8_t x, unsigned int count) { return (x >> ( 8 - count)) | (x << count); }
496ecb_inline uint8_t ecb_rotr8 (uint8_t x, unsigned int count) { return (x << ( 8 - count)) | (x >> count); } 522ecb_inline ecb_const uint8_t ecb_rotr8 (uint8_t x, unsigned int count) { return (x << ( 8 - count)) | (x >> count); }
497ecb_inline uint16_t ecb_rotl16 (uint16_t x, unsigned int count) { return (x >> (16 - count)) | (x << count); } 523ecb_inline ecb_const uint16_t ecb_rotl16 (uint16_t x, unsigned int count) { return (x >> (16 - count)) | (x << count); }
498ecb_inline uint16_t ecb_rotr16 (uint16_t x, unsigned int count) { return (x << (16 - count)) | (x >> count); } 524ecb_inline ecb_const uint16_t ecb_rotr16 (uint16_t x, unsigned int count) { return (x << (16 - count)) | (x >> count); }
499ecb_inline uint32_t ecb_rotl32 (uint32_t x, unsigned int count) { return (x >> (32 - count)) | (x << count); } 525ecb_inline ecb_const 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); } 526ecb_inline ecb_const 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); } 527ecb_inline ecb_const 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); } 528ecb_inline ecb_const uint64_t ecb_rotr64 (uint64_t x, unsigned int count) { return (x << (64 - count)) | (x >> count); }
503 529
504#if ECB_GCC_VERSION(4,3) 530#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) 531 #define ecb_bswap16(x) (__builtin_bswap32 (x) >> 16)
506 #define ecb_bswap32(x) __builtin_bswap32 (x) 532 #define ecb_bswap32(x) __builtin_bswap32 (x)
507 #define ecb_bswap64(x) __builtin_bswap64 (x) 533 #define ecb_bswap64(x) __builtin_bswap64 (x)
508#else 534#else
509 ecb_function_ uint16_t ecb_bswap16 (uint16_t x) ecb_const; 535 ecb_function_ ecb_const uint16_t ecb_bswap16 (uint16_t x);
510 ecb_function_ uint16_t 536 ecb_function_ ecb_const uint16_t
511 ecb_bswap16 (uint16_t x) 537 ecb_bswap16 (uint16_t x)
512 { 538 {
513 return ecb_rotl16 (x, 8); 539 return ecb_rotl16 (x, 8);
514 } 540 }
515 541
516 ecb_function_ uint32_t ecb_bswap32 (uint32_t x) ecb_const; 542 ecb_function_ ecb_const uint32_t ecb_bswap32 (uint32_t x);
517 ecb_function_ uint32_t 543 ecb_function_ ecb_const uint32_t
518 ecb_bswap32 (uint32_t x) 544 ecb_bswap32 (uint32_t x)
519 { 545 {
520 return (((uint32_t)ecb_bswap16 (x)) << 16) | ecb_bswap16 (x >> 16); 546 return (((uint32_t)ecb_bswap16 (x)) << 16) | ecb_bswap16 (x >> 16);
521 } 547 }
522 548
523 ecb_function_ uint64_t ecb_bswap64 (uint64_t x) ecb_const; 549 ecb_function_ ecb_const uint64_t ecb_bswap64 (uint64_t x);
524 ecb_function_ uint64_t 550 ecb_function_ ecb_const uint64_t
525 ecb_bswap64 (uint64_t x) 551 ecb_bswap64 (uint64_t x)
526 { 552 {
527 return (((uint64_t)ecb_bswap32 (x)) << 32) | ecb_bswap32 (x >> 32); 553 return (((uint64_t)ecb_bswap32 (x)) << 32) | ecb_bswap32 (x >> 32);
528 } 554 }
529#endif 555#endif
530 556
531#if ECB_GCC_VERSION(4,5) 557#if ECB_GCC_VERSION(4,5) || ECB_CLANG_BUILTIN(__builtin_unreachable)
532 #define ecb_unreachable() __builtin_unreachable () 558 #define ecb_unreachable() __builtin_unreachable ()
533#else 559#else
534 /* this seems to work fine, but gcc always emits a warning for it :/ */ 560 /* this seems to work fine, but gcc always emits a warning for it :/ */
535 ecb_inline void ecb_unreachable (void) ecb_noreturn; 561 ecb_inline ecb_noreturn void ecb_unreachable (void);
536 ecb_inline void ecb_unreachable (void) { } 562 ecb_inline ecb_noreturn void ecb_unreachable (void) { }
537#endif 563#endif
538 564
539/* try to tell the compiler that some condition is definitely true */ 565/* try to tell the compiler that some condition is definitely true */
540#define ecb_assume(cond) if (!(cond)) ecb_unreachable (); else 0 566#define ecb_assume(cond) if (!(cond)) ecb_unreachable (); else 0
541 567
542ecb_inline unsigned char ecb_byteorder_helper (void) ecb_const; 568ecb_inline ecb_const unsigned char ecb_byteorder_helper (void);
543ecb_inline unsigned char 569ecb_inline ecb_const unsigned char
544ecb_byteorder_helper (void) 570ecb_byteorder_helper (void)
545{ 571{
546 /* the union code still generates code under pressure in gcc, */ 572 /* the union code still generates code under pressure in gcc, */
547 /* but less than using pointers, and always seems to */ 573 /* but less than using pointers, and always seems to */
548 /* successfully return a constant. */ 574 /* successfully return a constant. */
… …
563 } u = { 0x11223344 }; 589 } u = { 0x11223344 };
564 return u.c; 590 return u.c;
565#endif 591#endif
566} 592}
567 593
568ecb_inline ecb_bool ecb_big_endian (void) ecb_const; 594ecb_inline ecb_const ecb_bool ecb_big_endian (void);
569ecb_inline ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; } 595ecb_inline ecb_const ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; }
570ecb_inline ecb_bool ecb_little_endian (void) ecb_const; 596ecb_inline ecb_const ecb_bool ecb_little_endian (void);
571ecb_inline ecb_bool ecb_little_endian (void) { return ecb_byteorder_helper () == 0x44; } 597ecb_inline ecb_const ecb_bool ecb_little_endian (void) { return ecb_byteorder_helper () == 0x44; }
572 598
573#if ECB_GCC_VERSION(3,0) || ECB_C99 599#if ECB_GCC_VERSION(3,0) || ECB_C99
574 #define ecb_mod(m,n) ((m) % (n) + ((m) % (n) < 0 ? (n) : 0)) 600 #define ecb_mod(m,n) ((m) % (n) + ((m) % (n) < 0 ? (n) : 0))
575#else 601#else
576 #define ecb_mod(m,n) ((m) < 0 ? ((n) - 1 - ((-1 - (m)) % (n))) : ((m) % (n))) 602 #define ecb_mod(m,n) ((m) < 0 ? ((n) - 1 - ((-1 - (m)) % (n))) : ((m) % (n)))
577#endif 603#endif
578 604
579#if __cplusplus 605#if ECB_CPP
580 template<typename T> 606 template<typename T>
581 static inline T ecb_div_rd (T val, T div) 607 static inline T ecb_div_rd (T val, T div)
582 { 608 {
583 return val < 0 ? - ((-val + div - 1) / div) : (val ) / div; 609 return val < 0 ? - ((-val + div - 1) / div) : (val ) / div;
584 } 610 }
… …
644 #define ECB_NAN NAN 670 #define ECB_NAN NAN
645 #else 671 #else
646 #define ECB_NAN ECB_INFINITY 672 #define ECB_NAN ECB_INFINITY
647 #endif 673 #endif
648 674
675 #if ECB_C99 || _XOPEN_VERSION >= 600 || _POSIX_VERSION >= 200112L
676 #define ecb_ldexpf(x,e) ldexpf ((x), (e))
677 #else
678 #define ecb_ldexpf(x,e) (float) ldexp ((x), (e))
679 #endif
680
649 /* converts an ieee half/binary16 to a float */ 681 /* converts an ieee half/binary16 to a float */
650 ecb_function_ float ecb_binary16_to_float (uint16_t x) ecb_const; 682 ecb_function_ ecb_const float ecb_binary16_to_float (uint16_t x);
651 ecb_function_ float 683 ecb_function_ ecb_const float
652 ecb_binary16_to_float (uint16_t x) 684 ecb_binary16_to_float (uint16_t x)
653 { 685 {
654 int e = (x >> 10) & 0x1f; 686 int e = (x >> 10) & 0x1f;
655 int m = x & 0x3ff; 687 int m = x & 0x3ff;
656 float r; 688 float r;
657 689
658 if (!e ) r = ldexpf (m , -24); 690 if (!e ) r = ecb_ldexpf (m , -24);
659 else if (e != 31) r = ldexpf (m + 0x400, e - 25); 691 else if (e != 31) r = ecb_ldexpf (m + 0x400, e - 25);
660 else if (m ) r = ECB_NAN; 692 else if (m ) r = ECB_NAN;
661 else r = ECB_INFINITY; 693 else r = ECB_INFINITY;
662 694
663 return x & 0x8000 ? -r : r; 695 return x & 0x8000 ? -r : r;
664 } 696 }
665 697
666 /* convert a float to ieee single/binary32 */ 698 /* convert a float to ieee single/binary32 */
667 ecb_function_ uint32_t ecb_float_to_binary32 (float x) ecb_const; 699 ecb_function_ ecb_const uint32_t ecb_float_to_binary32 (float x);
668 ecb_function_ uint32_t 700 ecb_function_ ecb_const uint32_t
669 ecb_float_to_binary32 (float x) 701 ecb_float_to_binary32 (float x)
670 { 702 {
671 uint32_t r; 703 uint32_t r;
672 704
673 #if ECB_STDFP 705 #if ECB_STDFP
… …
702 734
703 return r; 735 return r;
704 } 736 }
705 737
706 /* converts an ieee single/binary32 to a float */ 738 /* converts an ieee single/binary32 to a float */
707 ecb_function_ float ecb_binary32_to_float (uint32_t x) ecb_const; 739 ecb_function_ ecb_const float ecb_binary32_to_float (uint32_t x);
708 ecb_function_ float 740 ecb_function_ ecb_const float
709 ecb_binary32_to_float (uint32_t x) 741 ecb_binary32_to_float (uint32_t x)
710 { 742 {
711 float r; 743 float r;
712 744
713 #if ECB_STDFP 745 #if ECB_STDFP
… …
723 x |= 0x800000U; 755 x |= 0x800000U;
724 else 756 else
725 e = 1; 757 e = 1;
726 758
727 /* we distrust ldexpf a bit and do the 2**-24 scaling by an extra multiply */ 759 /* we distrust ldexpf a bit and do the 2**-24 scaling by an extra multiply */
728 r = ldexpf (x * (0.5f / 0x800000U), e - 126); 760 r = ecb_ldexpf (x * (0.5f / 0x800000U), e - 126);
729 761
730 r = neg ? -r : r; 762 r = neg ? -r : r;
731 #endif 763 #endif
732 764
733 return r; 765 return r;
734 } 766 }
735 767
736 /* convert a double to ieee double/binary64 */ 768 /* convert a double to ieee double/binary64 */
737 ecb_function_ uint64_t ecb_double_to_binary64 (double x) ecb_const; 769 ecb_function_ ecb_const uint64_t ecb_double_to_binary64 (double x);
738 ecb_function_ uint64_t 770 ecb_function_ ecb_const uint64_t
739 ecb_double_to_binary64 (double x) 771 ecb_double_to_binary64 (double x)
740 { 772 {
741 uint64_t r; 773 uint64_t r;
742 774
743 #if ECB_STDFP 775 #if ECB_STDFP
… …
772 804
773 return r; 805 return r;
774 } 806 }
775 807
776 /* converts an ieee double/binary64 to a double */ 808 /* converts an ieee double/binary64 to a double */
777 ecb_function_ double ecb_binary64_to_double (uint64_t x) ecb_const; 809 ecb_function_ ecb_const double ecb_binary64_to_double (uint64_t x);
778 ecb_function_ double 810 ecb_function_ ecb_const double
779 ecb_binary64_to_double (uint64_t x) 811 ecb_binary64_to_double (uint64_t x)
780 { 812 {
781 double r; 813 double r;
782 814
783 #if ECB_STDFP 815 #if ECB_STDFP

Diff Legend

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