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.157 by root, Fri Feb 20 17:17:26 2015 UTC

1/* 1/*
2 * libecb - http://software.schmorp.de/pkg/libecb 2 * libecb - http://software.schmorp.de/pkg/libecb
3 * 3 *
4 * Copyright (©) 2009-2014 Marc Alexander Lehmann <libecb@schmorp.de> 4 * Copyright (©) 2009-2015 Marc Alexander Lehmann <libecb@schmorp.de>
5 * Copyright (©) 2011 Emanuele Giaquinta 5 * Copyright (©) 2011 Emanuele Giaquinta
6 * All rights reserved. 6 * All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without modifica- 8 * Redistribution and use in source and binary forms, with or without modifica-
9 * tion, are permitted provided that the following conditions are met: 9 * tion, are permitted provided that the following conditions are met:
… …
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;
… …
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 99#endif
100 100
101#define ECB_CLANG_VERSION(major,minor) (__clang_major__ > (major) || (__clang_major__ == (major) && __clang_minor__ >= (minor))) 101#define ECB_CLANG_VERSION(major,minor) (__clang_major__ > (major) || (__clang_major__ == (major) && __clang_minor__ >= (minor)))
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... */
… …
277 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE 278 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
278#endif 279#endif
279 280
280/*****************************************************************************/ 281/*****************************************************************************/
281 282
282#if __cplusplus 283#if ECB_CPP
283 #define ecb_inline static inline 284 #define ecb_inline static inline
284#elif ECB_GCC_VERSION(2,5) 285#elif ECB_GCC_VERSION(2,5)
285 #define ecb_inline static __inline__ 286 #define ecb_inline static __inline__
286#elif ECB_C99 287#elif ECB_C99
287 #define ecb_inline static inline 288 #define ecb_inline static inline
… …
301 302
302#define ECB_CONCAT_(a, b) a ## b 303#define ECB_CONCAT_(a, b) a ## b
303#define ECB_CONCAT(a, b) ECB_CONCAT_(a, b) 304#define ECB_CONCAT(a, b) ECB_CONCAT_(a, b)
304#define ECB_STRINGIFY_(a) # a 305#define ECB_STRINGIFY_(a) # a
305#define ECB_STRINGIFY(a) ECB_STRINGIFY_(a) 306#define ECB_STRINGIFY(a) ECB_STRINGIFY_(a)
307#define ECB_STRINGIFY_EXPR(expr) ((expr), ECB_STRINGIFY_ (expr))
306 308
307#define ecb_function_ ecb_inline 309#define ecb_function_ ecb_inline
308 310
309#if ECB_GCC_VERSION(3,1) || ECB_CLANG_VERSION(2,8) 311#if ECB_GCC_VERSION(3,1) || ECB_CLANG_VERSION(2,8)
310 #define ecb_attribute(attrlist) __attribute__(attrlist) 312 #define ecb_attribute(attrlist) __attribute__ (attrlist)
311#else 313#else
312 #define ecb_attribute(attrlist) 314 #define ecb_attribute(attrlist)
313#endif 315#endif
314 316
315#if ECB_GCC_VERSION(3,1) || ECB_CLANG_BUILTIN(__builtin_constant_p) 317#if ECB_GCC_VERSION(3,1) || ECB_CLANG_BUILTIN(__builtin_constant_p)
… …
333#else 335#else
334 #define ecb_prefetch(addr,rw,locality) 336 #define ecb_prefetch(addr,rw,locality)
335#endif 337#endif
336 338
337/* no emulation for ecb_decltype */ 339/* no emulation for ecb_decltype */
338#if ECB_GCC_VERSION(4,5) 340#if ECB_CPP11
341 // older implementations might have problems with decltype(x)::type, work around it
342 template<class T> struct ecb_decltype_t { typedef T type; };
339 #define ecb_decltype(x) __decltype(x) 343 #define ecb_decltype(x) ecb_decltype_t<decltype (x)>::type
340#elif ECB_GCC_VERSION(3,0) 344#elif ECB_GCC_VERSION(3,0) || ECB_CLANG_VERSION(2,8)
341 #define ecb_decltype(x) __typeof(x) 345 #define ecb_decltype(x) __typeof__ (x)
342#endif 346#endif
343 347
344#if _MSC_VER >= 1300 348#if _MSC_VER >= 1300
345 #define ecb_deprecated __declspec(deprecated) 349 #define ecb_deprecated __declspec (deprecated)
346#else 350#else
347 #define ecb_deprecated ecb_attribute ((__deprecated__)) 351 #define ecb_deprecated ecb_attribute ((__deprecated__))
348#endif 352#endif
349 353
354#if __MSC_VER >= 1500
355 #define ecb_deprecated_message(msg) __declspec (deprecated (msg))
356#elif ECB_GCC_VERSION(4,5)
357 #define ecb_deprecated_message(msg) ecb_attribute ((__deprecated__ (msg))
358#else
359 #define ecb_deprecated_message(msg) ecb_deprecated
360#endif
361
362#if _MSC_VER >= 1400
363 #define ecb_noinline __declspec (noinline)
364#else
350#define ecb_noinline ecb_attribute ((__noinline__)) 365 #define ecb_noinline ecb_attribute ((__noinline__))
366#endif
367
351#define ecb_unused ecb_attribute ((__unused__)) 368#define ecb_unused ecb_attribute ((__unused__))
352#define ecb_const ecb_attribute ((__const__)) 369#define ecb_const ecb_attribute ((__const__))
353#define ecb_pure ecb_attribute ((__pure__)) 370#define ecb_pure ecb_attribute ((__pure__))
354 371
355/* http://msdn.microsoft.com/en-us/library/k6ktzx3s.aspx __declspec(noreturn) */ 372#if ECB_C11 || __IBMC_NORETURN
356#if ECB_C11 373 /* http://pic.dhe.ibm.com/infocenter/compbg/v121v141/topic/com.ibm.xlcpp121.bg.doc/language_ref/noreturn.html */
357 #define ecb_noreturn _Noreturn 374 #define ecb_noreturn _Noreturn
375#elif ECB_CPP11
376 #define ecb_noreturn [[noreturn]]
377#elif _MSC_VER >= 1200
378 /* http://msdn.microsoft.com/en-us/library/k6ktzx3s.aspx */
379 #define ecb_noreturn __declspec (noreturn)
358#else 380#else
359 #define ecb_noreturn ecb_attribute ((__noreturn__)) 381 #define ecb_noreturn ecb_attribute ((__noreturn__))
360#endif 382#endif
361 383
362#if ECB_GCC_VERSION(4,3) 384#if ECB_GCC_VERSION(4,3)
… …
377/* for compatibility to the rest of the world */ 399/* for compatibility to the rest of the world */
378#define ecb_likely(expr) ecb_expect_true (expr) 400#define ecb_likely(expr) ecb_expect_true (expr)
379#define ecb_unlikely(expr) ecb_expect_false (expr) 401#define ecb_unlikely(expr) ecb_expect_false (expr)
380 402
381/* count trailing zero bits and count # of one bits */ 403/* count trailing zero bits and count # of one bits */
404#if ECB_GCC_VERSION(3,4) \
382#if ECB_GCC_VERSION(3,4) || (ECB_CLANG_BUILTIN(__builtin_clz) && ECB_CLANG_BUILTIN(__builtin_clzll) \ 405 || (ECB_CLANG_BUILTIN(__builtin_clz) && ECB_CLANG_BUILTIN(__builtin_clzll) \
383 && ECB_CLANG_BUILTIN(__builtin_ctz) && ECB_CLANG_BUILTIN(__builtin_ctzll) \ 406 && ECB_CLANG_BUILTIN(__builtin_ctz) && ECB_CLANG_BUILTIN(__builtin_ctzll) \
384 && ECB_CLANG_BUILTIN(__builtin_popcount)) 407 && ECB_CLANG_BUILTIN(__builtin_popcount))
385 /* we assume int == 32 bit, long == 32 or 64 bit and long long == 64 bit */ 408 /* we assume int == 32 bit, long == 32 or 64 bit and long long == 64 bit */
386 #define ecb_ld32(x) (__builtin_clz (x) ^ 31) 409 #define ecb_ld32(x) (__builtin_clz (x) ^ 31)
387 #define ecb_ld64(x) (__builtin_clzll (x) ^ 63) 410 #define ecb_ld64(x) (__builtin_clzll (x) ^ 63)
388 #define ecb_ctz32(x) __builtin_ctz (x) 411 #define ecb_ctz32(x) __builtin_ctz (x)
389 #define ecb_ctz64(x) __builtin_ctzll (x) 412 #define ecb_ctz64(x) __builtin_ctzll (x)
390 #define ecb_popcount32(x) __builtin_popcount (x) 413 #define ecb_popcount32(x) __builtin_popcount (x)
391 /* no popcountll */ 414 /* no popcountll */
392#else 415#else
393 ecb_function_ int ecb_ctz32 (uint32_t x) ecb_const; 416 ecb_function_ ecb_const int ecb_ctz32 (uint32_t x);
394 ecb_function_ int 417 ecb_function_ ecb_const int
395 ecb_ctz32 (uint32_t x) 418 ecb_ctz32 (uint32_t x)
396 { 419 {
397 int r = 0; 420 int r = 0;
398 421
399 x &= ~x + 1; /* this isolates the lowest bit */ 422 x &= ~x + 1; /* this isolates the lowest bit */
… …
413#endif 436#endif
414 437
415 return r; 438 return r;
416 } 439 }
417 440
418 ecb_function_ int ecb_ctz64 (uint64_t x) ecb_const; 441 ecb_function_ ecb_const int ecb_ctz64 (uint64_t x);
419 ecb_function_ int 442 ecb_function_ ecb_const int
420 ecb_ctz64 (uint64_t x) 443 ecb_ctz64 (uint64_t x)
421 { 444 {
422 int shift = x & 0xffffffffU ? 0 : 32; 445 int shift = x & 0xffffffffU ? 0 : 32;
423 return ecb_ctz32 (x >> shift) + shift; 446 return ecb_ctz32 (x >> shift) + shift;
424 } 447 }
425 448
426 ecb_function_ int ecb_popcount32 (uint32_t x) ecb_const; 449 ecb_function_ ecb_const int ecb_popcount32 (uint32_t x);
427 ecb_function_ int 450 ecb_function_ ecb_const int
428 ecb_popcount32 (uint32_t x) 451 ecb_popcount32 (uint32_t x)
429 { 452 {
430 x -= (x >> 1) & 0x55555555; 453 x -= (x >> 1) & 0x55555555;
431 x = ((x >> 2) & 0x33333333) + (x & 0x33333333); 454 x = ((x >> 2) & 0x33333333) + (x & 0x33333333);
432 x = ((x >> 4) + x) & 0x0f0f0f0f; 455 x = ((x >> 4) + x) & 0x0f0f0f0f;
433 x *= 0x01010101; 456 x *= 0x01010101;
434 457
435 return x >> 24; 458 return x >> 24;
436 } 459 }
437 460
438 ecb_function_ int ecb_ld32 (uint32_t x) ecb_const; 461 ecb_function_ ecb_const int ecb_ld32 (uint32_t x);
439 ecb_function_ int ecb_ld32 (uint32_t x) 462 ecb_function_ ecb_const int ecb_ld32 (uint32_t x)
440 { 463 {
441 int r = 0; 464 int r = 0;
442 465
443 if (x >> 16) { x >>= 16; r += 16; } 466 if (x >> 16) { x >>= 16; r += 16; }
444 if (x >> 8) { x >>= 8; r += 8; } 467 if (x >> 8) { x >>= 8; r += 8; }
… …
447 if (x >> 1) { r += 1; } 470 if (x >> 1) { r += 1; }
448 471
449 return r; 472 return r;
450 } 473 }
451 474
452 ecb_function_ int ecb_ld64 (uint64_t x) ecb_const; 475 ecb_function_ ecb_const int ecb_ld64 (uint64_t x);
453 ecb_function_ int ecb_ld64 (uint64_t x) 476 ecb_function_ ecb_const int ecb_ld64 (uint64_t x)
454 { 477 {
455 int r = 0; 478 int r = 0;
456 479
457 if (x >> 32) { x >>= 32; r += 32; } 480 if (x >> 32) { x >>= 32; r += 32; }
458 481
459 return r + ecb_ld32 (x); 482 return r + ecb_ld32 (x);
460 } 483 }
461#endif 484#endif
462 485
463ecb_function_ ecb_bool ecb_is_pot32 (uint32_t x) ecb_const; 486ecb_function_ ecb_const ecb_bool ecb_is_pot32 (uint32_t x);
464ecb_function_ ecb_bool ecb_is_pot32 (uint32_t x) { return !(x & (x - 1)); } 487ecb_function_ ecb_const ecb_bool ecb_is_pot32 (uint32_t x) { return !(x & (x - 1)); }
465ecb_function_ ecb_bool ecb_is_pot64 (uint64_t x) ecb_const; 488ecb_function_ ecb_const ecb_bool ecb_is_pot64 (uint64_t x);
466ecb_function_ ecb_bool ecb_is_pot64 (uint64_t x) { return !(x & (x - 1)); } 489ecb_function_ ecb_const ecb_bool ecb_is_pot64 (uint64_t x) { return !(x & (x - 1)); }
467 490
468ecb_function_ uint8_t ecb_bitrev8 (uint8_t x) ecb_const; 491ecb_function_ ecb_const uint8_t ecb_bitrev8 (uint8_t x);
469ecb_function_ uint8_t ecb_bitrev8 (uint8_t x) 492ecb_function_ ecb_const uint8_t ecb_bitrev8 (uint8_t x)
470{ 493{
471 return ( (x * 0x0802U & 0x22110U) 494 return ( (x * 0x0802U & 0x22110U)
472 | (x * 0x8020U & 0x88440U)) * 0x10101U >> 16; 495 | (x * 0x8020U & 0x88440U)) * 0x10101U >> 16;
473} 496}
474 497
475ecb_function_ uint16_t ecb_bitrev16 (uint16_t x) ecb_const; 498ecb_function_ ecb_const uint16_t ecb_bitrev16 (uint16_t x);
476ecb_function_ uint16_t ecb_bitrev16 (uint16_t x) 499ecb_function_ ecb_const uint16_t ecb_bitrev16 (uint16_t x)
477{ 500{
478 x = ((x >> 1) & 0x5555) | ((x & 0x5555) << 1); 501 x = ((x >> 1) & 0x5555) | ((x & 0x5555) << 1);
479 x = ((x >> 2) & 0x3333) | ((x & 0x3333) << 2); 502 x = ((x >> 2) & 0x3333) | ((x & 0x3333) << 2);
480 x = ((x >> 4) & 0x0f0f) | ((x & 0x0f0f) << 4); 503 x = ((x >> 4) & 0x0f0f) | ((x & 0x0f0f) << 4);
481 x = ( x >> 8 ) | ( x << 8); 504 x = ( x >> 8 ) | ( x << 8);
482 505
483 return x; 506 return x;
484} 507}
485 508
486ecb_function_ uint32_t ecb_bitrev32 (uint32_t x) ecb_const; 509ecb_function_ ecb_const uint32_t ecb_bitrev32 (uint32_t x);
487ecb_function_ uint32_t ecb_bitrev32 (uint32_t x) 510ecb_function_ ecb_const uint32_t ecb_bitrev32 (uint32_t x)
488{ 511{
489 x = ((x >> 1) & 0x55555555) | ((x & 0x55555555) << 1); 512 x = ((x >> 1) & 0x55555555) | ((x & 0x55555555) << 1);
490 x = ((x >> 2) & 0x33333333) | ((x & 0x33333333) << 2); 513 x = ((x >> 2) & 0x33333333) | ((x & 0x33333333) << 2);
491 x = ((x >> 4) & 0x0f0f0f0f) | ((x & 0x0f0f0f0f) << 4); 514 x = ((x >> 4) & 0x0f0f0f0f) | ((x & 0x0f0f0f0f) << 4);
492 x = ((x >> 8) & 0x00ff00ff) | ((x & 0x00ff00ff) << 8); 515 x = ((x >> 8) & 0x00ff00ff) | ((x & 0x00ff00ff) << 8);
… …
495 return x; 518 return x;
496} 519}
497 520
498/* popcount64 is only available on 64 bit cpus as gcc builtin */ 521/* popcount64 is only available on 64 bit cpus as gcc builtin */
499/* so for this version we are lazy */ 522/* so for this version we are lazy */
500ecb_function_ int ecb_popcount64 (uint64_t x) ecb_const; 523ecb_function_ ecb_const int ecb_popcount64 (uint64_t x);
501ecb_function_ int 524ecb_function_ ecb_const int
502ecb_popcount64 (uint64_t x) 525ecb_popcount64 (uint64_t x)
503{ 526{
504 return ecb_popcount32 (x) + ecb_popcount32 (x >> 32); 527 return ecb_popcount32 (x) + ecb_popcount32 (x >> 32);
505} 528}
506 529
507ecb_inline uint8_t ecb_rotl8 (uint8_t x, unsigned int count) ecb_const; 530ecb_inline ecb_const uint8_t ecb_rotl8 (uint8_t x, unsigned int count);
508ecb_inline uint8_t ecb_rotr8 (uint8_t x, unsigned int count) ecb_const; 531ecb_inline ecb_const uint8_t ecb_rotr8 (uint8_t x, unsigned int count);
509ecb_inline uint16_t ecb_rotl16 (uint16_t x, unsigned int count) ecb_const; 532ecb_inline ecb_const uint16_t ecb_rotl16 (uint16_t x, unsigned int count);
510ecb_inline uint16_t ecb_rotr16 (uint16_t x, unsigned int count) ecb_const; 533ecb_inline ecb_const uint16_t ecb_rotr16 (uint16_t x, unsigned int count);
511ecb_inline uint32_t ecb_rotl32 (uint32_t x, unsigned int count) ecb_const; 534ecb_inline ecb_const uint32_t ecb_rotl32 (uint32_t x, unsigned int count);
512ecb_inline uint32_t ecb_rotr32 (uint32_t x, unsigned int count) ecb_const; 535ecb_inline ecb_const uint32_t ecb_rotr32 (uint32_t x, unsigned int count);
513ecb_inline uint64_t ecb_rotl64 (uint64_t x, unsigned int count) ecb_const; 536ecb_inline ecb_const uint64_t ecb_rotl64 (uint64_t x, unsigned int count);
514ecb_inline uint64_t ecb_rotr64 (uint64_t x, unsigned int count) ecb_const; 537ecb_inline ecb_const uint64_t ecb_rotr64 (uint64_t x, unsigned int count);
515 538
516ecb_inline uint8_t ecb_rotl8 (uint8_t x, unsigned int count) { return (x >> ( 8 - count)) | (x << count); } 539ecb_inline ecb_const uint8_t ecb_rotl8 (uint8_t x, unsigned int count) { return (x >> ( 8 - count)) | (x << count); }
517ecb_inline uint8_t ecb_rotr8 (uint8_t x, unsigned int count) { return (x << ( 8 - count)) | (x >> count); } 540ecb_inline ecb_const uint8_t ecb_rotr8 (uint8_t x, unsigned int count) { return (x << ( 8 - count)) | (x >> count); }
518ecb_inline uint16_t ecb_rotl16 (uint16_t x, unsigned int count) { return (x >> (16 - count)) | (x << count); } 541ecb_inline ecb_const uint16_t ecb_rotl16 (uint16_t x, unsigned int count) { return (x >> (16 - count)) | (x << count); }
519ecb_inline uint16_t ecb_rotr16 (uint16_t x, unsigned int count) { return (x << (16 - count)) | (x >> count); } 542ecb_inline ecb_const uint16_t ecb_rotr16 (uint16_t x, unsigned int count) { return (x << (16 - count)) | (x >> count); }
520ecb_inline uint32_t ecb_rotl32 (uint32_t x, unsigned int count) { return (x >> (32 - count)) | (x << count); } 543ecb_inline ecb_const uint32_t ecb_rotl32 (uint32_t x, unsigned int count) { return (x >> (32 - count)) | (x << count); }
521ecb_inline uint32_t ecb_rotr32 (uint32_t x, unsigned int count) { return (x << (32 - count)) | (x >> count); } 544ecb_inline ecb_const uint32_t ecb_rotr32 (uint32_t x, unsigned int count) { return (x << (32 - count)) | (x >> count); }
522ecb_inline uint64_t ecb_rotl64 (uint64_t x, unsigned int count) { return (x >> (64 - count)) | (x << count); } 545ecb_inline ecb_const uint64_t ecb_rotl64 (uint64_t x, unsigned int count) { return (x >> (64 - count)) | (x << count); }
523ecb_inline uint64_t ecb_rotr64 (uint64_t x, unsigned int count) { return (x << (64 - count)) | (x >> count); } 546ecb_inline ecb_const uint64_t ecb_rotr64 (uint64_t x, unsigned int count) { return (x << (64 - count)) | (x >> count); }
524 547
525#if ECB_GCC_VERSION(4,3) || (ECB_CLANG_BUILTIN(__builtin_bswap32) && ECB_CLANG_BUILTIN(__builtin_bswap64)) 548#if ECB_GCC_VERSION(4,3) || (ECB_CLANG_BUILTIN(__builtin_bswap32) && ECB_CLANG_BUILTIN(__builtin_bswap64))
526 #define ecb_bswap16(x) (__builtin_bswap32 (x) >> 16) 549 #define ecb_bswap16(x) (__builtin_bswap32 (x) >> 16)
527 #define ecb_bswap32(x) __builtin_bswap32 (x) 550 #define ecb_bswap32(x) __builtin_bswap32 (x)
528 #define ecb_bswap64(x) __builtin_bswap64 (x) 551 #define ecb_bswap64(x) __builtin_bswap64 (x)
529#else 552#else
530 ecb_function_ uint16_t ecb_bswap16 (uint16_t x) ecb_const; 553 ecb_function_ ecb_const uint16_t ecb_bswap16 (uint16_t x);
531 ecb_function_ uint16_t 554 ecb_function_ ecb_const uint16_t
532 ecb_bswap16 (uint16_t x) 555 ecb_bswap16 (uint16_t x)
533 { 556 {
534 return ecb_rotl16 (x, 8); 557 return ecb_rotl16 (x, 8);
535 } 558 }
536 559
537 ecb_function_ uint32_t ecb_bswap32 (uint32_t x) ecb_const; 560 ecb_function_ ecb_const uint32_t ecb_bswap32 (uint32_t x);
538 ecb_function_ uint32_t 561 ecb_function_ ecb_const uint32_t
539 ecb_bswap32 (uint32_t x) 562 ecb_bswap32 (uint32_t x)
540 { 563 {
541 return (((uint32_t)ecb_bswap16 (x)) << 16) | ecb_bswap16 (x >> 16); 564 return (((uint32_t)ecb_bswap16 (x)) << 16) | ecb_bswap16 (x >> 16);
542 } 565 }
543 566
544 ecb_function_ uint64_t ecb_bswap64 (uint64_t x) ecb_const; 567 ecb_function_ ecb_const uint64_t ecb_bswap64 (uint64_t x);
545 ecb_function_ uint64_t 568 ecb_function_ ecb_const uint64_t
546 ecb_bswap64 (uint64_t x) 569 ecb_bswap64 (uint64_t x)
547 { 570 {
548 return (((uint64_t)ecb_bswap32 (x)) << 32) | ecb_bswap32 (x >> 32); 571 return (((uint64_t)ecb_bswap32 (x)) << 32) | ecb_bswap32 (x >> 32);
549 } 572 }
550#endif 573#endif
551 574
552#if ECB_GCC_VERSION(4,5) || ECB_CLANG_BUILTIN(__builtin_unreachable) 575#if ECB_GCC_VERSION(4,5) || ECB_CLANG_BUILTIN(__builtin_unreachable)
553 #define ecb_unreachable() __builtin_unreachable () 576 #define ecb_unreachable() __builtin_unreachable ()
554#else 577#else
555 /* this seems to work fine, but gcc always emits a warning for it :/ */ 578 /* this seems to work fine, but gcc always emits a warning for it :/ */
556 ecb_inline void ecb_unreachable (void) ecb_noreturn; 579 ecb_inline ecb_noreturn void ecb_unreachable (void);
557 ecb_inline void ecb_unreachable (void) { } 580 ecb_inline ecb_noreturn void ecb_unreachable (void) { }
558#endif 581#endif
559 582
560/* try to tell the compiler that some condition is definitely true */ 583/* try to tell the compiler that some condition is definitely true */
561#define ecb_assume(cond) if (!(cond)) ecb_unreachable (); else 0 584#define ecb_assume(cond) if (!(cond)) ecb_unreachable (); else 0
562 585
563ecb_inline unsigned char ecb_byteorder_helper (void) ecb_const; 586ecb_inline ecb_const unsigned char ecb_byteorder_helper (void);
564ecb_inline unsigned char 587ecb_inline ecb_const unsigned char
565ecb_byteorder_helper (void) 588ecb_byteorder_helper (void)
566{ 589{
567 /* the union code still generates code under pressure in gcc, */ 590 /* the union code still generates code under pressure in gcc, */
568 /* but less than using pointers, and always seems to */ 591 /* but less than using pointers, and always seems to */
569 /* successfully return a constant. */ 592 /* successfully return a constant. */
570 /* the reason why we have this horrible preprocessor mess */ 593 /* the reason why we have this horrible preprocessor mess */
571 /* is to avoid it in all cases, at least on common architectures */ 594 /* is to avoid it in all cases, at least on common architectures */
572 /* or when using a recent enough gcc version (>= 4.6) */ 595 /* or when using a recent enough gcc version (>= 4.6) */
573#if __i386 || __i386__ || _M_X86 || __amd64 || __amd64__ || _M_X64 596#if ((__i386 || __i386__) && !__VOS__) || _M_X86 || __amd64 || __amd64__ || _M_X64
574 return 0x44; 597 return 0x44;
575#elif __BYTE_ORDER__ && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ 598#elif __BYTE_ORDER__ && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
576 return 0x44; 599 return 0x44;
577#elif __BYTE_ORDER__ && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ 600#elif __BYTE_ORDER__ && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
578 return 0x11; 601 return 0x11;
… …
584 } u = { 0x11223344 }; 607 } u = { 0x11223344 };
585 return u.c; 608 return u.c;
586#endif 609#endif
587} 610}
588 611
589ecb_inline ecb_bool ecb_big_endian (void) ecb_const; 612ecb_inline ecb_const ecb_bool ecb_big_endian (void);
590ecb_inline ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; } 613ecb_inline ecb_const ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; }
591ecb_inline ecb_bool ecb_little_endian (void) ecb_const; 614ecb_inline ecb_const ecb_bool ecb_little_endian (void);
592ecb_inline ecb_bool ecb_little_endian (void) { return ecb_byteorder_helper () == 0x44; } 615ecb_inline ecb_const ecb_bool ecb_little_endian (void) { return ecb_byteorder_helper () == 0x44; }
593 616
594#if ECB_GCC_VERSION(3,0) || ECB_C99 617#if ECB_GCC_VERSION(3,0) || ECB_C99
595 #define ecb_mod(m,n) ((m) % (n) + ((m) % (n) < 0 ? (n) : 0)) 618 #define ecb_mod(m,n) ((m) % (n) + ((m) % (n) < 0 ? (n) : 0))
596#else 619#else
597 #define ecb_mod(m,n) ((m) < 0 ? ((n) - 1 - ((-1 - (m)) % (n))) : ((m) % (n))) 620 #define ecb_mod(m,n) ((m) < 0 ? ((n) - 1 - ((-1 - (m)) % (n))) : ((m) % (n)))
598#endif 621#endif
599 622
600#if __cplusplus 623#if ECB_CPP
601 template<typename T> 624 template<typename T>
602 static inline T ecb_div_rd (T val, T div) 625 static inline T ecb_div_rd (T val, T div)
603 { 626 {
604 return val < 0 ? - ((-val + div - 1) / div) : (val ) / div; 627 return val < 0 ? - ((-val + div - 1) / div) : (val ) / div;
605 } 628 }
… …
665 #define ECB_NAN NAN 688 #define ECB_NAN NAN
666 #else 689 #else
667 #define ECB_NAN ECB_INFINITY 690 #define ECB_NAN ECB_INFINITY
668 #endif 691 #endif
669 692
693 #if ECB_C99 || _XOPEN_VERSION >= 600 || _POSIX_VERSION >= 200112L
694 #define ecb_ldexpf(x,e) ldexpf ((x), (e))
695 #else
696 #define ecb_ldexpf(x,e) (float) ldexp ((x), (e))
697 #endif
698
670 /* converts an ieee half/binary16 to a float */ 699 /* converts an ieee half/binary16 to a float */
671 ecb_function_ float ecb_binary16_to_float (uint16_t x) ecb_const; 700 ecb_function_ ecb_const float ecb_binary16_to_float (uint16_t x);
672 ecb_function_ float 701 ecb_function_ ecb_const float
673 ecb_binary16_to_float (uint16_t x) 702 ecb_binary16_to_float (uint16_t x)
674 { 703 {
675 int e = (x >> 10) & 0x1f; 704 int e = (x >> 10) & 0x1f;
676 int m = x & 0x3ff; 705 int m = x & 0x3ff;
677 float r; 706 float r;
678 707
679 if (!e ) r = ldexpf (m , -24); 708 if (!e ) r = ecb_ldexpf (m , -24);
680 else if (e != 31) r = ldexpf (m + 0x400, e - 25); 709 else if (e != 31) r = ecb_ldexpf (m + 0x400, e - 25);
681 else if (m ) r = ECB_NAN; 710 else if (m ) r = ECB_NAN;
682 else r = ECB_INFINITY; 711 else r = ECB_INFINITY;
683 712
684 return x & 0x8000 ? -r : r; 713 return x & 0x8000 ? -r : r;
685 } 714 }
686 715
687 /* convert a float to ieee single/binary32 */ 716 /* convert a float to ieee single/binary32 */
688 ecb_function_ uint32_t ecb_float_to_binary32 (float x) ecb_const; 717 ecb_function_ ecb_const uint32_t ecb_float_to_binary32 (float x);
689 ecb_function_ uint32_t 718 ecb_function_ ecb_const uint32_t
690 ecb_float_to_binary32 (float x) 719 ecb_float_to_binary32 (float x)
691 { 720 {
692 uint32_t r; 721 uint32_t r;
693 722
694 #if ECB_STDFP 723 #if ECB_STDFP
… …
723 752
724 return r; 753 return r;
725 } 754 }
726 755
727 /* converts an ieee single/binary32 to a float */ 756 /* converts an ieee single/binary32 to a float */
728 ecb_function_ float ecb_binary32_to_float (uint32_t x) ecb_const; 757 ecb_function_ ecb_const float ecb_binary32_to_float (uint32_t x);
729 ecb_function_ float 758 ecb_function_ ecb_const float
730 ecb_binary32_to_float (uint32_t x) 759 ecb_binary32_to_float (uint32_t x)
731 { 760 {
732 float r; 761 float r;
733 762
734 #if ECB_STDFP 763 #if ECB_STDFP
… …
744 x |= 0x800000U; 773 x |= 0x800000U;
745 else 774 else
746 e = 1; 775 e = 1;
747 776
748 /* we distrust ldexpf a bit and do the 2**-24 scaling by an extra multiply */ 777 /* we distrust ldexpf a bit and do the 2**-24 scaling by an extra multiply */
749 r = ldexpf (x * (0.5f / 0x800000U), e - 126); 778 r = ecb_ldexpf (x * (0.5f / 0x800000U), e - 126);
750 779
751 r = neg ? -r : r; 780 r = neg ? -r : r;
752 #endif 781 #endif
753 782
754 return r; 783 return r;
755 } 784 }
756 785
757 /* convert a double to ieee double/binary64 */ 786 /* convert a double to ieee double/binary64 */
758 ecb_function_ uint64_t ecb_double_to_binary64 (double x) ecb_const; 787 ecb_function_ ecb_const uint64_t ecb_double_to_binary64 (double x);
759 ecb_function_ uint64_t 788 ecb_function_ ecb_const uint64_t
760 ecb_double_to_binary64 (double x) 789 ecb_double_to_binary64 (double x)
761 { 790 {
762 uint64_t r; 791 uint64_t r;
763 792
764 #if ECB_STDFP 793 #if ECB_STDFP
… …
793 822
794 return r; 823 return r;
795 } 824 }
796 825
797 /* converts an ieee double/binary64 to a double */ 826 /* converts an ieee double/binary64 to a double */
798 ecb_function_ double ecb_binary64_to_double (uint64_t x) ecb_const; 827 ecb_function_ ecb_const double ecb_binary64_to_double (uint64_t x);
799 ecb_function_ double 828 ecb_function_ ecb_const double
800 ecb_binary64_to_double (uint64_t x) 829 ecb_binary64_to_double (uint64_t x)
801 { 830 {
802 double r; 831 double r;
803 832
804 #if ECB_STDFP 833 #if ECB_STDFP

Diff Legend

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