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

Comparing libeio/ecb.h (file contents):
Revision 1.21 by root, Fri May 16 15:15:23 2014 UTC vs.
Revision 1.24 by root, Sat Jun 13 00:06:13 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:
… …
40 40
41#ifndef ECB_H 41#ifndef ECB_H
42#define ECB_H 42#define ECB_H
43 43
44/* 16 bits major, 16 bits minor */ 44/* 16 bits major, 16 bits minor */
45#define ECB_VERSION 0x00010003 45#define ECB_VERSION 0x00010004
46 46
47#ifdef _WIN32 47#ifdef _WIN32
48 typedef signed char int8_t; 48 typedef signed char int8_t;
49 typedef unsigned char uint8_t; 49 typedef unsigned char uint8_t;
50 typedef signed short int16_t; 50 typedef signed short int16_t;
… …
90 * causing enormous grief in return for some better fake benchmark numbers. 90 * causing enormous grief in return for some better fake benchmark numbers.
91 * or so. 91 * or so.
92 * 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
93 * 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.
94 */ 94 */
95#ifndef ECB_GCC_VERSION
96 #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__
97 #define ECB_GCC_VERSION(major,minor) 0 96 #define ECB_GCC_VERSION(major,minor) 0
98 #else 97#else
99 #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)))
100 #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
101#endif 113#endif
102 114
103#define ECB_CPP (__cplusplus+0) 115#define ECB_CPP (__cplusplus+0)
104#define ECB_CPP11 (__cplusplus >= 201103L) 116#define ECB_CPP11 (__cplusplus >= 201103L)
105 117
… …
189 /* see comment below (stdatomic.h) about the C11 memory model. */ 201 /* see comment below (stdatomic.h) about the C11 memory model. */
190 #define ECB_MEMORY_FENCE __atomic_thread_fence (__ATOMIC_SEQ_CST) 202 #define ECB_MEMORY_FENCE __atomic_thread_fence (__ATOMIC_SEQ_CST)
191 #define ECB_MEMORY_FENCE_ACQUIRE __atomic_thread_fence (__ATOMIC_ACQUIRE) 203 #define ECB_MEMORY_FENCE_ACQUIRE __atomic_thread_fence (__ATOMIC_ACQUIRE)
192 #define ECB_MEMORY_FENCE_RELEASE __atomic_thread_fence (__ATOMIC_RELEASE) 204 #define ECB_MEMORY_FENCE_RELEASE __atomic_thread_fence (__ATOMIC_RELEASE)
193 205
194 /* The __has_feature syntax from clang is so misdesigned that we cannot use it 206 #elif ECB_CLANG_EXTENSION(c_atomic)
195 * without risking compile time errors with other compilers. We *could*
196 * define our own ecb_clang_has_feature, but I just can't be bothered to work
197 * around this shit time and again.
198 * #elif defined __clang && __has_feature (cxx_atomic)
199 * // see comment below (stdatomic.h) about the C11 memory model. 207 /* see comment below (stdatomic.h) about the C11 memory model. */
200 * #define ECB_MEMORY_FENCE __c11_atomic_thread_fence (__ATOMIC_SEQ_CST) 208 #define ECB_MEMORY_FENCE __c11_atomic_thread_fence (__ATOMIC_SEQ_CST)
201 * #define ECB_MEMORY_FENCE_ACQUIRE __c11_atomic_thread_fence (__ATOMIC_ACQUIRE) 209 #define ECB_MEMORY_FENCE_ACQUIRE __c11_atomic_thread_fence (__ATOMIC_ACQUIRE)
202 * #define ECB_MEMORY_FENCE_RELEASE __c11_atomic_thread_fence (__ATOMIC_RELEASE) 210 #define ECB_MEMORY_FENCE_RELEASE __c11_atomic_thread_fence (__ATOMIC_RELEASE)
203 */
204 211
205 #elif ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__ 212 #elif ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__
206 #define ECB_MEMORY_FENCE __sync_synchronize () 213 #define ECB_MEMORY_FENCE __sync_synchronize ()
207 #elif _MSC_VER >= 1500 /* VC++ 2008 */ 214 #elif _MSC_VER >= 1500 /* VC++ 2008 */
208 /* 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... */
… …
271 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE 278 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
272#endif 279#endif
273 280
274/*****************************************************************************/ 281/*****************************************************************************/
275 282
276#if __cplusplus 283#if ECB_CPP
277 #define ecb_inline static inline 284 #define ecb_inline static inline
278#elif ECB_GCC_VERSION(2,5) 285#elif ECB_GCC_VERSION(2,5)
279 #define ecb_inline static __inline__ 286 #define ecb_inline static __inline__
280#elif ECB_C99 287#elif ECB_C99
281 #define ecb_inline static inline 288 #define ecb_inline static inline
… …
295 302
296#define ECB_CONCAT_(a, b) a ## b 303#define ECB_CONCAT_(a, b) a ## b
297#define ECB_CONCAT(a, b) ECB_CONCAT_(a, b) 304#define ECB_CONCAT(a, b) ECB_CONCAT_(a, b)
298#define ECB_STRINGIFY_(a) # a 305#define ECB_STRINGIFY_(a) # a
299#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))
300 308
301#define ecb_function_ ecb_inline 309#define ecb_function_ ecb_inline
302 310
303#if ECB_GCC_VERSION(3,1) 311#if ECB_GCC_VERSION(3,1) || ECB_CLANG_VERSION(2,8)
304 #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)
305 #define ecb_is_constant(expr) __builtin_constant_p (expr) 318 #define ecb_is_constant(expr) __builtin_constant_p (expr)
306 #define ecb_expect(expr,value) __builtin_expect ((expr),(value))
307 #define ecb_prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality)
308#else 319#else
309 #define ecb_attribute(attrlist)
310
311 /* possible C11 impl for integral types 320 /* possible C11 impl for integral types
312 typedef struct ecb_is_constant_struct ecb_is_constant_struct; 321 typedef struct ecb_is_constant_struct ecb_is_constant_struct;
313 #define ecb_is_constant(expr) _Generic ((1 ? (struct ecb_is_constant_struct *)0 : (void *)((expr) - (expr)), ecb_is_constant_struct *: 0, default: 1)) */ 322 #define ecb_is_constant(expr) _Generic ((1 ? (struct ecb_is_constant_struct *)0 : (void *)((expr) - (expr)), ecb_is_constant_struct *: 0, default: 1)) */
314 323
315 #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
316 #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
317 #define ecb_prefetch(addr,rw,locality) 336 #define ecb_prefetch(addr,rw,locality)
318#endif 337#endif
319 338
320/* no emulation for ecb_decltype */ 339/* no emulation for ecb_decltype */
321#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; };
322 #define ecb_decltype(x) __decltype(x) 343 #define ecb_decltype(x) ecb_decltype_t<decltype (x)>::type
323#elif ECB_GCC_VERSION(3,0) 344#elif ECB_GCC_VERSION(3,0) || ECB_CLANG_VERSION(2,8)
324 #define ecb_decltype(x) __typeof(x) 345 #define ecb_decltype(x) __typeof__ (x)
325#endif 346#endif
326 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
327#define ecb_noinline ecb_attribute ((__noinline__)) 365 #define ecb_noinline ecb_attribute ((__noinline__))
366#endif
367
328#define ecb_unused ecb_attribute ((__unused__)) 368#define ecb_unused ecb_attribute ((__unused__))
329#define ecb_const ecb_attribute ((__const__)) 369#define ecb_const ecb_attribute ((__const__))
330#define ecb_pure ecb_attribute ((__pure__)) 370#define ecb_pure ecb_attribute ((__pure__))
331 371
332#if ECB_C11 372/* TODO http://msdn.microsoft.com/en-us/library/k6ktzx3s.aspx __declspec(noreturn) */
373#if ECB_C11 || __IBMC_NORETURN
374 /* http://pic.dhe.ibm.com/infocenter/compbg/v121v141/topic/com.ibm.xlcpp121.bg.doc/language_ref/noreturn.html */
333 #define ecb_noreturn _Noreturn 375 #define ecb_noreturn _Noreturn
376#elif ECB_CPP11
377 #define ecb_noreturn [[noreturn]]
378#elif _MSC_VER >= 1200
379 #define ecb_noreturn __declspec (noreturn)
334#else 380#else
335 #define ecb_noreturn ecb_attribute ((__noreturn__)) 381 #define ecb_noreturn ecb_attribute ((__noreturn__))
336#endif 382#endif
337 383
338#if ECB_GCC_VERSION(4,3) 384#if ECB_GCC_VERSION(4,3)
… …
353/* for compatibility to the rest of the world */ 399/* for compatibility to the rest of the world */
354#define ecb_likely(expr) ecb_expect_true (expr) 400#define ecb_likely(expr) ecb_expect_true (expr)
355#define ecb_unlikely(expr) ecb_expect_false (expr) 401#define ecb_unlikely(expr) ecb_expect_false (expr)
356 402
357/* count trailing zero bits and count # of one bits */ 403/* count trailing zero bits and count # of one bits */
358#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))
359 /* 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 */
360 #define ecb_ld32(x) (__builtin_clz (x) ^ 31) 409 #define ecb_ld32(x) (__builtin_clz (x) ^ 31)
361 #define ecb_ld64(x) (__builtin_clzll (x) ^ 63) 410 #define ecb_ld64(x) (__builtin_clzll (x) ^ 63)
362 #define ecb_ctz32(x) __builtin_ctz (x) 411 #define ecb_ctz32(x) __builtin_ctz (x)
363 #define ecb_ctz64(x) __builtin_ctzll (x) 412 #define ecb_ctz64(x) __builtin_ctzll (x)
364 #define ecb_popcount32(x) __builtin_popcount (x) 413 #define ecb_popcount32(x) __builtin_popcount (x)
365 /* no popcountll */ 414 /* no popcountll */
366#else 415#else
367 ecb_function_ int ecb_ctz32 (uint32_t x) ecb_const; 416 ecb_function_ ecb_const int ecb_ctz32 (uint32_t x);
368 ecb_function_ int 417 ecb_function_ ecb_const int
369 ecb_ctz32 (uint32_t x) 418 ecb_ctz32 (uint32_t x)
370 { 419 {
371 int r = 0; 420 int r = 0;
372 421
373 x &= ~x + 1; /* this isolates the lowest bit */ 422 x &= ~x + 1; /* this isolates the lowest bit */
… …
387#endif 436#endif
388 437
389 return r; 438 return r;
390 } 439 }
391 440
392 ecb_function_ int ecb_ctz64 (uint64_t x) ecb_const; 441 ecb_function_ ecb_const int ecb_ctz64 (uint64_t x);
393 ecb_function_ int 442 ecb_function_ ecb_const int
394 ecb_ctz64 (uint64_t x) 443 ecb_ctz64 (uint64_t x)
395 { 444 {
396 int shift = x & 0xffffffffU ? 0 : 32; 445 int shift = x & 0xffffffffU ? 0 : 32;
397 return ecb_ctz32 (x >> shift) + shift; 446 return ecb_ctz32 (x >> shift) + shift;
398 } 447 }
399 448
400 ecb_function_ int ecb_popcount32 (uint32_t x) ecb_const; 449 ecb_function_ ecb_const int ecb_popcount32 (uint32_t x);
401 ecb_function_ int 450 ecb_function_ ecb_const int
402 ecb_popcount32 (uint32_t x) 451 ecb_popcount32 (uint32_t x)
403 { 452 {
404 x -= (x >> 1) & 0x55555555; 453 x -= (x >> 1) & 0x55555555;
405 x = ((x >> 2) & 0x33333333) + (x & 0x33333333); 454 x = ((x >> 2) & 0x33333333) + (x & 0x33333333);
406 x = ((x >> 4) + x) & 0x0f0f0f0f; 455 x = ((x >> 4) + x) & 0x0f0f0f0f;
407 x *= 0x01010101; 456 x *= 0x01010101;
408 457
409 return x >> 24; 458 return x >> 24;
410 } 459 }
411 460
412 ecb_function_ int ecb_ld32 (uint32_t x) ecb_const; 461 ecb_function_ ecb_const int ecb_ld32 (uint32_t x);
413 ecb_function_ int ecb_ld32 (uint32_t x) 462 ecb_function_ ecb_const int ecb_ld32 (uint32_t x)
414 { 463 {
415 int r = 0; 464 int r = 0;
416 465
417 if (x >> 16) { x >>= 16; r += 16; } 466 if (x >> 16) { x >>= 16; r += 16; }
418 if (x >> 8) { x >>= 8; r += 8; } 467 if (x >> 8) { x >>= 8; r += 8; }
… …
421 if (x >> 1) { r += 1; } 470 if (x >> 1) { r += 1; }
422 471
423 return r; 472 return r;
424 } 473 }
425 474
426 ecb_function_ int ecb_ld64 (uint64_t x) ecb_const; 475 ecb_function_ ecb_const int ecb_ld64 (uint64_t x);
427 ecb_function_ int ecb_ld64 (uint64_t x) 476 ecb_function_ ecb_const int ecb_ld64 (uint64_t x)
428 { 477 {
429 int r = 0; 478 int r = 0;
430 479
431 if (x >> 32) { x >>= 32; r += 32; } 480 if (x >> 32) { x >>= 32; r += 32; }
432 481
433 return r + ecb_ld32 (x); 482 return r + ecb_ld32 (x);
434 } 483 }
435#endif 484#endif
436 485
437ecb_function_ ecb_bool ecb_is_pot32 (uint32_t x) ecb_const; 486ecb_function_ ecb_const ecb_bool ecb_is_pot32 (uint32_t x);
438ecb_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)); }
439ecb_function_ ecb_bool ecb_is_pot64 (uint64_t x) ecb_const; 488ecb_function_ ecb_const ecb_bool ecb_is_pot64 (uint64_t x);
440ecb_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)); }
441 490
442ecb_function_ uint8_t ecb_bitrev8 (uint8_t x) ecb_const; 491ecb_function_ ecb_const uint8_t ecb_bitrev8 (uint8_t x);
443ecb_function_ uint8_t ecb_bitrev8 (uint8_t x) 492ecb_function_ ecb_const uint8_t ecb_bitrev8 (uint8_t x)
444{ 493{
445 return ( (x * 0x0802U & 0x22110U) 494 return ( (x * 0x0802U & 0x22110U)
446 | (x * 0x8020U & 0x88440U)) * 0x10101U >> 16; 495 | (x * 0x8020U & 0x88440U)) * 0x10101U >> 16;
447} 496}
448 497
449ecb_function_ uint16_t ecb_bitrev16 (uint16_t x) ecb_const; 498ecb_function_ ecb_const uint16_t ecb_bitrev16 (uint16_t x);
450ecb_function_ uint16_t ecb_bitrev16 (uint16_t x) 499ecb_function_ ecb_const uint16_t ecb_bitrev16 (uint16_t x)
451{ 500{
452 x = ((x >> 1) & 0x5555) | ((x & 0x5555) << 1); 501 x = ((x >> 1) & 0x5555) | ((x & 0x5555) << 1);
453 x = ((x >> 2) & 0x3333) | ((x & 0x3333) << 2); 502 x = ((x >> 2) & 0x3333) | ((x & 0x3333) << 2);
454 x = ((x >> 4) & 0x0f0f) | ((x & 0x0f0f) << 4); 503 x = ((x >> 4) & 0x0f0f) | ((x & 0x0f0f) << 4);
455 x = ( x >> 8 ) | ( x << 8); 504 x = ( x >> 8 ) | ( x << 8);
456 505
457 return x; 506 return x;
458} 507}
459 508
460ecb_function_ uint32_t ecb_bitrev32 (uint32_t x) ecb_const; 509ecb_function_ ecb_const uint32_t ecb_bitrev32 (uint32_t x);
461ecb_function_ uint32_t ecb_bitrev32 (uint32_t x) 510ecb_function_ ecb_const uint32_t ecb_bitrev32 (uint32_t x)
462{ 511{
463 x = ((x >> 1) & 0x55555555) | ((x & 0x55555555) << 1); 512 x = ((x >> 1) & 0x55555555) | ((x & 0x55555555) << 1);
464 x = ((x >> 2) & 0x33333333) | ((x & 0x33333333) << 2); 513 x = ((x >> 2) & 0x33333333) | ((x & 0x33333333) << 2);
465 x = ((x >> 4) & 0x0f0f0f0f) | ((x & 0x0f0f0f0f) << 4); 514 x = ((x >> 4) & 0x0f0f0f0f) | ((x & 0x0f0f0f0f) << 4);
466 x = ((x >> 8) & 0x00ff00ff) | ((x & 0x00ff00ff) << 8); 515 x = ((x >> 8) & 0x00ff00ff) | ((x & 0x00ff00ff) << 8);
… …
469 return x; 518 return x;
470} 519}
471 520
472/* popcount64 is only available on 64 bit cpus as gcc builtin */ 521/* popcount64 is only available on 64 bit cpus as gcc builtin */
473/* so for this version we are lazy */ 522/* so for this version we are lazy */
474ecb_function_ int ecb_popcount64 (uint64_t x) ecb_const; 523ecb_function_ ecb_const int ecb_popcount64 (uint64_t x);
475ecb_function_ int 524ecb_function_ ecb_const int
476ecb_popcount64 (uint64_t x) 525ecb_popcount64 (uint64_t x)
477{ 526{
478 return ecb_popcount32 (x) + ecb_popcount32 (x >> 32); 527 return ecb_popcount32 (x) + ecb_popcount32 (x >> 32);
479} 528}
480 529
481ecb_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);
482ecb_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);
483ecb_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);
484ecb_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);
485ecb_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);
486ecb_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);
487ecb_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);
488ecb_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);
489 538
490ecb_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); }
491ecb_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); }
492ecb_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); }
493ecb_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); }
494ecb_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); }
495ecb_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); }
496ecb_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); }
497ecb_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); }
498 547
499#if ECB_GCC_VERSION(4,3) 548#if ECB_GCC_VERSION(4,3) || (ECB_CLANG_BUILTIN(__builtin_bswap32) && ECB_CLANG_BUILTIN(__builtin_bswap64))
500 #define ecb_bswap16(x) (__builtin_bswap32 (x) >> 16) 549 #define ecb_bswap16(x) (__builtin_bswap32 (x) >> 16)
501 #define ecb_bswap32(x) __builtin_bswap32 (x) 550 #define ecb_bswap32(x) __builtin_bswap32 (x)
502 #define ecb_bswap64(x) __builtin_bswap64 (x) 551 #define ecb_bswap64(x) __builtin_bswap64 (x)
503#else 552#else
504 ecb_function_ uint16_t ecb_bswap16 (uint16_t x) ecb_const; 553 ecb_function_ ecb_const uint16_t ecb_bswap16 (uint16_t x);
505 ecb_function_ uint16_t 554 ecb_function_ ecb_const uint16_t
506 ecb_bswap16 (uint16_t x) 555 ecb_bswap16 (uint16_t x)
507 { 556 {
508 return ecb_rotl16 (x, 8); 557 return ecb_rotl16 (x, 8);
509 } 558 }
510 559
511 ecb_function_ uint32_t ecb_bswap32 (uint32_t x) ecb_const; 560 ecb_function_ ecb_const uint32_t ecb_bswap32 (uint32_t x);
512 ecb_function_ uint32_t 561 ecb_function_ ecb_const uint32_t
513 ecb_bswap32 (uint32_t x) 562 ecb_bswap32 (uint32_t x)
514 { 563 {
515 return (((uint32_t)ecb_bswap16 (x)) << 16) | ecb_bswap16 (x >> 16); 564 return (((uint32_t)ecb_bswap16 (x)) << 16) | ecb_bswap16 (x >> 16);
516 } 565 }
517 566
518 ecb_function_ uint64_t ecb_bswap64 (uint64_t x) ecb_const; 567 ecb_function_ ecb_const uint64_t ecb_bswap64 (uint64_t x);
519 ecb_function_ uint64_t 568 ecb_function_ ecb_const uint64_t
520 ecb_bswap64 (uint64_t x) 569 ecb_bswap64 (uint64_t x)
521 { 570 {
522 return (((uint64_t)ecb_bswap32 (x)) << 32) | ecb_bswap32 (x >> 32); 571 return (((uint64_t)ecb_bswap32 (x)) << 32) | ecb_bswap32 (x >> 32);
523 } 572 }
524#endif 573#endif
525 574
526#if ECB_GCC_VERSION(4,5) 575#if ECB_GCC_VERSION(4,5) || ECB_CLANG_BUILTIN(__builtin_unreachable)
527 #define ecb_unreachable() __builtin_unreachable () 576 #define ecb_unreachable() __builtin_unreachable ()
528#else 577#else
529 /* 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 :/ */
530 ecb_inline void ecb_unreachable (void) ecb_noreturn; 579 ecb_inline ecb_noreturn void ecb_unreachable (void);
531 ecb_inline void ecb_unreachable (void) { } 580 ecb_inline ecb_noreturn void ecb_unreachable (void) { }
532#endif 581#endif
533 582
534/* try to tell the compiler that some condition is definitely true */ 583/* try to tell the compiler that some condition is definitely true */
535#define ecb_assume(cond) if (!(cond)) ecb_unreachable (); else 0 584#define ecb_assume(cond) if (!(cond)) ecb_unreachable (); else 0
536 585
537ecb_inline unsigned char ecb_byteorder_helper (void) ecb_const; 586ecb_inline ecb_const unsigned char ecb_byteorder_helper (void);
538ecb_inline unsigned char 587ecb_inline ecb_const unsigned char
539ecb_byteorder_helper (void) 588ecb_byteorder_helper (void)
540{ 589{
541 /* the union code still generates code under pressure in gcc, */ 590 /* the union code still generates code under pressure in gcc, */
542 /* but less than using pointers, and always seems to */ 591 /* but less than using pointers, and always seems to */
543 /* successfully return a constant. */ 592 /* successfully return a constant. */
… …
558 } u = { 0x11223344 }; 607 } u = { 0x11223344 };
559 return u.c; 608 return u.c;
560#endif 609#endif
561} 610}
562 611
563ecb_inline ecb_bool ecb_big_endian (void) ecb_const; 612ecb_inline ecb_const ecb_bool ecb_big_endian (void);
564ecb_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; }
565ecb_inline ecb_bool ecb_little_endian (void) ecb_const; 614ecb_inline ecb_const ecb_bool ecb_little_endian (void);
566ecb_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; }
567 616
568#if ECB_GCC_VERSION(3,0) || ECB_C99 617#if ECB_GCC_VERSION(3,0) || ECB_C99
569 #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))
570#else 619#else
571 #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)))
572#endif 621#endif
573 622
574#if __cplusplus 623#if ECB_CPP
575 template<typename T> 624 template<typename T>
576 static inline T ecb_div_rd (T val, T div) 625 static inline T ecb_div_rd (T val, T div)
577 { 626 {
578 return val < 0 ? - ((-val + div - 1) / div) : (val ) / div; 627 return val < 0 ? - ((-val + div - 1) / div) : (val ) / div;
579 } 628 }
… …
639 #define ECB_NAN NAN 688 #define ECB_NAN NAN
640 #else 689 #else
641 #define ECB_NAN ECB_INFINITY 690 #define ECB_NAN ECB_INFINITY
642 #endif 691 #endif
643 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
644 /* converts an ieee half/binary16 to a float */ 699 /* converts an ieee half/binary16 to a float */
645 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);
646 ecb_function_ float 701 ecb_function_ ecb_const float
647 ecb_binary16_to_float (uint16_t x) 702 ecb_binary16_to_float (uint16_t x)
648 { 703 {
649 int e = (x >> 10) & 0x1f; 704 int e = (x >> 10) & 0x1f;
650 int m = x & 0x3ff; 705 int m = x & 0x3ff;
651 float r; 706 float r;
652 707
653 if (!e ) r = ldexpf (m , -24); 708 if (!e ) r = ecb_ldexpf (m , -24);
654 else if (e != 31) r = ldexpf (m + 0x400, e - 25); 709 else if (e != 31) r = ecb_ldexpf (m + 0x400, e - 25);
655 else if (m ) r = ECB_NAN; 710 else if (m ) r = ECB_NAN;
656 else r = ECB_INFINITY; 711 else r = ECB_INFINITY;
657 712
658 return x & 0x8000 ? -r : r; 713 return x & 0x8000 ? -r : r;
659 } 714 }
660 715
661 /* convert a float to ieee single/binary32 */ 716 /* convert a float to ieee single/binary32 */
662 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);
663 ecb_function_ uint32_t 718 ecb_function_ ecb_const uint32_t
664 ecb_float_to_binary32 (float x) 719 ecb_float_to_binary32 (float x)
665 { 720 {
666 uint32_t r; 721 uint32_t r;
667 722
668 #if ECB_STDFP 723 #if ECB_STDFP
… …
697 752
698 return r; 753 return r;
699 } 754 }
700 755
701 /* converts an ieee single/binary32 to a float */ 756 /* converts an ieee single/binary32 to a float */
702 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);
703 ecb_function_ float 758 ecb_function_ ecb_const float
704 ecb_binary32_to_float (uint32_t x) 759 ecb_binary32_to_float (uint32_t x)
705 { 760 {
706 float r; 761 float r;
707 762
708 #if ECB_STDFP 763 #if ECB_STDFP
… …
718 x |= 0x800000U; 773 x |= 0x800000U;
719 else 774 else
720 e = 1; 775 e = 1;
721 776
722 /* 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 */
723 r = ldexpf (x * (0.5f / 0x800000U), e - 126); 778 r = ecb_ldexpf (x * (0.5f / 0x800000U), e - 126);
724 779
725 r = neg ? -r : r; 780 r = neg ? -r : r;
726 #endif 781 #endif
727 782
728 return r; 783 return r;
729 } 784 }
730 785
731 /* convert a double to ieee double/binary64 */ 786 /* convert a double to ieee double/binary64 */
732 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);
733 ecb_function_ uint64_t 788 ecb_function_ ecb_const uint64_t
734 ecb_double_to_binary64 (double x) 789 ecb_double_to_binary64 (double x)
735 { 790 {
736 uint64_t r; 791 uint64_t r;
737 792
738 #if ECB_STDFP 793 #if ECB_STDFP
… …
767 822
768 return r; 823 return r;
769 } 824 }
770 825
771 /* converts an ieee double/binary64 to a double */ 826 /* converts an ieee double/binary64 to a double */
772 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);
773 ecb_function_ double 828 ecb_function_ ecb_const double
774 ecb_binary64_to_double (uint64_t x) 829 ecb_binary64_to_double (uint64_t x)
775 { 830 {
776 double r; 831 double r;
777 832
778 #if ECB_STDFP 833 #if ECB_STDFP

Diff Legend

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