--- libecb/ecb.h 2011/06/11 13:25:52 1.36 +++ libecb/ecb.h 2011/06/13 08:19:29 1.44 @@ -30,7 +30,23 @@ #ifndef ECB_H #define ECB_H -#include +#ifdef _WIN32 + typedef signed char int8_t; + typedef unsigned char uint8_t; + typedef signed short int16_t; + typedef unsigned short uint16_t; + typedef signed int int32_t; + typedef unsigned int uint32_t; + #if __GNUC__ + typedef signed long long int64_t; + typedef unsigned long long uint64_t; + #else + typedef signed __int64 int64_t; + typedef unsigned __int64 uint64_t; + #endif +#else + #include +#endif /* many compilers define _GNUC_ to some versions but then only implement * what their idiot authors think are the "more important" extensions, @@ -40,50 +56,59 @@ * an issue with that they should have done it right in the first place. */ #ifndef ECB_GCC_VERSION -# if defined(__INTEL_COMPILER) || defined(__SUNPRO_C) || defined(__llvm__) -# define ECB_GCC_VERSION(major,minor) 0 -# else -# define ECB_GCC_VERSION(major,minor) (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor))) -# endif + #if defined(__INTEL_COMPILER) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) || defined(__llvm__) || defined(__clang__) + #define ECB_GCC_VERSION(major,minor) 0 + #else + #define ECB_GCC_VERSION(major,minor) (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor))) + #endif #endif -#ifndef __cplusplus -# if __STDC_VERSION__ >= 199901L -# define ECB_INLINE static inline -typedef _Bool ecb_bool; -# else -# define ECB_INLINE static inline /* yeah! */ -typedef int ecb_bool; -# endif +#define ECB_C99 (__STDC_VERSION__ >= 199901L) + +#if __cplusplus + #define ECB_INLINE static inline +#elif ECB_GCC_VERSION(2,5) + #define ECB_INLINE static __inline__ +#elif ECB_C99 + #define ECB_INLINE static inline #else -# define ECB_INLINE static inline -typedef bool ecb_bool; + #define ECB_INLINE static #endif +#if ECB_GCC_VERSION(3,3) + #define ecb_restrict __restrict__ +#elif ECB_C99 + #define ecb_restrict restrict +#else + #define ecb_restrict +#endif + +typedef int ecb_bool; + #define ECB_CONCAT_(a, b) a ## b #define ECB_CONCAT(a, b) ECB_CONCAT_(a, b) #define ECB_STRINGIFY_(a) # a #define ECB_STRINGIFY(a) ECB_STRINGIFY_(a) -#define ECB_HEADER_INLINE ECB_INLINE +#define ecb_function_ ECB_INLINE #if ECB_GCC_VERSION(3,1) -# define ecb_attribute(attrlist) __attribute__(attrlist) -# define ecb_is_constant(expr) __builtin_constant_p (expr) -# define ecb_expect(expr,value) __builtin_expect ((expr),(value)) -# define ecb_prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality) -#else -# define ecb_attribute(attrlist) -# define ecb_is_constant(expr) 0 -# define ecb_expect(expr,value) (expr) -# define ecb_prefetch(addr,rw,locality) + #define ecb_attribute(attrlist) __attribute__(attrlist) + #define ecb_is_constant(expr) __builtin_constant_p (expr) + #define ecb_expect(expr,value) __builtin_expect ((expr),(value)) + #define ecb_prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality) +#else + #define ecb_attribute(attrlist) + #define ecb_is_constant(expr) 0 + #define ecb_expect(expr,value) (expr) + #define ecb_prefetch(addr,rw,locality) #endif /* no emulation for ecb_decltype */ #if ECB_GCC_VERSION(4,5) -# define ecb_decltype(x) __decltype(x) + #define ecb_decltype(x) __decltype(x) #elif ECB_GCC_VERSION(3,0) -# define ecb_decltype(x) typeof(x) + #define ecb_decltype(x) __typeof(x) #endif #define ecb_noinline ecb_attribute ((__noinline__)) @@ -93,34 +118,31 @@ #define ecb_pure ecb_attribute ((__pure__)) #if ECB_GCC_VERSION(4,3) - #define ecb_artificial ecb_attribute ((__artificial__)) /* 4.3 */ - #define ecb_hot ecb_attribute ((__hot__)) /* 4.3 */ - #define ecb_cold ecb_attribute ((__cold__)) /* 4.3 */ + #define ecb_artificial ecb_attribute ((__artificial__)) + #define ecb_hot ecb_attribute ((__hot__)) + #define ecb_cold ecb_attribute ((__cold__)) #else #define ecb_artificial #define ecb_hot #define ecb_cold #endif -/* put into if's if you are very sure that the expression */ -/* is mostly true or mostly false. note that these return */ -/* booleans, not the expression. */ +/* put around conditional expressions if you are very sure that the */ +/* expression is mostly true or mostly false. note that these return */ +/* booleans, not the expression. */ #define ecb_expect_false(expr) ecb_expect (!!(expr), 0) #define ecb_expect_true(expr) ecb_expect (!!(expr), 1) /* for compatibility to the rest of the world */ #define ecb_likely(expr) ecb_expect_true (expr) #define ecb_unlikely(expr) ecb_expect_false (expr) -/* try to tell the compiler that some condition is definitely true */ -#define ecb_assume(cond) do { if (!(cond)) ecb_unreachable (); } while (0) - /* count trailing zero bits and count # of one bits */ #if ECB_GCC_VERSION(3,4) #define ecb_ctz32(x) __builtin_ctz (x) #define ecb_popcount32(x) __builtin_popcount (x) #else - ECB_HEADER_INLINE int ecb_ctz32 (uint32_t x) ecb_const; - ECB_HEADER_INLINE int + ecb_function_ int ecb_ctz32 (uint32_t x) ecb_const; + ecb_function_ int ecb_ctz32 (uint32_t x) { int r = 0; @@ -136,8 +158,8 @@ return r; } - ECB_HEADER_INLINE int ecb_popcount32 (uint32_t x) ecb_const; - ECB_HEADER_INLINE int + ecb_function_ int ecb_popcount32 (uint32_t x) ecb_const; + ecb_function_ int ecb_popcount32 (uint32_t x) { x -= (x >> 1) & 0x55555555; @@ -153,8 +175,8 @@ #define ecb_bswap32(x) __builtin_bswap32 (x) #define ecb_bswap16(x) (__builtin_bswap32(x) >> 16) #else - ECB_HEADER_INLINE uint32_t ecb_bswap32 (uint32_t x) ecb_const; - ECB_HEADER_INLINE uint32_t + ecb_function_ uint32_t ecb_bswap32 (uint32_t x) ecb_const; + ecb_function_ uint32_t ecb_bswap32 (uint32_t x) { return (x >> 24) @@ -163,8 +185,8 @@ | (x << 24); } - ECB_HEADER_INLINE uint32_t ecb_bswap16 (uint32_t x) ecb_const; - ECB_HEADER_INLINE uint32_t + ecb_function_ uint32_t ecb_bswap16 (uint32_t x) ecb_const; + ecb_function_ uint32_t ecb_bswap16 (uint32_t x) { return ((x >> 8) & 0xff) @@ -177,31 +199,34 @@ #define ecb_unreachable() __builtin_unreachable () #else /* this seems to work fine, but gcc always emits a warning for it :/ */ - ECB_HEADER_INLINE void ecb_unreachable (void) ecb_noreturn; - ECB_HEADER_INLINE void ecb_unreachable (void) { } + ecb_function_ void ecb_unreachable (void) ecb_noreturn; + ecb_function_ void ecb_unreachable (void) { } #endif -ECB_HEADER_INLINE unsigned char ecb_byteorder_helper (void) ecb_const; -ECB_HEADER_INLINE unsigned char +/* try to tell the compiler that some condition is definitely true */ +#define ecb_assume(cond) do { if (!(cond)) ecb_unreachable (); } while (0) + +ecb_function_ unsigned char ecb_byteorder_helper (void) ecb_const; +ecb_function_ unsigned char ecb_byteorder_helper (void) { const uint32_t u = 0x11223344; return *(unsigned char *)&u; } -ECB_HEADER_INLINE ecb_bool ecb_big_endian (void) ecb_const; -ECB_HEADER_INLINE ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; }; -ECB_HEADER_INLINE ecb_bool ecb_little_endian (void) ecb_const; -ECB_HEADER_INLINE ecb_bool ecb_little_endian (void) { return ecb_byteorder_helper () == 0x44; }; +ecb_function_ ecb_bool ecb_big_endian (void) ecb_const; +ecb_function_ ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; } +ecb_function_ ecb_bool ecb_little_endian (void) ecb_const; +ecb_function_ ecb_bool ecb_little_endian (void) { return ecb_byteorder_helper () == 0x44; } -#if ECB_GCC_VERSION(3,0) +#if ECB_GCC_VERSION(3,0) || ECB_C99 #define ecb_mod(m,n) ((m) % (n) + ((m) % (n) < 0 ? (n) : 0)) #else #define ecb_mod(m,n) ((m) < 0 ? ((n) - 1 - ((-1 - (m)) % (n))) : ((m) % (n))) #endif #if ecb_cplusplus_does_not_suck - // does not work for local types (http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2657.htm) + /* does not work for local types (http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2657.htm) */ template static inline int ecb_array_length (const T (&arr)[N]) {