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

Comparing libecb/ecb.h (file contents):
Revision 1.45 by root, Mon Jun 13 09:00:30 2011 UTC vs.
Revision 1.49 by root, Fri Jun 17 18:46:19 2011 UTC

… …
54 * or so. 54 * or so.
55 * we try to detect these and simply assume they are not gcc - if they have 55 * we try to detect these and simply assume they are not gcc - if they have
56 * an issue with that they should have done it right in the first place. 56 * an issue with that they should have done it right in the first place.
57 */ 57 */
58#ifndef ECB_GCC_VERSION 58#ifndef ECB_GCC_VERSION
59 #if defined(__INTEL_COMPILER) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) || defined(__llvm__) || defined(__clang__) 59 #if !defined(__GNUC_MINOR__) || defined(__INTEL_COMPILER) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) || defined(__llvm__) || defined(__clang__)
60 #define ECB_GCC_VERSION(major,minor) 0 60 #define ECB_GCC_VERSION(major,minor) 0
61 #else 61 #else
62 #define ECB_GCC_VERSION(major,minor) (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor))) 62 #define ECB_GCC_VERSION(major,minor) (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor)))
63 #endif 63 #endif
64#endif 64#endif
65 65
66#define ECB_C99 (__STDC_VERSION__ >= 199901L) 66#define ECB_C99 (__STDC_VERSION__ >= 199901L)
67 67
68#if __cplusplus 68#if __cplusplus
69 #define ECB_INLINE static inline 69 #define ecb_inline static inline
70#elif ECB_GCC_VERSION(2,5) 70#elif ECB_GCC_VERSION(2,5)
71 #define ECB_INLINE static __inline__ 71 #define ecb_inline static __inline__
72#elif ECB_C99 72#elif ECB_C99
73 #define ECB_INLINE static inline 73 #define ecb_inline static inline
74#else 74#else
75 #define ECB_INLINE static 75 #define ecb_inline static
76#endif 76#endif
77 77
78#if ECB_GCC_VERSION(3,3) 78#if ECB_GCC_VERSION(3,3)
79 #define ecb_restrict __restrict__ 79 #define ecb_restrict __restrict__
80#elif ECB_C99 80#elif ECB_C99
… …
88#define ECB_CONCAT_(a, b) a ## b 88#define ECB_CONCAT_(a, b) a ## b
89#define ECB_CONCAT(a, b) ECB_CONCAT_(a, b) 89#define ECB_CONCAT(a, b) ECB_CONCAT_(a, b)
90#define ECB_STRINGIFY_(a) # a 90#define ECB_STRINGIFY_(a) # a
91#define ECB_STRINGIFY(a) ECB_STRINGIFY_(a) 91#define ECB_STRINGIFY(a) ECB_STRINGIFY_(a)
92 92
93#define ecb_function_ ECB_INLINE 93#define ecb_function_ ecb_inline
94 94
95#if ECB_GCC_VERSION(3,1) 95#if ECB_GCC_VERSION(3,1)
96 #define ecb_attribute(attrlist) __attribute__(attrlist) 96 #define ecb_attribute(attrlist) __attribute__(attrlist)
97 #define ecb_is_constant(expr) __builtin_constant_p (expr) 97 #define ecb_is_constant(expr) __builtin_constant_p (expr)
98 #define ecb_expect(expr,value) __builtin_expect ((expr),(value)) 98 #define ecb_expect(expr,value) __builtin_expect ((expr),(value))
… …
136#define ecb_likely(expr) ecb_expect_true (expr) 136#define ecb_likely(expr) ecb_expect_true (expr)
137#define ecb_unlikely(expr) ecb_expect_false (expr) 137#define ecb_unlikely(expr) ecb_expect_false (expr)
138 138
139/* count trailing zero bits and count # of one bits */ 139/* count trailing zero bits and count # of one bits */
140#if ECB_GCC_VERSION(3,4) 140#if ECB_GCC_VERSION(3,4)
141 /* we assume int == 32 bit, long == 32 or 64 bit and long long == 64 bit */
142 #define ecb_ld32(x) (__builtin_clz (x) ^ 31)
143 #define ecb_ld64(x) (__builtin_clzll (x) ^ 63)
141 #define ecb_ctz32(x) __builtin_ctz (x) 144 #define ecb_ctz32(x) __builtin_ctz (x)
145 #define ecb_ctz64(x) __builtin_ctzll (x)
142 #define ecb_popcount32(x) __builtin_popcount (x) 146 #define ecb_popcount32(x) __builtin_popcount (x)
147 /* no popcountll */
143#else 148#else
144 ecb_function_ int ecb_ctz32 (uint32_t x) ecb_const; 149 ecb_function_ int ecb_ctz32 (uint32_t x) ecb_const;
145 ecb_function_ int 150 ecb_function_ int
146 ecb_ctz32 (uint32_t x) 151 ecb_ctz32 (uint32_t x)
147 { 152 {
148 int r = 0; 153 int r = 0;
149 154
150 x &= (uint32_t)-(int32_t)x; /* this isolates the lowest bit */ 155 x &= ~x + 1; /* this isolates the lowest bit */
151 156
152 if (x & 0xaaaaaaaa) r += 1; 157 if (x & 0xaaaaaaaa) r += 1;
153 if (x & 0xcccccccc) r += 2; 158 if (x & 0xcccccccc) r += 2;
154 if (x & 0xf0f0f0f0) r += 4; 159 if (x & 0xf0f0f0f0) r += 4;
155 if (x & 0xff00ff00) r += 8; 160 if (x & 0xff00ff00) r += 8;
156 if (x & 0xffff0000) r += 16; 161 if (x & 0xffff0000) r += 16;
157 162
158 return r; 163 return r;
159 } 164 }
160 165
166 ecb_function_ int ecb_ctz64 (uint64_t x) ecb_const;
167 ecb_function_ int
168 ecb_ctz64 (uint64_t x)
169 {
170 int shift = x & 0xffffffffU ? 0 : 32;
171 return ecb_ctz (x >> shift) + shift;
172 }
173
161 ecb_function_ int ecb_popcount32 (uint32_t x) ecb_const; 174 ecb_function_ int ecb_popcount32 (uint32_t x) ecb_const;
162 ecb_function_ int 175 ecb_function_ int
163 ecb_popcount32 (uint32_t x) 176 ecb_popcount32 (uint32_t x)
164 { 177 {
165 x -= (x >> 1) & 0x55555555; 178 x -= (x >> 1) & 0x55555555;
… …
167 x = ((x >> 4) + x) & 0x0f0f0f0f; 180 x = ((x >> 4) + x) & 0x0f0f0f0f;
168 x *= 0x01010101; 181 x *= 0x01010101;
169 182
170 return x >> 24; 183 return x >> 24;
171 } 184 }
185
186 /* you have the choice beetween something with a table lookup, */
187 /* something using lots of bit arithmetic and a simple loop */
188 /* we went for the loop */
189 ecb_function_ int ecb_ld32 (uint32_t x) ecb_const;
190 ecb_function_ int ecb_ld32 (uint32_t x)
191 {
192 int r = -1;
193
194 do
195 {
196 x >>= 1;
197 ++r;
198 }
199 while (x);
200
201 return r;
202 }
203
204 ecb_function_ int ecb_ld64 (uint64_t x) ecb_const;
205 ecb_function_ int ecb_ld64 (uint64_t x)
206 {
207 int r = -1;
208
209 do
210 {
211 x >>= 1;
212 ++r;
213 }
214 while (x);
215
216 return r;
217 }
172#endif 218#endif
219
220/* popcount64 is only available on 64 bit cpus as gcc builtin */
221/* so for this version we are lazy */
222ecb_function_ int ecb_popcount64 (uint64_t x) ecb_const;
223ecb_function_ int
224ecb_popcount64 (uint64_t x)
225{
226 return ecb_popcount32 (x) + ecb_popcount32 (x >> 32);
227}
173 228
174#if ECB_GCC_VERSION(4,3) 229#if ECB_GCC_VERSION(4,3)
175 #define ecb_bswap32(x) __builtin_bswap32 (x)
176 #define ecb_bswap16(x) (__builtin_bswap32(x) >> 16) 230 #define ecb_bswap16(x) (__builtin_bswap32 (x) >> 16)
231 #define ecb_bswap32(x) __builtin_bswap32 (x)
232 #define ecb_bswap64(x) __builtin_bswap64 (x)
177#else 233#else
234 ecb_function_ uint32_t ecb_bswap16 (uint32_t x) ecb_const;
235 ecb_function_ uint32_t
236 ecb_bswap16 (uint32_t x)
237 {
238 return ((x >> 8) & 0xff)
239 | ((x << 8) & 0x00ff0000)
240 | (x << 24);
241 }
242
178 ecb_function_ uint32_t ecb_bswap32 (uint32_t x) ecb_const; 243 ecb_function_ uint32_t ecb_bswap32 (uint32_t x) ecb_const;
179 ecb_function_ uint32_t 244 ecb_function_ uint32_t
180 ecb_bswap32 (uint32_t x) 245 ecb_bswap32 (uint32_t x)
181 { 246 {
182 return (x >> 24) 247 return (x >> 24)
183 | ((x >> 8) & 0x0000ff00) 248 | ((x >> 8) & 0x0000ff00)
184 | ((x << 8) & 0x00ff0000) 249 | ((x << 8) & 0x00ff0000)
185 | (x << 24); 250 | (x << 24);
186 } 251 }
187 252
188 ecb_function_ uint32_t ecb_bswap16 (uint32_t x) ecb_const; 253 ecb_function_ uint64_t ecb_bswap64 (uint64_t x) ecb_const;
189 ecb_function_ uint32_t 254 ecb_function_ uint64_t
190 ecb_bswap16 (uint32_t x) 255 ecb_bswap64 (uint64_t x)
191 { 256 {
192 return ((x >> 8) & 0xff) 257 return (((uint64_t)ecb_bswap32 (x)) << 32)
193 | ((x << 8) & 0x00ff0000) 258 | ecb_bswap32 (x >> 32);
194 | (x << 24);
195 } 259 }
196#endif 260#endif
197 261
198#if ECB_GCC_VERSION(4,5) 262#if ECB_GCC_VERSION(4,5)
199 #define ecb_unreachable() __builtin_unreachable () 263 #define ecb_unreachable() __builtin_unreachable ()
… …
234 } 298 }
235#else 299#else
236 #define ecb_array_length(name) (sizeof (name) / sizeof (name [0])) 300 #define ecb_array_length(name) (sizeof (name) / sizeof (name [0]))
237#endif 301#endif
238 302
239ECB_INLINE uint32_t ecb_rotr32 (uint32_t x, unsigned int count) ecb_const; 303ecb_inline uint32_t ecb_rotr32 (uint32_t x, unsigned int count) ecb_const;
240ECB_INLINE uint32_t 304ecb_inline uint32_t
241ecb_rotr32 (uint32_t x, unsigned int count) 305ecb_rotr32 (uint32_t x, unsigned int count)
242{ 306{
243 return (x << (32 - count)) | (x >> count); 307 return (x << (32 - count)) | (x >> count);
244} 308}
245 309
246ECB_INLINE uint32_t ecb_rotl32 (uint32_t x, unsigned int count) ecb_const; 310ecb_inline uint32_t ecb_rotl32 (uint32_t x, unsigned int count) ecb_const;
247ECB_INLINE uint32_t 311ecb_inline uint32_t
248ecb_rotl32 (uint32_t x, unsigned int count) 312ecb_rotl32 (uint32_t x, unsigned int count)
249{ 313{
250 return (x >> (32 - count)) | (x << count); 314 return (x >> (32 - count)) | (x << count);
251} 315}
252 316
253#endif 317ecb_inline uint64_t ecb_rotr64 (uint64_t x, unsigned int count) ecb_const;
318ecb_inline uint64_t
319ecb_rotr64 (uint64_t x, unsigned int count)
320{
321 return (x << (64 - count)) | (x >> count);
322}
254 323
324ecb_inline uint64_t ecb_rotl64 (uint64_t x, unsigned int count) ecb_const;
325ecb_inline uint64_t
326ecb_rotl64 (uint64_t x, unsigned int count)
327{
328 return (x >> (64 - count)) | (x << count);
329}
330
331#endif
332

Diff Legend

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