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

Comparing libecb/ecb.h (file contents):
Revision 1.144 by root, Fri Oct 17 11:02:20 2014 UTC vs.
Revision 1.157 by root, Fri Feb 20 17:17:26 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:
… …
98 #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)))
99#endif 99#endif
100 100
101#define ECB_CLANG_VERSION(major,minor) (__clang_major__ > (major) || (__clang_major__ == (major) && __clang_minor__ >= (minor))) 101#define ECB_CLANG_VERSION(major,minor) (__clang_major__ > (major) || (__clang_major__ == (major) && __clang_minor__ >= (minor)))
102 102
103#if __clang__ && defined(__has_builtin) 103#if __clang__ && defined __has_builtin
104 #define ECB_CLANG_BUILTIN(x) __has_builtin(x) 104 #define ECB_CLANG_BUILTIN(x) __has_builtin (x)
105#else 105#else
106 #define ECB_CLANG_BUILTIN(x) 0 106 #define ECB_CLANG_BUILTIN(x) 0
107#endif 107#endif
108 108
109#if __clang__ && defined(__has_extension) 109#if __clang__ && defined __has_extension
110 #define ECB_CLANG_EXTENSION(x) __has_extension(x) 110 #define ECB_CLANG_EXTENSION(x) __has_extension (x)
111#else 111#else
112 #define ECB_CLANG_EXTENSION(x) 0 112 #define ECB_CLANG_EXTENSION(x) 0
113#endif 113#endif
114 114
115#define ECB_CPP (__cplusplus+0) 115#define ECB_CPP (__cplusplus+0)
… …
278 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE 278 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
279#endif 279#endif
280 280
281/*****************************************************************************/ 281/*****************************************************************************/
282 282
283#if __cplusplus 283#if ECB_CPP
284 #define ecb_inline static inline 284 #define ecb_inline static inline
285#elif ECB_GCC_VERSION(2,5) 285#elif ECB_GCC_VERSION(2,5)
286 #define ecb_inline static __inline__ 286 #define ecb_inline static __inline__
287#elif ECB_C99 287#elif ECB_C99
288 #define ecb_inline static inline 288 #define ecb_inline static inline
… …
302 302
303#define ECB_CONCAT_(a, b) a ## b 303#define ECB_CONCAT_(a, b) a ## b
304#define ECB_CONCAT(a, b) ECB_CONCAT_(a, b) 304#define ECB_CONCAT(a, b) ECB_CONCAT_(a, b)
305#define ECB_STRINGIFY_(a) # a 305#define ECB_STRINGIFY_(a) # a
306#define ECB_STRINGIFY(a) ECB_STRINGIFY_(a) 306#define ECB_STRINGIFY(a) ECB_STRINGIFY_(a)
307#define ECB_STRINGIFY_EXPR(expr) ((expr), ECB_STRINGIFY_ (expr))
307 308
308#define ecb_function_ ecb_inline 309#define ecb_function_ ecb_inline
309 310
310#if ECB_GCC_VERSION(3,1) || ECB_CLANG_VERSION(2,8) 311#if ECB_GCC_VERSION(3,1) || ECB_CLANG_VERSION(2,8)
311 #define ecb_attribute(attrlist) __attribute__ (attrlist) 312 #define ecb_attribute(attrlist) __attribute__ (attrlist)
… …
336#endif 337#endif
337 338
338/* no emulation for ecb_decltype */ 339/* no emulation for ecb_decltype */
339#if ECB_CPP11 340#if ECB_CPP11
340 // older implementations might have problems with decltype(x)::type, work around it 341 // older implementations might have problems with decltype(x)::type, work around it
341 struct ecb_decltype_t { typedef T type; }; 342 template<class T> struct ecb_decltype_t { typedef T type; };
342 #define ecb_decltype(x) ecb_decltype_t<decltype(x)>::type 343 #define ecb_decltype(x) ecb_decltype_t<decltype (x)>::type
343#elif ECB_GCC_VERSION(3,0) || ECB_CLANG_VERSION(2,8) 344#elif ECB_GCC_VERSION(3,0) || ECB_CLANG_VERSION(2,8)
344 #define ecb_decltype(x) __typeof__ (x) 345 #define ecb_decltype(x) __typeof__ (x)
345#endif 346#endif
346 347
347#if _MSC_VER >= 1300 348#if _MSC_VER >= 1300
348 #define ecb_deprecated __declspec(deprecated) 349 #define ecb_deprecated __declspec (deprecated)
349#else 350#else
350 #define ecb_deprecated ecb_attribute ((__deprecated__)) 351 #define ecb_deprecated ecb_attribute ((__deprecated__))
351#endif 352#endif
352 353
354#if __MSC_VER >= 1500
355 #define ecb_deprecated_message(msg) __declspec (deprecated (msg))
356#elif ECB_GCC_VERSION(4,5)
357 #define ecb_deprecated_message(msg) ecb_attribute ((__deprecated__ (msg))
358#else
359 #define ecb_deprecated_message(msg) ecb_deprecated
360#endif
361
362#if _MSC_VER >= 1400
363 #define ecb_noinline __declspec (noinline)
364#else
353#define ecb_noinline ecb_attribute ((__noinline__)) 365 #define ecb_noinline ecb_attribute ((__noinline__))
366#endif
367
354#define ecb_unused ecb_attribute ((__unused__)) 368#define ecb_unused ecb_attribute ((__unused__))
355#define ecb_const ecb_attribute ((__const__)) 369#define ecb_const ecb_attribute ((__const__))
356#define ecb_pure ecb_attribute ((__pure__)) 370#define ecb_pure ecb_attribute ((__pure__))
357 371
358/* http://msdn.microsoft.com/en-us/library/k6ktzx3s.aspx __declspec(noreturn) */ 372#if ECB_C11 || __IBMC_NORETURN
359#if ECB_C11 373 /* http://pic.dhe.ibm.com/infocenter/compbg/v121v141/topic/com.ibm.xlcpp121.bg.doc/language_ref/noreturn.html */
360 #define ecb_noreturn _Noreturn 374 #define ecb_noreturn _Noreturn
375#elif ECB_CPP11
376 #define ecb_noreturn [[noreturn]]
377#elif _MSC_VER >= 1200
378 /* http://msdn.microsoft.com/en-us/library/k6ktzx3s.aspx */
379 #define ecb_noreturn __declspec (noreturn)
361#else 380#else
362 #define ecb_noreturn ecb_attribute ((__noreturn__)) 381 #define ecb_noreturn ecb_attribute ((__noreturn__))
363#endif 382#endif
364 383
365#if ECB_GCC_VERSION(4,3) 384#if ECB_GCC_VERSION(4,3)
… …
392 #define ecb_ctz32(x) __builtin_ctz (x) 411 #define ecb_ctz32(x) __builtin_ctz (x)
393 #define ecb_ctz64(x) __builtin_ctzll (x) 412 #define ecb_ctz64(x) __builtin_ctzll (x)
394 #define ecb_popcount32(x) __builtin_popcount (x) 413 #define ecb_popcount32(x) __builtin_popcount (x)
395 /* no popcountll */ 414 /* no popcountll */
396#else 415#else
397 ecb_function_ int ecb_ctz32 (uint32_t x) ecb_const; 416 ecb_function_ ecb_const int ecb_ctz32 (uint32_t x);
398 ecb_function_ int 417 ecb_function_ ecb_const int
399 ecb_ctz32 (uint32_t x) 418 ecb_ctz32 (uint32_t x)
400 { 419 {
401 int r = 0; 420 int r = 0;
402 421
403 x &= ~x + 1; /* this isolates the lowest bit */ 422 x &= ~x + 1; /* this isolates the lowest bit */
… …
417#endif 436#endif
418 437
419 return r; 438 return r;
420 } 439 }
421 440
422 ecb_function_ int ecb_ctz64 (uint64_t x) ecb_const; 441 ecb_function_ ecb_const int ecb_ctz64 (uint64_t x);
423 ecb_function_ int 442 ecb_function_ ecb_const int
424 ecb_ctz64 (uint64_t x) 443 ecb_ctz64 (uint64_t x)
425 { 444 {
426 int shift = x & 0xffffffffU ? 0 : 32; 445 int shift = x & 0xffffffffU ? 0 : 32;
427 return ecb_ctz32 (x >> shift) + shift; 446 return ecb_ctz32 (x >> shift) + shift;
428 } 447 }
429 448
430 ecb_function_ int ecb_popcount32 (uint32_t x) ecb_const; 449 ecb_function_ ecb_const int ecb_popcount32 (uint32_t x);
431 ecb_function_ int 450 ecb_function_ ecb_const int
432 ecb_popcount32 (uint32_t x) 451 ecb_popcount32 (uint32_t x)
433 { 452 {
434 x -= (x >> 1) & 0x55555555; 453 x -= (x >> 1) & 0x55555555;
435 x = ((x >> 2) & 0x33333333) + (x & 0x33333333); 454 x = ((x >> 2) & 0x33333333) + (x & 0x33333333);
436 x = ((x >> 4) + x) & 0x0f0f0f0f; 455 x = ((x >> 4) + x) & 0x0f0f0f0f;
437 x *= 0x01010101; 456 x *= 0x01010101;
438 457
439 return x >> 24; 458 return x >> 24;
440 } 459 }
441 460
442 ecb_function_ int ecb_ld32 (uint32_t x) ecb_const; 461 ecb_function_ ecb_const int ecb_ld32 (uint32_t x);
443 ecb_function_ int ecb_ld32 (uint32_t x) 462 ecb_function_ ecb_const int ecb_ld32 (uint32_t x)
444 { 463 {
445 int r = 0; 464 int r = 0;
446 465
447 if (x >> 16) { x >>= 16; r += 16; } 466 if (x >> 16) { x >>= 16; r += 16; }
448 if (x >> 8) { x >>= 8; r += 8; } 467 if (x >> 8) { x >>= 8; r += 8; }
… …
451 if (x >> 1) { r += 1; } 470 if (x >> 1) { r += 1; }
452 471
453 return r; 472 return r;
454 } 473 }
455 474
456 ecb_function_ int ecb_ld64 (uint64_t x) ecb_const; 475 ecb_function_ ecb_const int ecb_ld64 (uint64_t x);
457 ecb_function_ int ecb_ld64 (uint64_t x) 476 ecb_function_ ecb_const int ecb_ld64 (uint64_t x)
458 { 477 {
459 int r = 0; 478 int r = 0;
460 479
461 if (x >> 32) { x >>= 32; r += 32; } 480 if (x >> 32) { x >>= 32; r += 32; }
462 481
463 return r + ecb_ld32 (x); 482 return r + ecb_ld32 (x);
464 } 483 }
465#endif 484#endif
466 485
467ecb_function_ ecb_bool ecb_is_pot32 (uint32_t x) ecb_const; 486ecb_function_ ecb_const ecb_bool ecb_is_pot32 (uint32_t x);
468ecb_function_ ecb_bool ecb_is_pot32 (uint32_t x) { return !(x & (x - 1)); } 487ecb_function_ ecb_const ecb_bool ecb_is_pot32 (uint32_t x) { return !(x & (x - 1)); }
469ecb_function_ ecb_bool ecb_is_pot64 (uint64_t x) ecb_const; 488ecb_function_ ecb_const ecb_bool ecb_is_pot64 (uint64_t x);
470ecb_function_ ecb_bool ecb_is_pot64 (uint64_t x) { return !(x & (x - 1)); } 489ecb_function_ ecb_const ecb_bool ecb_is_pot64 (uint64_t x) { return !(x & (x - 1)); }
471 490
472ecb_function_ uint8_t ecb_bitrev8 (uint8_t x) ecb_const; 491ecb_function_ ecb_const uint8_t ecb_bitrev8 (uint8_t x);
473ecb_function_ uint8_t ecb_bitrev8 (uint8_t x) 492ecb_function_ ecb_const uint8_t ecb_bitrev8 (uint8_t x)
474{ 493{
475 return ( (x * 0x0802U & 0x22110U) 494 return ( (x * 0x0802U & 0x22110U)
476 | (x * 0x8020U & 0x88440U)) * 0x10101U >> 16; 495 | (x * 0x8020U & 0x88440U)) * 0x10101U >> 16;
477} 496}
478 497
479ecb_function_ uint16_t ecb_bitrev16 (uint16_t x) ecb_const; 498ecb_function_ ecb_const uint16_t ecb_bitrev16 (uint16_t x);
480ecb_function_ uint16_t ecb_bitrev16 (uint16_t x) 499ecb_function_ ecb_const uint16_t ecb_bitrev16 (uint16_t x)
481{ 500{
482 x = ((x >> 1) & 0x5555) | ((x & 0x5555) << 1); 501 x = ((x >> 1) & 0x5555) | ((x & 0x5555) << 1);
483 x = ((x >> 2) & 0x3333) | ((x & 0x3333) << 2); 502 x = ((x >> 2) & 0x3333) | ((x & 0x3333) << 2);
484 x = ((x >> 4) & 0x0f0f) | ((x & 0x0f0f) << 4); 503 x = ((x >> 4) & 0x0f0f) | ((x & 0x0f0f) << 4);
485 x = ( x >> 8 ) | ( x << 8); 504 x = ( x >> 8 ) | ( x << 8);
486 505
487 return x; 506 return x;
488} 507}
489 508
490ecb_function_ uint32_t ecb_bitrev32 (uint32_t x) ecb_const; 509ecb_function_ ecb_const uint32_t ecb_bitrev32 (uint32_t x);
491ecb_function_ uint32_t ecb_bitrev32 (uint32_t x) 510ecb_function_ ecb_const uint32_t ecb_bitrev32 (uint32_t x)
492{ 511{
493 x = ((x >> 1) & 0x55555555) | ((x & 0x55555555) << 1); 512 x = ((x >> 1) & 0x55555555) | ((x & 0x55555555) << 1);
494 x = ((x >> 2) & 0x33333333) | ((x & 0x33333333) << 2); 513 x = ((x >> 2) & 0x33333333) | ((x & 0x33333333) << 2);
495 x = ((x >> 4) & 0x0f0f0f0f) | ((x & 0x0f0f0f0f) << 4); 514 x = ((x >> 4) & 0x0f0f0f0f) | ((x & 0x0f0f0f0f) << 4);
496 x = ((x >> 8) & 0x00ff00ff) | ((x & 0x00ff00ff) << 8); 515 x = ((x >> 8) & 0x00ff00ff) | ((x & 0x00ff00ff) << 8);
… …
499 return x; 518 return x;
500} 519}
501 520
502/* popcount64 is only available on 64 bit cpus as gcc builtin */ 521/* popcount64 is only available on 64 bit cpus as gcc builtin */
503/* so for this version we are lazy */ 522/* so for this version we are lazy */
504ecb_function_ int ecb_popcount64 (uint64_t x) ecb_const; 523ecb_function_ ecb_const int ecb_popcount64 (uint64_t x);
505ecb_function_ int 524ecb_function_ ecb_const int
506ecb_popcount64 (uint64_t x) 525ecb_popcount64 (uint64_t x)
507{ 526{
508 return ecb_popcount32 (x) + ecb_popcount32 (x >> 32); 527 return ecb_popcount32 (x) + ecb_popcount32 (x >> 32);
509} 528}
510 529
511ecb_inline uint8_t ecb_rotl8 (uint8_t x, unsigned int count) ecb_const; 530ecb_inline ecb_const uint8_t ecb_rotl8 (uint8_t x, unsigned int count);
512ecb_inline uint8_t ecb_rotr8 (uint8_t x, unsigned int count) ecb_const; 531ecb_inline ecb_const uint8_t ecb_rotr8 (uint8_t x, unsigned int count);
513ecb_inline uint16_t ecb_rotl16 (uint16_t x, unsigned int count) ecb_const; 532ecb_inline ecb_const uint16_t ecb_rotl16 (uint16_t x, unsigned int count);
514ecb_inline uint16_t ecb_rotr16 (uint16_t x, unsigned int count) ecb_const; 533ecb_inline ecb_const uint16_t ecb_rotr16 (uint16_t x, unsigned int count);
515ecb_inline uint32_t ecb_rotl32 (uint32_t x, unsigned int count) ecb_const; 534ecb_inline ecb_const uint32_t ecb_rotl32 (uint32_t x, unsigned int count);
516ecb_inline uint32_t ecb_rotr32 (uint32_t x, unsigned int count) ecb_const; 535ecb_inline ecb_const uint32_t ecb_rotr32 (uint32_t x, unsigned int count);
517ecb_inline uint64_t ecb_rotl64 (uint64_t x, unsigned int count) ecb_const; 536ecb_inline ecb_const uint64_t ecb_rotl64 (uint64_t x, unsigned int count);
518ecb_inline uint64_t ecb_rotr64 (uint64_t x, unsigned int count) ecb_const; 537ecb_inline ecb_const uint64_t ecb_rotr64 (uint64_t x, unsigned int count);
519 538
520ecb_inline uint8_t ecb_rotl8 (uint8_t x, unsigned int count) { return (x >> ( 8 - count)) | (x << count); } 539ecb_inline ecb_const uint8_t ecb_rotl8 (uint8_t x, unsigned int count) { return (x >> ( 8 - count)) | (x << count); }
521ecb_inline uint8_t ecb_rotr8 (uint8_t x, unsigned int count) { return (x << ( 8 - count)) | (x >> count); } 540ecb_inline ecb_const uint8_t ecb_rotr8 (uint8_t x, unsigned int count) { return (x << ( 8 - count)) | (x >> count); }
522ecb_inline uint16_t ecb_rotl16 (uint16_t x, unsigned int count) { return (x >> (16 - count)) | (x << count); } 541ecb_inline ecb_const uint16_t ecb_rotl16 (uint16_t x, unsigned int count) { return (x >> (16 - count)) | (x << count); }
523ecb_inline uint16_t ecb_rotr16 (uint16_t x, unsigned int count) { return (x << (16 - count)) | (x >> count); } 542ecb_inline ecb_const uint16_t ecb_rotr16 (uint16_t x, unsigned int count) { return (x << (16 - count)) | (x >> count); }
524ecb_inline uint32_t ecb_rotl32 (uint32_t x, unsigned int count) { return (x >> (32 - count)) | (x << count); } 543ecb_inline ecb_const uint32_t ecb_rotl32 (uint32_t x, unsigned int count) { return (x >> (32 - count)) | (x << count); }
525ecb_inline uint32_t ecb_rotr32 (uint32_t x, unsigned int count) { return (x << (32 - count)) | (x >> count); } 544ecb_inline ecb_const uint32_t ecb_rotr32 (uint32_t x, unsigned int count) { return (x << (32 - count)) | (x >> count); }
526ecb_inline uint64_t ecb_rotl64 (uint64_t x, unsigned int count) { return (x >> (64 - count)) | (x << count); } 545ecb_inline ecb_const uint64_t ecb_rotl64 (uint64_t x, unsigned int count) { return (x >> (64 - count)) | (x << count); }
527ecb_inline uint64_t ecb_rotr64 (uint64_t x, unsigned int count) { return (x << (64 - count)) | (x >> count); } 546ecb_inline ecb_const uint64_t ecb_rotr64 (uint64_t x, unsigned int count) { return (x << (64 - count)) | (x >> count); }
528 547
529#if ECB_GCC_VERSION(4,3) || (ECB_CLANG_BUILTIN(__builtin_bswap32) && ECB_CLANG_BUILTIN(__builtin_bswap64)) 548#if ECB_GCC_VERSION(4,3) || (ECB_CLANG_BUILTIN(__builtin_bswap32) && ECB_CLANG_BUILTIN(__builtin_bswap64))
530 #define ecb_bswap16(x) (__builtin_bswap32 (x) >> 16) 549 #define ecb_bswap16(x) (__builtin_bswap32 (x) >> 16)
531 #define ecb_bswap32(x) __builtin_bswap32 (x) 550 #define ecb_bswap32(x) __builtin_bswap32 (x)
532 #define ecb_bswap64(x) __builtin_bswap64 (x) 551 #define ecb_bswap64(x) __builtin_bswap64 (x)
533#else 552#else
534 ecb_function_ uint16_t ecb_bswap16 (uint16_t x) ecb_const; 553 ecb_function_ ecb_const uint16_t ecb_bswap16 (uint16_t x);
535 ecb_function_ uint16_t 554 ecb_function_ ecb_const uint16_t
536 ecb_bswap16 (uint16_t x) 555 ecb_bswap16 (uint16_t x)
537 { 556 {
538 return ecb_rotl16 (x, 8); 557 return ecb_rotl16 (x, 8);
539 } 558 }
540 559
541 ecb_function_ uint32_t ecb_bswap32 (uint32_t x) ecb_const; 560 ecb_function_ ecb_const uint32_t ecb_bswap32 (uint32_t x);
542 ecb_function_ uint32_t 561 ecb_function_ ecb_const uint32_t
543 ecb_bswap32 (uint32_t x) 562 ecb_bswap32 (uint32_t x)
544 { 563 {
545 return (((uint32_t)ecb_bswap16 (x)) << 16) | ecb_bswap16 (x >> 16); 564 return (((uint32_t)ecb_bswap16 (x)) << 16) | ecb_bswap16 (x >> 16);
546 } 565 }
547 566
548 ecb_function_ uint64_t ecb_bswap64 (uint64_t x) ecb_const; 567 ecb_function_ ecb_const uint64_t ecb_bswap64 (uint64_t x);
549 ecb_function_ uint64_t 568 ecb_function_ ecb_const uint64_t
550 ecb_bswap64 (uint64_t x) 569 ecb_bswap64 (uint64_t x)
551 { 570 {
552 return (((uint64_t)ecb_bswap32 (x)) << 32) | ecb_bswap32 (x >> 32); 571 return (((uint64_t)ecb_bswap32 (x)) << 32) | ecb_bswap32 (x >> 32);
553 } 572 }
554#endif 573#endif
555 574
556#if ECB_GCC_VERSION(4,5) || ECB_CLANG_BUILTIN(__builtin_unreachable) 575#if ECB_GCC_VERSION(4,5) || ECB_CLANG_BUILTIN(__builtin_unreachable)
557 #define ecb_unreachable() __builtin_unreachable () 576 #define ecb_unreachable() __builtin_unreachable ()
558#else 577#else
559 /* this seems to work fine, but gcc always emits a warning for it :/ */ 578 /* this seems to work fine, but gcc always emits a warning for it :/ */
560 ecb_inline void ecb_unreachable (void) ecb_noreturn; 579 ecb_inline ecb_noreturn void ecb_unreachable (void);
561 ecb_inline void ecb_unreachable (void) { } 580 ecb_inline ecb_noreturn void ecb_unreachable (void) { }
562#endif 581#endif
563 582
564/* try to tell the compiler that some condition is definitely true */ 583/* try to tell the compiler that some condition is definitely true */
565#define ecb_assume(cond) if (!(cond)) ecb_unreachable (); else 0 584#define ecb_assume(cond) if (!(cond)) ecb_unreachable (); else 0
566 585
567ecb_inline unsigned char ecb_byteorder_helper (void) ecb_const; 586ecb_inline ecb_const unsigned char ecb_byteorder_helper (void);
568ecb_inline unsigned char 587ecb_inline ecb_const unsigned char
569ecb_byteorder_helper (void) 588ecb_byteorder_helper (void)
570{ 589{
571 /* the union code still generates code under pressure in gcc, */ 590 /* the union code still generates code under pressure in gcc, */
572 /* but less than using pointers, and always seems to */ 591 /* but less than using pointers, and always seems to */
573 /* successfully return a constant. */ 592 /* successfully return a constant. */
574 /* the reason why we have this horrible preprocessor mess */ 593 /* the reason why we have this horrible preprocessor mess */
575 /* is to avoid it in all cases, at least on common architectures */ 594 /* is to avoid it in all cases, at least on common architectures */
576 /* or when using a recent enough gcc version (>= 4.6) */ 595 /* or when using a recent enough gcc version (>= 4.6) */
577#if __i386 || __i386__ || _M_X86 || __amd64 || __amd64__ || _M_X64 596#if ((__i386 || __i386__) && !__VOS__) || _M_X86 || __amd64 || __amd64__ || _M_X64
578 return 0x44; 597 return 0x44;
579#elif __BYTE_ORDER__ && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ 598#elif __BYTE_ORDER__ && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
580 return 0x44; 599 return 0x44;
581#elif __BYTE_ORDER__ && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ 600#elif __BYTE_ORDER__ && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
582 return 0x11; 601 return 0x11;
… …
588 } u = { 0x11223344 }; 607 } u = { 0x11223344 };
589 return u.c; 608 return u.c;
590#endif 609#endif
591} 610}
592 611
593ecb_inline ecb_bool ecb_big_endian (void) ecb_const; 612ecb_inline ecb_const ecb_bool ecb_big_endian (void);
594ecb_inline ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; } 613ecb_inline ecb_const ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; }
595ecb_inline ecb_bool ecb_little_endian (void) ecb_const; 614ecb_inline ecb_const ecb_bool ecb_little_endian (void);
596ecb_inline ecb_bool ecb_little_endian (void) { return ecb_byteorder_helper () == 0x44; } 615ecb_inline ecb_const ecb_bool ecb_little_endian (void) { return ecb_byteorder_helper () == 0x44; }
597 616
598#if ECB_GCC_VERSION(3,0) || ECB_C99 617#if ECB_GCC_VERSION(3,0) || ECB_C99
599 #define ecb_mod(m,n) ((m) % (n) + ((m) % (n) < 0 ? (n) : 0)) 618 #define ecb_mod(m,n) ((m) % (n) + ((m) % (n) < 0 ? (n) : 0))
600#else 619#else
601 #define ecb_mod(m,n) ((m) < 0 ? ((n) - 1 - ((-1 - (m)) % (n))) : ((m) % (n))) 620 #define ecb_mod(m,n) ((m) < 0 ? ((n) - 1 - ((-1 - (m)) % (n))) : ((m) % (n)))
602#endif 621#endif
603 622
604#if __cplusplus 623#if ECB_CPP
605 template<typename T> 624 template<typename T>
606 static inline T ecb_div_rd (T val, T div) 625 static inline T ecb_div_rd (T val, T div)
607 { 626 {
608 return val < 0 ? - ((-val + div - 1) / div) : (val ) / div; 627 return val < 0 ? - ((-val + div - 1) / div) : (val ) / div;
609 } 628 }
… …
669 #define ECB_NAN NAN 688 #define ECB_NAN NAN
670 #else 689 #else
671 #define ECB_NAN ECB_INFINITY 690 #define ECB_NAN ECB_INFINITY
672 #endif 691 #endif
673 692
693 #if ECB_C99 || _XOPEN_VERSION >= 600 || _POSIX_VERSION >= 200112L
694 #define ecb_ldexpf(x,e) ldexpf ((x), (e))
695 #else
696 #define ecb_ldexpf(x,e) (float) ldexp ((x), (e))
697 #endif
698
674 /* converts an ieee half/binary16 to a float */ 699 /* converts an ieee half/binary16 to a float */
675 ecb_function_ float ecb_binary16_to_float (uint16_t x) ecb_const; 700 ecb_function_ ecb_const float ecb_binary16_to_float (uint16_t x);
676 ecb_function_ float 701 ecb_function_ ecb_const float
677 ecb_binary16_to_float (uint16_t x) 702 ecb_binary16_to_float (uint16_t x)
678 { 703 {
679 int e = (x >> 10) & 0x1f; 704 int e = (x >> 10) & 0x1f;
680 int m = x & 0x3ff; 705 int m = x & 0x3ff;
681 float r; 706 float r;
682 707
683 if (!e ) r = ldexpf (m , -24); 708 if (!e ) r = ecb_ldexpf (m , -24);
684 else if (e != 31) r = ldexpf (m + 0x400, e - 25); 709 else if (e != 31) r = ecb_ldexpf (m + 0x400, e - 25);
685 else if (m ) r = ECB_NAN; 710 else if (m ) r = ECB_NAN;
686 else r = ECB_INFINITY; 711 else r = ECB_INFINITY;
687 712
688 return x & 0x8000 ? -r : r; 713 return x & 0x8000 ? -r : r;
689 } 714 }
690 715
691 /* convert a float to ieee single/binary32 */ 716 /* convert a float to ieee single/binary32 */
692 ecb_function_ uint32_t ecb_float_to_binary32 (float x) ecb_const; 717 ecb_function_ ecb_const uint32_t ecb_float_to_binary32 (float x);
693 ecb_function_ uint32_t 718 ecb_function_ ecb_const uint32_t
694 ecb_float_to_binary32 (float x) 719 ecb_float_to_binary32 (float x)
695 { 720 {
696 uint32_t r; 721 uint32_t r;
697 722
698 #if ECB_STDFP 723 #if ECB_STDFP
… …
727 752
728 return r; 753 return r;
729 } 754 }
730 755
731 /* converts an ieee single/binary32 to a float */ 756 /* converts an ieee single/binary32 to a float */
732 ecb_function_ float ecb_binary32_to_float (uint32_t x) ecb_const; 757 ecb_function_ ecb_const float ecb_binary32_to_float (uint32_t x);
733 ecb_function_ float 758 ecb_function_ ecb_const float
734 ecb_binary32_to_float (uint32_t x) 759 ecb_binary32_to_float (uint32_t x)
735 { 760 {
736 float r; 761 float r;
737 762
738 #if ECB_STDFP 763 #if ECB_STDFP
… …
748 x |= 0x800000U; 773 x |= 0x800000U;
749 else 774 else
750 e = 1; 775 e = 1;
751 776
752 /* we distrust ldexpf a bit and do the 2**-24 scaling by an extra multiply */ 777 /* we distrust ldexpf a bit and do the 2**-24 scaling by an extra multiply */
753 r = ldexpf (x * (0.5f / 0x800000U), e - 126); 778 r = ecb_ldexpf (x * (0.5f / 0x800000U), e - 126);
754 779
755 r = neg ? -r : r; 780 r = neg ? -r : r;
756 #endif 781 #endif
757 782
758 return r; 783 return r;
759 } 784 }
760 785
761 /* convert a double to ieee double/binary64 */ 786 /* convert a double to ieee double/binary64 */
762 ecb_function_ uint64_t ecb_double_to_binary64 (double x) ecb_const; 787 ecb_function_ ecb_const uint64_t ecb_double_to_binary64 (double x);
763 ecb_function_ uint64_t 788 ecb_function_ ecb_const uint64_t
764 ecb_double_to_binary64 (double x) 789 ecb_double_to_binary64 (double x)
765 { 790 {
766 uint64_t r; 791 uint64_t r;
767 792
768 #if ECB_STDFP 793 #if ECB_STDFP
… …
797 822
798 return r; 823 return r;
799 } 824 }
800 825
801 /* converts an ieee double/binary64 to a double */ 826 /* converts an ieee double/binary64 to a double */
802 ecb_function_ double ecb_binary64_to_double (uint64_t x) ecb_const; 827 ecb_function_ ecb_const double ecb_binary64_to_double (uint64_t x);
803 ecb_function_ double 828 ecb_function_ ecb_const double
804 ecb_binary64_to_double (uint64_t x) 829 ecb_binary64_to_double (uint64_t x)
805 { 830 {
806 double r; 831 double r;
807 832
808 #if ECB_STDFP 833 #if ECB_STDFP

Diff Legend

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