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

Comparing libecb/ecb.h (file contents):
Revision 1.129 by root, Thu Mar 20 22:04:29 2014 UTC vs.
Revision 1.158 by sf-exg, Fri Feb 20 17:23:51 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
… …
284 302
285#define ECB_CONCAT_(a, b) a ## b 303#define ECB_CONCAT_(a, b) a ## b
286#define ECB_CONCAT(a, b) ECB_CONCAT_(a, b) 304#define ECB_CONCAT(a, b) ECB_CONCAT_(a, b)
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)
307#define ECB_STRINGIFY_EXPR(expr) ((expr), ECB_STRINGIFY_ (expr))
289 308
290#define ecb_function_ ecb_inline 309#define ecb_function_ ecb_inline
291 310
292#if ECB_GCC_VERSION(3,1) 311#if ECB_GCC_VERSION(3,1) || ECB_CLANG_VERSION(2,8)
293 #define ecb_attribute(attrlist) __attribute__(attrlist) 312 #define ecb_attribute(attrlist) __attribute__ (attrlist)
313#else
314 #define ecb_attribute(attrlist)
315#endif
316
317#if ECB_GCC_VERSION(3,1) || ECB_CLANG_BUILTIN(__builtin_constant_p)
294 #define ecb_is_constant(expr) __builtin_constant_p (expr) 318 #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 319#else
298 #define ecb_attribute(attrlist)
299
300 /* possible C11 impl for integral types 320 /* possible C11 impl for integral types
301 typedef struct ecb_is_constant_struct ecb_is_constant_struct; 321 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)) */ 322 #define ecb_is_constant(expr) _Generic ((1 ? (struct ecb_is_constant_struct *)0 : (void *)((expr) - (expr)), ecb_is_constant_struct *: 0, default: 1)) */
303 323
304 #define ecb_is_constant(expr) 0 324 #define ecb_is_constant(expr) 0
325#endif
326
327#if ECB_GCC_VERSION(3,1) || ECB_CLANG_BUILTIN(__builtin_expect)
328 #define ecb_expect(expr,value) __builtin_expect ((expr),(value))
329#else
305 #define ecb_expect(expr,value) (expr) 330 #define ecb_expect(expr,value) (expr)
331#endif
332
333#if ECB_GCC_VERSION(3,1) || ECB_CLANG_BUILTIN(__builtin_prefetch)
334 #define ecb_prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality)
335#else
306 #define ecb_prefetch(addr,rw,locality) 336 #define ecb_prefetch(addr,rw,locality)
307#endif 337#endif
308 338
309/* no emulation for ecb_decltype */ 339/* no emulation for ecb_decltype */
310#if ECB_GCC_VERSION(4,5) 340#if ECB_CPP11
341 // older implementations might have problems with decltype(x)::type, work around it
342 template<class T> struct ecb_decltype_t { typedef T type; };
311 #define ecb_decltype(x) __decltype(x) 343 #define ecb_decltype(x) ecb_decltype_t<decltype (x)>::type
312#elif ECB_GCC_VERSION(3,0) 344#elif ECB_GCC_VERSION(3,0) || ECB_CLANG_VERSION(2,8)
313 #define ecb_decltype(x) __typeof(x) 345 #define ecb_decltype(x) __typeof__ (x)
314#endif 346#endif
315 347
348#if _MSC_VER >= 1300
349 #define ecb_deprecated __declspec (deprecated)
350#else
351 #define ecb_deprecated ecb_attribute ((__deprecated__))
352#endif
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
316#define ecb_noinline ecb_attribute ((__noinline__)) 365 #define ecb_noinline ecb_attribute ((__noinline__))
366#endif
367
317#define ecb_unused ecb_attribute ((__unused__)) 368#define ecb_unused ecb_attribute ((__unused__))
318#define ecb_const ecb_attribute ((__const__)) 369#define ecb_const ecb_attribute ((__const__))
319#define ecb_pure ecb_attribute ((__pure__)) 370#define ecb_pure ecb_attribute ((__pure__))
320 371
321#if ECB_C11 372#if ECB_C11 || __IBMC_NORETURN
373 /* http://pic.dhe.ibm.com/infocenter/compbg/v121v141/topic/com.ibm.xlcpp121.bg.doc/language_ref/noreturn.html */
322 #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)
323#else 380#else
324 #define ecb_noreturn ecb_attribute ((__noreturn__)) 381 #define ecb_noreturn ecb_attribute ((__noreturn__))
325#endif 382#endif
326 383
327#if ECB_GCC_VERSION(4,3) 384#if ECB_GCC_VERSION(4,3)
… …
342/* for compatibility to the rest of the world */ 399/* for compatibility to the rest of the world */
343#define ecb_likely(expr) ecb_expect_true (expr) 400#define ecb_likely(expr) ecb_expect_true (expr)
344#define ecb_unlikely(expr) ecb_expect_false (expr) 401#define ecb_unlikely(expr) ecb_expect_false (expr)
345 402
346/* count trailing zero bits and count # of one bits */ 403/* count trailing zero bits and count # of one bits */
347#if ECB_GCC_VERSION(3,4) 404#if ECB_GCC_VERSION(3,4) \
405 || (ECB_CLANG_BUILTIN(__builtin_clz) && ECB_CLANG_BUILTIN(__builtin_clzll) \
406 && ECB_CLANG_BUILTIN(__builtin_ctz) && ECB_CLANG_BUILTIN(__builtin_ctzll) \
407 && ECB_CLANG_BUILTIN(__builtin_popcount))
348 /* we assume int == 32 bit, long == 32 or 64 bit and long long == 64 bit */ 408 /* we assume int == 32 bit, long == 32 or 64 bit and long long == 64 bit */
349 #define ecb_ld32(x) (__builtin_clz (x) ^ 31) 409 #define ecb_ld32(x) (__builtin_clz (x) ^ 31)
350 #define ecb_ld64(x) (__builtin_clzll (x) ^ 63) 410 #define ecb_ld64(x) (__builtin_clzll (x) ^ 63)
351 #define ecb_ctz32(x) __builtin_ctz (x) 411 #define ecb_ctz32(x) __builtin_ctz (x)
352 #define ecb_ctz64(x) __builtin_ctzll (x) 412 #define ecb_ctz64(x) __builtin_ctzll (x)
353 #define ecb_popcount32(x) __builtin_popcount (x) 413 #define ecb_popcount32(x) __builtin_popcount (x)
354 /* no popcountll */ 414 /* no popcountll */
355#else 415#else
356 ecb_function_ int ecb_ctz32 (uint32_t x) ecb_const; 416 ecb_function_ ecb_const int ecb_ctz32 (uint32_t x);
357 ecb_function_ int 417 ecb_function_ ecb_const int
358 ecb_ctz32 (uint32_t x) 418 ecb_ctz32 (uint32_t x)
359 { 419 {
360 int r = 0; 420 int r = 0;
361 421
362 x &= ~x + 1; /* this isolates the lowest bit */ 422 x &= ~x + 1; /* this isolates the lowest bit */
… …
376#endif 436#endif
377 437
378 return r; 438 return r;
379 } 439 }
380 440
381 ecb_function_ int ecb_ctz64 (uint64_t x) ecb_const; 441 ecb_function_ ecb_const int ecb_ctz64 (uint64_t x);
382 ecb_function_ int 442 ecb_function_ ecb_const int
383 ecb_ctz64 (uint64_t x) 443 ecb_ctz64 (uint64_t x)
384 { 444 {
385 int shift = x & 0xffffffffU ? 0 : 32; 445 int shift = x & 0xffffffffU ? 0 : 32;
386 return ecb_ctz32 (x >> shift) + shift; 446 return ecb_ctz32 (x >> shift) + shift;
387 } 447 }
388 448
389 ecb_function_ int ecb_popcount32 (uint32_t x) ecb_const; 449 ecb_function_ ecb_const int ecb_popcount32 (uint32_t x);
390 ecb_function_ int 450 ecb_function_ ecb_const int
391 ecb_popcount32 (uint32_t x) 451 ecb_popcount32 (uint32_t x)
392 { 452 {
393 x -= (x >> 1) & 0x55555555; 453 x -= (x >> 1) & 0x55555555;
394 x = ((x >> 2) & 0x33333333) + (x & 0x33333333); 454 x = ((x >> 2) & 0x33333333) + (x & 0x33333333);
395 x = ((x >> 4) + x) & 0x0f0f0f0f; 455 x = ((x >> 4) + x) & 0x0f0f0f0f;
396 x *= 0x01010101; 456 x *= 0x01010101;
397 457
398 return x >> 24; 458 return x >> 24;
399 } 459 }
400 460
401 ecb_function_ int ecb_ld32 (uint32_t x) ecb_const; 461 ecb_function_ ecb_const int ecb_ld32 (uint32_t x);
402 ecb_function_ int ecb_ld32 (uint32_t x) 462 ecb_function_ ecb_const int ecb_ld32 (uint32_t x)
403 { 463 {
404 int r = 0; 464 int r = 0;
405 465
406 if (x >> 16) { x >>= 16; r += 16; } 466 if (x >> 16) { x >>= 16; r += 16; }
407 if (x >> 8) { x >>= 8; r += 8; } 467 if (x >> 8) { x >>= 8; r += 8; }
… …
410 if (x >> 1) { r += 1; } 470 if (x >> 1) { r += 1; }
411 471
412 return r; 472 return r;
413 } 473 }
414 474
415 ecb_function_ int ecb_ld64 (uint64_t x) ecb_const; 475 ecb_function_ ecb_const int ecb_ld64 (uint64_t x);
416 ecb_function_ int ecb_ld64 (uint64_t x) 476 ecb_function_ ecb_const int ecb_ld64 (uint64_t x)
417 { 477 {
418 int r = 0; 478 int r = 0;
419 479
420 if (x >> 32) { x >>= 32; r += 32; } 480 if (x >> 32) { x >>= 32; r += 32; }
421 481
422 return r + ecb_ld32 (x); 482 return r + ecb_ld32 (x);
423 } 483 }
424#endif 484#endif
425 485
426ecb_function_ ecb_bool ecb_is_pot32 (uint32_t x) ecb_const; 486ecb_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)); } 487ecb_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; 488ecb_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)); } 489ecb_function_ ecb_const ecb_bool ecb_is_pot64 (uint64_t x) { return !(x & (x - 1)); }
430 490
431ecb_function_ uint8_t ecb_bitrev8 (uint8_t x) ecb_const; 491ecb_function_ ecb_const uint8_t ecb_bitrev8 (uint8_t x);
432ecb_function_ uint8_t ecb_bitrev8 (uint8_t x) 492ecb_function_ ecb_const uint8_t ecb_bitrev8 (uint8_t x)
433{ 493{
434 return ( (x * 0x0802U & 0x22110U) 494 return ( (x * 0x0802U & 0x22110U)
435 | (x * 0x8020U & 0x88440U)) * 0x10101U >> 16; 495 | (x * 0x8020U & 0x88440U)) * 0x10101U >> 16;
436} 496}
437 497
438ecb_function_ uint16_t ecb_bitrev16 (uint16_t x) ecb_const; 498ecb_function_ ecb_const uint16_t ecb_bitrev16 (uint16_t x);
439ecb_function_ uint16_t ecb_bitrev16 (uint16_t x) 499ecb_function_ ecb_const uint16_t ecb_bitrev16 (uint16_t x)
440{ 500{
441 x = ((x >> 1) & 0x5555) | ((x & 0x5555) << 1); 501 x = ((x >> 1) & 0x5555) | ((x & 0x5555) << 1);
442 x = ((x >> 2) & 0x3333) | ((x & 0x3333) << 2); 502 x = ((x >> 2) & 0x3333) | ((x & 0x3333) << 2);
443 x = ((x >> 4) & 0x0f0f) | ((x & 0x0f0f) << 4); 503 x = ((x >> 4) & 0x0f0f) | ((x & 0x0f0f) << 4);
444 x = ( x >> 8 ) | ( x << 8); 504 x = ( x >> 8 ) | ( x << 8);
445 505
446 return x; 506 return x;
447} 507}
448 508
449ecb_function_ uint32_t ecb_bitrev32 (uint32_t x) ecb_const; 509ecb_function_ ecb_const uint32_t ecb_bitrev32 (uint32_t x);
450ecb_function_ uint32_t ecb_bitrev32 (uint32_t x) 510ecb_function_ ecb_const uint32_t ecb_bitrev32 (uint32_t x)
451{ 511{
452 x = ((x >> 1) & 0x55555555) | ((x & 0x55555555) << 1); 512 x = ((x >> 1) & 0x55555555) | ((x & 0x55555555) << 1);
453 x = ((x >> 2) & 0x33333333) | ((x & 0x33333333) << 2); 513 x = ((x >> 2) & 0x33333333) | ((x & 0x33333333) << 2);
454 x = ((x >> 4) & 0x0f0f0f0f) | ((x & 0x0f0f0f0f) << 4); 514 x = ((x >> 4) & 0x0f0f0f0f) | ((x & 0x0f0f0f0f) << 4);
455 x = ((x >> 8) & 0x00ff00ff) | ((x & 0x00ff00ff) << 8); 515 x = ((x >> 8) & 0x00ff00ff) | ((x & 0x00ff00ff) << 8);
… …
458 return x; 518 return x;
459} 519}
460 520
461/* popcount64 is only available on 64 bit cpus as gcc builtin */ 521/* popcount64 is only available on 64 bit cpus as gcc builtin */
462/* so for this version we are lazy */ 522/* so for this version we are lazy */
463ecb_function_ int ecb_popcount64 (uint64_t x) ecb_const; 523ecb_function_ ecb_const int ecb_popcount64 (uint64_t x);
464ecb_function_ int 524ecb_function_ ecb_const int
465ecb_popcount64 (uint64_t x) 525ecb_popcount64 (uint64_t x)
466{ 526{
467 return ecb_popcount32 (x) + ecb_popcount32 (x >> 32); 527 return ecb_popcount32 (x) + ecb_popcount32 (x >> 32);
468} 528}
469 529
470ecb_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);
471ecb_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);
472ecb_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);
473ecb_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);
474ecb_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);
475ecb_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);
476ecb_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);
477ecb_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);
478 538
479ecb_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); }
480ecb_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); }
481ecb_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); }
482ecb_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); }
483ecb_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); }
484ecb_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); }
485ecb_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); }
486ecb_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); }
487 547
488#if ECB_GCC_VERSION(4,3) 548#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) 549 #define ecb_bswap16(x) (__builtin_bswap32 (x) >> 16)
490 #define ecb_bswap32(x) __builtin_bswap32 (x) 550 #define ecb_bswap32(x) __builtin_bswap32 (x)
491 #define ecb_bswap64(x) __builtin_bswap64 (x) 551 #define ecb_bswap64(x) __builtin_bswap64 (x)
492#else 552#else
493 ecb_function_ uint16_t ecb_bswap16 (uint16_t x) ecb_const; 553 ecb_function_ ecb_const uint16_t ecb_bswap16 (uint16_t x);
494 ecb_function_ uint16_t 554 ecb_function_ ecb_const uint16_t
495 ecb_bswap16 (uint16_t x) 555 ecb_bswap16 (uint16_t x)
496 { 556 {
497 return ecb_rotl16 (x, 8); 557 return ecb_rotl16 (x, 8);
498 } 558 }
499 559
500 ecb_function_ uint32_t ecb_bswap32 (uint32_t x) ecb_const; 560 ecb_function_ ecb_const uint32_t ecb_bswap32 (uint32_t x);
501 ecb_function_ uint32_t 561 ecb_function_ ecb_const uint32_t
502 ecb_bswap32 (uint32_t x) 562 ecb_bswap32 (uint32_t x)
503 { 563 {
504 return (((uint32_t)ecb_bswap16 (x)) << 16) | ecb_bswap16 (x >> 16); 564 return (((uint32_t)ecb_bswap16 (x)) << 16) | ecb_bswap16 (x >> 16);
505 } 565 }
506 566
507 ecb_function_ uint64_t ecb_bswap64 (uint64_t x) ecb_const; 567 ecb_function_ ecb_const uint64_t ecb_bswap64 (uint64_t x);
508 ecb_function_ uint64_t 568 ecb_function_ ecb_const uint64_t
509 ecb_bswap64 (uint64_t x) 569 ecb_bswap64 (uint64_t x)
510 { 570 {
511 return (((uint64_t)ecb_bswap32 (x)) << 32) | ecb_bswap32 (x >> 32); 571 return (((uint64_t)ecb_bswap32 (x)) << 32) | ecb_bswap32 (x >> 32);
512 } 572 }
513#endif 573#endif
514 574
515#if ECB_GCC_VERSION(4,5) 575#if ECB_GCC_VERSION(4,5) || ECB_CLANG_BUILTIN(__builtin_unreachable)
516 #define ecb_unreachable() __builtin_unreachable () 576 #define ecb_unreachable() __builtin_unreachable ()
517#else 577#else
518 /* 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 :/ */
519 ecb_inline void ecb_unreachable (void) ecb_noreturn; 579 ecb_inline ecb_noreturn void ecb_unreachable (void);
520 ecb_inline void ecb_unreachable (void) { } 580 ecb_inline ecb_noreturn void ecb_unreachable (void) { }
521#endif 581#endif
522 582
523/* try to tell the compiler that some condition is definitely true */ 583/* try to tell the compiler that some condition is definitely true */
524#define ecb_assume(cond) if (!(cond)) ecb_unreachable (); else 0 584#define ecb_assume(cond) if (!(cond)) ecb_unreachable (); else 0
525 585
526ecb_inline unsigned char ecb_byteorder_helper (void) ecb_const; 586ecb_inline ecb_const unsigned char ecb_byteorder_helper (void);
527ecb_inline unsigned char 587ecb_inline ecb_const unsigned char
528ecb_byteorder_helper (void) 588ecb_byteorder_helper (void)
529{ 589{
530 /* the union code still generates code under pressure in gcc, */ 590 /* the union code still generates code under pressure in gcc, */
531 /* but less than using pointers, and always seems to */ 591 /* but less than using pointers, and always seems to */
532 /* successfully return a constant. */ 592 /* successfully return a constant. */
533 /* the reason why we have this horrible preprocessor mess */ 593 /* the reason why we have this horrible preprocessor mess */
534 /* 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 */
535 /* or when using a recent enough gcc version (>= 4.6) */ 595 /* or when using a recent enough gcc version (>= 4.6) */
536#if __i386 || __i386__ || _M_X86 || __amd64 || __amd64__ || _M_X64 596#if ((__i386 || __i386__) && !__VOS__) || _M_IX86 || __amd64 || __amd64__ || _M_X64
537 return 0x44; 597 return 0x44;
538#elif __BYTE_ORDER__ && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ 598#elif __BYTE_ORDER__ && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
539 return 0x44; 599 return 0x44;
540#elif __BYTE_ORDER__ && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ 600#elif __BYTE_ORDER__ && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
541 return 0x11; 601 return 0x11;
… …
547 } u = { 0x11223344 }; 607 } u = { 0x11223344 };
548 return u.c; 608 return u.c;
549#endif 609#endif
550} 610}
551 611
552ecb_inline ecb_bool ecb_big_endian (void) ecb_const; 612ecb_inline ecb_const ecb_bool ecb_big_endian (void);
553ecb_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; }
554ecb_inline ecb_bool ecb_little_endian (void) ecb_const; 614ecb_inline ecb_const ecb_bool ecb_little_endian (void);
555ecb_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; }
556 616
557#if ECB_GCC_VERSION(3,0) || ECB_C99 617#if ECB_GCC_VERSION(3,0) || ECB_C99
558 #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))
559#else 619#else
560 #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)))
561#endif 621#endif
562 622
563#if __cplusplus 623#if ECB_CPP
564 template<typename T> 624 template<typename T>
565 static inline T ecb_div_rd (T val, T div) 625 static inline T ecb_div_rd (T val, T div)
566 { 626 {
567 return val < 0 ? - ((-val + div - 1) / div) : (val ) / div; 627 return val < 0 ? - ((-val + div - 1) / div) : (val ) / div;
568 } 628 }
… …
594/* the only noteworthy exception is ancient armle, which uses order 43218765 */ 654/* the only noteworthy exception is ancient armle, which uses order 43218765 */
595#if 0 \ 655#if 0 \
596 || __i386 || __i386__ \ 656 || __i386 || __i386__ \
597 || __amd64 || __amd64__ || __x86_64 || __x86_64__ \ 657 || __amd64 || __amd64__ || __x86_64 || __x86_64__ \
598 || __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__ \ 658 || __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__ \
599 || defined __arm__ && defined __ARM_EABI__ \
600 || defined __s390__ || defined __s390x__ \ 659 || defined __s390__ || defined __s390x__ \
601 || defined __mips__ \ 660 || defined __mips__ \
602 || defined __alpha__ \ 661 || defined __alpha__ \
603 || defined __hppa__ \ 662 || defined __hppa__ \
604 || defined __ia64__ \ 663 || defined __ia64__ \
605 || defined __m68k__ \ 664 || defined __m68k__ \
606 || defined __m88k__ \ 665 || defined __m88k__ \
607 || defined __sh__ \ 666 || defined __sh__ \
608 || defined _M_IX86 || defined _M_AMD64 || defined _M_IA64 667 || defined _M_IX86 || defined _M_AMD64 || defined _M_IA64 \
668 || (defined __arm__ && (defined __ARM_EABI__ || defined __EABI__ || defined __VFP_FP__ || defined _WIN32_WCE || defined __ANDROID__)) \
669 || defined __aarch64__
609 #define ECB_STDFP 1 670 #define ECB_STDFP 1
610 #include <string.h> /* for memcpy */ 671 #include <string.h> /* for memcpy */
611#else 672#else
612 #define ECB_STDFP 0 673 #define ECB_STDFP 0
613#endif 674#endif
… …
627 #define ECB_NAN NAN 688 #define ECB_NAN NAN
628 #else 689 #else
629 #define ECB_NAN ECB_INFINITY 690 #define ECB_NAN ECB_INFINITY
630 #endif 691 #endif
631 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
632 /* converts an ieee half/binary16 to a float */ 699 /* converts an ieee half/binary16 to a float */
633 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);
634 ecb_function_ float 701 ecb_function_ ecb_const float
635 ecb_binary16_to_float (uint16_t x) 702 ecb_binary16_to_float (uint16_t x)
636 { 703 {
637 int e = (x >> 10) & 0x1f; 704 int e = (x >> 10) & 0x1f;
638 int m = x & 0x3ff; 705 int m = x & 0x3ff;
639 float r; 706 float r;
640 707
641 if (!e ) r = ldexpf (m , -24); 708 if (!e ) r = ecb_ldexpf (m , -24);
642 else if (e != 31) r = ldexpf (m + 0x400, e - 25); 709 else if (e != 31) r = ecb_ldexpf (m + 0x400, e - 25);
643 else if (m ) r = ECB_NAN; 710 else if (m ) r = ECB_NAN;
644 else r = ECB_INFINITY; 711 else r = ECB_INFINITY;
645 712
646 return x & 0x8000 ? -r : r; 713 return x & 0x8000 ? -r : r;
647 } 714 }
648 715
649 /* convert a float to ieee single/binary32 */ 716 /* convert a float to ieee single/binary32 */
650 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);
651 ecb_function_ uint32_t 718 ecb_function_ ecb_const uint32_t
652 ecb_float_to_binary32 (float x) 719 ecb_float_to_binary32 (float x)
653 { 720 {
654 uint32_t r; 721 uint32_t r;
655 722
656 #if ECB_STDFP 723 #if ECB_STDFP
… …
685 752
686 return r; 753 return r;
687 } 754 }
688 755
689 /* converts an ieee single/binary32 to a float */ 756 /* converts an ieee single/binary32 to a float */
690 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);
691 ecb_function_ float 758 ecb_function_ ecb_const float
692 ecb_binary32_to_float (uint32_t x) 759 ecb_binary32_to_float (uint32_t x)
693 { 760 {
694 float r; 761 float r;
695 762
696 #if ECB_STDFP 763 #if ECB_STDFP
… …
706 x |= 0x800000U; 773 x |= 0x800000U;
707 else 774 else
708 e = 1; 775 e = 1;
709 776
710 /* 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 */
711 r = ldexpf (x * (0.5f / 0x800000U), e - 126); 778 r = ecb_ldexpf (x * (0.5f / 0x800000U), e - 126);
712 779
713 r = neg ? -r : r; 780 r = neg ? -r : r;
714 #endif 781 #endif
715 782
716 return r; 783 return r;
717 } 784 }
718 785
719 /* convert a double to ieee double/binary64 */ 786 /* convert a double to ieee double/binary64 */
720 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);
721 ecb_function_ uint64_t 788 ecb_function_ ecb_const uint64_t
722 ecb_double_to_binary64 (double x) 789 ecb_double_to_binary64 (double x)
723 { 790 {
724 uint64_t r; 791 uint64_t r;
725 792
726 #if ECB_STDFP 793 #if ECB_STDFP
… …
755 822
756 return r; 823 return r;
757 } 824 }
758 825
759 /* converts an ieee double/binary64 to a double */ 826 /* converts an ieee double/binary64 to a double */
760 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);
761 ecb_function_ double 828 ecb_function_ ecb_const double
762 ecb_binary64_to_double (uint64_t x) 829 ecb_binary64_to_double (uint64_t x)
763 { 830 {
764 double r; 831 double r;
765 832
766 #if ECB_STDFP 833 #if ECB_STDFP

Diff Legend

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