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

Comparing libecb/ecb.h (file contents):
Revision 1.106 by root, Thu Jun 28 20:20:27 2012 UTC vs.
Revision 1.133 by root, Fri May 16 15:15:13 2014 UTC

1/* 1/*
2 * libecb - http://software.schmorp.de/pkg/libecb 2 * libecb - http://software.schmorp.de/pkg/libecb
3 * 3 *
4 * Copyright (©) 2009-2012 Marc Alexander Lehmann <libecb@schmorp.de> 4 * Copyright (©) 2009-2014 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:
… …
23 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 23 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
24 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 24 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
25 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH- 25 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
26 * ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 26 * ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
27 * OF THE POSSIBILITY OF SUCH DAMAGE. 27 * OF THE POSSIBILITY OF SUCH DAMAGE.
28 *
29 * Alternatively, the contents of this file may be used under the terms of
30 * the GNU General Public License ("GPL") version 2 or any later version,
31 * in which case the provisions of the GPL are applicable instead of
32 * the above. If you wish to allow the use of your version of this file
33 * only under the terms of the GPL and not to allow others to use your
34 * version of this file under the BSD license, indicate your decision
35 * by deleting the provisions above and replace them with the notice
36 * and other provisions required by the GPL. If you do not delete the
37 * provisions above, a recipient may use your version of this file under
38 * either the BSD or the GPL.
28 */ 39 */
29 40
30#ifndef ECB_H 41#ifndef ECB_H
31#define ECB_H 42#define ECB_H
32 43
33/* 16 bits major, 16 bits minor */ 44/* 16 bits major, 16 bits minor */
34#define ECB_VERSION 0x00010001 45#define ECB_VERSION 0x00010003
35 46
36#ifdef _WIN32 47#ifdef _WIN32
37 typedef signed char int8_t; 48 typedef signed char int8_t;
38 typedef unsigned char uint8_t; 49 typedef unsigned char uint8_t;
39 typedef signed short int16_t; 50 typedef signed short int16_t;
… …
63 #else 74 #else
64 #define ECB_PTRSIZE 4 75 #define ECB_PTRSIZE 4
65 #endif 76 #endif
66#endif 77#endif
67 78
79/* work around x32 idiocy by defining proper macros */
80#if __amd64 || __x86_64 || _M_AMD64 || _M_X64
81 #if _ILP32
82 #define ECB_AMD64_X32 1
83 #else
84 #define ECB_AMD64 1
85 #endif
86#endif
87
68/* many compilers define _GNUC_ to some versions but then only implement 88/* many compilers define _GNUC_ to some versions but then only implement
69 * what their idiot authors think are the "more important" extensions, 89 * what their idiot authors think are the "more important" extensions,
70 * causing enormous grief in return for some better fake benchmark numbers. 90 * causing enormous grief in return for some better fake benchmark numbers.
71 * or so. 91 * or so.
72 * we try to detect these and simply assume they are not gcc - if they have 92 * we try to detect these and simply assume they are not gcc - if they have
… …
78 #else 98 #else
79 #define ECB_GCC_VERSION(major,minor) (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor))) 99 #define ECB_GCC_VERSION(major,minor) (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor)))
80 #endif 100 #endif
81#endif 101#endif
82 102
83#define ECB_C (__STDC__+0) /* this assumes that __STDC__ is either empty or a number */
84#define ECB_C99 (__STDC_VERSION__ >= 199901L)
85#define ECB_C11 (__STDC_VERSION__ >= 201112L)
86#define ECB_CPP (__cplusplus+0) 103#define ECB_CPP (__cplusplus+0)
87#define ECB_CPP11 (__cplusplus >= 201103L) 104#define ECB_CPP11 (__cplusplus >= 201103L)
105
106#if ECB_CPP
107 #define ECB_C 0
108 #define ECB_STDC_VERSION 0
109#else
110 #define ECB_C 1
111 #define ECB_STDC_VERSION __STDC_VERSION__
112#endif
113
114#define ECB_C99 (ECB_STDC_VERSION >= 199901L)
115#define ECB_C11 (ECB_STDC_VERSION >= 201112L)
88 116
89#if ECB_CPP 117#if ECB_CPP
90 #define ECB_EXTERN_C extern "C" 118 #define ECB_EXTERN_C extern "C"
91 #define ECB_EXTERN_C_BEG ECB_EXTERN_C { 119 #define ECB_EXTERN_C_BEG ECB_EXTERN_C {
92 #define ECB_EXTERN_C_END } 120 #define ECB_EXTERN_C_END }
… …
125 || defined __ARM_ARCH_6K__ || defined __ARM_ARCH_6ZK__ 153 || defined __ARM_ARCH_6K__ || defined __ARM_ARCH_6ZK__
126 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mcr p15,0,%0,c7,c10,5" : : "r" (0) : "memory") 154 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mcr p15,0,%0,c7,c10,5" : : "r" (0) : "memory")
127 #elif defined __ARM_ARCH_7__ || defined __ARM_ARCH_7A__ \ 155 #elif defined __ARM_ARCH_7__ || defined __ARM_ARCH_7A__ \
128 || defined __ARM_ARCH_7M__ || defined __ARM_ARCH_7R__ 156 || defined __ARM_ARCH_7M__ || defined __ARM_ARCH_7R__
129 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("dmb" : : : "memory") 157 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("dmb" : : : "memory")
158 #elif __aarch64__
159 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("dmb ish" : : : "memory")
130 #elif __sparc || __sparc__ 160 #elif (__sparc || __sparc__) && !__sparcv8
131 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad | #StoreStore | #StoreLoad" : : : "memory") 161 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad | #StoreStore | #StoreLoad" : : : "memory")
132 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad" : : : "memory") 162 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad" : : : "memory")
133 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("membar #LoadStore | #StoreStore") 163 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("membar #LoadStore | #StoreStore")
134 #elif defined __s390__ || defined __s390x__ 164 #elif defined __s390__ || defined __s390x__
135 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("bcr 15,0" : : : "memory") 165 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("bcr 15,0" : : : "memory")
136 #elif defined __mips__ 166 #elif defined __mips__
167 /* GNU/Linux emulates sync on mips1 architectures, so we force its use */
168 /* anybody else who still uses mips1 is supposed to send in their version, with detection code. */
137 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory") 169 #define ECB_MEMORY_FENCE __asm__ __volatile__ (".set mips2; sync; .set mips0" : : : "memory")
138 #elif defined __alpha__ 170 #elif defined __alpha__
139 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mb" : : : "memory") 171 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mb" : : : "memory")
140 #elif defined __hppa__ 172 #elif defined __hppa__
141 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("" : : : "memory") 173 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("" : : : "memory")
142 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("") 174 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("")
143 #elif defined __ia64__ 175 #elif defined __ia64__
144 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mf" : : : "memory") 176 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mf" : : : "memory")
177 #elif defined __m68k__
178 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("" : : : "memory")
179 #elif defined __m88k__
180 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("tb1 0,%%r0,128" : : : "memory")
181 #elif defined __sh__
182 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("" : : : "memory")
145 #endif 183 #endif
146 #endif 184 #endif
147#endif 185#endif
148 186
149#ifndef ECB_MEMORY_FENCE 187#ifndef ECB_MEMORY_FENCE
150 #if ECB_GCC_VERSION(4,7) 188 #if ECB_GCC_VERSION(4,7)
151 /* see comment below (stdatomic.h) about the C11 memory model. */ 189 /* see comment below (stdatomic.h) about the C11 memory model. */
152 #define ECB_MEMORY_FENCE __atomic_thread_fence (__ATOMIC_SEQ_CST) 190 #define ECB_MEMORY_FENCE __atomic_thread_fence (__ATOMIC_SEQ_CST)
191 #define ECB_MEMORY_FENCE_ACQUIRE __atomic_thread_fence (__ATOMIC_ACQUIRE)
192 #define ECB_MEMORY_FENCE_RELEASE __atomic_thread_fence (__ATOMIC_RELEASE)
193
194 /* The __has_feature syntax from clang is so misdesigned that we cannot use it
195 * without risking compile time errors with other compilers. We *could*
196 * define our own ecb_clang_has_feature, but I just can't be bothered to work
197 * around this shit time and again.
153 /*#elif defined __clang && __has_feature (cxx_atomic)*/ 198 * #elif defined __clang && __has_feature (cxx_atomic)
154 /* see comment below (stdatomic.h) about the C11 memory model. */ 199 * // see comment below (stdatomic.h) about the C11 memory model.
155 /*#define ECB_MEMORY_FENCE __c11_atomic_thread_fence (__ATOMIC_SEQ_CST)*/ 200 * #define ECB_MEMORY_FENCE __c11_atomic_thread_fence (__ATOMIC_SEQ_CST)
201 * #define ECB_MEMORY_FENCE_ACQUIRE __c11_atomic_thread_fence (__ATOMIC_ACQUIRE)
202 * #define ECB_MEMORY_FENCE_RELEASE __c11_atomic_thread_fence (__ATOMIC_RELEASE)
203 */
204
156 #elif ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__ 205 #elif ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__
157 #define ECB_MEMORY_FENCE __sync_synchronize () 206 #define ECB_MEMORY_FENCE __sync_synchronize ()
207 #elif _MSC_VER >= 1500 /* VC++ 2008 */
208 /* apparently, microsoft broke all the memory barrier stuff in Visual Studio 2008... */
209 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier)
210 #define ECB_MEMORY_FENCE _ReadWriteBarrier (); MemoryBarrier()
211 #define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier (); MemoryBarrier() /* according to msdn, _ReadBarrier is not a load fence */
212 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier (); MemoryBarrier()
158 #elif _MSC_VER >= 1400 /* VC++ 2005 */ 213 #elif _MSC_VER >= 1400 /* VC++ 2005 */
159 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier) 214 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier)
160 #define ECB_MEMORY_FENCE _ReadWriteBarrier () 215 #define ECB_MEMORY_FENCE _ReadWriteBarrier ()
161 #define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier () /* according to msdn, _ReadBarrier is not a load fence */ 216 #define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier () /* according to msdn, _ReadBarrier is not a load fence */
162 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier () 217 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier ()
… …
182 /* any fence other than seq_cst, which isn't very efficient for us. */ 237 /* any fence other than seq_cst, which isn't very efficient for us. */
183 /* Why that is, we don't know - either the C11 memory model is quite useless */ 238 /* Why that is, we don't know - either the C11 memory model is quite useless */
184 /* for most usages, or gcc and clang have a bug */ 239 /* for most usages, or gcc and clang have a bug */
185 /* I *currently* lean towards the latter, and inefficiently implement */ 240 /* I *currently* lean towards the latter, and inefficiently implement */
186 /* all three of ecb's fences as a seq_cst fence */ 241 /* all three of ecb's fences as a seq_cst fence */
242 /* Update, gcc-4.8 generates mfence for all c++ fences, but nothing */
243 /* for all __atomic_thread_fence's except seq_cst */
187 #define ECB_MEMORY_FENCE atomic_thread_fence (memory_order_seq_cst) 244 #define ECB_MEMORY_FENCE atomic_thread_fence (memory_order_seq_cst)
188 #endif 245 #endif
189#endif 246#endif
190 247
191#ifndef ECB_MEMORY_FENCE 248#ifndef ECB_MEMORY_FENCE
… …
248 #define ecb_is_constant(expr) __builtin_constant_p (expr) 305 #define ecb_is_constant(expr) __builtin_constant_p (expr)
249 #define ecb_expect(expr,value) __builtin_expect ((expr),(value)) 306 #define ecb_expect(expr,value) __builtin_expect ((expr),(value))
250 #define ecb_prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality) 307 #define ecb_prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality)
251#else 308#else
252 #define ecb_attribute(attrlist) 309 #define ecb_attribute(attrlist)
310
311 /* possible C11 impl for integral types
312 typedef struct ecb_is_constant_struct ecb_is_constant_struct;
313 #define ecb_is_constant(expr) _Generic ((1 ? (struct ecb_is_constant_struct *)0 : (void *)((expr) - (expr)), ecb_is_constant_struct *: 0, default: 1)) */
314
253 #define ecb_is_constant(expr) 0 315 #define ecb_is_constant(expr) 0
254 #define ecb_expect(expr,value) (expr) 316 #define ecb_expect(expr,value) (expr)
255 #define ecb_prefetch(addr,rw,locality) 317 #define ecb_prefetch(addr,rw,locality)
256#endif 318#endif
257 319
… …
475ecb_inline unsigned char ecb_byteorder_helper (void) ecb_const; 537ecb_inline unsigned char ecb_byteorder_helper (void) ecb_const;
476ecb_inline unsigned char 538ecb_inline unsigned char
477ecb_byteorder_helper (void) 539ecb_byteorder_helper (void)
478{ 540{
479 /* the union code still generates code under pressure in gcc, */ 541 /* the union code still generates code under pressure in gcc, */
480 /* but less than using pointers, and always seem to */ 542 /* but less than using pointers, and always seems to */
481 /* successfully return a constant. */ 543 /* successfully return a constant. */
482 /* the reason why we have this horrible preprocessor mess */ 544 /* the reason why we have this horrible preprocessor mess */
483 /* is to avoid it in all cases, at least on common architectures */ 545 /* is to avoid it in all cases, at least on common architectures */
484 /* and yes, gcc defines __BYTE_ORDER__, g++ does not */ 546 /* or when using a recent enough gcc version (>= 4.6) */
485#if __i386 || __i386__ || _M_X86 || __amd64 || __amd64__ || _M_X64 547#if __i386 || __i386__ || _M_X86 || __amd64 || __amd64__ || _M_X64
486 return 0x44; 548 return 0x44;
487#elif __BYTE_ORDER__ && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ 549#elif __BYTE_ORDER__ && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
488 return 0x44; 550 return 0x44;
489#elif __BYTE_ORDER__ && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ 551#elif __BYTE_ORDER__ && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
490 retrurn 0x11; 552 return 0x11;
491#else 553#else
492 union 554 union
493 { 555 {
494 uint32_t i; 556 uint32_t i;
495 uint8_t c; 557 uint8_t c;
… …
543/* the only noteworthy exception is ancient armle, which uses order 43218765 */ 605/* the only noteworthy exception is ancient armle, which uses order 43218765 */
544#if 0 \ 606#if 0 \
545 || __i386 || __i386__ \ 607 || __i386 || __i386__ \
546 || __amd64 || __amd64__ || __x86_64 || __x86_64__ \ 608 || __amd64 || __amd64__ || __x86_64 || __x86_64__ \
547 || __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__ \ 609 || __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__ \
548 || defined __arm__ && defined __ARM_EABI__ \
549 || defined __s390__ || defined __s390x__ \ 610 || defined __s390__ || defined __s390x__ \
550 || defined __mips__ \ 611 || defined __mips__ \
551 || defined __alpha__ \ 612 || defined __alpha__ \
552 || defined __hppa__ \ 613 || defined __hppa__ \
553 || defined __ia64__ \ 614 || defined __ia64__ \
615 || defined __m68k__ \
616 || defined __m88k__ \
617 || defined __sh__ \
554 || defined _M_IX86 || defined _M_AMD64 || defined _M_IA64 618 || defined _M_IX86 || defined _M_AMD64 || defined _M_IA64 \
619 || (defined __arm__ && (defined __ARM_EABI__ || defined __EABI__ || defined __VFP_FP__ || defined _WIN32_WCE || defined __ANDROID__)) \
620 || defined __aarch64__
555 #define ECB_STDFP 1 621 #define ECB_STDFP 1
556 #include <string.h> /* for memcpy */ 622 #include <string.h> /* for memcpy */
557#else 623#else
558 #define ECB_STDFP 0 624 #define ECB_STDFP 0
559#endif 625#endif
560 626
561#ifndef ECB_NO_LIBM 627#ifndef ECB_NO_LIBM
628
629 #include <math.h> /* for frexp*, ldexp*, INFINITY, NAN */
630
631 /* only the oldest of old doesn't have this one. solaris. */
632 #ifdef INFINITY
633 #define ECB_INFINITY INFINITY
634 #else
635 #define ECB_INFINITY HUGE_VAL
636 #endif
637
638 #ifdef NAN
639 #define ECB_NAN NAN
640 #else
641 #define ECB_NAN ECB_INFINITY
642 #endif
643
644 /* converts an ieee half/binary16 to a float */
645 ecb_function_ float ecb_binary16_to_float (uint16_t x) ecb_const;
646 ecb_function_ float
647 ecb_binary16_to_float (uint16_t x)
648 {
649 int e = (x >> 10) & 0x1f;
650 int m = x & 0x3ff;
651 float r;
652
653 if (!e ) r = ldexpf (m , -24);
654 else if (e != 31) r = ldexpf (m + 0x400, e - 25);
655 else if (m ) r = ECB_NAN;
656 else r = ECB_INFINITY;
657
658 return x & 0x8000 ? -r : r;
659 }
562 660
563 /* convert a float to ieee single/binary32 */ 661 /* convert a float to ieee single/binary32 */
564 ecb_function_ uint32_t ecb_float_to_binary32 (float x) ecb_const; 662 ecb_function_ uint32_t ecb_float_to_binary32 (float x) ecb_const;
565 ecb_function_ uint32_t 663 ecb_function_ uint32_t
566 ecb_float_to_binary32 (float x) 664 ecb_float_to_binary32 (float x)
… …
569 667
570 #if ECB_STDFP 668 #if ECB_STDFP
571 memcpy (&r, &x, 4); 669 memcpy (&r, &x, 4);
572 #else 670 #else
573 /* slow emulation, works for anything but -0 */ 671 /* slow emulation, works for anything but -0 */
574 ECB_EXTERN_C float frexpf (float v, int *e);
575 uint32_t m; 672 uint32_t m;
576 int e; 673 int e;
577 674
578 if (x == 0e0f ) return 0; 675 if (x == 0e0f ) return 0x00000000U;
579 if (x > +3.40282346638528860e+38f) return 0x7f800000U; 676 if (x > +3.40282346638528860e+38f) return 0x7f800000U;
580 if (x < -3.40282346638528860e+38f) return 0xff800000U; 677 if (x < -3.40282346638528860e+38f) return 0xff800000U;
581 if (x != x ) return 0x7fbfffffU; 678 if (x != x ) return 0x7fbfffffU;
582 679
583 m = frexpf (x, &e) * 0x1000000U; 680 m = frexpf (x, &e) * 0x1000000U;
… …
585 r = m & 0x80000000U; 682 r = m & 0x80000000U;
586 683
587 if (r) 684 if (r)
588 m = -m; 685 m = -m;
589 686
590 if (e < -125) 687 if (e <= -126)
591 { 688 {
592 m &= 0xffffffU; 689 m &= 0xffffffU;
593 m >>= (-125 - e); 690 m >>= (-125 - e);
594 e = -126; 691 e = -126;
595 } 692 }
… …
610 707
611 #if ECB_STDFP 708 #if ECB_STDFP
612 memcpy (&r, &x, 4); 709 memcpy (&r, &x, 4);
613 #else 710 #else
614 /* emulation, only works for normals and subnormals and +0 */ 711 /* emulation, only works for normals and subnormals and +0 */
615 ECB_EXTERN_C float ldexpf (float x, int e);
616
617 int neg = x >> 31; 712 int neg = x >> 31;
618 int e = (x >> 23) & 0xffU; 713 int e = (x >> 23) & 0xffU;
619 714
620 x &= 0x7fffffU; 715 x &= 0x7fffffU;
621 716
… …
623 x |= 0x800000U; 718 x |= 0x800000U;
624 else 719 else
625 e = 1; 720 e = 1;
626 721
627 /* we distrust ldexpf a bit and do the 2**-24 scaling by an extra multiply */ 722 /* we distrust ldexpf a bit and do the 2**-24 scaling by an extra multiply */
628 r = ldexpf (x * (1.f / 0x1000000U), e - 126); 723 r = ldexpf (x * (0.5f / 0x800000U), e - 126);
629 724
630 r = neg ? -r : r; 725 r = neg ? -r : r;
631 #endif 726 #endif
632 727
633 return r; 728 return r;
… …
642 737
643 #if ECB_STDFP 738 #if ECB_STDFP
644 memcpy (&r, &x, 8); 739 memcpy (&r, &x, 8);
645 #else 740 #else
646 /* slow emulation, works for anything but -0 */ 741 /* slow emulation, works for anything but -0 */
647 ECB_EXTERN_C double frexp (double v, int *e);
648 uint64_t m; 742 uint64_t m;
649 int e; 743 int e;
650 744
651 if (x == 0e0 ) return 0; 745 if (x == 0e0 ) return 0x0000000000000000U;
652 if (x > +1.79769313486231470e+308) return 0x7ff0000000000000U; 746 if (x > +1.79769313486231470e+308) return 0x7ff0000000000000U;
653 if (x < -1.79769313486231470e+308) return 0xfff0000000000000U; 747 if (x < -1.79769313486231470e+308) return 0xfff0000000000000U;
654 if (x != x ) return 0X7ff7ffffffffffffU; 748 if (x != x ) return 0X7ff7ffffffffffffU;
655 749
656 m = frexpf (x, &e) * 0x1000000U;
657 m = frexp (x, &e) * 0x20000000000000U; 750 m = frexp (x, &e) * 0x20000000000000U;
658 751
659 r = m & 0x8000000000000000;; 752 r = m & 0x8000000000000000;;
660 753
661 if (r) 754 if (r)
662 m = -m; 755 m = -m;
663 756
664 if (e < -1021) 757 if (e <= -1022)
665 { 758 {
666 m &= 0x1fffffffffffffU; 759 m &= 0x1fffffffffffffU;
667 m >>= (-1021 - e); 760 m >>= (-1021 - e);
668 e = -1022; 761 e = -1022;
669 } 762 }
… …
684 777
685 #if ECB_STDFP 778 #if ECB_STDFP
686 memcpy (&r, &x, 8); 779 memcpy (&r, &x, 8);
687 #else 780 #else
688 /* emulation, only works for normals and subnormals and +0 */ 781 /* emulation, only works for normals and subnormals and +0 */
689 ECB_EXTERN_C double ldexp (double x, int e);
690
691 int neg = x >> 63; 782 int neg = x >> 63;
692 int e = (x >> 52) & 0x7ffU; 783 int e = (x >> 52) & 0x7ffU;
693 784
694 x &= 0xfffffffffffffU; 785 x &= 0xfffffffffffffU;
695 786
696 if (e) 787 if (e)
697 x |= 0x10000000000000U; 788 x |= 0x10000000000000U;
698 else 789 else
699 e = 1; 790 e = 1;
700 791
701 /* we distrust ldexpf a bit and do the 2**-53 scaling by an extra multiply */ 792 /* we distrust ldexp a bit and do the 2**-53 scaling by an extra multiply */
702 r = ldexp (x * (1. / 0x20000000000000U), e - 1022); 793 r = ldexp (x * (0.5 / 0x10000000000000U), e - 1022);
703 794
704 r = neg ? -r : r; 795 r = neg ? -r : r;
705 #endif 796 #endif
706 797
707 return r; 798 return r;

Diff Legend

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