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

Comparing libev/ev.c (file contents):
Revision 1.466 by root, Tue Mar 25 19:26:42 2014 UTC vs.
Revision 1.475 by sf-exg, Wed Apr 1 06:57:41 2015 UTC

… …
43# include EV_CONFIG_H 43# include EV_CONFIG_H
44# else 44# else
45# include "config.h" 45# include "config.h"
46# endif 46# endif
47 47
48#if HAVE_FLOOR 48# if HAVE_FLOOR
49# ifndef EV_USE_FLOOR 49# ifndef EV_USE_FLOOR
50# define EV_USE_FLOOR 1 50# define EV_USE_FLOOR 1
51# endif
51# endif 52# endif
52#endif
53 53
54# if HAVE_CLOCK_SYSCALL 54# if HAVE_CLOCK_SYSCALL
55# ifndef EV_USE_CLOCK_SYSCALL 55# ifndef EV_USE_CLOCK_SYSCALL
56# define EV_USE_CLOCK_SYSCALL 1 56# define EV_USE_CLOCK_SYSCALL 1
57# ifndef EV_USE_REALTIME 57# ifndef EV_USE_REALTIME
… …
256# else 256# else
257# define EV_USE_CLOCK_SYSCALL 0 257# define EV_USE_CLOCK_SYSCALL 0
258# endif 258# endif
259#endif 259#endif
260 260
261#if !(_POSIX_TIMERS > 0)
262# ifndef EV_USE_MONOTONIC
263# define EV_USE_MONOTONIC 0
264# endif
265# ifndef EV_USE_REALTIME
266# define EV_USE_REALTIME 0
267# endif
268#endif
269
261#ifndef EV_USE_MONOTONIC 270#ifndef EV_USE_MONOTONIC
262# if defined _POSIX_MONOTONIC_CLOCK && _POSIX_MONOTONIC_CLOCK >= 0 271# if defined _POSIX_MONOTONIC_CLOCK && _POSIX_MONOTONIC_CLOCK >= 0
263# define EV_USE_MONOTONIC EV_FEATURE_OS 272# define EV_USE_MONOTONIC EV_FEATURE_OS
264# else 273# else
265# define EV_USE_MONOTONIC 0 274# define EV_USE_MONOTONIC 0
… …
482/* 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 */
483/* ECB.H BEGIN */ 492/* ECB.H BEGIN */
484/* 493/*
485 * libecb - http://software.schmorp.de/pkg/libecb 494 * libecb - http://software.schmorp.de/pkg/libecb
486 * 495 *
487 * Copyright (©) 2009-2014 Marc Alexander Lehmann <libecb@schmorp.de> 496 * Copyright (©) 2009-2015 Marc Alexander Lehmann <libecb@schmorp.de>
488 * Copyright (©) 2011 Emanuele Giaquinta 497 * Copyright (©) 2011 Emanuele Giaquinta
489 * All rights reserved. 498 * All rights reserved.
490 * 499 *
491 * 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-
492 * tion, are permitted provided that the following conditions are met: 501 * tion, are permitted provided that the following conditions are met:
… …
506 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 515 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
507 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 516 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
508 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH- 517 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
509 * ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 518 * ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
510 * OF THE POSSIBILITY OF SUCH DAMAGE. 519 * OF THE POSSIBILITY OF SUCH DAMAGE.
520 *
521 * Alternatively, the contents of this file may be used under the terms of
522 * the GNU General Public License ("GPL") version 2 or any later version,
523 * in which case the provisions of the GPL are applicable instead of
524 * the above. If you wish to allow the use of your version of this file
525 * only under the terms of the GPL and not to allow others to use your
526 * version of this file under the BSD license, indicate your decision
527 * by deleting the provisions above and replace them with the notice
528 * and other provisions required by the GPL. If you do not delete the
529 * provisions above, a recipient may use your version of this file under
530 * either the BSD or the GPL.
511 */ 531 */
512 532
513#ifndef ECB_H 533#ifndef ECB_H
514#define ECB_H 534#define ECB_H
515 535
516/* 16 bits major, 16 bits minor */ 536/* 16 bits major, 16 bits minor */
517#define ECB_VERSION 0x00010003 537#define ECB_VERSION 0x00010004
518 538
519#ifdef _WIN32 539#ifdef _WIN32
520 typedef signed char int8_t; 540 typedef signed char int8_t;
521 typedef unsigned char uint8_t; 541 typedef unsigned char uint8_t;
522 typedef signed short int16_t; 542 typedef signed short int16_t;
… …
546 #else 566 #else
547 #define ECB_PTRSIZE 4 567 #define ECB_PTRSIZE 4
548 #endif 568 #endif
549#endif 569#endif
550 570
571#define ECB_GCC_AMD64 (__amd64 || __amd64__ || __x86_64 || __x86_64__)
572#define ECB_MSVC_AMD64 (_M_AMD64 || _M_X64)
573
551/* work around x32 idiocy by defining proper macros */ 574/* work around x32 idiocy by defining proper macros */
552#if __amd64 || __x86_64 || _M_AMD64 || _M_X64 575#if ECB_GCC_AMD64 || ECB_MSVC_AMD64
553 #if _ILP32 576 #if _ILP32
554 #define ECB_AMD64_X32 1 577 #define ECB_AMD64_X32 1
555 #else 578 #else
556 #define ECB_AMD64 1 579 #define ECB_AMD64 1
557 #endif 580 #endif
… …
562 * causing enormous grief in return for some better fake benchmark numbers. 585 * causing enormous grief in return for some better fake benchmark numbers.
563 * or so. 586 * or so.
564 * 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
565 * 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.
566 */ 589 */
567#ifndef ECB_GCC_VERSION
568 #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__
569 #define ECB_GCC_VERSION(major,minor) 0 591 #define ECB_GCC_VERSION(major,minor) 0
570 #else 592#else
571 #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)))
572 #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
573#endif 608#endif
574 609
575#define ECB_CPP (__cplusplus+0) 610#define ECB_CPP (__cplusplus+0)
576#define ECB_CPP11 (__cplusplus >= 201103L) 611#define ECB_CPP11 (__cplusplus >= 201103L)
577 612
… …
613 #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
614 #if __i386 || __i386__ 649 #if __i386 || __i386__
615 #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")
616 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("" : : : "memory") 651 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("" : : : "memory")
617 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("") 652 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("")
618 #elif __amd64 || __amd64__ || __x86_64 || __x86_64__ 653 #elif ECB_GCC_AMD64
619 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mfence" : : : "memory") 654 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mfence" : : : "memory")
620 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("" : : : "memory") 655 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("" : : : "memory")
621 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("") 656 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("")
622 #elif __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__ 657 #elif __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__
623 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory") 658 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory")
… …
661 /* see comment below (stdatomic.h) about the C11 memory model. */ 696 /* see comment below (stdatomic.h) about the C11 memory model. */
662 #define ECB_MEMORY_FENCE __atomic_thread_fence (__ATOMIC_SEQ_CST) 697 #define ECB_MEMORY_FENCE __atomic_thread_fence (__ATOMIC_SEQ_CST)
663 #define ECB_MEMORY_FENCE_ACQUIRE __atomic_thread_fence (__ATOMIC_ACQUIRE) 698 #define ECB_MEMORY_FENCE_ACQUIRE __atomic_thread_fence (__ATOMIC_ACQUIRE)
664 #define ECB_MEMORY_FENCE_RELEASE __atomic_thread_fence (__ATOMIC_RELEASE) 699 #define ECB_MEMORY_FENCE_RELEASE __atomic_thread_fence (__ATOMIC_RELEASE)
665 700
666 /* The __has_feature syntax from clang is so misdesigned that we cannot use it 701 #elif ECB_CLANG_EXTENSION(c_atomic)
667 * without risking compile time errors with other compilers. We *could*
668 * define our own ecb_clang_has_feature, but I just can't be bothered to work
669 * around this shit time and again.
670 * #elif defined __clang && __has_feature (cxx_atomic)
671 * // see comment below (stdatomic.h) about the C11 memory model. 702 /* see comment below (stdatomic.h) about the C11 memory model. */
672 * #define ECB_MEMORY_FENCE __c11_atomic_thread_fence (__ATOMIC_SEQ_CST) 703 #define ECB_MEMORY_FENCE __c11_atomic_thread_fence (__ATOMIC_SEQ_CST)
673 * #define ECB_MEMORY_FENCE_ACQUIRE __c11_atomic_thread_fence (__ATOMIC_ACQUIRE) 704 #define ECB_MEMORY_FENCE_ACQUIRE __c11_atomic_thread_fence (__ATOMIC_ACQUIRE)
674 * #define ECB_MEMORY_FENCE_RELEASE __c11_atomic_thread_fence (__ATOMIC_RELEASE) 705 #define ECB_MEMORY_FENCE_RELEASE __c11_atomic_thread_fence (__ATOMIC_RELEASE)
675 */
676 706
677 #elif ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__ 707 #elif ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__
678 #define ECB_MEMORY_FENCE __sync_synchronize () 708 #define ECB_MEMORY_FENCE __sync_synchronize ()
679 #elif _MSC_VER >= 1500 /* VC++ 2008 */ 709 #elif _MSC_VER >= 1500 /* VC++ 2008 */
680 /* 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... */
… …
743 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE 773 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
744#endif 774#endif
745 775
746/*****************************************************************************/ 776/*****************************************************************************/
747 777
748#if __cplusplus 778#if ECB_CPP
749 #define ecb_inline static inline 779 #define ecb_inline static inline
750#elif ECB_GCC_VERSION(2,5) 780#elif ECB_GCC_VERSION(2,5)
751 #define ecb_inline static __inline__ 781 #define ecb_inline static __inline__
752#elif ECB_C99 782#elif ECB_C99
753 #define ecb_inline static inline 783 #define ecb_inline static inline
… …
767 797
768#define ECB_CONCAT_(a, b) a ## b 798#define ECB_CONCAT_(a, b) a ## b
769#define ECB_CONCAT(a, b) ECB_CONCAT_(a, b) 799#define ECB_CONCAT(a, b) ECB_CONCAT_(a, b)
770#define ECB_STRINGIFY_(a) # a 800#define ECB_STRINGIFY_(a) # a
771#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))
772 803
773#define ecb_function_ ecb_inline 804#define ecb_function_ ecb_inline
774 805
775#if ECB_GCC_VERSION(3,1) 806#if ECB_GCC_VERSION(3,1) || ECB_CLANG_VERSION(2,8)
776 #define ecb_attribute(attrlist) __attribute__(attrlist) 807 #define ecb_attribute(attrlist) __attribute__ (attrlist)
777 #define ecb_is_constant(expr) __builtin_constant_p (expr)
778 #define ecb_expect(expr,value) __builtin_expect ((expr),(value))
779 #define ecb_prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality)
780#else 808#else
781 #define ecb_attribute(attrlist) 809 #define ecb_attribute(attrlist)
810#endif
782 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
783 /* possible C11 impl for integral types 815 /* possible C11 impl for integral types
784 typedef struct ecb_is_constant_struct ecb_is_constant_struct; 816 typedef struct ecb_is_constant_struct ecb_is_constant_struct;
785 #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)) */
786 818
787 #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
788 #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
789 #define ecb_prefetch(addr,rw,locality) 831 #define ecb_prefetch(addr,rw,locality)
790#endif 832#endif
791 833
792/* no emulation for ecb_decltype */ 834/* no emulation for ecb_decltype */
793#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; };
794 #define ecb_decltype(x) __decltype(x) 838 #define ecb_decltype(x) ecb_decltype_t<decltype (x)>::type
795#elif ECB_GCC_VERSION(3,0) 839#elif ECB_GCC_VERSION(3,0) || ECB_CLANG_VERSION(2,8)
796 #define ecb_decltype(x) __typeof(x) 840 #define ecb_decltype(x) __typeof__ (x)
797#endif 841#endif
798 842
843#if _MSC_VER >= 1300
844 #define ecb_deprecated __declspec (deprecated)
845#else
846 #define ecb_deprecated ecb_attribute ((__deprecated__))
847#endif
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
799#define ecb_noinline ecb_attribute ((__noinline__)) 860 #define ecb_noinline ecb_attribute ((__noinline__))
861#endif
862
800#define ecb_unused ecb_attribute ((__unused__)) 863#define ecb_unused ecb_attribute ((__unused__))
801#define ecb_const ecb_attribute ((__const__)) 864#define ecb_const ecb_attribute ((__const__))
802#define ecb_pure ecb_attribute ((__pure__)) 865#define ecb_pure ecb_attribute ((__pure__))
803 866
804#if ECB_C11 867#if ECB_C11 || __IBMC_NORETURN
868 /* http://pic.dhe.ibm.com/infocenter/compbg/v121v141/topic/com.ibm.xlcpp121.bg.doc/language_ref/noreturn.html */
805 #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)
806#else 875#else
807 #define ecb_noreturn ecb_attribute ((__noreturn__)) 876 #define ecb_noreturn ecb_attribute ((__noreturn__))
808#endif 877#endif
809 878
810#if ECB_GCC_VERSION(4,3) 879#if ECB_GCC_VERSION(4,3)
… …
825/* for compatibility to the rest of the world */ 894/* for compatibility to the rest of the world */
826#define ecb_likely(expr) ecb_expect_true (expr) 895#define ecb_likely(expr) ecb_expect_true (expr)
827#define ecb_unlikely(expr) ecb_expect_false (expr) 896#define ecb_unlikely(expr) ecb_expect_false (expr)
828 897
829/* count trailing zero bits and count # of one bits */ 898/* count trailing zero bits and count # of one bits */
830#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))
831 /* 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 */
832 #define ecb_ld32(x) (__builtin_clz (x) ^ 31) 904 #define ecb_ld32(x) (__builtin_clz (x) ^ 31)
833 #define ecb_ld64(x) (__builtin_clzll (x) ^ 63) 905 #define ecb_ld64(x) (__builtin_clzll (x) ^ 63)
834 #define ecb_ctz32(x) __builtin_ctz (x) 906 #define ecb_ctz32(x) __builtin_ctz (x)
835 #define ecb_ctz64(x) __builtin_ctzll (x) 907 #define ecb_ctz64(x) __builtin_ctzll (x)
836 #define ecb_popcount32(x) __builtin_popcount (x) 908 #define ecb_popcount32(x) __builtin_popcount (x)
837 /* no popcountll */ 909 /* no popcountll */
838#else 910#else
839 ecb_function_ int ecb_ctz32 (uint32_t x) ecb_const; 911 ecb_function_ ecb_const int ecb_ctz32 (uint32_t x);
840 ecb_function_ int 912 ecb_function_ ecb_const int
841 ecb_ctz32 (uint32_t x) 913 ecb_ctz32 (uint32_t x)
842 { 914 {
843 int r = 0; 915 int r = 0;
844 916
845 x &= ~x + 1; /* this isolates the lowest bit */ 917 x &= ~x + 1; /* this isolates the lowest bit */
… …
859#endif 931#endif
860 932
861 return r; 933 return r;
862 } 934 }
863 935
864 ecb_function_ int ecb_ctz64 (uint64_t x) ecb_const; 936 ecb_function_ ecb_const int ecb_ctz64 (uint64_t x);
865 ecb_function_ int 937 ecb_function_ ecb_const int
866 ecb_ctz64 (uint64_t x) 938 ecb_ctz64 (uint64_t x)
867 { 939 {
868 int shift = x & 0xffffffffU ? 0 : 32; 940 int shift = x & 0xffffffffU ? 0 : 32;
869 return ecb_ctz32 (x >> shift) + shift; 941 return ecb_ctz32 (x >> shift) + shift;
870 } 942 }
871 943
872 ecb_function_ int ecb_popcount32 (uint32_t x) ecb_const; 944 ecb_function_ ecb_const int ecb_popcount32 (uint32_t x);
873 ecb_function_ int 945 ecb_function_ ecb_const int
874 ecb_popcount32 (uint32_t x) 946 ecb_popcount32 (uint32_t x)
875 { 947 {
876 x -= (x >> 1) & 0x55555555; 948 x -= (x >> 1) & 0x55555555;
877 x = ((x >> 2) & 0x33333333) + (x & 0x33333333); 949 x = ((x >> 2) & 0x33333333) + (x & 0x33333333);
878 x = ((x >> 4) + x) & 0x0f0f0f0f; 950 x = ((x >> 4) + x) & 0x0f0f0f0f;
879 x *= 0x01010101; 951 x *= 0x01010101;
880 952
881 return x >> 24; 953 return x >> 24;
882 } 954 }
883 955
884 ecb_function_ int ecb_ld32 (uint32_t x) ecb_const; 956 ecb_function_ ecb_const int ecb_ld32 (uint32_t x);
885 ecb_function_ int ecb_ld32 (uint32_t x) 957 ecb_function_ ecb_const int ecb_ld32 (uint32_t x)
886 { 958 {
887 int r = 0; 959 int r = 0;
888 960
889 if (x >> 16) { x >>= 16; r += 16; } 961 if (x >> 16) { x >>= 16; r += 16; }
890 if (x >> 8) { x >>= 8; r += 8; } 962 if (x >> 8) { x >>= 8; r += 8; }
… …
893 if (x >> 1) { r += 1; } 965 if (x >> 1) { r += 1; }
894 966
895 return r; 967 return r;
896 } 968 }
897 969
898 ecb_function_ int ecb_ld64 (uint64_t x) ecb_const; 970 ecb_function_ ecb_const int ecb_ld64 (uint64_t x);
899 ecb_function_ int ecb_ld64 (uint64_t x) 971 ecb_function_ ecb_const int ecb_ld64 (uint64_t x)
900 { 972 {
901 int r = 0; 973 int r = 0;
902 974
903 if (x >> 32) { x >>= 32; r += 32; } 975 if (x >> 32) { x >>= 32; r += 32; }
904 976
905 return r + ecb_ld32 (x); 977 return r + ecb_ld32 (x);
906 } 978 }
907#endif 979#endif
908 980
909ecb_function_ ecb_bool ecb_is_pot32 (uint32_t x) ecb_const; 981ecb_function_ ecb_const ecb_bool ecb_is_pot32 (uint32_t x);
910ecb_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)); }
911ecb_function_ ecb_bool ecb_is_pot64 (uint64_t x) ecb_const; 983ecb_function_ ecb_const ecb_bool ecb_is_pot64 (uint64_t x);
912ecb_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)); }
913 985
914ecb_function_ uint8_t ecb_bitrev8 (uint8_t x) ecb_const; 986ecb_function_ ecb_const uint8_t ecb_bitrev8 (uint8_t x);
915ecb_function_ uint8_t ecb_bitrev8 (uint8_t x) 987ecb_function_ ecb_const uint8_t ecb_bitrev8 (uint8_t x)
916{ 988{
917 return ( (x * 0x0802U & 0x22110U) 989 return ( (x * 0x0802U & 0x22110U)
918 | (x * 0x8020U & 0x88440U)) * 0x10101U >> 16; 990 | (x * 0x8020U & 0x88440U)) * 0x10101U >> 16;
919} 991}
920 992
921ecb_function_ uint16_t ecb_bitrev16 (uint16_t x) ecb_const; 993ecb_function_ ecb_const uint16_t ecb_bitrev16 (uint16_t x);
922ecb_function_ uint16_t ecb_bitrev16 (uint16_t x) 994ecb_function_ ecb_const uint16_t ecb_bitrev16 (uint16_t x)
923{ 995{
924 x = ((x >> 1) & 0x5555) | ((x & 0x5555) << 1); 996 x = ((x >> 1) & 0x5555) | ((x & 0x5555) << 1);
925 x = ((x >> 2) & 0x3333) | ((x & 0x3333) << 2); 997 x = ((x >> 2) & 0x3333) | ((x & 0x3333) << 2);
926 x = ((x >> 4) & 0x0f0f) | ((x & 0x0f0f) << 4); 998 x = ((x >> 4) & 0x0f0f) | ((x & 0x0f0f) << 4);
927 x = ( x >> 8 ) | ( x << 8); 999 x = ( x >> 8 ) | ( x << 8);
928 1000
929 return x; 1001 return x;
930} 1002}
931 1003
932ecb_function_ uint32_t ecb_bitrev32 (uint32_t x) ecb_const; 1004ecb_function_ ecb_const uint32_t ecb_bitrev32 (uint32_t x);
933ecb_function_ uint32_t ecb_bitrev32 (uint32_t x) 1005ecb_function_ ecb_const uint32_t ecb_bitrev32 (uint32_t x)
934{ 1006{
935 x = ((x >> 1) & 0x55555555) | ((x & 0x55555555) << 1); 1007 x = ((x >> 1) & 0x55555555) | ((x & 0x55555555) << 1);
936 x = ((x >> 2) & 0x33333333) | ((x & 0x33333333) << 2); 1008 x = ((x >> 2) & 0x33333333) | ((x & 0x33333333) << 2);
937 x = ((x >> 4) & 0x0f0f0f0f) | ((x & 0x0f0f0f0f) << 4); 1009 x = ((x >> 4) & 0x0f0f0f0f) | ((x & 0x0f0f0f0f) << 4);
938 x = ((x >> 8) & 0x00ff00ff) | ((x & 0x00ff00ff) << 8); 1010 x = ((x >> 8) & 0x00ff00ff) | ((x & 0x00ff00ff) << 8);
… …
941 return x; 1013 return x;
942} 1014}
943 1015
944/* popcount64 is only available on 64 bit cpus as gcc builtin */ 1016/* popcount64 is only available on 64 bit cpus as gcc builtin */
945/* so for this version we are lazy */ 1017/* so for this version we are lazy */
946ecb_function_ int ecb_popcount64 (uint64_t x) ecb_const; 1018ecb_function_ ecb_const int ecb_popcount64 (uint64_t x);
947ecb_function_ int 1019ecb_function_ ecb_const int
948ecb_popcount64 (uint64_t x) 1020ecb_popcount64 (uint64_t x)
949{ 1021{
950 return ecb_popcount32 (x) + ecb_popcount32 (x >> 32); 1022 return ecb_popcount32 (x) + ecb_popcount32 (x >> 32);
951} 1023}
952 1024
953ecb_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);
954ecb_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);
955ecb_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);
956ecb_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);
957ecb_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);
958ecb_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);
959ecb_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);
960ecb_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);
961 1033
962ecb_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); }
963ecb_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); }
964ecb_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); }
965ecb_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); }
966ecb_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); }
967ecb_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); }
968ecb_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); }
969ecb_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); }
970 1042
971#if ECB_GCC_VERSION(4,3) 1043#if ECB_GCC_VERSION(4,3) || (ECB_CLANG_BUILTIN(__builtin_bswap32) && ECB_CLANG_BUILTIN(__builtin_bswap64))
972 #define ecb_bswap16(x) (__builtin_bswap32 (x) >> 16) 1044 #define ecb_bswap16(x) (__builtin_bswap32 (x) >> 16)
973 #define ecb_bswap32(x) __builtin_bswap32 (x) 1045 #define ecb_bswap32(x) __builtin_bswap32 (x)
974 #define ecb_bswap64(x) __builtin_bswap64 (x) 1046 #define ecb_bswap64(x) __builtin_bswap64 (x)
975#else 1047#else
976 ecb_function_ uint16_t ecb_bswap16 (uint16_t x) ecb_const; 1048 ecb_function_ ecb_const uint16_t ecb_bswap16 (uint16_t x);
977 ecb_function_ uint16_t 1049 ecb_function_ ecb_const uint16_t
978 ecb_bswap16 (uint16_t x) 1050 ecb_bswap16 (uint16_t x)
979 { 1051 {
980 return ecb_rotl16 (x, 8); 1052 return ecb_rotl16 (x, 8);
981 } 1053 }
982 1054
983 ecb_function_ uint32_t ecb_bswap32 (uint32_t x) ecb_const; 1055 ecb_function_ ecb_const uint32_t ecb_bswap32 (uint32_t x);
984 ecb_function_ uint32_t 1056 ecb_function_ ecb_const uint32_t
985 ecb_bswap32 (uint32_t x) 1057 ecb_bswap32 (uint32_t x)
986 { 1058 {
987 return (((uint32_t)ecb_bswap16 (x)) << 16) | ecb_bswap16 (x >> 16); 1059 return (((uint32_t)ecb_bswap16 (x)) << 16) | ecb_bswap16 (x >> 16);
988 } 1060 }
989 1061
990 ecb_function_ uint64_t ecb_bswap64 (uint64_t x) ecb_const; 1062 ecb_function_ ecb_const uint64_t ecb_bswap64 (uint64_t x);
991 ecb_function_ uint64_t 1063 ecb_function_ ecb_const uint64_t
992 ecb_bswap64 (uint64_t x) 1064 ecb_bswap64 (uint64_t x)
993 { 1065 {
994 return (((uint64_t)ecb_bswap32 (x)) << 32) | ecb_bswap32 (x >> 32); 1066 return (((uint64_t)ecb_bswap32 (x)) << 32) | ecb_bswap32 (x >> 32);
995 } 1067 }
996#endif 1068#endif
997 1069
998#if ECB_GCC_VERSION(4,5) 1070#if ECB_GCC_VERSION(4,5) || ECB_CLANG_BUILTIN(__builtin_unreachable)
999 #define ecb_unreachable() __builtin_unreachable () 1071 #define ecb_unreachable() __builtin_unreachable ()
1000#else 1072#else
1001 /* 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 :/ */
1002 ecb_inline void ecb_unreachable (void) ecb_noreturn; 1074 ecb_inline ecb_noreturn void ecb_unreachable (void);
1003 ecb_inline void ecb_unreachable (void) { } 1075 ecb_inline ecb_noreturn void ecb_unreachable (void) { }
1004#endif 1076#endif
1005 1077
1006/* try to tell the compiler that some condition is definitely true */ 1078/* try to tell the compiler that some condition is definitely true */
1007#define ecb_assume(cond) if (!(cond)) ecb_unreachable (); else 0 1079#define ecb_assume(cond) if (!(cond)) ecb_unreachable (); else 0
1008 1080
1009ecb_inline unsigned char ecb_byteorder_helper (void) ecb_const; 1081ecb_inline ecb_const unsigned char ecb_byteorder_helper (void);
1010ecb_inline unsigned char 1082ecb_inline ecb_const unsigned char
1011ecb_byteorder_helper (void) 1083ecb_byteorder_helper (void)
1012{ 1084{
1013 /* the union code still generates code under pressure in gcc, */ 1085 /* the union code still generates code under pressure in gcc, */
1014 /* but less than using pointers, and always seems to */ 1086 /* but less than using pointers, and always seems to */
1015 /* successfully return a constant. */ 1087 /* successfully return a constant. */
1016 /* the reason why we have this horrible preprocessor mess */ 1088 /* the reason why we have this horrible preprocessor mess */
1017 /* 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 */
1018 /* or when using a recent enough gcc version (>= 4.6) */ 1090 /* or when using a recent enough gcc version (>= 4.6) */
1019#if __i386 || __i386__ || _M_X86 || __amd64 || __amd64__ || _M_X64 1091#if ((__i386 || __i386__) && !__VOS__) || _M_IX86 || ECB_GCC_AMD64 || ECB_MSVC_AMD64
1020 return 0x44; 1092 return 0x44;
1021#elif __BYTE_ORDER__ && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ 1093#elif __BYTE_ORDER__ && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
1022 return 0x44; 1094 return 0x44;
1023#elif __BYTE_ORDER__ && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ 1095#elif __BYTE_ORDER__ && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
1024 return 0x11; 1096 return 0x11;
… …
1030 } u = { 0x11223344 }; 1102 } u = { 0x11223344 };
1031 return u.c; 1103 return u.c;
1032#endif 1104#endif
1033} 1105}
1034 1106
1035ecb_inline ecb_bool ecb_big_endian (void) ecb_const; 1107ecb_inline ecb_const ecb_bool ecb_big_endian (void);
1036ecb_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; }
1037ecb_inline ecb_bool ecb_little_endian (void) ecb_const; 1109ecb_inline ecb_const ecb_bool ecb_little_endian (void);
1038ecb_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; }
1039 1111
1040#if ECB_GCC_VERSION(3,0) || ECB_C99 1112#if ECB_GCC_VERSION(3,0) || ECB_C99
1041 #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))
1042#else 1114#else
1043 #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)))
1044#endif 1116#endif
1045 1117
1046#if __cplusplus 1118#if ECB_CPP
1047 template<typename T> 1119 template<typename T>
1048 static inline T ecb_div_rd (T val, T div) 1120 static inline T ecb_div_rd (T val, T div)
1049 { 1121 {
1050 return val < 0 ? - ((-val + div - 1) / div) : (val ) / div; 1122 return val < 0 ? - ((-val + div - 1) / div) : (val ) / div;
1051 } 1123 }
… …
1075 1147
1076/* basically, everything uses "ieee pure-endian" floating point numbers */ 1148/* basically, everything uses "ieee pure-endian" floating point numbers */
1077/* the only noteworthy exception is ancient armle, which uses order 43218765 */ 1149/* the only noteworthy exception is ancient armle, which uses order 43218765 */
1078#if 0 \ 1150#if 0 \
1079 || __i386 || __i386__ \ 1151 || __i386 || __i386__ \
1080 || __amd64 || __amd64__ || __x86_64 || __x86_64__ \ 1152 || ECB_GCC_AMD64 \
1081 || __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__ \ 1153 || __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__ \
1082 || defined __s390__ || defined __s390x__ \ 1154 || defined __s390__ || defined __s390x__ \
1083 || defined __mips__ \ 1155 || defined __mips__ \
1084 || defined __alpha__ \ 1156 || defined __alpha__ \
1085 || defined __hppa__ \ 1157 || defined __hppa__ \
1086 || defined __ia64__ \ 1158 || defined __ia64__ \
1087 || defined __m68k__ \ 1159 || defined __m68k__ \
1088 || defined __m88k__ \ 1160 || defined __m88k__ \
1089 || defined __sh__ \ 1161 || defined __sh__ \
1090 || defined _M_IX86 || defined _M_AMD64 || defined _M_IA64 \ 1162 || defined _M_IX86 || defined ECB_MSVC_AMD64 || defined _M_IA64 \
1091 || (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__)) \
1092 || defined __aarch64__ 1164 || defined __aarch64__
1093 #define ECB_STDFP 1 1165 #define ECB_STDFP 1
1094 #include <string.h> /* for memcpy */ 1166 #include <string.h> /* for memcpy */
1095#else 1167#else
… …
1111 #define ECB_NAN NAN 1183 #define ECB_NAN NAN
1112 #else 1184 #else
1113 #define ECB_NAN ECB_INFINITY 1185 #define ECB_NAN ECB_INFINITY
1114 #endif 1186 #endif
1115 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
1116 /* converts an ieee half/binary16 to a float */ 1194 /* converts an ieee half/binary16 to a float */
1117 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);
1118 ecb_function_ float 1196 ecb_function_ ecb_const float
1119 ecb_binary16_to_float (uint16_t x) 1197 ecb_binary16_to_float (uint16_t x)
1120 { 1198 {
1121 int e = (x >> 10) & 0x1f; 1199 int e = (x >> 10) & 0x1f;
1122 int m = x & 0x3ff; 1200 int m = x & 0x3ff;
1123 float r; 1201 float r;
1124 1202
1125 if (!e ) r = ldexpf (m , -24); 1203 if (!e ) r = ecb_ldexpf (m , -24);
1126 else if (e != 31) r = ldexpf (m + 0x400, e - 25); 1204 else if (e != 31) r = ecb_ldexpf (m + 0x400, e - 25);
1127 else if (m ) r = ECB_NAN; 1205 else if (m ) r = ECB_NAN;
1128 else r = ECB_INFINITY; 1206 else r = ECB_INFINITY;
1129 1207
1130 return x & 0x8000 ? -r : r; 1208 return x & 0x8000 ? -r : r;
1131 } 1209 }
1132 1210
1133 /* convert a float to ieee single/binary32 */ 1211 /* convert a float to ieee single/binary32 */
1134 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);
1135 ecb_function_ uint32_t 1213 ecb_function_ ecb_const uint32_t
1136 ecb_float_to_binary32 (float x) 1214 ecb_float_to_binary32 (float x)
1137 { 1215 {
1138 uint32_t r; 1216 uint32_t r;
1139 1217
1140 #if ECB_STDFP 1218 #if ECB_STDFP
… …
1169 1247
1170 return r; 1248 return r;
1171 } 1249 }
1172 1250
1173 /* converts an ieee single/binary32 to a float */ 1251 /* converts an ieee single/binary32 to a float */
1174 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);
1175 ecb_function_ float 1253 ecb_function_ ecb_const float
1176 ecb_binary32_to_float (uint32_t x) 1254 ecb_binary32_to_float (uint32_t x)
1177 { 1255 {
1178 float r; 1256 float r;
1179 1257
1180 #if ECB_STDFP 1258 #if ECB_STDFP
… …
1190 x |= 0x800000U; 1268 x |= 0x800000U;
1191 else 1269 else
1192 e = 1; 1270 e = 1;
1193 1271
1194 /* 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 */
1195 r = ldexpf (x * (0.5f / 0x800000U), e - 126); 1273 r = ecb_ldexpf (x * (0.5f / 0x800000U), e - 126);
1196 1274
1197 r = neg ? -r : r; 1275 r = neg ? -r : r;
1198 #endif 1276 #endif
1199 1277
1200 return r; 1278 return r;
1201 } 1279 }
1202 1280
1203 /* convert a double to ieee double/binary64 */ 1281 /* convert a double to ieee double/binary64 */
1204 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);
1205 ecb_function_ uint64_t 1283 ecb_function_ ecb_const uint64_t
1206 ecb_double_to_binary64 (double x) 1284 ecb_double_to_binary64 (double x)
1207 { 1285 {
1208 uint64_t r; 1286 uint64_t r;
1209 1287
1210 #if ECB_STDFP 1288 #if ECB_STDFP
… …
1239 1317
1240 return r; 1318 return r;
1241 } 1319 }
1242 1320
1243 /* converts an ieee double/binary64 to a double */ 1321 /* converts an ieee double/binary64 to a double */
1244 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);
1245 ecb_function_ double 1323 ecb_function_ ecb_const double
1246 ecb_binary64_to_double (uint64_t x) 1324 ecb_binary64_to_double (uint64_t x)
1247 { 1325 {
1248 double r; 1326 double r;
1249 1327
1250 #if ECB_STDFP 1328 #if ECB_STDFP
… …
2586{ 2664{
2587 invoke_cb = invoke_pending_cb; 2665 invoke_cb = invoke_pending_cb;
2588} 2666}
2589 2667
2590void 2668void
2591ev_set_loop_release_cb (EV_P_ ev_loop_callback_nothrow release, ev_loop_callback_nothrow acquire) EV_THROW 2669ev_set_loop_release_cb (EV_P_ void (*release)(EV_P) EV_THROW, void (*acquire)(EV_P) EV_THROW) EV_THROW
2592{ 2670{
2593 release_cb = release; 2671 release_cb = release;
2594 acquire_cb = acquire; 2672 acquire_cb = acquire;
2595} 2673}
2596#endif 2674#endif

Diff Legend

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