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

Comparing libecb/ecb.h (file contents):
Revision 1.41 by root, Sat Jun 11 17:35:48 2011 UTC vs.
Revision 1.50 by root, Fri Jun 17 21:16:11 2011 UTC

… …
28 */ 28 */
29 29
30#ifndef ECB_H 30#ifndef ECB_H
31#define ECB_H 31#define ECB_H
32 32
33#ifdef _WIN32
34 typedef signed char int8_t;
35 typedef unsigned char uint8_t;
36 typedef signed short int16_t;
37 typedef unsigned short uint16_t;
38 typedef signed int int32_t;
39 typedef unsigned int uint32_t;
40 #if __GNUC__
41 typedef signed long long int64_t;
42 typedef unsigned long long uint64_t;
43 #else
44 typedef signed __int64 int64_t;
45 typedef unsigned __int64 uint64_t;
46 #endif
47#else
33#include <inttypes.h> 48 #include <inttypes.h>
49#endif
34 50
35/* many compilers define _GNUC_ to some versions but then only implement 51/* many compilers define _GNUC_ to some versions but then only implement
36 * what their idiot authors think are the "more important" extensions, 52 * what their idiot authors think are the "more important" extensions,
37 * causing enourmous grief in return for some better fake benchmark numbers. 53 * causing enourmous grief in return for some better fake benchmark numbers.
38 * or so. 54 * or so.
39 * 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
40 * 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.
41 */ 57 */
42#ifndef ECB_GCC_VERSION 58#ifndef ECB_GCC_VERSION
43 #if defined(__INTEL_COMPILER) || defined(__SUNPRO_C) || defined(__llvm__) 59 #if !defined(__GNUC_MINOR__) || defined(__INTEL_COMPILER) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) || defined(__llvm__) || defined(__clang__)
44 #define ECB_GCC_VERSION(major,minor) 0 60 #define ECB_GCC_VERSION(major,minor) 0
45 #else 61 #else
46 #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)))
47 #endif 63 #endif
48#endif 64#endif
49 65
50#define ECB_C99 (__STDC_VERSION__ >= 199901L) 66#define ECB_C99 (__STDC_VERSION__ >= 199901L)
51 67
52#if __cplusplus 68#if __cplusplus
53 #define ECB_INLINE static inline 69 #define ecb_inline static inline
54#elif ECB_GCC_VERSION(2,5) 70#elif ECB_GCC_VERSION(2,5)
55 #define ECB_INLINE static __inline__ 71 #define ecb_inline static __inline__
56#elif ECB_C99 72#elif ECB_C99
57 #define ECB_INLINE static inline 73 #define ecb_inline static inline
58#else 74#else
59 #define ECB_INLINE static 75 #define ecb_inline static
60#endif 76#endif
61 77
62#if ECB_GCC_VERSION(3,3) 78#if ECB_GCC_VERSION(3,3)
63 #define ecb_restrict __restrict__ 79 #define ecb_restrict __restrict__
64#elif ECB_C99 80#elif ECB_C99
… …
72#define ECB_CONCAT_(a, b) a ## b 88#define ECB_CONCAT_(a, b) a ## b
73#define ECB_CONCAT(a, b) ECB_CONCAT_(a, b) 89#define ECB_CONCAT(a, b) ECB_CONCAT_(a, b)
74#define ECB_STRINGIFY_(a) # a 90#define ECB_STRINGIFY_(a) # a
75#define ECB_STRINGIFY(a) ECB_STRINGIFY_(a) 91#define ECB_STRINGIFY(a) ECB_STRINGIFY_(a)
76 92
77#define ecb_function_ ECB_INLINE 93#define ecb_function_ ecb_inline
78 94
79#if ECB_GCC_VERSION(3,1) 95#if ECB_GCC_VERSION(3,1)
80 #define ecb_attribute(attrlist) __attribute__(attrlist) 96 #define ecb_attribute(attrlist) __attribute__(attrlist)
81 #define ecb_is_constant(expr) __builtin_constant_p (expr) 97 #define ecb_is_constant(expr) __builtin_constant_p (expr)
82 #define ecb_expect(expr,value) __builtin_expect ((expr),(value)) 98 #define ecb_expect(expr,value) __builtin_expect ((expr),(value))
… …
120#define ecb_likely(expr) ecb_expect_true (expr) 136#define ecb_likely(expr) ecb_expect_true (expr)
121#define ecb_unlikely(expr) ecb_expect_false (expr) 137#define ecb_unlikely(expr) ecb_expect_false (expr)
122 138
123/* count trailing zero bits and count # of one bits */ 139/* count trailing zero bits and count # of one bits */
124#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)
125 #define ecb_ctz32(x) __builtin_ctz (x) 144 #define ecb_ctz32(x) __builtin_ctz (x)
145 #define ecb_ctz64(x) __builtin_ctzll (x)
126 #define ecb_popcount32(x) __builtin_popcount (x) 146 #define ecb_popcount32(x) __builtin_popcount (x)
147 /* no popcountll */
127#else 148#else
128 ecb_function_ int ecb_ctz32 (uint32_t x) ecb_const; 149 ecb_function_ int ecb_ctz32 (uint32_t x) ecb_const;
129 ecb_function_ int 150 ecb_function_ int
130 ecb_ctz32 (uint32_t x) 151 ecb_ctz32 (uint32_t x)
131 { 152 {
132 int r = 0; 153 int r = 0;
133 154
134 x &= -x; /* this isolates the lowest bit */ 155 x &= ~x + 1; /* this isolates the lowest bit */
135 156
157#if ECB_branchless_on_i386
158 r += !!(x & 0xaaaaaaaa) << 0;
159 r += !!(x & 0xcccccccc) << 1;
160 r += !!(x & 0xf0f0f0f0) << 2;
161 r += !!(x & 0xff00ff00) << 3;
162 r += !!(x & 0xffff0000) << 4;
163#else
136 if (x & 0xaaaaaaaa) r += 1; 164 if (x & 0xaaaaaaaa) r += 1;
137 if (x & 0xcccccccc) r += 2; 165 if (x & 0xcccccccc) r += 2;
138 if (x & 0xf0f0f0f0) r += 4; 166 if (x & 0xf0f0f0f0) r += 4;
139 if (x & 0xff00ff00) r += 8; 167 if (x & 0xff00ff00) r += 8;
140 if (x & 0xffff0000) r += 16; 168 if (x & 0xffff0000) r += 16;
169#endif
141 170
142 return r; 171 return r;
172 }
173
174 ecb_function_ int ecb_ctz64 (uint64_t x) ecb_const;
175 ecb_function_ int
176 ecb_ctz64 (uint64_t x)
177 {
178 int shift = x & 0xffffffffU ? 0 : 32;
179 return ecb_ctz32 (x >> shift) + shift;
143 } 180 }
144 181
145 ecb_function_ int ecb_popcount32 (uint32_t x) ecb_const; 182 ecb_function_ int ecb_popcount32 (uint32_t x) ecb_const;
146 ecb_function_ int 183 ecb_function_ int
147 ecb_popcount32 (uint32_t x) 184 ecb_popcount32 (uint32_t x)
… …
151 x = ((x >> 4) + x) & 0x0f0f0f0f; 188 x = ((x >> 4) + x) & 0x0f0f0f0f;
152 x *= 0x01010101; 189 x *= 0x01010101;
153 190
154 return x >> 24; 191 return x >> 24;
155 } 192 }
193
194 /* you have the choice beetween something with a table lookup, */
195 /* something using lots of bit arithmetic and a simple loop */
196 /* we went for the loop */
197 ecb_function_ int ecb_ld32 (uint32_t x) ecb_const;
198 ecb_function_ int ecb_ld32 (uint32_t x)
199 {
200 int r = 0;
201
202 if (x >> 16) { x >>= 16; r += 16; }
203 if (x >> 8) { x >>= 8; r += 8; }
204 if (x >> 4) { x >>= 4; r += 4; }
205 if (x >> 2) { x >>= 2; r += 2; }
206 if (x >> 1) { r += 1; }
207
208 return r;
209 }
210
211 ecb_function_ int ecb_ld64 (uint64_t x) ecb_const;
212 ecb_function_ int ecb_ld64 (uint64_t x)
213 {
214 int r = 0;
215
216 if (x >> 32) { x >>= 32; r += 32; }
217
218 return r + ecb_ld32 (x);
219 }
156#endif 220#endif
221
222/* popcount64 is only available on 64 bit cpus as gcc builtin */
223/* so for this version we are lazy */
224ecb_function_ int ecb_popcount64 (uint64_t x) ecb_const;
225ecb_function_ int
226ecb_popcount64 (uint64_t x)
227{
228 return ecb_popcount32 (x) + ecb_popcount32 (x >> 32);
229}
230
231ecb_inline uint8_t ecb_rotl8 (uint8_t x, unsigned int count) ecb_const;
232ecb_inline uint8_t ecb_rotr8 (uint8_t x, unsigned int count) ecb_const;
233ecb_inline uint16_t ecb_rotl16 (uint16_t x, unsigned int count) ecb_const;
234ecb_inline uint16_t ecb_rotr16 (uint16_t x, unsigned int count) ecb_const;
235ecb_inline uint32_t ecb_rotl32 (uint32_t x, unsigned int count) ecb_const;
236ecb_inline uint32_t ecb_rotr32 (uint32_t x, unsigned int count) ecb_const;
237ecb_inline uint64_t ecb_rotl64 (uint64_t x, unsigned int count) ecb_const;
238ecb_inline uint64_t ecb_rotr64 (uint64_t x, unsigned int count) ecb_const;
239
240ecb_inline uint8_t ecb_rotl8 (uint8_t x, unsigned int count) { return (x >> ( 8 - count)) | (x << count); }
241ecb_inline uint8_t ecb_rotr8 (uint8_t x, unsigned int count) { return (x << ( 8 - count)) | (x >> count); }
242ecb_inline uint16_t ecb_rotl16 (uint16_t x, unsigned int count) { return (x >> (16 - count)) | (x << count); }
243ecb_inline uint16_t ecb_rotr16 (uint16_t x, unsigned int count) { return (x << (16 - count)) | (x >> count); }
244ecb_inline uint32_t ecb_rotl32 (uint32_t x, unsigned int count) { return (x >> (32 - count)) | (x << count); }
245ecb_inline uint32_t ecb_rotr32 (uint32_t x, unsigned int count) { return (x << (32 - count)) | (x >> count); }
246ecb_inline uint64_t ecb_rotl64 (uint64_t x, unsigned int count) { return (x >> (64 - count)) | (x << count); }
247ecb_inline uint64_t ecb_rotr64 (uint64_t x, unsigned int count) { return (x << (64 - count)) | (x >> count); }
157 248
158#if ECB_GCC_VERSION(4,3) 249#if ECB_GCC_VERSION(4,3)
159 #define ecb_bswap32(x) __builtin_bswap32 (x)
160 #define ecb_bswap16(x) (__builtin_bswap32(x) >> 16) 250 #define ecb_bswap16(x) (__builtin_bswap32 (x) >> 16)
251 #define ecb_bswap32(x) __builtin_bswap32 (x)
252 #define ecb_bswap64(x) __builtin_bswap64 (x)
161#else 253#else
254 ecb_function_ uint16_t ecb_bswap16 (uint16_t x) ecb_const;
255 ecb_function_ uint16_t
256 ecb_bswap16 (uint16_t x)
257 {
258 return ecb_rotl16 (x, 8);
259 }
260
162 ecb_function_ uint32_t ecb_bswap32 (uint32_t x) ecb_const; 261 ecb_function_ uint32_t ecb_bswap32 (uint32_t x) ecb_const;
163 ecb_function_ uint32_t 262 ecb_function_ uint32_t
164 ecb_bswap32 (uint32_t x) 263 ecb_bswap32 (uint32_t x)
165 { 264 {
166 return (x >> 24) 265 return (((uint32_t)ecb_bswap16 (x)) << 16) | ecb_bswap16 (x >> 16);
167 | ((x >> 8) & 0x0000ff00)
168 | ((x << 8) & 0x00ff0000)
169 | (x << 24);
170 } 266 }
171 267
172 ecb_function_ uint32_t ecb_bswap16 (uint32_t x) ecb_const; 268 ecb_function_ uint64_t ecb_bswap64 (uint64_t x) ecb_const;
173 ecb_function_ uint32_t 269 ecb_function_ uint64_t
174 ecb_bswap16 (uint32_t x) 270 ecb_bswap64 (uint64_t x)
175 { 271 {
176 return ((x >> 8) & 0xff) 272 return (((uint64_t)ecb_bswap32 (x)) << 32) | ecb_bswap32 (x >> 32);
177 | ((x << 8) & 0x00ff0000)
178 | (x << 24);
179 } 273 }
180#endif 274#endif
181 275
182#if ECB_GCC_VERSION(4,5) 276#if ECB_GCC_VERSION(4,5)
183 #define ecb_unreachable() __builtin_unreachable () 277 #define ecb_unreachable() __builtin_unreachable ()
… …
197 const uint32_t u = 0x11223344; 291 const uint32_t u = 0x11223344;
198 return *(unsigned char *)&u; 292 return *(unsigned char *)&u;
199} 293}
200 294
201ecb_function_ ecb_bool ecb_big_endian (void) ecb_const; 295ecb_function_ ecb_bool ecb_big_endian (void) ecb_const;
202ecb_function_ ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; }; 296ecb_function_ ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; }
203ecb_function_ ecb_bool ecb_little_endian (void) ecb_const; 297ecb_function_ ecb_bool ecb_little_endian (void) ecb_const;
204ecb_function_ ecb_bool ecb_little_endian (void) { return ecb_byteorder_helper () == 0x44; }; 298ecb_function_ ecb_bool ecb_little_endian (void) { return ecb_byteorder_helper () == 0x44; }
205 299
206#if ECB_GCC_VERSION(3,0) || ECB_C99 300#if ECB_GCC_VERSION(3,0) || ECB_C99
207 #define ecb_mod(m,n) ((m) % (n) + ((m) % (n) < 0 ? (n) : 0)) 301 #define ecb_mod(m,n) ((m) % (n) + ((m) % (n) < 0 ? (n) : 0))
208#else 302#else
209 #define ecb_mod(m,n) ((m) < 0 ? ((n) - 1 - ((-1 - (m)) % (n))) : ((m) % (n))) 303 #define ecb_mod(m,n) ((m) < 0 ? ((n) - 1 - ((-1 - (m)) % (n))) : ((m) % (n)))
… …
218 } 312 }
219#else 313#else
220 #define ecb_array_length(name) (sizeof (name) / sizeof (name [0])) 314 #define ecb_array_length(name) (sizeof (name) / sizeof (name [0]))
221#endif 315#endif
222 316
223ECB_INLINE uint32_t ecb_rotr32 (uint32_t x, unsigned int count) ecb_const;
224ECB_INLINE uint32_t
225ecb_rotr32 (uint32_t x, unsigned int count)
226{
227 return (x << (32 - count)) | (x >> count);
228}
229
230ECB_INLINE uint32_t ecb_rotl32 (uint32_t x, unsigned int count) ecb_const;
231ECB_INLINE uint32_t
232ecb_rotl32 (uint32_t x, unsigned int count)
233{
234 return (x >> (32 - count)) | (x << count);
235}
236
237#endif 317#endif
238 318

Diff Legend

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