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

Comparing libecb/ecb.h (file contents):
Revision 1.32 by root, Wed Jun 1 01:02:31 2011 UTC vs.
Revision 1.40 by root, Sat Jun 11 17:34:57 2011 UTC

… …
38 * or so. 38 * or so.
39 * we try to detect these and simply assume they are not gcc - if they have 39 * we try to detect these and simply assume they are not gcc - if they have
40 * an issue with that they should have done it right in the first place. 40 * an issue with that they should have done it right in the first place.
41 */ 41 */
42#ifndef ECB_GCC_VERSION 42#ifndef ECB_GCC_VERSION
43# if defined(__INTEL_COMPILER) || defined(__SUNPRO_C) || defined(__llvm__) 43 #if defined(__INTEL_COMPILER) || defined(__SUNPRO_C) || defined(__llvm__)
44# define ECB_GCC_VERSION(major,minor) 0 44 #define ECB_GCC_VERSION(major,minor) 0
45# else 45 #else
46# define ECB_GCC_VERSION(major,minor) (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor))) 46 #define ECB_GCC_VERSION(major,minor) (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor)))
47 #endif
47# endif 48#endif
48#endif
49 49
50#define ECB_C99 (__STDC_VERSION__ >= 199901L)
51
50#ifndef __cplusplus 52#if __cplusplus
51# if __STDC_VERSION__ >= 199901L
52# define ECB_INLINE inline 53 #define ECB_INLINE static inline
53typedef _Bool ecb_bool; 54#elif ECB_GCC_VERSION(2,5)
55 #define ECB_INLINE static __inline__
56#elif ECB_C99
57 #define ECB_INLINE static inline
54# else 58#else
55# define ECB_INLINE inline /* yeah! */ 59 #define ECB_INLINE static
60#endif
61
62#if ECB_GCC_VERSION(3,3)
63 #define ecb_restrict __restrict__
64#elif ECB_C99
65 #define ecb_restrict restrict
66#else
67 #define ecb_restrict
68#endif
69
56typedef int ecb_bool; 70typedef int ecb_bool;
57# endif
58#else
59# define ECB_INLINE inline
60typedef bool ecb_bool;
61#endif
62 71
63#define ECB_CONCAT_(a, b) a ## b 72#define ECB_CONCAT_(a, b) a ## b
64#define ECB_CONCAT(a, b) ECB_CONCAT_(a, b) 73#define ECB_CONCAT(a, b) ECB_CONCAT_(a, b)
65#define ECB_STRINGIFY_(a) # a 74#define ECB_STRINGIFY_(a) # a
66#define ECB_STRINGIFY(a) ECB_STRINGIFY_(a) 75#define ECB_STRINGIFY(a) ECB_STRINGIFY_(a)
67 76
68#define ECB_HEADER_INLINE static ECB_INLINE 77#define ecb_function_ ECB_INLINE
69 78
70#if ECB_GCC_VERSION(3,1) 79#if ECB_GCC_VERSION(3,1)
71# define ecb_attribute(attrlist) __attribute__(attrlist) 80 #define ecb_attribute(attrlist) __attribute__(attrlist)
72# define ecb_is_constant(expr) __builtin_constant_p (expr) 81 #define ecb_is_constant(expr) __builtin_constant_p (expr)
73# define ecb_expect(expr,value) __builtin_expect ((expr),(value)) 82 #define ecb_expect(expr,value) __builtin_expect ((expr),(value))
74# define ecb_prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality) 83 #define ecb_prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality)
75#else 84#else
76# define ecb_attribute(attrlist) 85 #define ecb_attribute(attrlist)
77# define ecb_is_constant(expr) 0 86 #define ecb_is_constant(expr) 0
78# define ecb_expect(expr,value) (expr) 87 #define ecb_expect(expr,value) (expr)
79# define ecb_prefetch(addr,rw,locality) 88 #define ecb_prefetch(addr,rw,locality)
80#endif 89#endif
81 90
82/* no emulation for ecb_decltype */ 91/* no emulation for ecb_decltype */
83#if ECB_GCC_VERSION(4,5) 92#if ECB_GCC_VERSION(4,5)
84# define ecb_decltype(x) __decltype(x) 93 #define ecb_decltype(x) __decltype(x)
85#elif ECB_GCC_VERSION(3,0) 94#elif ECB_GCC_VERSION(3,0)
86# define ecb_decltype(x) typeof(x) 95 #define ecb_decltype(x) __typeof(x)
87#endif 96#endif
88 97
89#define ecb_artificial ecb_attribute ((__artificial__)) /* 4.3 */
90#define ecb_noinline ecb_attribute ((__noinline__)) 98#define ecb_noinline ecb_attribute ((__noinline__))
91#define ecb_noreturn ecb_attribute ((__noreturn__)) 99#define ecb_noreturn ecb_attribute ((__noreturn__))
92#define ecb_unused ecb_attribute ((__unused__)) 100#define ecb_unused ecb_attribute ((__unused__))
93#define ecb_const ecb_attribute ((__const__)) 101#define ecb_const ecb_attribute ((__const__))
94#define ecb_pure ecb_attribute ((__pure__)) 102#define ecb_pure ecb_attribute ((__pure__))
103
104#if ECB_GCC_VERSION(4,3)
105 #define ecb_artificial ecb_attribute ((__artificial__))
95#define ecb_hot ecb_attribute ((__hot__)) /* 4.3 */ 106 #define ecb_hot ecb_attribute ((__hot__))
96#define ecb_cold ecb_attribute ((__cold__)) /* 4.3 */ 107 #define ecb_cold ecb_attribute ((__cold__))
108#else
109 #define ecb_artificial
110 #define ecb_hot
111 #define ecb_cold
112#endif
97 113
98/* put into if's if you are very sure that the expression */ 114/* put around conditional expressions if you are very sure that the */
99/* is mostly true or mosty false. note that these return */ 115/* expression is mostly true or mostly false. note that these return */
100/* booleans, not the expression. */ 116/* booleans, not the expression. */
101#define ecb_unlikely(expr) ecb_expect (!!(expr), 0) 117#define ecb_expect_false(expr) ecb_expect (!!(expr), 0)
118#define ecb_expect_true(expr) ecb_expect (!!(expr), 1)
119/* for compatibility to the rest of the world */
102#define ecb_likely(expr) ecb_expect (!!(expr), 1) 120#define ecb_likely(expr) ecb_expect_true (expr)
121#define ecb_unlikely(expr) ecb_expect_false (expr)
103 122
104/* try to tell the compiler that some condition is definitely true */ 123/* try to tell the compiler that some condition is definitely true */
105#define ecb_assume(cond) do { if (!(cond)) ecb_unreachable (); } while (0) 124#define ecb_assume(cond) do { if (!(cond)) ecb_unreachable (); } while (0)
106 125
107/* count trailing zero bits and count # of one bits */ 126/* count trailing zero bits and count # of one bits */
108#if ECB_GCC_VERSION(3,4) 127#if ECB_GCC_VERSION(3,4)
109#define ecb_ctz32(x) __builtin_ctz (x) 128 #define ecb_ctz32(x) __builtin_ctz (x)
110#define ecb_popcount32(x) __builtin_popcount (x) 129 #define ecb_popcount32(x) __builtin_popcount (x)
111#else 130#else
112ECB_HEADER_INLINE int ecb_ctz32 (uint32_t x) ecb_const; 131 ecb_function_ int ecb_ctz32 (uint32_t x) ecb_const;
113ECB_HEADER_INLINE 132 ecb_function_ int
114ecb_ctz32 (uint32_t x) 133 ecb_ctz32 (uint32_t x)
115{ 134 {
116 int r = 0; 135 int r = 0;
117 136
118 x &= -x; /* this isolates the lowest bit */ 137 x &= -x; /* this isolates the lowest bit */
119 138
120 if (x & 0xaaaaaaaa) r += 1; 139 if (x & 0xaaaaaaaa) r += 1;
121 if (x & 0xcccccccc) r += 2; 140 if (x & 0xcccccccc) r += 2;
122 if (x & 0xf0f0f0f0) r += 4; 141 if (x & 0xf0f0f0f0) r += 4;
123 if (x & 0xff00ff00) r += 8; 142 if (x & 0xff00ff00) r += 8;
124 if (x & 0xffff0000) r += 16; 143 if (x & 0xffff0000) r += 16;
125 144
126 return r; 145 return r;
127} 146 }
128 147
129ECB_HEADER_INLINE int ecb_popcount32 (uint32_t x) ecb_const; 148 ecb_function_ int ecb_popcount32 (uint32_t x) ecb_const;
130ECB_HEADER_INLINE 149 ecb_function_ int
131ecb_popcount32 (uint32_t x) 150 ecb_popcount32 (uint32_t x)
132{ 151 {
133 x -= (x >> 1) & 0x55555555; 152 x -= (x >> 1) & 0x55555555;
134 x = ((x >> 2) & 0x33333333) + (x & 0x33333333); 153 x = ((x >> 2) & 0x33333333) + (x & 0x33333333);
135 x = ((x >> 4) + x) & 0x0f0f0f0f; 154 x = ((x >> 4) + x) & 0x0f0f0f0f;
136 x *= 0x01010101; 155 x *= 0x01010101;
137 156
138 return x >> 24; 157 return x >> 24;
139} 158 }
140#endif 159#endif
141 160
142#if ECB_GCC_VERSION(4,3) 161#if ECB_GCC_VERSION(4,3)
143# define ecb_bswap32(x) __builtin_bswap32 (x) 162 #define ecb_bswap32(x) __builtin_bswap32 (x)
144# define ecb_bswap16(x) (__builtin_bswap32(x) >> 16) 163 #define ecb_bswap16(x) (__builtin_bswap32(x) >> 16)
145#else 164#else
146ECB_HEADER_INLINE uint32_t ecb_bswap32 (uint32_t x) ecb_const; 165 ecb_function_ uint32_t ecb_bswap32 (uint32_t x) ecb_const;
147ECB_HEADER_INLINE uint32_t 166 ecb_function_ uint32_t
148ecb_bswap32 (uint32_t x) 167 ecb_bswap32 (uint32_t x)
149{ 168 {
150 return (x >> 24) 169 return (x >> 24)
151 | ((x >> 8) & 0x0000ff00) 170 | ((x >> 8) & 0x0000ff00)
152 | ((x << 8) & 0x00ff0000) 171 | ((x << 8) & 0x00ff0000)
153 | (x << 24); 172 | (x << 24);
154} 173 }
155 174
156ECB_HEADER_INLINE uint32_t ecb_bswap16 (uint32_t x) ecb_const; 175 ecb_function_ uint32_t ecb_bswap16 (uint32_t x) ecb_const;
157ECB_HEADER_INLINE uint32_t 176 ecb_function_ uint32_t
158ecb_bswap16 (uint32_t x) 177 ecb_bswap16 (uint32_t x)
159{ 178 {
160 return ((x >> 8) & 0xff) 179 return ((x >> 8) & 0xff)
161 | ((x << 8) & 0x00ff0000) 180 | ((x << 8) & 0x00ff0000)
162 | (x << 24); 181 | (x << 24);
163} 182 }
164#endif 183#endif
165 184
166#if ECB_GCC_VERSION(4,5) 185#if ECB_GCC_VERSION(4,5)
167# define ecb_unreachable() __builtin_unreachable () 186 #define ecb_unreachable() __builtin_unreachable ()
168#else 187#else
169/* this seems to work fine, but gcc always emits a warning for it :/ */ 188 /* this seems to work fine, but gcc always emits a warning for it :/ */
170ECB_HEADER_INLINE void ecb_unreachable (void) ecb_noreturn; 189 ecb_function_ void ecb_unreachable (void) ecb_noreturn;
171ECB_HEADER_INLINE void ecb_unreachable (void) { } 190 ecb_function_ void ecb_unreachable (void) { }
172#endif 191#endif
173 192
174ECB_HEADER_INLINE unsigned char ecb_byteorder_helper (void) ecb_const; 193ecb_function_ unsigned char ecb_byteorder_helper (void) ecb_const;
175ECB_HEADER_INLINE unsigned char 194ecb_function_ unsigned char
176ecb_byteorder_helper (void) 195ecb_byteorder_helper (void)
177{ 196{
178 const uint32_t u = 0x11223344; 197 const uint32_t u = 0x11223344;
179 return *(unsigned char *)&u; 198 return *(unsigned char *)&u;
180} 199}
181 200
182ECB_HEADER_INLINE ecb_bool ecb_big_endian (void) ecb_const; 201ecb_function_ ecb_bool ecb_big_endian (void) ecb_const;
183ECB_HEADER_INLINE ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; }; 202ecb_function_ ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; };
184ECB_HEADER_INLINE ecb_bool ecb_little_endian (void) ecb_const; 203ecb_function_ ecb_bool ecb_little_endian (void) ecb_const;
185ECB_HEADER_INLINE ecb_bool ecb_little_endian (void) { return ecb_byteorder_helper () == 0x44; }; 204ecb_function_ ecb_bool ecb_little_endian (void) { return ecb_byteorder_helper () == 0x44; };
186 205
187#if ECB_GCC_VERSION(3,0) 206#if ECB_GCC_VERSION(3,0) || ECB_C99
188# define ecb_mod(m,n) ((m) % (n) + ((m) % (n) < 0 ? (n) : 0)) 207 #define ecb_mod(m,n) ((m) % (n) + ((m) % (n) < 0 ? (n) : 0))
189#else 208#else
190# define ecb_mod(m,n) ((m) < 0 ? ((n) - 1 - ((-1 - (m)) % (n))) : ((m) % (n))) 209 #define ecb_mod(m,n) ((m) < 0 ? ((n) - 1 - ((-1 - (m)) % (n))) : ((m) % (n)))
191#endif 210#endif
192 211
193#if ecb_cplusplus_does_not_suck 212#if ecb_cplusplus_does_not_suck
194// does not work for local types (http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2657.htm) 213 /* does not work for local types (http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2657.htm) */
195template<typename T, int N> 214 template<typename T, int N>
196static inline int ecb_array_length (const T (&arr)[N]) 215 static inline int ecb_array_length (const T (&arr)[N])
197{ 216 {
198 return N; 217 return N;
199} 218 }
200#else 219#else
201#define ecb_array_length(name) (sizeof (name) / sizeof (name [0])) 220 #define ecb_array_length(name) (sizeof (name) / sizeof (name [0]))
202#endif 221#endif
203 222
204ECB_INLINE uint32_t ecb_rotr32 (uint32_t x, unsigned int count) ecb_const; 223ECB_INLINE uint32_t ecb_rotr32 (uint32_t x, unsigned int count) ecb_const;
205ECB_INLINE uint32_t 224ECB_INLINE uint32_t
206ecb_rotr32 (uint32_t x, unsigned int count) 225ecb_rotr32 (uint32_t x, unsigned int count)

Diff Legend

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