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

Comparing libecb/ecb.h (file contents):
Revision 1.109 by root, Fri Jun 29 14:05:50 2012 UTC vs.
Revision 1.149 by root, Fri Oct 24 04:54:11 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 0x00010004
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
73 * an issue with that they should have done it right in the first place. 93 * an issue with that they should have done it right in the first place.
74 */ 94 */
75#ifndef ECB_GCC_VERSION
76 #if !defined __GNUC_MINOR__ || defined __INTEL_COMPILER || defined __SUNPRO_C || defined __SUNPRO_CC || defined __llvm__ || defined __clang__ 95#if !defined __GNUC_MINOR__ || defined __INTEL_COMPILER || defined __SUNPRO_C || defined __SUNPRO_CC || defined __llvm__ || defined __clang__
77 #define ECB_GCC_VERSION(major,minor) 0 96 #define ECB_GCC_VERSION(major,minor) 0
78 #else 97#else
79 #define ECB_GCC_VERSION(major,minor) (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor))) 98 #define ECB_GCC_VERSION(major,minor) (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor)))
80 #endif 99#endif
81#endif
82 100
83#define ECB_C (__STDC__+0) /* this assumes that __STDC__ is either empty or a number */ 101#define ECB_CLANG_VERSION(major,minor) (__clang_major__ > (major) || (__clang_major__ == (major) && __clang_minor__ >= (minor)))
84#define ECB_C99 (__STDC_VERSION__ >= 199901L) 102
85#define ECB_C11 (__STDC_VERSION__ >= 201112L) 103#if __clang__ && defined __has_builtin
104 #define ECB_CLANG_BUILTIN(x) __has_builtin (x)
105#else
106 #define ECB_CLANG_BUILTIN(x) 0
107#endif
108
109#if __clang__ && defined __has_extension
110 #define ECB_CLANG_EXTENSION(x) __has_extension (x)
111#else
112 #define ECB_CLANG_EXTENSION(x) 0
113#endif
114
86#define ECB_CPP (__cplusplus+0) 115#define ECB_CPP (__cplusplus+0)
87#define ECB_CPP11 (__cplusplus >= 201103L) 116#define ECB_CPP11 (__cplusplus >= 201103L)
117
118#if ECB_CPP
119 #define ECB_C 0
120 #define ECB_STDC_VERSION 0
121#else
122 #define ECB_C 1
123 #define ECB_STDC_VERSION __STDC_VERSION__
124#endif
125
126#define ECB_C99 (ECB_STDC_VERSION >= 199901L)
127#define ECB_C11 (ECB_STDC_VERSION >= 201112L)
88 128
89#if ECB_CPP 129#if ECB_CPP
90 #define ECB_EXTERN_C extern "C" 130 #define ECB_EXTERN_C extern "C"
91 #define ECB_EXTERN_C_BEG ECB_EXTERN_C { 131 #define ECB_EXTERN_C_BEG ECB_EXTERN_C {
92 #define ECB_EXTERN_C_END } 132 #define ECB_EXTERN_C_END }
… …
125 || defined __ARM_ARCH_6K__ || defined __ARM_ARCH_6ZK__ 165 || 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") 166 #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__ \ 167 #elif defined __ARM_ARCH_7__ || defined __ARM_ARCH_7A__ \
128 || defined __ARM_ARCH_7M__ || defined __ARM_ARCH_7R__ 168 || defined __ARM_ARCH_7M__ || defined __ARM_ARCH_7R__
129 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("dmb" : : : "memory") 169 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("dmb" : : : "memory")
170 #elif __aarch64__
171 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("dmb ish" : : : "memory")
130 #elif __sparc || __sparc__ 172 #elif (__sparc || __sparc__) && !__sparcv8
131 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad | #StoreStore | #StoreLoad" : : : "memory") 173 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad | #StoreStore | #StoreLoad" : : : "memory")
132 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad" : : : "memory") 174 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad" : : : "memory")
133 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("membar #LoadStore | #StoreStore") 175 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("membar #LoadStore | #StoreStore")
134 #elif defined __s390__ || defined __s390x__ 176 #elif defined __s390__ || defined __s390x__
135 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("bcr 15,0" : : : "memory") 177 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("bcr 15,0" : : : "memory")
136 #elif defined __mips__ 178 #elif defined __mips__
179 /* GNU/Linux emulates sync on mips1 architectures, so we force its use */
180 /* 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") 181 #define ECB_MEMORY_FENCE __asm__ __volatile__ (".set mips2; sync; .set mips0" : : : "memory")
138 #elif defined __alpha__ 182 #elif defined __alpha__
139 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mb" : : : "memory") 183 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mb" : : : "memory")
140 #elif defined __hppa__ 184 #elif defined __hppa__
141 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("" : : : "memory") 185 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("" : : : "memory")
142 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("") 186 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("")
143 #elif defined __ia64__ 187 #elif defined __ia64__
144 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mf" : : : "memory") 188 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mf" : : : "memory")
189 #elif defined __m68k__
190 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("" : : : "memory")
191 #elif defined __m88k__
192 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("tb1 0,%%r0,128" : : : "memory")
193 #elif defined __sh__
194 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("" : : : "memory")
145 #endif 195 #endif
146 #endif 196 #endif
147#endif 197#endif
148 198
149#ifndef ECB_MEMORY_FENCE 199#ifndef ECB_MEMORY_FENCE
150 #if ECB_GCC_VERSION(4,7) 200 #if ECB_GCC_VERSION(4,7)
151 /* see comment below (stdatomic.h) about the C11 memory model. */ 201 /* see comment below (stdatomic.h) about the C11 memory model. */
152 #define ECB_MEMORY_FENCE __atomic_thread_fence (__ATOMIC_SEQ_CST) 202 #define ECB_MEMORY_FENCE __atomic_thread_fence (__ATOMIC_SEQ_CST)
153 /*#elif defined __clang && __has_feature (cxx_atomic)*/ 203 #define ECB_MEMORY_FENCE_ACQUIRE __atomic_thread_fence (__ATOMIC_ACQUIRE)
204 #define ECB_MEMORY_FENCE_RELEASE __atomic_thread_fence (__ATOMIC_RELEASE)
205
206 #elif ECB_CLANG_EXTENSION(c_atomic)
154 /* see comment below (stdatomic.h) about the C11 memory model. */ 207 /* see comment below (stdatomic.h) about the C11 memory model. */
155 /*#define ECB_MEMORY_FENCE __c11_atomic_thread_fence (__ATOMIC_SEQ_CST)*/ 208 #define ECB_MEMORY_FENCE __c11_atomic_thread_fence (__ATOMIC_SEQ_CST)
209 #define ECB_MEMORY_FENCE_ACQUIRE __c11_atomic_thread_fence (__ATOMIC_ACQUIRE)
210 #define ECB_MEMORY_FENCE_RELEASE __c11_atomic_thread_fence (__ATOMIC_RELEASE)
211
156 #elif ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__ 212 #elif ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__
157 #define ECB_MEMORY_FENCE __sync_synchronize () 213 #define ECB_MEMORY_FENCE __sync_synchronize ()
214 #elif _MSC_VER >= 1500 /* VC++ 2008 */
215 /* apparently, microsoft broke all the memory barrier stuff in Visual Studio 2008... */
216 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier)
217 #define ECB_MEMORY_FENCE _ReadWriteBarrier (); MemoryBarrier()
218 #define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier (); MemoryBarrier() /* according to msdn, _ReadBarrier is not a load fence */
219 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier (); MemoryBarrier()
158 #elif _MSC_VER >= 1400 /* VC++ 2005 */ 220 #elif _MSC_VER >= 1400 /* VC++ 2005 */
159 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier) 221 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier)
160 #define ECB_MEMORY_FENCE _ReadWriteBarrier () 222 #define ECB_MEMORY_FENCE _ReadWriteBarrier ()
161 #define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier () /* according to msdn, _ReadBarrier is not a load fence */ 223 #define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier () /* according to msdn, _ReadBarrier is not a load fence */
162 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier () 224 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier ()
… …
182 /* any fence other than seq_cst, which isn't very efficient for us. */ 244 /* 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 */ 245 /* 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 */ 246 /* for most usages, or gcc and clang have a bug */
185 /* I *currently* lean towards the latter, and inefficiently implement */ 247 /* I *currently* lean towards the latter, and inefficiently implement */
186 /* all three of ecb's fences as a seq_cst fence */ 248 /* all three of ecb's fences as a seq_cst fence */
249 /* Update, gcc-4.8 generates mfence for all c++ fences, but nothing */
250 /* for all __atomic_thread_fence's except seq_cst */
187 #define ECB_MEMORY_FENCE atomic_thread_fence (memory_order_seq_cst) 251 #define ECB_MEMORY_FENCE atomic_thread_fence (memory_order_seq_cst)
188 #endif 252 #endif
189#endif 253#endif
190 254
191#ifndef ECB_MEMORY_FENCE 255#ifndef ECB_MEMORY_FENCE
… …
214 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE 278 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
215#endif 279#endif
216 280
217/*****************************************************************************/ 281/*****************************************************************************/
218 282
219#if __cplusplus 283#if ECB_CPP
220 #define ecb_inline static inline 284 #define ecb_inline static inline
221#elif ECB_GCC_VERSION(2,5) 285#elif ECB_GCC_VERSION(2,5)
222 #define ecb_inline static __inline__ 286 #define ecb_inline static __inline__
223#elif ECB_C99 287#elif ECB_C99
224 #define ecb_inline static inline 288 #define ecb_inline static inline
… …
241#define ECB_STRINGIFY_(a) # a 305#define ECB_STRINGIFY_(a) # a
242#define ECB_STRINGIFY(a) ECB_STRINGIFY_(a) 306#define ECB_STRINGIFY(a) ECB_STRINGIFY_(a)
243 307
244#define ecb_function_ ecb_inline 308#define ecb_function_ ecb_inline
245 309
246#if ECB_GCC_VERSION(3,1) 310#if ECB_GCC_VERSION(3,1) || ECB_CLANG_VERSION(2,8)
247 #define ecb_attribute(attrlist) __attribute__(attrlist) 311 #define ecb_attribute(attrlist) __attribute__ (attrlist)
312#else
313 #define ecb_attribute(attrlist)
314#endif
315
316#if ECB_GCC_VERSION(3,1) || ECB_CLANG_BUILTIN(__builtin_constant_p)
248 #define ecb_is_constant(expr) __builtin_constant_p (expr) 317 #define ecb_is_constant(expr) __builtin_constant_p (expr)
318#else
319 /* possible C11 impl for integral types
320 typedef struct ecb_is_constant_struct ecb_is_constant_struct;
321 #define ecb_is_constant(expr) _Generic ((1 ? (struct ecb_is_constant_struct *)0 : (void *)((expr) - (expr)), ecb_is_constant_struct *: 0, default: 1)) */
322
323 #define ecb_is_constant(expr) 0
324#endif
325
326#if ECB_GCC_VERSION(3,1) || ECB_CLANG_BUILTIN(__builtin_expect)
249 #define ecb_expect(expr,value) __builtin_expect ((expr),(value)) 327 #define ecb_expect(expr,value) __builtin_expect ((expr),(value))
328#else
329 #define ecb_expect(expr,value) (expr)
330#endif
331
332#if ECB_GCC_VERSION(3,1) || ECB_CLANG_BUILTIN(__builtin_prefetch)
250 #define ecb_prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality) 333 #define ecb_prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality)
251#else 334#else
252 #define ecb_attribute(attrlist)
253 #define ecb_is_constant(expr) 0
254 #define ecb_expect(expr,value) (expr)
255 #define ecb_prefetch(addr,rw,locality) 335 #define ecb_prefetch(addr,rw,locality)
256#endif 336#endif
257 337
258/* no emulation for ecb_decltype */ 338/* no emulation for ecb_decltype */
259#if ECB_GCC_VERSION(4,5) 339#if ECB_CPP11
340 // older implementations might have problems with decltype(x)::type, work around it
341 template<class T> struct ecb_decltype_t { typedef T type; };
260 #define ecb_decltype(x) __decltype(x) 342 #define ecb_decltype(x) ecb_decltype_t<decltype (x)>::type
261#elif ECB_GCC_VERSION(3,0) 343#elif ECB_GCC_VERSION(3,0) || ECB_CLANG_VERSION(2,8)
262 #define ecb_decltype(x) __typeof(x) 344 #define ecb_decltype(x) __typeof__ (x)
345#endif
346
347#if _MSC_VER >= 1300
348 #define ecb_deprecated __declspec (deprecated)
349#else
350 #define ecb_deprecated ecb_attribute ((__deprecated__))
263#endif 351#endif
264 352
265#define ecb_noinline ecb_attribute ((__noinline__)) 353#define ecb_noinline ecb_attribute ((__noinline__))
266#define ecb_unused ecb_attribute ((__unused__)) 354#define ecb_unused ecb_attribute ((__unused__))
267#define ecb_const ecb_attribute ((__const__)) 355#define ecb_const ecb_attribute ((__const__))
268#define ecb_pure ecb_attribute ((__pure__)) 356#define ecb_pure ecb_attribute ((__pure__))
269 357
270#if ECB_C11 358/* TODO http://msdn.microsoft.com/en-us/library/k6ktzx3s.aspx __declspec(noreturn) */
359#if ECB_C11 || __IBMC_NORETURN
360 /* http://pic.dhe.ibm.com/infocenter/compbg/v121v141/topic/com.ibm.xlcpp121.bg.doc/language_ref/noreturn.html */
271 #define ecb_noreturn _Noreturn 361 #define ecb_noreturn _Noreturn
272#else 362#else
273 #define ecb_noreturn ecb_attribute ((__noreturn__)) 363 #define ecb_noreturn ecb_attribute ((__noreturn__))
274#endif 364#endif
275 365
… …
291/* for compatibility to the rest of the world */ 381/* for compatibility to the rest of the world */
292#define ecb_likely(expr) ecb_expect_true (expr) 382#define ecb_likely(expr) ecb_expect_true (expr)
293#define ecb_unlikely(expr) ecb_expect_false (expr) 383#define ecb_unlikely(expr) ecb_expect_false (expr)
294 384
295/* count trailing zero bits and count # of one bits */ 385/* count trailing zero bits and count # of one bits */
296#if ECB_GCC_VERSION(3,4) 386#if ECB_GCC_VERSION(3,4) \
387 || (ECB_CLANG_BUILTIN(__builtin_clz) && ECB_CLANG_BUILTIN(__builtin_clzll) \
388 && ECB_CLANG_BUILTIN(__builtin_ctz) && ECB_CLANG_BUILTIN(__builtin_ctzll) \
389 && ECB_CLANG_BUILTIN(__builtin_popcount))
297 /* we assume int == 32 bit, long == 32 or 64 bit and long long == 64 bit */ 390 /* we assume int == 32 bit, long == 32 or 64 bit and long long == 64 bit */
298 #define ecb_ld32(x) (__builtin_clz (x) ^ 31) 391 #define ecb_ld32(x) (__builtin_clz (x) ^ 31)
299 #define ecb_ld64(x) (__builtin_clzll (x) ^ 63) 392 #define ecb_ld64(x) (__builtin_clzll (x) ^ 63)
300 #define ecb_ctz32(x) __builtin_ctz (x) 393 #define ecb_ctz32(x) __builtin_ctz (x)
301 #define ecb_ctz64(x) __builtin_ctzll (x) 394 #define ecb_ctz64(x) __builtin_ctzll (x)
… …
432ecb_inline uint32_t ecb_rotl32 (uint32_t x, unsigned int count) { return (x >> (32 - count)) | (x << count); } 525ecb_inline uint32_t ecb_rotl32 (uint32_t x, unsigned int count) { return (x >> (32 - count)) | (x << count); }
433ecb_inline uint32_t ecb_rotr32 (uint32_t x, unsigned int count) { return (x << (32 - count)) | (x >> count); } 526ecb_inline uint32_t ecb_rotr32 (uint32_t x, unsigned int count) { return (x << (32 - count)) | (x >> count); }
434ecb_inline uint64_t ecb_rotl64 (uint64_t x, unsigned int count) { return (x >> (64 - count)) | (x << count); } 527ecb_inline uint64_t ecb_rotl64 (uint64_t x, unsigned int count) { return (x >> (64 - count)) | (x << count); }
435ecb_inline uint64_t ecb_rotr64 (uint64_t x, unsigned int count) { return (x << (64 - count)) | (x >> count); } 528ecb_inline uint64_t ecb_rotr64 (uint64_t x, unsigned int count) { return (x << (64 - count)) | (x >> count); }
436 529
437#if ECB_GCC_VERSION(4,3) 530#if ECB_GCC_VERSION(4,3) || (ECB_CLANG_BUILTIN(__builtin_bswap32) && ECB_CLANG_BUILTIN(__builtin_bswap64))
438 #define ecb_bswap16(x) (__builtin_bswap32 (x) >> 16) 531 #define ecb_bswap16(x) (__builtin_bswap32 (x) >> 16)
439 #define ecb_bswap32(x) __builtin_bswap32 (x) 532 #define ecb_bswap32(x) __builtin_bswap32 (x)
440 #define ecb_bswap64(x) __builtin_bswap64 (x) 533 #define ecb_bswap64(x) __builtin_bswap64 (x)
441#else 534#else
442 ecb_function_ uint16_t ecb_bswap16 (uint16_t x) ecb_const; 535 ecb_function_ uint16_t ecb_bswap16 (uint16_t x) ecb_const;
… …
459 { 552 {
460 return (((uint64_t)ecb_bswap32 (x)) << 32) | ecb_bswap32 (x >> 32); 553 return (((uint64_t)ecb_bswap32 (x)) << 32) | ecb_bswap32 (x >> 32);
461 } 554 }
462#endif 555#endif
463 556
464#if ECB_GCC_VERSION(4,5) 557#if ECB_GCC_VERSION(4,5) || ECB_CLANG_BUILTIN(__builtin_unreachable)
465 #define ecb_unreachable() __builtin_unreachable () 558 #define ecb_unreachable() __builtin_unreachable ()
466#else 559#else
467 /* this seems to work fine, but gcc always emits a warning for it :/ */ 560 /* this seems to work fine, but gcc always emits a warning for it :/ */
468 ecb_inline void ecb_unreachable (void) ecb_noreturn; 561 ecb_inline void ecb_unreachable (void) ecb_noreturn;
469 ecb_inline void ecb_unreachable (void) { } 562 ecb_inline void ecb_unreachable (void) { }
… …
475ecb_inline unsigned char ecb_byteorder_helper (void) ecb_const; 568ecb_inline unsigned char ecb_byteorder_helper (void) ecb_const;
476ecb_inline unsigned char 569ecb_inline unsigned char
477ecb_byteorder_helper (void) 570ecb_byteorder_helper (void)
478{ 571{
479 /* the union code still generates code under pressure in gcc, */ 572 /* the union code still generates code under pressure in gcc, */
480 /* but less than using pointers, and always seem to */ 573 /* but less than using pointers, and always seems to */
481 /* successfully return a constant. */ 574 /* successfully return a constant. */
482 /* the reason why we have this horrible preprocessor mess */ 575 /* the reason why we have this horrible preprocessor mess */
483 /* is to avoid it in all cases, at least on common architectures */ 576 /* is to avoid it in all cases, at least on common architectures */
484 /* and yes, gcc defines __BYTE_ORDER__, g++ does not */ 577 /* or when using a recent enough gcc version (>= 4.6) */
485#if __i386 || __i386__ || _M_X86 || __amd64 || __amd64__ || _M_X64 578#if __i386 || __i386__ || _M_X86 || __amd64 || __amd64__ || _M_X64
486 return 0x44; 579 return 0x44;
487#elif __BYTE_ORDER__ && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ 580#elif __BYTE_ORDER__ && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
488 return 0x44; 581 return 0x44;
489#elif __BYTE_ORDER__ && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ 582#elif __BYTE_ORDER__ && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
490 retrurn 0x11; 583 return 0x11;
491#else 584#else
492 union 585 union
493 { 586 {
494 uint32_t i; 587 uint32_t i;
495 uint8_t c; 588 uint8_t c;
… …
507 #define ecb_mod(m,n) ((m) % (n) + ((m) % (n) < 0 ? (n) : 0)) 600 #define ecb_mod(m,n) ((m) % (n) + ((m) % (n) < 0 ? (n) : 0))
508#else 601#else
509 #define ecb_mod(m,n) ((m) < 0 ? ((n) - 1 - ((-1 - (m)) % (n))) : ((m) % (n))) 602 #define ecb_mod(m,n) ((m) < 0 ? ((n) - 1 - ((-1 - (m)) % (n))) : ((m) % (n)))
510#endif 603#endif
511 604
512#if __cplusplus 605#if ECB_CPP
513 template<typename T> 606 template<typename T>
514 static inline T ecb_div_rd (T val, T div) 607 static inline T ecb_div_rd (T val, T div)
515 { 608 {
516 return val < 0 ? - ((-val + div - 1) / div) : (val ) / div; 609 return val < 0 ? - ((-val + div - 1) / div) : (val ) / div;
517 } 610 }
… …
543/* the only noteworthy exception is ancient armle, which uses order 43218765 */ 636/* the only noteworthy exception is ancient armle, which uses order 43218765 */
544#if 0 \ 637#if 0 \
545 || __i386 || __i386__ \ 638 || __i386 || __i386__ \
546 || __amd64 || __amd64__ || __x86_64 || __x86_64__ \ 639 || __amd64 || __amd64__ || __x86_64 || __x86_64__ \
547 || __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__ \ 640 || __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__ \
548 || defined __arm__ && defined __ARM_EABI__ \
549 || defined __s390__ || defined __s390x__ \ 641 || defined __s390__ || defined __s390x__ \
550 || defined __mips__ \ 642 || defined __mips__ \
551 || defined __alpha__ \ 643 || defined __alpha__ \
552 || defined __hppa__ \ 644 || defined __hppa__ \
553 || defined __ia64__ \ 645 || defined __ia64__ \
646 || defined __m68k__ \
647 || defined __m88k__ \
648 || defined __sh__ \
554 || defined _M_IX86 || defined _M_AMD64 || defined _M_IA64 649 || defined _M_IX86 || defined _M_AMD64 || defined _M_IA64 \
650 || (defined __arm__ && (defined __ARM_EABI__ || defined __EABI__ || defined __VFP_FP__ || defined _WIN32_WCE || defined __ANDROID__)) \
651 || defined __aarch64__
555 #define ECB_STDFP 1 652 #define ECB_STDFP 1
556 #include <string.h> /* for memcpy */ 653 #include <string.h> /* for memcpy */
557#else 654#else
558 #define ECB_STDFP 0 655 #define ECB_STDFP 0
559 #include <math.h> /* for frexp*, ldexp* */
560#endif 656#endif
561 657
562#ifndef ECB_NO_LIBM 658#ifndef ECB_NO_LIBM
659
660 #include <math.h> /* for frexp*, ldexp*, INFINITY, NAN */
661
662 /* only the oldest of old doesn't have this one. solaris. */
663 #ifdef INFINITY
664 #define ECB_INFINITY INFINITY
665 #else
666 #define ECB_INFINITY HUGE_VAL
667 #endif
668
669 #ifdef NAN
670 #define ECB_NAN NAN
671 #else
672 #define ECB_NAN ECB_INFINITY
673 #endif
674
675 #if ECB_C99 || _XOPEN_VERSION >= 600 || _POSIX_VERSION >= 200112L
676 #define ecb_ldexpf(x,e) ldexpf (x, e)
677 #else
678 #define ecb_ldexpf(x,e) (float) ldexp ((double)(x), e)
679 #endif
680
681 /* converts an ieee half/binary16 to a float */
682 ecb_function_ float ecb_binary16_to_float (uint16_t x) ecb_const;
683 ecb_function_ float
684 ecb_binary16_to_float (uint16_t x)
685 {
686 int e = (x >> 10) & 0x1f;
687 int m = x & 0x3ff;
688 float r;
689
690 if (!e ) r = ecb_ldexpf (m , -24);
691 else if (e != 31) r = ecb_ldexpf (m + 0x400, e - 25);
692 else if (m ) r = ECB_NAN;
693 else r = ECB_INFINITY;
694
695 return x & 0x8000 ? -r : r;
696 }
563 697
564 /* convert a float to ieee single/binary32 */ 698 /* convert a float to ieee single/binary32 */
565 ecb_function_ uint32_t ecb_float_to_binary32 (float x) ecb_const; 699 ecb_function_ uint32_t ecb_float_to_binary32 (float x) ecb_const;
566 ecb_function_ uint32_t 700 ecb_function_ uint32_t
567 ecb_float_to_binary32 (float x) 701 ecb_float_to_binary32 (float x)
… …
621 x |= 0x800000U; 755 x |= 0x800000U;
622 else 756 else
623 e = 1; 757 e = 1;
624 758
625 /* we distrust ldexpf a bit and do the 2**-24 scaling by an extra multiply */ 759 /* we distrust ldexpf a bit and do the 2**-24 scaling by an extra multiply */
626 r = ldexpf (x * (0.5f / 0x800000U), e - 126); 760 r = ecb_ldexpf (x * (0.5f / 0x800000U), e - 126);
627 761
628 r = neg ? -r : r; 762 r = neg ? -r : r;
629 #endif 763 #endif
630 764
631 return r; 765 return r;

Diff Legend

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