ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/libev/ev.c
(Generate patch)

Comparing libev/ev.c (file contents):
Revision 1.472 by root, Tue Sep 9 13:24:13 2014 UTC vs.
Revision 1.475 by sf-exg, Wed Apr 1 06:57:41 2015 UTC

… …
491/* the following is ecb.h embedded into libev - use update_ev_c to update from an external copy */ 491/* the following is ecb.h embedded into libev - use update_ev_c to update from an external copy */
492/* ECB.H BEGIN */ 492/* ECB.H BEGIN */
493/* 493/*
494 * libecb - http://software.schmorp.de/pkg/libecb 494 * libecb - http://software.schmorp.de/pkg/libecb
495 * 495 *
496 * Copyright (©) 2009-2014 Marc Alexander Lehmann <libecb@schmorp.de> 496 * Copyright (©) 2009-2015 Marc Alexander Lehmann <libecb@schmorp.de>
497 * Copyright (©) 2011 Emanuele Giaquinta 497 * Copyright (©) 2011 Emanuele Giaquinta
498 * All rights reserved. 498 * All rights reserved.
499 * 499 *
500 * Redistribution and use in source and binary forms, with or without modifica- 500 * Redistribution and use in source and binary forms, with or without modifica-
501 * tion, are permitted provided that the following conditions are met: 501 * tion, are permitted provided that the following conditions are met:
… …
532 532
533#ifndef ECB_H 533#ifndef ECB_H
534#define ECB_H 534#define ECB_H
535 535
536/* 16 bits major, 16 bits minor */ 536/* 16 bits major, 16 bits minor */
537#define ECB_VERSION 0x00010003 537#define ECB_VERSION 0x00010004
538 538
539#ifdef _WIN32 539#ifdef _WIN32
540 typedef signed char int8_t; 540 typedef signed char int8_t;
541 typedef unsigned char uint8_t; 541 typedef unsigned char uint8_t;
542 typedef signed short int16_t; 542 typedef signed short int16_t;
… …
566 #else 566 #else
567 #define ECB_PTRSIZE 4 567 #define ECB_PTRSIZE 4
568 #endif 568 #endif
569#endif 569#endif
570 570
571#define ECB_GCC_AMD64 (__amd64 || __amd64__ || __x86_64 || __x86_64__)
572#define ECB_MSVC_AMD64 (_M_AMD64 || _M_X64)
573
571/* work around x32 idiocy by defining proper macros */ 574/* work around x32 idiocy by defining proper macros */
572#if __amd64 || __x86_64 || _M_AMD64 || _M_X64 575#if ECB_GCC_AMD64 || ECB_MSVC_AMD64
573 #if _ILP32 576 #if _ILP32
574 #define ECB_AMD64_X32 1 577 #define ECB_AMD64_X32 1
575 #else 578 #else
576 #define ECB_AMD64 1 579 #define ECB_AMD64 1
577 #endif 580 #endif
… …
582 * causing enormous grief in return for some better fake benchmark numbers. 585 * causing enormous grief in return for some better fake benchmark numbers.
583 * or so. 586 * or so.
584 * we try to detect these and simply assume they are not gcc - if they have 587 * we try to detect these and simply assume they are not gcc - if they have
585 * an issue with that they should have done it right in the first place. 588 * an issue with that they should have done it right in the first place.
586 */ 589 */
587#ifndef ECB_GCC_VERSION
588 #if !defined __GNUC_MINOR__ || defined __INTEL_COMPILER || defined __SUNPRO_C || defined __SUNPRO_CC || defined __llvm__ || defined __clang__ 590#if !defined __GNUC_MINOR__ || defined __INTEL_COMPILER || defined __SUNPRO_C || defined __SUNPRO_CC || defined __llvm__ || defined __clang__
589 #define ECB_GCC_VERSION(major,minor) 0 591 #define ECB_GCC_VERSION(major,minor) 0
590 #else 592#else
591 #define ECB_GCC_VERSION(major,minor) (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor))) 593 #define ECB_GCC_VERSION(major,minor) (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor)))
592 #endif 594#endif
595
596#define ECB_CLANG_VERSION(major,minor) (__clang_major__ > (major) || (__clang_major__ == (major) && __clang_minor__ >= (minor)))
597
598#if __clang__ && defined __has_builtin
599 #define ECB_CLANG_BUILTIN(x) __has_builtin (x)
600#else
601 #define ECB_CLANG_BUILTIN(x) 0
602#endif
603
604#if __clang__ && defined __has_extension
605 #define ECB_CLANG_EXTENSION(x) __has_extension (x)
606#else
607 #define ECB_CLANG_EXTENSION(x) 0
593#endif 608#endif
594 609
595#define ECB_CPP (__cplusplus+0) 610#define ECB_CPP (__cplusplus+0)
596#define ECB_CPP11 (__cplusplus >= 201103L) 611#define ECB_CPP11 (__cplusplus >= 201103L)
597 612
… …
633 #if ECB_GCC_VERSION(2,5) || defined __INTEL_COMPILER || (__llvm__ && __GNUC__) || __SUNPRO_C >= 0x5110 || __SUNPRO_CC >= 0x5110 648 #if ECB_GCC_VERSION(2,5) || defined __INTEL_COMPILER || (__llvm__ && __GNUC__) || __SUNPRO_C >= 0x5110 || __SUNPRO_CC >= 0x5110
634 #if __i386 || __i386__ 649 #if __i386 || __i386__
635 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("lock; orb $0, -1(%%esp)" : : : "memory") 650 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("lock; orb $0, -1(%%esp)" : : : "memory")
636 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("" : : : "memory") 651 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("" : : : "memory")
637 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("") 652 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("")
638 #elif __amd64 || __amd64__ || __x86_64 || __x86_64__ 653 #elif ECB_GCC_AMD64
639 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mfence" : : : "memory") 654 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mfence" : : : "memory")
640 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("" : : : "memory") 655 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("" : : : "memory")
641 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("") 656 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("")
642 #elif __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__ 657 #elif __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__
643 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory") 658 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory")
… …
681 /* see comment below (stdatomic.h) about the C11 memory model. */ 696 /* see comment below (stdatomic.h) about the C11 memory model. */
682 #define ECB_MEMORY_FENCE __atomic_thread_fence (__ATOMIC_SEQ_CST) 697 #define ECB_MEMORY_FENCE __atomic_thread_fence (__ATOMIC_SEQ_CST)
683 #define ECB_MEMORY_FENCE_ACQUIRE __atomic_thread_fence (__ATOMIC_ACQUIRE) 698 #define ECB_MEMORY_FENCE_ACQUIRE __atomic_thread_fence (__ATOMIC_ACQUIRE)
684 #define ECB_MEMORY_FENCE_RELEASE __atomic_thread_fence (__ATOMIC_RELEASE) 699 #define ECB_MEMORY_FENCE_RELEASE __atomic_thread_fence (__ATOMIC_RELEASE)
685 700
686 /* The __has_feature syntax from clang is so misdesigned that we cannot use it 701 #elif ECB_CLANG_EXTENSION(c_atomic)
687 * without risking compile time errors with other compilers. We *could*
688 * define our own ecb_clang_has_feature, but I just can't be bothered to work
689 * around this shit time and again.
690 * #elif defined __clang && __has_feature (cxx_atomic)
691 * // see comment below (stdatomic.h) about the C11 memory model. 702 /* see comment below (stdatomic.h) about the C11 memory model. */
692 * #define ECB_MEMORY_FENCE __c11_atomic_thread_fence (__ATOMIC_SEQ_CST) 703 #define ECB_MEMORY_FENCE __c11_atomic_thread_fence (__ATOMIC_SEQ_CST)
693 * #define ECB_MEMORY_FENCE_ACQUIRE __c11_atomic_thread_fence (__ATOMIC_ACQUIRE) 704 #define ECB_MEMORY_FENCE_ACQUIRE __c11_atomic_thread_fence (__ATOMIC_ACQUIRE)
694 * #define ECB_MEMORY_FENCE_RELEASE __c11_atomic_thread_fence (__ATOMIC_RELEASE) 705 #define ECB_MEMORY_FENCE_RELEASE __c11_atomic_thread_fence (__ATOMIC_RELEASE)
695 */
696 706
697 #elif ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__ 707 #elif ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__
698 #define ECB_MEMORY_FENCE __sync_synchronize () 708 #define ECB_MEMORY_FENCE __sync_synchronize ()
699 #elif _MSC_VER >= 1500 /* VC++ 2008 */ 709 #elif _MSC_VER >= 1500 /* VC++ 2008 */
700 /* apparently, microsoft broke all the memory barrier stuff in Visual Studio 2008... */ 710 /* apparently, microsoft broke all the memory barrier stuff in Visual Studio 2008... */
… …
763 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE 773 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
764#endif 774#endif
765 775
766/*****************************************************************************/ 776/*****************************************************************************/
767 777
768#if __cplusplus 778#if ECB_CPP
769 #define ecb_inline static inline 779 #define ecb_inline static inline
770#elif ECB_GCC_VERSION(2,5) 780#elif ECB_GCC_VERSION(2,5)
771 #define ecb_inline static __inline__ 781 #define ecb_inline static __inline__
772#elif ECB_C99 782#elif ECB_C99
773 #define ecb_inline static inline 783 #define ecb_inline static inline
… …
787 797
788#define ECB_CONCAT_(a, b) a ## b 798#define ECB_CONCAT_(a, b) a ## b
789#define ECB_CONCAT(a, b) ECB_CONCAT_(a, b) 799#define ECB_CONCAT(a, b) ECB_CONCAT_(a, b)
790#define ECB_STRINGIFY_(a) # a 800#define ECB_STRINGIFY_(a) # a
791#define ECB_STRINGIFY(a) ECB_STRINGIFY_(a) 801#define ECB_STRINGIFY(a) ECB_STRINGIFY_(a)
802#define ECB_STRINGIFY_EXPR(expr) ((expr), ECB_STRINGIFY_ (expr))
792 803
793#define ecb_function_ ecb_inline 804#define ecb_function_ ecb_inline
794 805
795#if ECB_GCC_VERSION(3,1) 806#if ECB_GCC_VERSION(3,1) || ECB_CLANG_VERSION(2,8)
796 #define ecb_attribute(attrlist) __attribute__(attrlist) 807 #define ecb_attribute(attrlist) __attribute__ (attrlist)
797 #define ecb_is_constant(expr) __builtin_constant_p (expr)
798 #define ecb_expect(expr,value) __builtin_expect ((expr),(value))
799 #define ecb_prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality)
800#else 808#else
801 #define ecb_attribute(attrlist) 809 #define ecb_attribute(attrlist)
810#endif
802 811
812#if ECB_GCC_VERSION(3,1) || ECB_CLANG_BUILTIN(__builtin_constant_p)
813 #define ecb_is_constant(expr) __builtin_constant_p (expr)
814#else
803 /* possible C11 impl for integral types 815 /* possible C11 impl for integral types
804 typedef struct ecb_is_constant_struct ecb_is_constant_struct; 816 typedef struct ecb_is_constant_struct ecb_is_constant_struct;
805 #define ecb_is_constant(expr) _Generic ((1 ? (struct ecb_is_constant_struct *)0 : (void *)((expr) - (expr)), ecb_is_constant_struct *: 0, default: 1)) */ 817 #define ecb_is_constant(expr) _Generic ((1 ? (struct ecb_is_constant_struct *)0 : (void *)((expr) - (expr)), ecb_is_constant_struct *: 0, default: 1)) */
806 818
807 #define ecb_is_constant(expr) 0 819 #define ecb_is_constant(expr) 0
820#endif
821
822#if ECB_GCC_VERSION(3,1) || ECB_CLANG_BUILTIN(__builtin_expect)
823 #define ecb_expect(expr,value) __builtin_expect ((expr),(value))
824#else
808 #define ecb_expect(expr,value) (expr) 825 #define ecb_expect(expr,value) (expr)
826#endif
827
828#if ECB_GCC_VERSION(3,1) || ECB_CLANG_BUILTIN(__builtin_prefetch)
829 #define ecb_prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality)
830#else
809 #define ecb_prefetch(addr,rw,locality) 831 #define ecb_prefetch(addr,rw,locality)
810#endif 832#endif
811 833
812/* no emulation for ecb_decltype */ 834/* no emulation for ecb_decltype */
813#if ECB_GCC_VERSION(4,5) 835#if ECB_CPP11
836 // older implementations might have problems with decltype(x)::type, work around it
837 template<class T> struct ecb_decltype_t { typedef T type; };
814 #define ecb_decltype(x) __decltype(x) 838 #define ecb_decltype(x) ecb_decltype_t<decltype (x)>::type
815#elif ECB_GCC_VERSION(3,0) 839#elif ECB_GCC_VERSION(3,0) || ECB_CLANG_VERSION(2,8)
816 #define ecb_decltype(x) __typeof(x) 840 #define ecb_decltype(x) __typeof__ (x)
817#endif 841#endif
818 842
819#if _MSC_VER >= 1300 843#if _MSC_VER >= 1300
820 #define ecb_deprecated __declspec(deprecated) 844 #define ecb_deprecated __declspec (deprecated)
821#else 845#else
822 #define ecb_deprecated ecb_attribute ((__deprecated__)) 846 #define ecb_deprecated ecb_attribute ((__deprecated__))
823#endif 847#endif
824 848
849#if __MSC_VER >= 1500
850 #define ecb_deprecated_message(msg) __declspec (deprecated (msg))
851#elif ECB_GCC_VERSION(4,5)
852 #define ecb_deprecated_message(msg) ecb_attribute ((__deprecated__ (msg))
853#else
854 #define ecb_deprecated_message(msg) ecb_deprecated
855#endif
856
857#if _MSC_VER >= 1400
858 #define ecb_noinline __declspec (noinline)
859#else
825#define ecb_noinline ecb_attribute ((__noinline__)) 860 #define ecb_noinline ecb_attribute ((__noinline__))
861#endif
862
826#define ecb_unused ecb_attribute ((__unused__)) 863#define ecb_unused ecb_attribute ((__unused__))
827#define ecb_const ecb_attribute ((__const__)) 864#define ecb_const ecb_attribute ((__const__))
828#define ecb_pure ecb_attribute ((__pure__)) 865#define ecb_pure ecb_attribute ((__pure__))
829 866
830/* http://msdn.microsoft.com/en-us/library/k6ktzx3s.aspx __declspec(noreturn) */ 867#if ECB_C11 || __IBMC_NORETURN
831#if ECB_C11 868 /* http://pic.dhe.ibm.com/infocenter/compbg/v121v141/topic/com.ibm.xlcpp121.bg.doc/language_ref/noreturn.html */
832 #define ecb_noreturn _Noreturn 869 #define ecb_noreturn _Noreturn
870#elif ECB_CPP11
871 #define ecb_noreturn [[noreturn]]
872#elif _MSC_VER >= 1200
873 /* http://msdn.microsoft.com/en-us/library/k6ktzx3s.aspx */
874 #define ecb_noreturn __declspec (noreturn)
833#else 875#else
834 #define ecb_noreturn ecb_attribute ((__noreturn__)) 876 #define ecb_noreturn ecb_attribute ((__noreturn__))
835#endif 877#endif
836 878
837#if ECB_GCC_VERSION(4,3) 879#if ECB_GCC_VERSION(4,3)
… …
852/* for compatibility to the rest of the world */ 894/* for compatibility to the rest of the world */
853#define ecb_likely(expr) ecb_expect_true (expr) 895#define ecb_likely(expr) ecb_expect_true (expr)
854#define ecb_unlikely(expr) ecb_expect_false (expr) 896#define ecb_unlikely(expr) ecb_expect_false (expr)
855 897
856/* count trailing zero bits and count # of one bits */ 898/* count trailing zero bits and count # of one bits */
857#if ECB_GCC_VERSION(3,4) 899#if ECB_GCC_VERSION(3,4) \
900 || (ECB_CLANG_BUILTIN(__builtin_clz) && ECB_CLANG_BUILTIN(__builtin_clzll) \
901 && ECB_CLANG_BUILTIN(__builtin_ctz) && ECB_CLANG_BUILTIN(__builtin_ctzll) \
902 && ECB_CLANG_BUILTIN(__builtin_popcount))
858 /* we assume int == 32 bit, long == 32 or 64 bit and long long == 64 bit */ 903 /* we assume int == 32 bit, long == 32 or 64 bit and long long == 64 bit */
859 #define ecb_ld32(x) (__builtin_clz (x) ^ 31) 904 #define ecb_ld32(x) (__builtin_clz (x) ^ 31)
860 #define ecb_ld64(x) (__builtin_clzll (x) ^ 63) 905 #define ecb_ld64(x) (__builtin_clzll (x) ^ 63)
861 #define ecb_ctz32(x) __builtin_ctz (x) 906 #define ecb_ctz32(x) __builtin_ctz (x)
862 #define ecb_ctz64(x) __builtin_ctzll (x) 907 #define ecb_ctz64(x) __builtin_ctzll (x)
863 #define ecb_popcount32(x) __builtin_popcount (x) 908 #define ecb_popcount32(x) __builtin_popcount (x)
864 /* no popcountll */ 909 /* no popcountll */
865#else 910#else
866 ecb_function_ int ecb_ctz32 (uint32_t x) ecb_const; 911 ecb_function_ ecb_const int ecb_ctz32 (uint32_t x);
867 ecb_function_ int 912 ecb_function_ ecb_const int
868 ecb_ctz32 (uint32_t x) 913 ecb_ctz32 (uint32_t x)
869 { 914 {
870 int r = 0; 915 int r = 0;
871 916
872 x &= ~x + 1; /* this isolates the lowest bit */ 917 x &= ~x + 1; /* this isolates the lowest bit */
… …
886#endif 931#endif
887 932
888 return r; 933 return r;
889 } 934 }
890 935
891 ecb_function_ int ecb_ctz64 (uint64_t x) ecb_const; 936 ecb_function_ ecb_const int ecb_ctz64 (uint64_t x);
892 ecb_function_ int 937 ecb_function_ ecb_const int
893 ecb_ctz64 (uint64_t x) 938 ecb_ctz64 (uint64_t x)
894 { 939 {
895 int shift = x & 0xffffffffU ? 0 : 32; 940 int shift = x & 0xffffffffU ? 0 : 32;
896 return ecb_ctz32 (x >> shift) + shift; 941 return ecb_ctz32 (x >> shift) + shift;
897 } 942 }
898 943
899 ecb_function_ int ecb_popcount32 (uint32_t x) ecb_const; 944 ecb_function_ ecb_const int ecb_popcount32 (uint32_t x);
900 ecb_function_ int 945 ecb_function_ ecb_const int
901 ecb_popcount32 (uint32_t x) 946 ecb_popcount32 (uint32_t x)
902 { 947 {
903 x -= (x >> 1) & 0x55555555; 948 x -= (x >> 1) & 0x55555555;
904 x = ((x >> 2) & 0x33333333) + (x & 0x33333333); 949 x = ((x >> 2) & 0x33333333) + (x & 0x33333333);
905 x = ((x >> 4) + x) & 0x0f0f0f0f; 950 x = ((x >> 4) + x) & 0x0f0f0f0f;
906 x *= 0x01010101; 951 x *= 0x01010101;
907 952
908 return x >> 24; 953 return x >> 24;
909 } 954 }
910 955
911 ecb_function_ int ecb_ld32 (uint32_t x) ecb_const; 956 ecb_function_ ecb_const int ecb_ld32 (uint32_t x);
912 ecb_function_ int ecb_ld32 (uint32_t x) 957 ecb_function_ ecb_const int ecb_ld32 (uint32_t x)
913 { 958 {
914 int r = 0; 959 int r = 0;
915 960
916 if (x >> 16) { x >>= 16; r += 16; } 961 if (x >> 16) { x >>= 16; r += 16; }
917 if (x >> 8) { x >>= 8; r += 8; } 962 if (x >> 8) { x >>= 8; r += 8; }
… …
920 if (x >> 1) { r += 1; } 965 if (x >> 1) { r += 1; }
921 966
922 return r; 967 return r;
923 } 968 }
924 969
925 ecb_function_ int ecb_ld64 (uint64_t x) ecb_const; 970 ecb_function_ ecb_const int ecb_ld64 (uint64_t x);
926 ecb_function_ int ecb_ld64 (uint64_t x) 971 ecb_function_ ecb_const int ecb_ld64 (uint64_t x)
927 { 972 {
928 int r = 0; 973 int r = 0;
929 974
930 if (x >> 32) { x >>= 32; r += 32; } 975 if (x >> 32) { x >>= 32; r += 32; }
931 976
932 return r + ecb_ld32 (x); 977 return r + ecb_ld32 (x);
933 } 978 }
934#endif 979#endif
935 980
936ecb_function_ ecb_bool ecb_is_pot32 (uint32_t x) ecb_const; 981ecb_function_ ecb_const ecb_bool ecb_is_pot32 (uint32_t x);
937ecb_function_ ecb_bool ecb_is_pot32 (uint32_t x) { return !(x & (x - 1)); } 982ecb_function_ ecb_const ecb_bool ecb_is_pot32 (uint32_t x) { return !(x & (x - 1)); }
938ecb_function_ ecb_bool ecb_is_pot64 (uint64_t x) ecb_const; 983ecb_function_ ecb_const ecb_bool ecb_is_pot64 (uint64_t x);
939ecb_function_ ecb_bool ecb_is_pot64 (uint64_t x) { return !(x & (x - 1)); } 984ecb_function_ ecb_const ecb_bool ecb_is_pot64 (uint64_t x) { return !(x & (x - 1)); }
940 985
941ecb_function_ uint8_t ecb_bitrev8 (uint8_t x) ecb_const; 986ecb_function_ ecb_const uint8_t ecb_bitrev8 (uint8_t x);
942ecb_function_ uint8_t ecb_bitrev8 (uint8_t x) 987ecb_function_ ecb_const uint8_t ecb_bitrev8 (uint8_t x)
943{ 988{
944 return ( (x * 0x0802U & 0x22110U) 989 return ( (x * 0x0802U & 0x22110U)
945 | (x * 0x8020U & 0x88440U)) * 0x10101U >> 16; 990 | (x * 0x8020U & 0x88440U)) * 0x10101U >> 16;
946} 991}
947 992
948ecb_function_ uint16_t ecb_bitrev16 (uint16_t x) ecb_const; 993ecb_function_ ecb_const uint16_t ecb_bitrev16 (uint16_t x);
949ecb_function_ uint16_t ecb_bitrev16 (uint16_t x) 994ecb_function_ ecb_const uint16_t ecb_bitrev16 (uint16_t x)
950{ 995{
951 x = ((x >> 1) & 0x5555) | ((x & 0x5555) << 1); 996 x = ((x >> 1) & 0x5555) | ((x & 0x5555) << 1);
952 x = ((x >> 2) & 0x3333) | ((x & 0x3333) << 2); 997 x = ((x >> 2) & 0x3333) | ((x & 0x3333) << 2);
953 x = ((x >> 4) & 0x0f0f) | ((x & 0x0f0f) << 4); 998 x = ((x >> 4) & 0x0f0f) | ((x & 0x0f0f) << 4);
954 x = ( x >> 8 ) | ( x << 8); 999 x = ( x >> 8 ) | ( x << 8);
955 1000
956 return x; 1001 return x;
957} 1002}
958 1003
959ecb_function_ uint32_t ecb_bitrev32 (uint32_t x) ecb_const; 1004ecb_function_ ecb_const uint32_t ecb_bitrev32 (uint32_t x);
960ecb_function_ uint32_t ecb_bitrev32 (uint32_t x) 1005ecb_function_ ecb_const uint32_t ecb_bitrev32 (uint32_t x)
961{ 1006{
962 x = ((x >> 1) & 0x55555555) | ((x & 0x55555555) << 1); 1007 x = ((x >> 1) & 0x55555555) | ((x & 0x55555555) << 1);
963 x = ((x >> 2) & 0x33333333) | ((x & 0x33333333) << 2); 1008 x = ((x >> 2) & 0x33333333) | ((x & 0x33333333) << 2);
964 x = ((x >> 4) & 0x0f0f0f0f) | ((x & 0x0f0f0f0f) << 4); 1009 x = ((x >> 4) & 0x0f0f0f0f) | ((x & 0x0f0f0f0f) << 4);
965 x = ((x >> 8) & 0x00ff00ff) | ((x & 0x00ff00ff) << 8); 1010 x = ((x >> 8) & 0x00ff00ff) | ((x & 0x00ff00ff) << 8);
… …
968 return x; 1013 return x;
969} 1014}
970 1015
971/* popcount64 is only available on 64 bit cpus as gcc builtin */ 1016/* popcount64 is only available on 64 bit cpus as gcc builtin */
972/* so for this version we are lazy */ 1017/* so for this version we are lazy */
973ecb_function_ int ecb_popcount64 (uint64_t x) ecb_const; 1018ecb_function_ ecb_const int ecb_popcount64 (uint64_t x);
974ecb_function_ int 1019ecb_function_ ecb_const int
975ecb_popcount64 (uint64_t x) 1020ecb_popcount64 (uint64_t x)
976{ 1021{
977 return ecb_popcount32 (x) + ecb_popcount32 (x >> 32); 1022 return ecb_popcount32 (x) + ecb_popcount32 (x >> 32);
978} 1023}
979 1024
980ecb_inline uint8_t ecb_rotl8 (uint8_t x, unsigned int count) ecb_const; 1025ecb_inline ecb_const uint8_t ecb_rotl8 (uint8_t x, unsigned int count);
981ecb_inline uint8_t ecb_rotr8 (uint8_t x, unsigned int count) ecb_const; 1026ecb_inline ecb_const uint8_t ecb_rotr8 (uint8_t x, unsigned int count);
982ecb_inline uint16_t ecb_rotl16 (uint16_t x, unsigned int count) ecb_const; 1027ecb_inline ecb_const uint16_t ecb_rotl16 (uint16_t x, unsigned int count);
983ecb_inline uint16_t ecb_rotr16 (uint16_t x, unsigned int count) ecb_const; 1028ecb_inline ecb_const uint16_t ecb_rotr16 (uint16_t x, unsigned int count);
984ecb_inline uint32_t ecb_rotl32 (uint32_t x, unsigned int count) ecb_const; 1029ecb_inline ecb_const uint32_t ecb_rotl32 (uint32_t x, unsigned int count);
985ecb_inline uint32_t ecb_rotr32 (uint32_t x, unsigned int count) ecb_const; 1030ecb_inline ecb_const uint32_t ecb_rotr32 (uint32_t x, unsigned int count);
986ecb_inline uint64_t ecb_rotl64 (uint64_t x, unsigned int count) ecb_const; 1031ecb_inline ecb_const uint64_t ecb_rotl64 (uint64_t x, unsigned int count);
987ecb_inline uint64_t ecb_rotr64 (uint64_t x, unsigned int count) ecb_const; 1032ecb_inline ecb_const uint64_t ecb_rotr64 (uint64_t x, unsigned int count);
988 1033
989ecb_inline uint8_t ecb_rotl8 (uint8_t x, unsigned int count) { return (x >> ( 8 - count)) | (x << count); } 1034ecb_inline ecb_const uint8_t ecb_rotl8 (uint8_t x, unsigned int count) { return (x >> ( 8 - count)) | (x << count); }
990ecb_inline uint8_t ecb_rotr8 (uint8_t x, unsigned int count) { return (x << ( 8 - count)) | (x >> count); } 1035ecb_inline ecb_const uint8_t ecb_rotr8 (uint8_t x, unsigned int count) { return (x << ( 8 - count)) | (x >> count); }
991ecb_inline uint16_t ecb_rotl16 (uint16_t x, unsigned int count) { return (x >> (16 - count)) | (x << count); } 1036ecb_inline ecb_const uint16_t ecb_rotl16 (uint16_t x, unsigned int count) { return (x >> (16 - count)) | (x << count); }
992ecb_inline uint16_t ecb_rotr16 (uint16_t x, unsigned int count) { return (x << (16 - count)) | (x >> count); } 1037ecb_inline ecb_const uint16_t ecb_rotr16 (uint16_t x, unsigned int count) { return (x << (16 - count)) | (x >> count); }
993ecb_inline uint32_t ecb_rotl32 (uint32_t x, unsigned int count) { return (x >> (32 - count)) | (x << count); } 1038ecb_inline ecb_const uint32_t ecb_rotl32 (uint32_t x, unsigned int count) { return (x >> (32 - count)) | (x << count); }
994ecb_inline uint32_t ecb_rotr32 (uint32_t x, unsigned int count) { return (x << (32 - count)) | (x >> count); } 1039ecb_inline ecb_const uint32_t ecb_rotr32 (uint32_t x, unsigned int count) { return (x << (32 - count)) | (x >> count); }
995ecb_inline uint64_t ecb_rotl64 (uint64_t x, unsigned int count) { return (x >> (64 - count)) | (x << count); } 1040ecb_inline ecb_const uint64_t ecb_rotl64 (uint64_t x, unsigned int count) { return (x >> (64 - count)) | (x << count); }
996ecb_inline uint64_t ecb_rotr64 (uint64_t x, unsigned int count) { return (x << (64 - count)) | (x >> count); } 1041ecb_inline ecb_const uint64_t ecb_rotr64 (uint64_t x, unsigned int count) { return (x << (64 - count)) | (x >> count); }
997 1042
998#if ECB_GCC_VERSION(4,3) 1043#if ECB_GCC_VERSION(4,3) || (ECB_CLANG_BUILTIN(__builtin_bswap32) && ECB_CLANG_BUILTIN(__builtin_bswap64))
999 #define ecb_bswap16(x) (__builtin_bswap32 (x) >> 16) 1044 #define ecb_bswap16(x) (__builtin_bswap32 (x) >> 16)
1000 #define ecb_bswap32(x) __builtin_bswap32 (x) 1045 #define ecb_bswap32(x) __builtin_bswap32 (x)
1001 #define ecb_bswap64(x) __builtin_bswap64 (x) 1046 #define ecb_bswap64(x) __builtin_bswap64 (x)
1002#else 1047#else
1003 ecb_function_ uint16_t ecb_bswap16 (uint16_t x) ecb_const; 1048 ecb_function_ ecb_const uint16_t ecb_bswap16 (uint16_t x);
1004 ecb_function_ uint16_t 1049 ecb_function_ ecb_const uint16_t
1005 ecb_bswap16 (uint16_t x) 1050 ecb_bswap16 (uint16_t x)
1006 { 1051 {
1007 return ecb_rotl16 (x, 8); 1052 return ecb_rotl16 (x, 8);
1008 } 1053 }
1009 1054
1010 ecb_function_ uint32_t ecb_bswap32 (uint32_t x) ecb_const; 1055 ecb_function_ ecb_const uint32_t ecb_bswap32 (uint32_t x);
1011 ecb_function_ uint32_t 1056 ecb_function_ ecb_const uint32_t
1012 ecb_bswap32 (uint32_t x) 1057 ecb_bswap32 (uint32_t x)
1013 { 1058 {
1014 return (((uint32_t)ecb_bswap16 (x)) << 16) | ecb_bswap16 (x >> 16); 1059 return (((uint32_t)ecb_bswap16 (x)) << 16) | ecb_bswap16 (x >> 16);
1015 } 1060 }
1016 1061
1017 ecb_function_ uint64_t ecb_bswap64 (uint64_t x) ecb_const; 1062 ecb_function_ ecb_const uint64_t ecb_bswap64 (uint64_t x);
1018 ecb_function_ uint64_t 1063 ecb_function_ ecb_const uint64_t
1019 ecb_bswap64 (uint64_t x) 1064 ecb_bswap64 (uint64_t x)
1020 { 1065 {
1021 return (((uint64_t)ecb_bswap32 (x)) << 32) | ecb_bswap32 (x >> 32); 1066 return (((uint64_t)ecb_bswap32 (x)) << 32) | ecb_bswap32 (x >> 32);
1022 } 1067 }
1023#endif 1068#endif
1024 1069
1025#if ECB_GCC_VERSION(4,5) 1070#if ECB_GCC_VERSION(4,5) || ECB_CLANG_BUILTIN(__builtin_unreachable)
1026 #define ecb_unreachable() __builtin_unreachable () 1071 #define ecb_unreachable() __builtin_unreachable ()
1027#else 1072#else
1028 /* this seems to work fine, but gcc always emits a warning for it :/ */ 1073 /* this seems to work fine, but gcc always emits a warning for it :/ */
1029 ecb_inline void ecb_unreachable (void) ecb_noreturn; 1074 ecb_inline ecb_noreturn void ecb_unreachable (void);
1030 ecb_inline void ecb_unreachable (void) { } 1075 ecb_inline ecb_noreturn void ecb_unreachable (void) { }
1031#endif 1076#endif
1032 1077
1033/* try to tell the compiler that some condition is definitely true */ 1078/* try to tell the compiler that some condition is definitely true */
1034#define ecb_assume(cond) if (!(cond)) ecb_unreachable (); else 0 1079#define ecb_assume(cond) if (!(cond)) ecb_unreachable (); else 0
1035 1080
1036ecb_inline unsigned char ecb_byteorder_helper (void) ecb_const; 1081ecb_inline ecb_const unsigned char ecb_byteorder_helper (void);
1037ecb_inline unsigned char 1082ecb_inline ecb_const unsigned char
1038ecb_byteorder_helper (void) 1083ecb_byteorder_helper (void)
1039{ 1084{
1040 /* the union code still generates code under pressure in gcc, */ 1085 /* the union code still generates code under pressure in gcc, */
1041 /* but less than using pointers, and always seems to */ 1086 /* but less than using pointers, and always seems to */
1042 /* successfully return a constant. */ 1087 /* successfully return a constant. */
1043 /* the reason why we have this horrible preprocessor mess */ 1088 /* the reason why we have this horrible preprocessor mess */
1044 /* is to avoid it in all cases, at least on common architectures */ 1089 /* is to avoid it in all cases, at least on common architectures */
1045 /* or when using a recent enough gcc version (>= 4.6) */ 1090 /* or when using a recent enough gcc version (>= 4.6) */
1046#if __i386 || __i386__ || _M_X86 || __amd64 || __amd64__ || _M_X64 1091#if ((__i386 || __i386__) && !__VOS__) || _M_IX86 || ECB_GCC_AMD64 || ECB_MSVC_AMD64
1047 return 0x44; 1092 return 0x44;
1048#elif __BYTE_ORDER__ && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ 1093#elif __BYTE_ORDER__ && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
1049 return 0x44; 1094 return 0x44;
1050#elif __BYTE_ORDER__ && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ 1095#elif __BYTE_ORDER__ && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
1051 return 0x11; 1096 return 0x11;
… …
1057 } u = { 0x11223344 }; 1102 } u = { 0x11223344 };
1058 return u.c; 1103 return u.c;
1059#endif 1104#endif
1060} 1105}
1061 1106
1062ecb_inline ecb_bool ecb_big_endian (void) ecb_const; 1107ecb_inline ecb_const ecb_bool ecb_big_endian (void);
1063ecb_inline ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; } 1108ecb_inline ecb_const ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; }
1064ecb_inline ecb_bool ecb_little_endian (void) ecb_const; 1109ecb_inline ecb_const ecb_bool ecb_little_endian (void);
1065ecb_inline ecb_bool ecb_little_endian (void) { return ecb_byteorder_helper () == 0x44; } 1110ecb_inline ecb_const ecb_bool ecb_little_endian (void) { return ecb_byteorder_helper () == 0x44; }
1066 1111
1067#if ECB_GCC_VERSION(3,0) || ECB_C99 1112#if ECB_GCC_VERSION(3,0) || ECB_C99
1068 #define ecb_mod(m,n) ((m) % (n) + ((m) % (n) < 0 ? (n) : 0)) 1113 #define ecb_mod(m,n) ((m) % (n) + ((m) % (n) < 0 ? (n) : 0))
1069#else 1114#else
1070 #define ecb_mod(m,n) ((m) < 0 ? ((n) - 1 - ((-1 - (m)) % (n))) : ((m) % (n))) 1115 #define ecb_mod(m,n) ((m) < 0 ? ((n) - 1 - ((-1 - (m)) % (n))) : ((m) % (n)))
1071#endif 1116#endif
1072 1117
1073#if __cplusplus 1118#if ECB_CPP
1074 template<typename T> 1119 template<typename T>
1075 static inline T ecb_div_rd (T val, T div) 1120 static inline T ecb_div_rd (T val, T div)
1076 { 1121 {
1077 return val < 0 ? - ((-val + div - 1) / div) : (val ) / div; 1122 return val < 0 ? - ((-val + div - 1) / div) : (val ) / div;
1078 } 1123 }
… …
1102 1147
1103/* basically, everything uses "ieee pure-endian" floating point numbers */ 1148/* basically, everything uses "ieee pure-endian" floating point numbers */
1104/* the only noteworthy exception is ancient armle, which uses order 43218765 */ 1149/* the only noteworthy exception is ancient armle, which uses order 43218765 */
1105#if 0 \ 1150#if 0 \
1106 || __i386 || __i386__ \ 1151 || __i386 || __i386__ \
1107 || __amd64 || __amd64__ || __x86_64 || __x86_64__ \ 1152 || ECB_GCC_AMD64 \
1108 || __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__ \ 1153 || __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__ \
1109 || defined __s390__ || defined __s390x__ \ 1154 || defined __s390__ || defined __s390x__ \
1110 || defined __mips__ \ 1155 || defined __mips__ \
1111 || defined __alpha__ \ 1156 || defined __alpha__ \
1112 || defined __hppa__ \ 1157 || defined __hppa__ \
1113 || defined __ia64__ \ 1158 || defined __ia64__ \
1114 || defined __m68k__ \ 1159 || defined __m68k__ \
1115 || defined __m88k__ \ 1160 || defined __m88k__ \
1116 || defined __sh__ \ 1161 || defined __sh__ \
1117 || defined _M_IX86 || defined _M_AMD64 || defined _M_IA64 \ 1162 || defined _M_IX86 || defined ECB_MSVC_AMD64 || defined _M_IA64 \
1118 || (defined __arm__ && (defined __ARM_EABI__ || defined __EABI__ || defined __VFP_FP__ || defined _WIN32_WCE || defined __ANDROID__)) \ 1163 || (defined __arm__ && (defined __ARM_EABI__ || defined __EABI__ || defined __VFP_FP__ || defined _WIN32_WCE || defined __ANDROID__)) \
1119 || defined __aarch64__ 1164 || defined __aarch64__
1120 #define ECB_STDFP 1 1165 #define ECB_STDFP 1
1121 #include <string.h> /* for memcpy */ 1166 #include <string.h> /* for memcpy */
1122#else 1167#else
… …
1138 #define ECB_NAN NAN 1183 #define ECB_NAN NAN
1139 #else 1184 #else
1140 #define ECB_NAN ECB_INFINITY 1185 #define ECB_NAN ECB_INFINITY
1141 #endif 1186 #endif
1142 1187
1188 #if ECB_C99 || _XOPEN_VERSION >= 600 || _POSIX_VERSION >= 200112L
1189 #define ecb_ldexpf(x,e) ldexpf ((x), (e))
1190 #else
1191 #define ecb_ldexpf(x,e) (float) ldexp ((float) (x), (e))
1192 #endif
1193
1143 /* converts an ieee half/binary16 to a float */ 1194 /* converts an ieee half/binary16 to a float */
1144 ecb_function_ float ecb_binary16_to_float (uint16_t x) ecb_const; 1195 ecb_function_ ecb_const float ecb_binary16_to_float (uint16_t x);
1145 ecb_function_ float 1196 ecb_function_ ecb_const float
1146 ecb_binary16_to_float (uint16_t x) 1197 ecb_binary16_to_float (uint16_t x)
1147 { 1198 {
1148 int e = (x >> 10) & 0x1f; 1199 int e = (x >> 10) & 0x1f;
1149 int m = x & 0x3ff; 1200 int m = x & 0x3ff;
1150 float r; 1201 float r;
1151 1202
1152 if (!e ) r = ldexpf (m , -24); 1203 if (!e ) r = ecb_ldexpf (m , -24);
1153 else if (e != 31) r = ldexpf (m + 0x400, e - 25); 1204 else if (e != 31) r = ecb_ldexpf (m + 0x400, e - 25);
1154 else if (m ) r = ECB_NAN; 1205 else if (m ) r = ECB_NAN;
1155 else r = ECB_INFINITY; 1206 else r = ECB_INFINITY;
1156 1207
1157 return x & 0x8000 ? -r : r; 1208 return x & 0x8000 ? -r : r;
1158 } 1209 }
1159 1210
1160 /* convert a float to ieee single/binary32 */ 1211 /* convert a float to ieee single/binary32 */
1161 ecb_function_ uint32_t ecb_float_to_binary32 (float x) ecb_const; 1212 ecb_function_ ecb_const uint32_t ecb_float_to_binary32 (float x);
1162 ecb_function_ uint32_t 1213 ecb_function_ ecb_const uint32_t
1163 ecb_float_to_binary32 (float x) 1214 ecb_float_to_binary32 (float x)
1164 { 1215 {
1165 uint32_t r; 1216 uint32_t r;
1166 1217
1167 #if ECB_STDFP 1218 #if ECB_STDFP
… …
1196 1247
1197 return r; 1248 return r;
1198 } 1249 }
1199 1250
1200 /* converts an ieee single/binary32 to a float */ 1251 /* converts an ieee single/binary32 to a float */
1201 ecb_function_ float ecb_binary32_to_float (uint32_t x) ecb_const; 1252 ecb_function_ ecb_const float ecb_binary32_to_float (uint32_t x);
1202 ecb_function_ float 1253 ecb_function_ ecb_const float
1203 ecb_binary32_to_float (uint32_t x) 1254 ecb_binary32_to_float (uint32_t x)
1204 { 1255 {
1205 float r; 1256 float r;
1206 1257
1207 #if ECB_STDFP 1258 #if ECB_STDFP
… …
1217 x |= 0x800000U; 1268 x |= 0x800000U;
1218 else 1269 else
1219 e = 1; 1270 e = 1;
1220 1271
1221 /* we distrust ldexpf a bit and do the 2**-24 scaling by an extra multiply */ 1272 /* we distrust ldexpf a bit and do the 2**-24 scaling by an extra multiply */
1222 r = ldexpf (x * (0.5f / 0x800000U), e - 126); 1273 r = ecb_ldexpf (x * (0.5f / 0x800000U), e - 126);
1223 1274
1224 r = neg ? -r : r; 1275 r = neg ? -r : r;
1225 #endif 1276 #endif
1226 1277
1227 return r; 1278 return r;
1228 } 1279 }
1229 1280
1230 /* convert a double to ieee double/binary64 */ 1281 /* convert a double to ieee double/binary64 */
1231 ecb_function_ uint64_t ecb_double_to_binary64 (double x) ecb_const; 1282 ecb_function_ ecb_const uint64_t ecb_double_to_binary64 (double x);
1232 ecb_function_ uint64_t 1283 ecb_function_ ecb_const uint64_t
1233 ecb_double_to_binary64 (double x) 1284 ecb_double_to_binary64 (double x)
1234 { 1285 {
1235 uint64_t r; 1286 uint64_t r;
1236 1287
1237 #if ECB_STDFP 1288 #if ECB_STDFP
… …
1266 1317
1267 return r; 1318 return r;
1268 } 1319 }
1269 1320
1270 /* converts an ieee double/binary64 to a double */ 1321 /* converts an ieee double/binary64 to a double */
1271 ecb_function_ double ecb_binary64_to_double (uint64_t x) ecb_const; 1322 ecb_function_ ecb_const double ecb_binary64_to_double (uint64_t x);
1272 ecb_function_ double 1323 ecb_function_ ecb_const double
1273 ecb_binary64_to_double (uint64_t x) 1324 ecb_binary64_to_double (uint64_t x)
1274 { 1325 {
1275 double r; 1326 double r;
1276 1327
1277 #if ECB_STDFP 1328 #if ECB_STDFP
… …
2613{ 2664{
2614 invoke_cb = invoke_pending_cb; 2665 invoke_cb = invoke_pending_cb;
2615} 2666}
2616 2667
2617void 2668void
2618ev_set_loop_release_cb (EV_P_ ev_loop_callback EV_THROW release, ev_loop_callback EV_THROW acquire) EV_THROW 2669ev_set_loop_release_cb (EV_P_ void (*release)(EV_P) EV_THROW, void (*acquire)(EV_P) EV_THROW) EV_THROW
2619{ 2670{
2620 release_cb = release; 2671 release_cb = release;
2621 acquire_cb = acquire; 2672 acquire_cb = acquire;
2622} 2673}
2623#endif 2674#endif

Diff Legend

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