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

Comparing libeio/ecb.h (file contents):
Revision 1.20 by root, Fri Apr 11 05:19:41 2014 UTC vs.
Revision 1.23 by root, Wed Feb 11 19:32:36 2015 UTC

1/* 1/*
2 * libecb - http://software.schmorp.de/pkg/libecb 2 * libecb - http://software.schmorp.de/pkg/libecb
3 * 3 *
4 * Copyright (©) 2009-2014 Marc Alexander Lehmann <libecb@schmorp.de> 4 * Copyright (©) 2009-2015 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 0x00010003 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;
… …
79 * causing enormous grief in return for some better fake benchmark numbers. 90 * causing enormous grief in return for some better fake benchmark numbers.
80 * or so. 91 * or so.
81 * 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
82 * 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.
83 */ 94 */
84#ifndef ECB_GCC_VERSION
85 #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__
86 #define ECB_GCC_VERSION(major,minor) 0 96 #define ECB_GCC_VERSION(major,minor) 0
87 #else 97#else
88 #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)))
89 #endif 99#endif
100
101#define ECB_CLANG_VERSION(major,minor) (__clang_major__ > (major) || (__clang_major__ == (major) && __clang_minor__ >= (minor)))
102
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
90#endif 113#endif
91 114
92#define ECB_CPP (__cplusplus+0) 115#define ECB_CPP (__cplusplus+0)
93#define ECB_CPP11 (__cplusplus >= 201103L) 116#define ECB_CPP11 (__cplusplus >= 201103L)
94 117
… …
178 /* see comment below (stdatomic.h) about the C11 memory model. */ 201 /* see comment below (stdatomic.h) about the C11 memory model. */
179 #define ECB_MEMORY_FENCE __atomic_thread_fence (__ATOMIC_SEQ_CST) 202 #define ECB_MEMORY_FENCE __atomic_thread_fence (__ATOMIC_SEQ_CST)
180 #define ECB_MEMORY_FENCE_ACQUIRE __atomic_thread_fence (__ATOMIC_ACQUIRE) 203 #define ECB_MEMORY_FENCE_ACQUIRE __atomic_thread_fence (__ATOMIC_ACQUIRE)
181 #define ECB_MEMORY_FENCE_RELEASE __atomic_thread_fence (__ATOMIC_RELEASE) 204 #define ECB_MEMORY_FENCE_RELEASE __atomic_thread_fence (__ATOMIC_RELEASE)
182 205
183 /* The __has_feature syntax from clang is so misdesigned that we cannot use it 206 #elif ECB_CLANG_EXTENSION(c_atomic)
184 * without risking compile time errors with other compilers. We *could*
185 * define our own ecb_clang_has_feature, but I just can't be bothered to work
186 * around this shit time and again.
187 * #elif defined __clang && __has_feature (cxx_atomic)
188 * // see comment below (stdatomic.h) about the C11 memory model. 207 /* see comment below (stdatomic.h) about the C11 memory model. */
189 * #define ECB_MEMORY_FENCE __c11_atomic_thread_fence (__ATOMIC_SEQ_CST) 208 #define ECB_MEMORY_FENCE __c11_atomic_thread_fence (__ATOMIC_SEQ_CST)
190 * #define ECB_MEMORY_FENCE_ACQUIRE __c11_atomic_thread_fence (__ATOMIC_ACQUIRE) 209 #define ECB_MEMORY_FENCE_ACQUIRE __c11_atomic_thread_fence (__ATOMIC_ACQUIRE)
191 * #define ECB_MEMORY_FENCE_RELEASE __c11_atomic_thread_fence (__ATOMIC_RELEASE) 210 #define ECB_MEMORY_FENCE_RELEASE __c11_atomic_thread_fence (__ATOMIC_RELEASE)
192 */
193 211
194 #elif ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__ 212 #elif ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__
195 #define ECB_MEMORY_FENCE __sync_synchronize () 213 #define ECB_MEMORY_FENCE __sync_synchronize ()
196 #elif _MSC_VER >= 1500 /* VC++ 2008 */ 214 #elif _MSC_VER >= 1500 /* VC++ 2008 */
197 /* apparently, microsoft broke all the memory barrier stuff in Visual Studio 2008... */ 215 /* apparently, microsoft broke all the memory barrier stuff in Visual Studio 2008... */
… …
260 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE 278 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
261#endif 279#endif
262 280
263/*****************************************************************************/ 281/*****************************************************************************/
264 282
265#if __cplusplus 283#if ECB_CPP
266 #define ecb_inline static inline 284 #define ecb_inline static inline
267#elif ECB_GCC_VERSION(2,5) 285#elif ECB_GCC_VERSION(2,5)
268 #define ecb_inline static __inline__ 286 #define ecb_inline static __inline__
269#elif ECB_C99 287#elif ECB_C99
270 #define ecb_inline static inline 288 #define ecb_inline static inline
… …
287#define ECB_STRINGIFY_(a) # a 305#define ECB_STRINGIFY_(a) # a
288#define ECB_STRINGIFY(a) ECB_STRINGIFY_(a) 306#define ECB_STRINGIFY(a) ECB_STRINGIFY_(a)
289 307
290#define ecb_function_ ecb_inline 308#define ecb_function_ ecb_inline
291 309
292#if ECB_GCC_VERSION(3,1) 310#if ECB_GCC_VERSION(3,1) || ECB_CLANG_VERSION(2,8)
293 #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)
294 #define ecb_is_constant(expr) __builtin_constant_p (expr) 317 #define ecb_is_constant(expr) __builtin_constant_p (expr)
295 #define ecb_expect(expr,value) __builtin_expect ((expr),(value))
296 #define ecb_prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality)
297#else 318#else
298 #define ecb_attribute(attrlist)
299
300 /* possible C11 impl for integral types 319 /* possible C11 impl for integral types
301 typedef struct ecb_is_constant_struct ecb_is_constant_struct; 320 typedef struct ecb_is_constant_struct ecb_is_constant_struct;
302 #define ecb_is_constant(expr) _Generic ((1 ? (struct ecb_is_constant_struct *)0 : (void *)((expr) - (expr)), ecb_is_constant_struct *: 0, default: 1)) */ 321 #define ecb_is_constant(expr) _Generic ((1 ? (struct ecb_is_constant_struct *)0 : (void *)((expr) - (expr)), ecb_is_constant_struct *: 0, default: 1)) */
303 322
304 #define ecb_is_constant(expr) 0 323 #define ecb_is_constant(expr) 0
324#endif
325
326#if ECB_GCC_VERSION(3,1) || ECB_CLANG_BUILTIN(__builtin_expect)
327 #define ecb_expect(expr,value) __builtin_expect ((expr),(value))
328#else
305 #define ecb_expect(expr,value) (expr) 329 #define ecb_expect(expr,value) (expr)
330#endif
331
332#if ECB_GCC_VERSION(3,1) || ECB_CLANG_BUILTIN(__builtin_prefetch)
333 #define ecb_prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality)
334#else
306 #define ecb_prefetch(addr,rw,locality) 335 #define ecb_prefetch(addr,rw,locality)
307#endif 336#endif
308 337
309/* no emulation for ecb_decltype */ 338/* no emulation for ecb_decltype */
310#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; };
311 #define ecb_decltype(x) __decltype(x) 342 #define ecb_decltype(x) ecb_decltype_t<decltype (x)>::type
312#elif ECB_GCC_VERSION(3,0) 343#elif ECB_GCC_VERSION(3,0) || ECB_CLANG_VERSION(2,8)
313 #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__))
314#endif 351#endif
315 352
316#define ecb_noinline ecb_attribute ((__noinline__)) 353#define ecb_noinline ecb_attribute ((__noinline__))
317#define ecb_unused ecb_attribute ((__unused__)) 354#define ecb_unused ecb_attribute ((__unused__))
318#define ecb_const ecb_attribute ((__const__)) 355#define ecb_const ecb_attribute ((__const__))
319#define ecb_pure ecb_attribute ((__pure__)) 356#define ecb_pure ecb_attribute ((__pure__))
320 357
321#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 */
322 #define ecb_noreturn _Noreturn 361 #define ecb_noreturn _Noreturn
323#else 362#else
324 #define ecb_noreturn ecb_attribute ((__noreturn__)) 363 #define ecb_noreturn ecb_attribute ((__noreturn__))
325#endif 364#endif
326 365
… …
342/* for compatibility to the rest of the world */ 381/* for compatibility to the rest of the world */
343#define ecb_likely(expr) ecb_expect_true (expr) 382#define ecb_likely(expr) ecb_expect_true (expr)
344#define ecb_unlikely(expr) ecb_expect_false (expr) 383#define ecb_unlikely(expr) ecb_expect_false (expr)
345 384
346/* count trailing zero bits and count # of one bits */ 385/* count trailing zero bits and count # of one bits */
347#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))
348 /* 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 */
349 #define ecb_ld32(x) (__builtin_clz (x) ^ 31) 391 #define ecb_ld32(x) (__builtin_clz (x) ^ 31)
350 #define ecb_ld64(x) (__builtin_clzll (x) ^ 63) 392 #define ecb_ld64(x) (__builtin_clzll (x) ^ 63)
351 #define ecb_ctz32(x) __builtin_ctz (x) 393 #define ecb_ctz32(x) __builtin_ctz (x)
352 #define ecb_ctz64(x) __builtin_ctzll (x) 394 #define ecb_ctz64(x) __builtin_ctzll (x)
353 #define ecb_popcount32(x) __builtin_popcount (x) 395 #define ecb_popcount32(x) __builtin_popcount (x)
354 /* no popcountll */ 396 /* no popcountll */
355#else 397#else
356 ecb_function_ int ecb_ctz32 (uint32_t x) ecb_const; 398 ecb_function_ ecb_const int ecb_ctz32 (uint32_t x);
357 ecb_function_ int 399 ecb_function_ ecb_const int
358 ecb_ctz32 (uint32_t x) 400 ecb_ctz32 (uint32_t x)
359 { 401 {
360 int r = 0; 402 int r = 0;
361 403
362 x &= ~x + 1; /* this isolates the lowest bit */ 404 x &= ~x + 1; /* this isolates the lowest bit */
… …
376#endif 418#endif
377 419
378 return r; 420 return r;
379 } 421 }
380 422
381 ecb_function_ int ecb_ctz64 (uint64_t x) ecb_const; 423 ecb_function_ ecb_const int ecb_ctz64 (uint64_t x);
382 ecb_function_ int 424 ecb_function_ ecb_const int
383 ecb_ctz64 (uint64_t x) 425 ecb_ctz64 (uint64_t x)
384 { 426 {
385 int shift = x & 0xffffffffU ? 0 : 32; 427 int shift = x & 0xffffffffU ? 0 : 32;
386 return ecb_ctz32 (x >> shift) + shift; 428 return ecb_ctz32 (x >> shift) + shift;
387 } 429 }
388 430
389 ecb_function_ int ecb_popcount32 (uint32_t x) ecb_const; 431 ecb_function_ ecb_const int ecb_popcount32 (uint32_t x);
390 ecb_function_ int 432 ecb_function_ ecb_const int
391 ecb_popcount32 (uint32_t x) 433 ecb_popcount32 (uint32_t x)
392 { 434 {
393 x -= (x >> 1) & 0x55555555; 435 x -= (x >> 1) & 0x55555555;
394 x = ((x >> 2) & 0x33333333) + (x & 0x33333333); 436 x = ((x >> 2) & 0x33333333) + (x & 0x33333333);
395 x = ((x >> 4) + x) & 0x0f0f0f0f; 437 x = ((x >> 4) + x) & 0x0f0f0f0f;
396 x *= 0x01010101; 438 x *= 0x01010101;
397 439
398 return x >> 24; 440 return x >> 24;
399 } 441 }
400 442
401 ecb_function_ int ecb_ld32 (uint32_t x) ecb_const; 443 ecb_function_ ecb_const int ecb_ld32 (uint32_t x);
402 ecb_function_ int ecb_ld32 (uint32_t x) 444 ecb_function_ ecb_const int ecb_ld32 (uint32_t x)
403 { 445 {
404 int r = 0; 446 int r = 0;
405 447
406 if (x >> 16) { x >>= 16; r += 16; } 448 if (x >> 16) { x >>= 16; r += 16; }
407 if (x >> 8) { x >>= 8; r += 8; } 449 if (x >> 8) { x >>= 8; r += 8; }
… …
410 if (x >> 1) { r += 1; } 452 if (x >> 1) { r += 1; }
411 453
412 return r; 454 return r;
413 } 455 }
414 456
415 ecb_function_ int ecb_ld64 (uint64_t x) ecb_const; 457 ecb_function_ ecb_const int ecb_ld64 (uint64_t x);
416 ecb_function_ int ecb_ld64 (uint64_t x) 458 ecb_function_ ecb_const int ecb_ld64 (uint64_t x)
417 { 459 {
418 int r = 0; 460 int r = 0;
419 461
420 if (x >> 32) { x >>= 32; r += 32; } 462 if (x >> 32) { x >>= 32; r += 32; }
421 463
422 return r + ecb_ld32 (x); 464 return r + ecb_ld32 (x);
423 } 465 }
424#endif 466#endif
425 467
426ecb_function_ ecb_bool ecb_is_pot32 (uint32_t x) ecb_const; 468ecb_function_ ecb_const ecb_bool ecb_is_pot32 (uint32_t x);
427ecb_function_ ecb_bool ecb_is_pot32 (uint32_t x) { return !(x & (x - 1)); } 469ecb_function_ ecb_const ecb_bool ecb_is_pot32 (uint32_t x) { return !(x & (x - 1)); }
428ecb_function_ ecb_bool ecb_is_pot64 (uint64_t x) ecb_const; 470ecb_function_ ecb_const ecb_bool ecb_is_pot64 (uint64_t x);
429ecb_function_ ecb_bool ecb_is_pot64 (uint64_t x) { return !(x & (x - 1)); } 471ecb_function_ ecb_const ecb_bool ecb_is_pot64 (uint64_t x) { return !(x & (x - 1)); }
430 472
431ecb_function_ uint8_t ecb_bitrev8 (uint8_t x) ecb_const; 473ecb_function_ ecb_const uint8_t ecb_bitrev8 (uint8_t x);
432ecb_function_ uint8_t ecb_bitrev8 (uint8_t x) 474ecb_function_ ecb_const uint8_t ecb_bitrev8 (uint8_t x)
433{ 475{
434 return ( (x * 0x0802U & 0x22110U) 476 return ( (x * 0x0802U & 0x22110U)
435 | (x * 0x8020U & 0x88440U)) * 0x10101U >> 16; 477 | (x * 0x8020U & 0x88440U)) * 0x10101U >> 16;
436} 478}
437 479
438ecb_function_ uint16_t ecb_bitrev16 (uint16_t x) ecb_const; 480ecb_function_ ecb_const uint16_t ecb_bitrev16 (uint16_t x);
439ecb_function_ uint16_t ecb_bitrev16 (uint16_t x) 481ecb_function_ ecb_const uint16_t ecb_bitrev16 (uint16_t x)
440{ 482{
441 x = ((x >> 1) & 0x5555) | ((x & 0x5555) << 1); 483 x = ((x >> 1) & 0x5555) | ((x & 0x5555) << 1);
442 x = ((x >> 2) & 0x3333) | ((x & 0x3333) << 2); 484 x = ((x >> 2) & 0x3333) | ((x & 0x3333) << 2);
443 x = ((x >> 4) & 0x0f0f) | ((x & 0x0f0f) << 4); 485 x = ((x >> 4) & 0x0f0f) | ((x & 0x0f0f) << 4);
444 x = ( x >> 8 ) | ( x << 8); 486 x = ( x >> 8 ) | ( x << 8);
445 487
446 return x; 488 return x;
447} 489}
448 490
449ecb_function_ uint32_t ecb_bitrev32 (uint32_t x) ecb_const; 491ecb_function_ ecb_const uint32_t ecb_bitrev32 (uint32_t x);
450ecb_function_ uint32_t ecb_bitrev32 (uint32_t x) 492ecb_function_ ecb_const uint32_t ecb_bitrev32 (uint32_t x)
451{ 493{
452 x = ((x >> 1) & 0x55555555) | ((x & 0x55555555) << 1); 494 x = ((x >> 1) & 0x55555555) | ((x & 0x55555555) << 1);
453 x = ((x >> 2) & 0x33333333) | ((x & 0x33333333) << 2); 495 x = ((x >> 2) & 0x33333333) | ((x & 0x33333333) << 2);
454 x = ((x >> 4) & 0x0f0f0f0f) | ((x & 0x0f0f0f0f) << 4); 496 x = ((x >> 4) & 0x0f0f0f0f) | ((x & 0x0f0f0f0f) << 4);
455 x = ((x >> 8) & 0x00ff00ff) | ((x & 0x00ff00ff) << 8); 497 x = ((x >> 8) & 0x00ff00ff) | ((x & 0x00ff00ff) << 8);
… …
458 return x; 500 return x;
459} 501}
460 502
461/* popcount64 is only available on 64 bit cpus as gcc builtin */ 503/* popcount64 is only available on 64 bit cpus as gcc builtin */
462/* so for this version we are lazy */ 504/* so for this version we are lazy */
463ecb_function_ int ecb_popcount64 (uint64_t x) ecb_const; 505ecb_function_ ecb_const int ecb_popcount64 (uint64_t x);
464ecb_function_ int 506ecb_function_ ecb_const int
465ecb_popcount64 (uint64_t x) 507ecb_popcount64 (uint64_t x)
466{ 508{
467 return ecb_popcount32 (x) + ecb_popcount32 (x >> 32); 509 return ecb_popcount32 (x) + ecb_popcount32 (x >> 32);
468} 510}
469 511
470ecb_inline uint8_t ecb_rotl8 (uint8_t x, unsigned int count) ecb_const; 512ecb_inline ecb_const uint8_t ecb_rotl8 (uint8_t x, unsigned int count);
471ecb_inline uint8_t ecb_rotr8 (uint8_t x, unsigned int count) ecb_const; 513ecb_inline ecb_const uint8_t ecb_rotr8 (uint8_t x, unsigned int count);
472ecb_inline uint16_t ecb_rotl16 (uint16_t x, unsigned int count) ecb_const; 514ecb_inline ecb_const uint16_t ecb_rotl16 (uint16_t x, unsigned int count);
473ecb_inline uint16_t ecb_rotr16 (uint16_t x, unsigned int count) ecb_const; 515ecb_inline ecb_const uint16_t ecb_rotr16 (uint16_t x, unsigned int count);
474ecb_inline uint32_t ecb_rotl32 (uint32_t x, unsigned int count) ecb_const; 516ecb_inline ecb_const uint32_t ecb_rotl32 (uint32_t x, unsigned int count);
475ecb_inline uint32_t ecb_rotr32 (uint32_t x, unsigned int count) ecb_const; 517ecb_inline ecb_const uint32_t ecb_rotr32 (uint32_t x, unsigned int count);
476ecb_inline uint64_t ecb_rotl64 (uint64_t x, unsigned int count) ecb_const; 518ecb_inline ecb_const uint64_t ecb_rotl64 (uint64_t x, unsigned int count);
477ecb_inline uint64_t ecb_rotr64 (uint64_t x, unsigned int count) ecb_const; 519ecb_inline ecb_const uint64_t ecb_rotr64 (uint64_t x, unsigned int count);
478 520
479ecb_inline uint8_t ecb_rotl8 (uint8_t x, unsigned int count) { return (x >> ( 8 - count)) | (x << count); } 521ecb_inline ecb_const uint8_t ecb_rotl8 (uint8_t x, unsigned int count) { return (x >> ( 8 - count)) | (x << count); }
480ecb_inline uint8_t ecb_rotr8 (uint8_t x, unsigned int count) { return (x << ( 8 - count)) | (x >> count); } 522ecb_inline ecb_const uint8_t ecb_rotr8 (uint8_t x, unsigned int count) { return (x << ( 8 - count)) | (x >> count); }
481ecb_inline uint16_t ecb_rotl16 (uint16_t x, unsigned int count) { return (x >> (16 - count)) | (x << count); } 523ecb_inline ecb_const uint16_t ecb_rotl16 (uint16_t x, unsigned int count) { return (x >> (16 - count)) | (x << count); }
482ecb_inline uint16_t ecb_rotr16 (uint16_t x, unsigned int count) { return (x << (16 - count)) | (x >> count); } 524ecb_inline ecb_const uint16_t ecb_rotr16 (uint16_t x, unsigned int count) { return (x << (16 - count)) | (x >> count); }
483ecb_inline uint32_t ecb_rotl32 (uint32_t x, unsigned int count) { return (x >> (32 - count)) | (x << count); } 525ecb_inline ecb_const uint32_t ecb_rotl32 (uint32_t x, unsigned int count) { return (x >> (32 - count)) | (x << count); }
484ecb_inline uint32_t ecb_rotr32 (uint32_t x, unsigned int count) { return (x << (32 - count)) | (x >> count); } 526ecb_inline ecb_const uint32_t ecb_rotr32 (uint32_t x, unsigned int count) { return (x << (32 - count)) | (x >> count); }
485ecb_inline uint64_t ecb_rotl64 (uint64_t x, unsigned int count) { return (x >> (64 - count)) | (x << count); } 527ecb_inline ecb_const uint64_t ecb_rotl64 (uint64_t x, unsigned int count) { return (x >> (64 - count)) | (x << count); }
486ecb_inline uint64_t ecb_rotr64 (uint64_t x, unsigned int count) { return (x << (64 - count)) | (x >> count); } 528ecb_inline ecb_const uint64_t ecb_rotr64 (uint64_t x, unsigned int count) { return (x << (64 - count)) | (x >> count); }
487 529
488#if ECB_GCC_VERSION(4,3) 530#if ECB_GCC_VERSION(4,3) || (ECB_CLANG_BUILTIN(__builtin_bswap32) && ECB_CLANG_BUILTIN(__builtin_bswap64))
489 #define ecb_bswap16(x) (__builtin_bswap32 (x) >> 16) 531 #define ecb_bswap16(x) (__builtin_bswap32 (x) >> 16)
490 #define ecb_bswap32(x) __builtin_bswap32 (x) 532 #define ecb_bswap32(x) __builtin_bswap32 (x)
491 #define ecb_bswap64(x) __builtin_bswap64 (x) 533 #define ecb_bswap64(x) __builtin_bswap64 (x)
492#else 534#else
493 ecb_function_ uint16_t ecb_bswap16 (uint16_t x) ecb_const; 535 ecb_function_ ecb_const uint16_t ecb_bswap16 (uint16_t x);
494 ecb_function_ uint16_t 536 ecb_function_ ecb_const uint16_t
495 ecb_bswap16 (uint16_t x) 537 ecb_bswap16 (uint16_t x)
496 { 538 {
497 return ecb_rotl16 (x, 8); 539 return ecb_rotl16 (x, 8);
498 } 540 }
499 541
500 ecb_function_ uint32_t ecb_bswap32 (uint32_t x) ecb_const; 542 ecb_function_ ecb_const uint32_t ecb_bswap32 (uint32_t x);
501 ecb_function_ uint32_t 543 ecb_function_ ecb_const uint32_t
502 ecb_bswap32 (uint32_t x) 544 ecb_bswap32 (uint32_t x)
503 { 545 {
504 return (((uint32_t)ecb_bswap16 (x)) << 16) | ecb_bswap16 (x >> 16); 546 return (((uint32_t)ecb_bswap16 (x)) << 16) | ecb_bswap16 (x >> 16);
505 } 547 }
506 548
507 ecb_function_ uint64_t ecb_bswap64 (uint64_t x) ecb_const; 549 ecb_function_ ecb_const uint64_t ecb_bswap64 (uint64_t x);
508 ecb_function_ uint64_t 550 ecb_function_ ecb_const uint64_t
509 ecb_bswap64 (uint64_t x) 551 ecb_bswap64 (uint64_t x)
510 { 552 {
511 return (((uint64_t)ecb_bswap32 (x)) << 32) | ecb_bswap32 (x >> 32); 553 return (((uint64_t)ecb_bswap32 (x)) << 32) | ecb_bswap32 (x >> 32);
512 } 554 }
513#endif 555#endif
514 556
515#if ECB_GCC_VERSION(4,5) 557#if ECB_GCC_VERSION(4,5) || ECB_CLANG_BUILTIN(__builtin_unreachable)
516 #define ecb_unreachable() __builtin_unreachable () 558 #define ecb_unreachable() __builtin_unreachable ()
517#else 559#else
518 /* 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 :/ */
519 ecb_inline void ecb_unreachable (void) ecb_noreturn; 561 ecb_inline ecb_noreturn void ecb_unreachable (void);
520 ecb_inline void ecb_unreachable (void) { } 562 ecb_inline ecb_noreturn void ecb_unreachable (void) { }
521#endif 563#endif
522 564
523/* try to tell the compiler that some condition is definitely true */ 565/* try to tell the compiler that some condition is definitely true */
524#define ecb_assume(cond) if (!(cond)) ecb_unreachable (); else 0 566#define ecb_assume(cond) if (!(cond)) ecb_unreachable (); else 0
525 567
526ecb_inline unsigned char ecb_byteorder_helper (void) ecb_const; 568ecb_inline ecb_const unsigned char ecb_byteorder_helper (void);
527ecb_inline unsigned char 569ecb_inline ecb_const unsigned char
528ecb_byteorder_helper (void) 570ecb_byteorder_helper (void)
529{ 571{
530 /* the union code still generates code under pressure in gcc, */ 572 /* the union code still generates code under pressure in gcc, */
531 /* but less than using pointers, and always seems to */ 573 /* but less than using pointers, and always seems to */
532 /* successfully return a constant. */ 574 /* successfully return a constant. */
… …
547 } u = { 0x11223344 }; 589 } u = { 0x11223344 };
548 return u.c; 590 return u.c;
549#endif 591#endif
550} 592}
551 593
552ecb_inline ecb_bool ecb_big_endian (void) ecb_const; 594ecb_inline ecb_const ecb_bool ecb_big_endian (void);
553ecb_inline ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; } 595ecb_inline ecb_const ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; }
554ecb_inline ecb_bool ecb_little_endian (void) ecb_const; 596ecb_inline ecb_const ecb_bool ecb_little_endian (void);
555ecb_inline ecb_bool ecb_little_endian (void) { return ecb_byteorder_helper () == 0x44; } 597ecb_inline ecb_const ecb_bool ecb_little_endian (void) { return ecb_byteorder_helper () == 0x44; }
556 598
557#if ECB_GCC_VERSION(3,0) || ECB_C99 599#if ECB_GCC_VERSION(3,0) || ECB_C99
558 #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))
559#else 601#else
560 #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)))
561#endif 603#endif
562 604
563#if __cplusplus 605#if ECB_CPP
564 template<typename T> 606 template<typename T>
565 static inline T ecb_div_rd (T val, T div) 607 static inline T ecb_div_rd (T val, T div)
566 { 608 {
567 return val < 0 ? - ((-val + div - 1) / div) : (val ) / div; 609 return val < 0 ? - ((-val + div - 1) / div) : (val ) / div;
568 } 610 }
… …
628 #define ECB_NAN NAN 670 #define ECB_NAN NAN
629 #else 671 #else
630 #define ECB_NAN ECB_INFINITY 672 #define ECB_NAN ECB_INFINITY
631 #endif 673 #endif
632 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 ((x), (e))
679 #endif
680
633 /* converts an ieee half/binary16 to a float */ 681 /* converts an ieee half/binary16 to a float */
634 ecb_function_ float ecb_binary16_to_float (uint16_t x) ecb_const; 682 ecb_function_ ecb_const float ecb_binary16_to_float (uint16_t x);
635 ecb_function_ float 683 ecb_function_ ecb_const float
636 ecb_binary16_to_float (uint16_t x) 684 ecb_binary16_to_float (uint16_t x)
637 { 685 {
638 int e = (x >> 10) & 0x1f; 686 int e = (x >> 10) & 0x1f;
639 int m = x & 0x3ff; 687 int m = x & 0x3ff;
640 float r; 688 float r;
641 689
642 if (!e ) r = ldexpf (m , -24); 690 if (!e ) r = ecb_ldexpf (m , -24);
643 else if (e != 31) r = ldexpf (m + 0x400, e - 25); 691 else if (e != 31) r = ecb_ldexpf (m + 0x400, e - 25);
644 else if (m ) r = ECB_NAN; 692 else if (m ) r = ECB_NAN;
645 else r = ECB_INFINITY; 693 else r = ECB_INFINITY;
646 694
647 return x & 0x8000 ? -r : r; 695 return x & 0x8000 ? -r : r;
648 } 696 }
649 697
650 /* convert a float to ieee single/binary32 */ 698 /* convert a float to ieee single/binary32 */
651 ecb_function_ uint32_t ecb_float_to_binary32 (float x) ecb_const; 699 ecb_function_ ecb_const uint32_t ecb_float_to_binary32 (float x);
652 ecb_function_ uint32_t 700 ecb_function_ ecb_const uint32_t
653 ecb_float_to_binary32 (float x) 701 ecb_float_to_binary32 (float x)
654 { 702 {
655 uint32_t r; 703 uint32_t r;
656 704
657 #if ECB_STDFP 705 #if ECB_STDFP
… …
686 734
687 return r; 735 return r;
688 } 736 }
689 737
690 /* converts an ieee single/binary32 to a float */ 738 /* converts an ieee single/binary32 to a float */
691 ecb_function_ float ecb_binary32_to_float (uint32_t x) ecb_const; 739 ecb_function_ ecb_const float ecb_binary32_to_float (uint32_t x);
692 ecb_function_ float 740 ecb_function_ ecb_const float
693 ecb_binary32_to_float (uint32_t x) 741 ecb_binary32_to_float (uint32_t x)
694 { 742 {
695 float r; 743 float r;
696 744
697 #if ECB_STDFP 745 #if ECB_STDFP
… …
707 x |= 0x800000U; 755 x |= 0x800000U;
708 else 756 else
709 e = 1; 757 e = 1;
710 758
711 /* 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 */
712 r = ldexpf (x * (0.5f / 0x800000U), e - 126); 760 r = ecb_ldexpf (x * (0.5f / 0x800000U), e - 126);
713 761
714 r = neg ? -r : r; 762 r = neg ? -r : r;
715 #endif 763 #endif
716 764
717 return r; 765 return r;
718 } 766 }
719 767
720 /* convert a double to ieee double/binary64 */ 768 /* convert a double to ieee double/binary64 */
721 ecb_function_ uint64_t ecb_double_to_binary64 (double x) ecb_const; 769 ecb_function_ ecb_const uint64_t ecb_double_to_binary64 (double x);
722 ecb_function_ uint64_t 770 ecb_function_ ecb_const uint64_t
723 ecb_double_to_binary64 (double x) 771 ecb_double_to_binary64 (double x)
724 { 772 {
725 uint64_t r; 773 uint64_t r;
726 774
727 #if ECB_STDFP 775 #if ECB_STDFP
… …
756 804
757 return r; 805 return r;
758 } 806 }
759 807
760 /* converts an ieee double/binary64 to a double */ 808 /* converts an ieee double/binary64 to a double */
761 ecb_function_ double ecb_binary64_to_double (uint64_t x) ecb_const; 809 ecb_function_ ecb_const double ecb_binary64_to_double (uint64_t x);
762 ecb_function_ double 810 ecb_function_ ecb_const double
763 ecb_binary64_to_double (uint64_t x) 811 ecb_binary64_to_double (uint64_t x)
764 { 812 {
765 double r; 813 double r;
766 814
767 #if ECB_STDFP 815 #if ECB_STDFP

Diff Legend

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