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

Comparing libecb/ecb.h (file contents):
Revision 1.150 by root, Thu Oct 30 07:21:42 2014 UTC vs.
Revision 1.151 by root, Wed Feb 11 18:47:34 2015 UTC

… …
393 #define ecb_ctz32(x) __builtin_ctz (x) 393 #define ecb_ctz32(x) __builtin_ctz (x)
394 #define ecb_ctz64(x) __builtin_ctzll (x) 394 #define ecb_ctz64(x) __builtin_ctzll (x)
395 #define ecb_popcount32(x) __builtin_popcount (x) 395 #define ecb_popcount32(x) __builtin_popcount (x)
396 /* no popcountll */ 396 /* no popcountll */
397#else 397#else
398 ecb_function_ int ecb_ctz32 (uint32_t x) ecb_const; 398 ecb_function_ ecb_const int ecb_ctz32 (uint32_t x);
399 ecb_function_ int 399 ecb_function_ ecb_const int
400 ecb_ctz32 (uint32_t x) 400 ecb_ctz32 (uint32_t x)
401 { 401 {
402 int r = 0; 402 int r = 0;
403 403
404 x &= ~x + 1; /* this isolates the lowest bit */ 404 x &= ~x + 1; /* this isolates the lowest bit */
… …
418#endif 418#endif
419 419
420 return r; 420 return r;
421 } 421 }
422 422
423 ecb_function_ int ecb_ctz64 (uint64_t x) ecb_const; 423 ecb_function_ ecb_const int ecb_ctz64 (uint64_t x);
424 ecb_function_ int 424 ecb_function_ ecb_const int
425 ecb_ctz64 (uint64_t x) 425 ecb_ctz64 (uint64_t x)
426 { 426 {
427 int shift = x & 0xffffffffU ? 0 : 32; 427 int shift = x & 0xffffffffU ? 0 : 32;
428 return ecb_ctz32 (x >> shift) + shift; 428 return ecb_ctz32 (x >> shift) + shift;
429 } 429 }
430 430
431 ecb_function_ int ecb_popcount32 (uint32_t x) ecb_const; 431 ecb_function_ ecb_const int ecb_popcount32 (uint32_t x);
432 ecb_function_ int 432 ecb_function_ ecb_const int
433 ecb_popcount32 (uint32_t x) 433 ecb_popcount32 (uint32_t x)
434 { 434 {
435 x -= (x >> 1) & 0x55555555; 435 x -= (x >> 1) & 0x55555555;
436 x = ((x >> 2) & 0x33333333) + (x & 0x33333333); 436 x = ((x >> 2) & 0x33333333) + (x & 0x33333333);
437 x = ((x >> 4) + x) & 0x0f0f0f0f; 437 x = ((x >> 4) + x) & 0x0f0f0f0f;
438 x *= 0x01010101; 438 x *= 0x01010101;
439 439
440 return x >> 24; 440 return x >> 24;
441 } 441 }
442 442
443 ecb_function_ int ecb_ld32 (uint32_t x) ecb_const; 443 ecb_function_ ecb_const int ecb_ld32 (uint32_t x);
444 ecb_function_ int ecb_ld32 (uint32_t x) 444 ecb_function_ ecb_const int ecb_ld32 (uint32_t x)
445 { 445 {
446 int r = 0; 446 int r = 0;
447 447
448 if (x >> 16) { x >>= 16; r += 16; } 448 if (x >> 16) { x >>= 16; r += 16; }
449 if (x >> 8) { x >>= 8; r += 8; } 449 if (x >> 8) { x >>= 8; r += 8; }
… …
452 if (x >> 1) { r += 1; } 452 if (x >> 1) { r += 1; }
453 453
454 return r; 454 return r;
455 } 455 }
456 456
457 ecb_function_ int ecb_ld64 (uint64_t x) ecb_const; 457 ecb_function_ ecb_const int ecb_ld64 (uint64_t x);
458 ecb_function_ int ecb_ld64 (uint64_t x) 458 ecb_function_ ecb_const int ecb_ld64 (uint64_t x)
459 { 459 {
460 int r = 0; 460 int r = 0;
461 461
462 if (x >> 32) { x >>= 32; r += 32; } 462 if (x >> 32) { x >>= 32; r += 32; }
463 463
464 return r + ecb_ld32 (x); 464 return r + ecb_ld32 (x);
465 } 465 }
466#endif 466#endif
467 467
468ecb_function_ ecb_bool ecb_is_pot32 (uint32_t x) ecb_const; 468ecb_function_ ecb_const ecb_bool ecb_is_pot32 (uint32_t x);
469ecb_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)); }
470ecb_function_ ecb_bool ecb_is_pot64 (uint64_t x) ecb_const; 470ecb_function_ ecb_const ecb_bool ecb_is_pot64 (uint64_t x);
471ecb_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)); }
472 472
473ecb_function_ uint8_t ecb_bitrev8 (uint8_t x) ecb_const; 473ecb_function_ ecb_const uint8_t ecb_bitrev8 (uint8_t x);
474ecb_function_ uint8_t ecb_bitrev8 (uint8_t x) 474ecb_function_ ecb_const uint8_t ecb_bitrev8 (uint8_t x)
475{ 475{
476 return ( (x * 0x0802U & 0x22110U) 476 return ( (x * 0x0802U & 0x22110U)
477 | (x * 0x8020U & 0x88440U)) * 0x10101U >> 16; 477 | (x * 0x8020U & 0x88440U)) * 0x10101U >> 16;
478} 478}
479 479
480ecb_function_ uint16_t ecb_bitrev16 (uint16_t x) ecb_const; 480ecb_function_ ecb_const uint16_t ecb_bitrev16 (uint16_t x);
481ecb_function_ uint16_t ecb_bitrev16 (uint16_t x) 481ecb_function_ ecb_const uint16_t ecb_bitrev16 (uint16_t x)
482{ 482{
483 x = ((x >> 1) & 0x5555) | ((x & 0x5555) << 1); 483 x = ((x >> 1) & 0x5555) | ((x & 0x5555) << 1);
484 x = ((x >> 2) & 0x3333) | ((x & 0x3333) << 2); 484 x = ((x >> 2) & 0x3333) | ((x & 0x3333) << 2);
485 x = ((x >> 4) & 0x0f0f) | ((x & 0x0f0f) << 4); 485 x = ((x >> 4) & 0x0f0f) | ((x & 0x0f0f) << 4);
486 x = ( x >> 8 ) | ( x << 8); 486 x = ( x >> 8 ) | ( x << 8);
487 487
488 return x; 488 return x;
489} 489}
490 490
491ecb_function_ uint32_t ecb_bitrev32 (uint32_t x) ecb_const; 491ecb_function_ ecb_const uint32_t ecb_bitrev32 (uint32_t x);
492ecb_function_ uint32_t ecb_bitrev32 (uint32_t x) 492ecb_function_ ecb_const uint32_t ecb_bitrev32 (uint32_t x)
493{ 493{
494 x = ((x >> 1) & 0x55555555) | ((x & 0x55555555) << 1); 494 x = ((x >> 1) & 0x55555555) | ((x & 0x55555555) << 1);
495 x = ((x >> 2) & 0x33333333) | ((x & 0x33333333) << 2); 495 x = ((x >> 2) & 0x33333333) | ((x & 0x33333333) << 2);
496 x = ((x >> 4) & 0x0f0f0f0f) | ((x & 0x0f0f0f0f) << 4); 496 x = ((x >> 4) & 0x0f0f0f0f) | ((x & 0x0f0f0f0f) << 4);
497 x = ((x >> 8) & 0x00ff00ff) | ((x & 0x00ff00ff) << 8); 497 x = ((x >> 8) & 0x00ff00ff) | ((x & 0x00ff00ff) << 8);
… …
500 return x; 500 return x;
501} 501}
502 502
503/* popcount64 is only available on 64 bit cpus as gcc builtin */ 503/* popcount64 is only available on 64 bit cpus as gcc builtin */
504/* so for this version we are lazy */ 504/* so for this version we are lazy */
505ecb_function_ int ecb_popcount64 (uint64_t x) ecb_const; 505ecb_function_ ecb_const int ecb_popcount64 (uint64_t x);
506ecb_function_ int 506ecb_function_ ecb_const int
507ecb_popcount64 (uint64_t x) 507ecb_popcount64 (uint64_t x)
508{ 508{
509 return ecb_popcount32 (x) + ecb_popcount32 (x >> 32); 509 return ecb_popcount32 (x) + ecb_popcount32 (x >> 32);
510} 510}
511 511
512ecb_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);
513ecb_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);
514ecb_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);
515ecb_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);
516ecb_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);
517ecb_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);
518ecb_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);
519ecb_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);
520 520
521ecb_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); }
522ecb_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); }
523ecb_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); }
524ecb_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); }
525ecb_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); }
526ecb_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); }
527ecb_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); }
528ecb_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); }
529 529
530#if ECB_GCC_VERSION(4,3) || (ECB_CLANG_BUILTIN(__builtin_bswap32) && ECB_CLANG_BUILTIN(__builtin_bswap64)) 530#if ECB_GCC_VERSION(4,3) || (ECB_CLANG_BUILTIN(__builtin_bswap32) && ECB_CLANG_BUILTIN(__builtin_bswap64))
531 #define ecb_bswap16(x) (__builtin_bswap32 (x) >> 16) 531 #define ecb_bswap16(x) (__builtin_bswap32 (x) >> 16)
532 #define ecb_bswap32(x) __builtin_bswap32 (x) 532 #define ecb_bswap32(x) __builtin_bswap32 (x)
533 #define ecb_bswap64(x) __builtin_bswap64 (x) 533 #define ecb_bswap64(x) __builtin_bswap64 (x)
534#else 534#else
535 ecb_function_ uint16_t ecb_bswap16 (uint16_t x) ecb_const; 535 ecb_function_ ecb_const uint16_t ecb_bswap16 (uint16_t x);
536 ecb_function_ uint16_t 536 ecb_function_ ecb_const uint16_t
537 ecb_bswap16 (uint16_t x) 537 ecb_bswap16 (uint16_t x)
538 { 538 {
539 return ecb_rotl16 (x, 8); 539 return ecb_rotl16 (x, 8);
540 } 540 }
541 541
542 ecb_function_ uint32_t ecb_bswap32 (uint32_t x) ecb_const; 542 ecb_function_ ecb_const uint32_t ecb_bswap32 (uint32_t x);
543 ecb_function_ uint32_t 543 ecb_function_ ecb_const uint32_t
544 ecb_bswap32 (uint32_t x) 544 ecb_bswap32 (uint32_t x)
545 { 545 {
546 return (((uint32_t)ecb_bswap16 (x)) << 16) | ecb_bswap16 (x >> 16); 546 return (((uint32_t)ecb_bswap16 (x)) << 16) | ecb_bswap16 (x >> 16);
547 } 547 }
548 548
549 ecb_function_ uint64_t ecb_bswap64 (uint64_t x) ecb_const; 549 ecb_function_ ecb_const uint64_t ecb_bswap64 (uint64_t x);
550 ecb_function_ uint64_t 550 ecb_function_ ecb_const uint64_t
551 ecb_bswap64 (uint64_t x) 551 ecb_bswap64 (uint64_t x)
552 { 552 {
553 return (((uint64_t)ecb_bswap32 (x)) << 32) | ecb_bswap32 (x >> 32); 553 return (((uint64_t)ecb_bswap32 (x)) << 32) | ecb_bswap32 (x >> 32);
554 } 554 }
555#endif 555#endif
556 556
557#if ECB_GCC_VERSION(4,5) || ECB_CLANG_BUILTIN(__builtin_unreachable) 557#if ECB_GCC_VERSION(4,5) || ECB_CLANG_BUILTIN(__builtin_unreachable)
558 #define ecb_unreachable() __builtin_unreachable () 558 #define ecb_unreachable() __builtin_unreachable ()
559#else 559#else
560 /* 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 :/ */
561 ecb_inline void ecb_unreachable (void) ecb_noreturn; 561 ecb_inline ecb_noreturn void ecb_unreachable (void);
562 ecb_inline void ecb_unreachable (void) { } 562 ecb_inline ecb_noreturn void ecb_unreachable (void) { }
563#endif 563#endif
564 564
565/* try to tell the compiler that some condition is definitely true */ 565/* try to tell the compiler that some condition is definitely true */
566#define ecb_assume(cond) if (!(cond)) ecb_unreachable (); else 0 566#define ecb_assume(cond) if (!(cond)) ecb_unreachable (); else 0
567 567
568ecb_inline unsigned char ecb_byteorder_helper (void) ecb_const; 568ecb_inline ecb_const unsigned char ecb_byteorder_helper (void);
569ecb_inline unsigned char 569ecb_inline ecb_const unsigned char
570ecb_byteorder_helper (void) 570ecb_byteorder_helper (void)
571{ 571{
572 /* the union code still generates code under pressure in gcc, */ 572 /* the union code still generates code under pressure in gcc, */
573 /* but less than using pointers, and always seems to */ 573 /* but less than using pointers, and always seems to */
574 /* successfully return a constant. */ 574 /* successfully return a constant. */
… …
589 } u = { 0x11223344 }; 589 } u = { 0x11223344 };
590 return u.c; 590 return u.c;
591#endif 591#endif
592} 592}
593 593
594ecb_inline ecb_bool ecb_big_endian (void) ecb_const; 594ecb_inline ecb_const ecb_bool ecb_big_endian (void);
595ecb_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; }
596ecb_inline ecb_bool ecb_little_endian (void) ecb_const; 596ecb_inline ecb_const ecb_bool ecb_little_endian (void);
597ecb_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; }
598 598
599#if ECB_GCC_VERSION(3,0) || ECB_C99 599#if ECB_GCC_VERSION(3,0) || ECB_C99
600 #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))
601#else 601#else
602 #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)))
… …
677 #else 677 #else
678 #define ecb_ldexpf(x,e) (float) ldexp ((x), (e)) 678 #define ecb_ldexpf(x,e) (float) ldexp ((x), (e))
679 #endif 679 #endif
680 680
681 /* converts an ieee half/binary16 to a float */ 681 /* converts an ieee half/binary16 to a float */
682 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);
683 ecb_function_ float 683 ecb_function_ ecb_const float
684 ecb_binary16_to_float (uint16_t x) 684 ecb_binary16_to_float (uint16_t x)
685 { 685 {
686 int e = (x >> 10) & 0x1f; 686 int e = (x >> 10) & 0x1f;
687 int m = x & 0x3ff; 687 int m = x & 0x3ff;
688 float r; 688 float r;
… …
694 694
695 return x & 0x8000 ? -r : r; 695 return x & 0x8000 ? -r : r;
696 } 696 }
697 697
698 /* convert a float to ieee single/binary32 */ 698 /* convert a float to ieee single/binary32 */
699 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);
700 ecb_function_ uint32_t 700 ecb_function_ ecb_const uint32_t
701 ecb_float_to_binary32 (float x) 701 ecb_float_to_binary32 (float x)
702 { 702 {
703 uint32_t r; 703 uint32_t r;
704 704
705 #if ECB_STDFP 705 #if ECB_STDFP
… …
734 734
735 return r; 735 return r;
736 } 736 }
737 737
738 /* converts an ieee single/binary32 to a float */ 738 /* converts an ieee single/binary32 to a float */
739 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);
740 ecb_function_ float 740 ecb_function_ ecb_const float
741 ecb_binary32_to_float (uint32_t x) 741 ecb_binary32_to_float (uint32_t x)
742 { 742 {
743 float r; 743 float r;
744 744
745 #if ECB_STDFP 745 #if ECB_STDFP
… …
764 764
765 return r; 765 return r;
766 } 766 }
767 767
768 /* convert a double to ieee double/binary64 */ 768 /* convert a double to ieee double/binary64 */
769 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);
770 ecb_function_ uint64_t 770 ecb_function_ ecb_const uint64_t
771 ecb_double_to_binary64 (double x) 771 ecb_double_to_binary64 (double x)
772 { 772 {
773 uint64_t r; 773 uint64_t r;
774 774
775 #if ECB_STDFP 775 #if ECB_STDFP
… …
804 804
805 return r; 805 return r;
806 } 806 }
807 807
808 /* converts an ieee double/binary64 to a double */ 808 /* converts an ieee double/binary64 to a double */
809 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);
810 ecb_function_ double 810 ecb_function_ ecb_const double
811 ecb_binary64_to_double (uint64_t x) 811 ecb_binary64_to_double (uint64_t x)
812 { 812 {
813 double r; 813 double r;
814 814
815 #if ECB_STDFP 815 #if ECB_STDFP

Diff Legend

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