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

Comparing libecb/ecb.h (file contents):
Revision 1.37 by root, Sat Jun 11 13:47:47 2011 UTC vs.
Revision 1.64 by root, Thu Aug 4 14:47:53 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 /* _MSC_VER || __BORLANDC__ */
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 enormous 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
66/*****************************************************************************/
67
68/* ECB_NO_THREADS - ecb is not used by multiple threads, ever */
69/* ECB_NO_SMP - ecb might be used in multiple threads, but only on a single cpu */
70
71#if ECB_NO_THREADS || ECB_NO_SMP
72 #define ECB_MEMORY_FENCE do { } while (0)
73#endif
74
75#ifndef ECB_MEMORY_FENCE
76 #if ECB_GCC_VERSION(2,5)
77 #if __x86
78 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("lock; orb $0, -1(%%esp)" : : : "memory")
79 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE /* non-lock xchg might be enough */
80 #define ECB_MEMORY_FENCE_RELEASE do { } while (0) /* unlikely to change in future cpus */
81 #elif __amd64
82 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mfence" : : : "memory")
83 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("lfence" : : : "memory")
84 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("sfence") /* play safe - not needed in any current cpu */
85 #elif __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__
86 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory")
87 #elif defined(__ARM_ARCH_6__ ) || defined(__ARM_ARCH_6J__ ) \
88 || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6ZK__)
89 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mcr p15,0,%0,c7,c10,4" : : "r" (0) : "memory")
90 #elif defined(__ARM_ARCH_7__ ) || defined(__ARM_ARCH_7A__ ) \
91 || defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7R__ )
92 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("dsb" : : : "memory")
93 #endif
94 #endif
95#endif
96
97#ifndef ECB_MEMORY_FENCE
98 #if ECB_GCC_VERSION(4,4) || defined(__INTEL_COMPILER)
99 #define ECB_MEMORY_FENCE __sync_synchronize ()
100 /*#define ECB_MEMORY_FENCE_ACQUIRE ({ char dummy = 0; __sync_lock_test_and_set (&dummy, 1); }) */
101 /*#define ECB_MEMORY_FENCE_RELEASE ({ char dummy = 1; __sync_lock_release (&dummy ); }) */
102 #elif _MSC_VER >= 1400 /* VC++ 2005 */
103 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier)
104 #define ECB_MEMORY_FENCE _ReadWriteBarrier ()
105 #define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier () /* according to msdn, _ReadBarrier is not a load fence */
106 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier ()
107 #elif defined(_WIN32)
108 #include <WinNT.h>
109 #define ECB_MEMORY_FENCE MemoryBarrier () /* actually just xchg on x86... scary */
110 #endif
111#endif
112
113#ifndef ECB_MEMORY_FENCE
114 #if !ECB_AVOID_PTHREADS
115 /*
116 * if you get undefined symbol references to pthread_mutex_lock,
117 * or failure to find pthread.h, then you should implement
118 * the ECB_MEMORY_FENCE operations for your cpu/compiler
119 * OR provide pthread.h and link against the posix thread library
120 * of your system.
121 */
122 #include <pthread.h>
123 #define ECB_NEEDS_PTHREADS 1
124 #define ECB_MEMORY_FENCE_NEEDS_PTHREADS 1
125
126 static pthread_mutex_t ecb_mf_lock = PTHREAD_MUTEX_INITIALIZER;
127 #define ECB_MEMORY_FENCE do { pthread_mutex_lock (&ecb_mf_lock); pthread_mutex_unlock (&ecb_mf_lock); } while (0)
128 #endif
129#endif
130
131#if !defined(ECB_MEMORY_FENCE_ACQUIRE) && defined(ECB_MEMORY_FENCE)
132 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE
133#endif
134
135#if !defined(ECB_MEMORY_FENCE_RELEASE) && defined(ECB_MEMORY_FENCE)
136 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
137#endif
138
139/*****************************************************************************/
140
141#define ECB_C99 (__STDC_VERSION__ >= 199901L)
142
50#ifndef __cplusplus 143#if __cplusplus
51 #if __STDC_VERSION__ >= 199901L 144 #define ecb_inline static inline
52 #define ECB_INLINE static inline 145#elif ECB_GCC_VERSION(2,5)
53 typedef _Bool ecb_bool; 146 #define ecb_inline static __inline__
147#elif ECB_C99
148 #define ecb_inline static inline
54 #else 149#else
55 #define ECB_INLINE static inline /* we assume the extension is ubiquituous, please tell us when we are wrong, or upgrade to the GCC */ 150 #define ecb_inline static
151#endif
152
153#if ECB_GCC_VERSION(3,3)
154 #define ecb_restrict __restrict__
155#elif ECB_C99
156 #define ecb_restrict restrict
157#else
158 #define ecb_restrict
159#endif
160
56 typedef int ecb_bool; 161typedef int ecb_bool;
57 #endif
58#else
59 #define ECB_INLINE static inline
60 typedef bool ecb_bool;
61#endif
62 162
63#define ECB_CONCAT_(a, b) a ## b 163#define ECB_CONCAT_(a, b) a ## b
64#define ECB_CONCAT(a, b) ECB_CONCAT_(a, b) 164#define ECB_CONCAT(a, b) ECB_CONCAT_(a, b)
65#define ECB_STRINGIFY_(a) # a 165#define ECB_STRINGIFY_(a) # a
66#define ECB_STRINGIFY(a) ECB_STRINGIFY_(a) 166#define ECB_STRINGIFY(a) ECB_STRINGIFY_(a)
67 167
68#define ECB_HEADER_INLINE ECB_INLINE 168#define ecb_function_ ecb_inline
69 169
70#if ECB_GCC_VERSION(3,1) 170#if ECB_GCC_VERSION(3,1)
71 #define ecb_attribute(attrlist) __attribute__(attrlist) 171 #define ecb_attribute(attrlist) __attribute__(attrlist)
72 #define ecb_is_constant(expr) __builtin_constant_p (expr) 172 #define ecb_is_constant(expr) __builtin_constant_p (expr)
73 #define ecb_expect(expr,value) __builtin_expect ((expr),(value)) 173 #define ecb_expect(expr,value) __builtin_expect ((expr),(value))
… …
81 181
82/* no emulation for ecb_decltype */ 182/* no emulation for ecb_decltype */
83#if ECB_GCC_VERSION(4,5) 183#if ECB_GCC_VERSION(4,5)
84 #define ecb_decltype(x) __decltype(x) 184 #define ecb_decltype(x) __decltype(x)
85#elif ECB_GCC_VERSION(3,0) 185#elif ECB_GCC_VERSION(3,0)
86 #define ecb_decltype(x) typeof(x) 186 #define ecb_decltype(x) __typeof(x)
87#endif 187#endif
88 188
89#define ecb_noinline ecb_attribute ((__noinline__)) 189#define ecb_noinline ecb_attribute ((__noinline__))
90#define ecb_noreturn ecb_attribute ((__noreturn__)) 190#define ecb_noreturn ecb_attribute ((__noreturn__))
91#define ecb_unused ecb_attribute ((__unused__)) 191#define ecb_unused ecb_attribute ((__unused__))
92#define ecb_const ecb_attribute ((__const__)) 192#define ecb_const ecb_attribute ((__const__))
93#define ecb_pure ecb_attribute ((__pure__)) 193#define ecb_pure ecb_attribute ((__pure__))
94 194
95#if ECB_GCC_VERSION(4,3) 195#if ECB_GCC_VERSION(4,3)
96 #define ecb_artificial ecb_attribute ((__artificial__)) /* 4.3 */ 196 #define ecb_artificial ecb_attribute ((__artificial__))
97 #define ecb_hot ecb_attribute ((__hot__)) /* 4.3 */ 197 #define ecb_hot ecb_attribute ((__hot__))
98 #define ecb_cold ecb_attribute ((__cold__)) /* 4.3 */ 198 #define ecb_cold ecb_attribute ((__cold__))
99#else 199#else
100 #define ecb_artificial 200 #define ecb_artificial
101 #define ecb_hot 201 #define ecb_hot
102 #define ecb_cold 202 #define ecb_cold
103#endif 203#endif
104 204
105/* put into if's if you are very sure that the expression */ 205/* put around conditional expressions if you are very sure that the */
106/* is mostly true or mostly false. note that these return */ 206/* expression is mostly true or mostly false. note that these return */
107/* booleans, not the expression. */ 207/* booleans, not the expression. */
108#define ecb_expect_false(expr) ecb_expect (!!(expr), 0) 208#define ecb_expect_false(expr) ecb_expect (!!(expr), 0)
109#define ecb_expect_true(expr) ecb_expect (!!(expr), 1) 209#define ecb_expect_true(expr) ecb_expect (!!(expr), 1)
110/* for compatibility to the rest of the world */ 210/* for compatibility to the rest of the world */
111#define ecb_likely(expr) ecb_expect_true (expr) 211#define ecb_likely(expr) ecb_expect_true (expr)
112#define ecb_unlikely(expr) ecb_expect_false (expr) 212#define ecb_unlikely(expr) ecb_expect_false (expr)
113 213
114/* try to tell the compiler that some condition is definitely true */
115#define ecb_assume(cond) do { if (!(cond)) ecb_unreachable (); } while (0)
116
117/* count trailing zero bits and count # of one bits */ 214/* count trailing zero bits and count # of one bits */
118#if ECB_GCC_VERSION(3,4) 215#if ECB_GCC_VERSION(3,4)
216 /* we assume int == 32 bit, long == 32 or 64 bit and long long == 64 bit */
217 #define ecb_ld32(x) (__builtin_clz (x) ^ 31)
218 #define ecb_ld64(x) (__builtin_clzll (x) ^ 63)
119 #define ecb_ctz32(x) __builtin_ctz (x) 219 #define ecb_ctz32(x) __builtin_ctz (x)
220 #define ecb_ctz64(x) __builtin_ctzll (x)
120 #define ecb_popcount32(x) __builtin_popcount (x) 221 #define ecb_popcount32(x) __builtin_popcount (x)
222 /* no popcountll */
121#else 223#else
122 ECB_HEADER_INLINE int ecb_ctz32 (uint32_t x) ecb_const; 224 ecb_function_ int ecb_ctz32 (uint32_t x) ecb_const;
123 ECB_HEADER_INLINE int 225 ecb_function_ int
124 ecb_ctz32 (uint32_t x) 226 ecb_ctz32 (uint32_t x)
125 { 227 {
126 int r = 0; 228 int r = 0;
127 229
128 x &= -x; /* this isolates the lowest bit */ 230 x &= ~x + 1; /* this isolates the lowest bit */
129 231
232#if ECB_branchless_on_i386
233 r += !!(x & 0xaaaaaaaa) << 0;
234 r += !!(x & 0xcccccccc) << 1;
235 r += !!(x & 0xf0f0f0f0) << 2;
236 r += !!(x & 0xff00ff00) << 3;
237 r += !!(x & 0xffff0000) << 4;
238#else
130 if (x & 0xaaaaaaaa) r += 1; 239 if (x & 0xaaaaaaaa) r += 1;
131 if (x & 0xcccccccc) r += 2; 240 if (x & 0xcccccccc) r += 2;
132 if (x & 0xf0f0f0f0) r += 4; 241 if (x & 0xf0f0f0f0) r += 4;
133 if (x & 0xff00ff00) r += 8; 242 if (x & 0xff00ff00) r += 8;
134 if (x & 0xffff0000) r += 16; 243 if (x & 0xffff0000) r += 16;
244#endif
135 245
136 return r; 246 return r;
137 } 247 }
138 248
249 ecb_function_ int ecb_ctz64 (uint64_t x) ecb_const;
250 ecb_function_ int
251 ecb_ctz64 (uint64_t x)
252 {
253 int shift = x & 0xffffffffU ? 0 : 32;
254 return ecb_ctz32 (x >> shift) + shift;
255 }
256
139 ECB_HEADER_INLINE int ecb_popcount32 (uint32_t x) ecb_const; 257 ecb_function_ int ecb_popcount32 (uint32_t x) ecb_const;
140 ECB_HEADER_INLINE int 258 ecb_function_ int
141 ecb_popcount32 (uint32_t x) 259 ecb_popcount32 (uint32_t x)
142 { 260 {
143 x -= (x >> 1) & 0x55555555; 261 x -= (x >> 1) & 0x55555555;
144 x = ((x >> 2) & 0x33333333) + (x & 0x33333333); 262 x = ((x >> 2) & 0x33333333) + (x & 0x33333333);
145 x = ((x >> 4) + x) & 0x0f0f0f0f; 263 x = ((x >> 4) + x) & 0x0f0f0f0f;
146 x *= 0x01010101; 264 x *= 0x01010101;
147 265
148 return x >> 24; 266 return x >> 24;
149 } 267 }
268
269 ecb_function_ int ecb_ld32 (uint32_t x) ecb_const;
270 ecb_function_ int ecb_ld32 (uint32_t x)
271 {
272 int r = 0;
273
274 if (x >> 16) { x >>= 16; r += 16; }
275 if (x >> 8) { x >>= 8; r += 8; }
276 if (x >> 4) { x >>= 4; r += 4; }
277 if (x >> 2) { x >>= 2; r += 2; }
278 if (x >> 1) { r += 1; }
279
280 return r;
281 }
282
283 ecb_function_ int ecb_ld64 (uint64_t x) ecb_const;
284 ecb_function_ int ecb_ld64 (uint64_t x)
285 {
286 int r = 0;
287
288 if (x >> 32) { x >>= 32; r += 32; }
289
290 return r + ecb_ld32 (x);
291 }
150#endif 292#endif
293
294/* popcount64 is only available on 64 bit cpus as gcc builtin */
295/* so for this version we are lazy */
296ecb_function_ int ecb_popcount64 (uint64_t x) ecb_const;
297ecb_function_ int
298ecb_popcount64 (uint64_t x)
299{
300 return ecb_popcount32 (x) + ecb_popcount32 (x >> 32);
301}
302
303ecb_inline uint8_t ecb_rotl8 (uint8_t x, unsigned int count) ecb_const;
304ecb_inline uint8_t ecb_rotr8 (uint8_t x, unsigned int count) ecb_const;
305ecb_inline uint16_t ecb_rotl16 (uint16_t x, unsigned int count) ecb_const;
306ecb_inline uint16_t ecb_rotr16 (uint16_t x, unsigned int count) ecb_const;
307ecb_inline uint32_t ecb_rotl32 (uint32_t x, unsigned int count) ecb_const;
308ecb_inline uint32_t ecb_rotr32 (uint32_t x, unsigned int count) ecb_const;
309ecb_inline uint64_t ecb_rotl64 (uint64_t x, unsigned int count) ecb_const;
310ecb_inline uint64_t ecb_rotr64 (uint64_t x, unsigned int count) ecb_const;
311
312ecb_inline uint8_t ecb_rotl8 (uint8_t x, unsigned int count) { return (x >> ( 8 - count)) | (x << count); }
313ecb_inline uint8_t ecb_rotr8 (uint8_t x, unsigned int count) { return (x << ( 8 - count)) | (x >> count); }
314ecb_inline uint16_t ecb_rotl16 (uint16_t x, unsigned int count) { return (x >> (16 - count)) | (x << count); }
315ecb_inline uint16_t ecb_rotr16 (uint16_t x, unsigned int count) { return (x << (16 - count)) | (x >> count); }
316ecb_inline uint32_t ecb_rotl32 (uint32_t x, unsigned int count) { return (x >> (32 - count)) | (x << count); }
317ecb_inline uint32_t ecb_rotr32 (uint32_t x, unsigned int count) { return (x << (32 - count)) | (x >> count); }
318ecb_inline uint64_t ecb_rotl64 (uint64_t x, unsigned int count) { return (x >> (64 - count)) | (x << count); }
319ecb_inline uint64_t ecb_rotr64 (uint64_t x, unsigned int count) { return (x << (64 - count)) | (x >> count); }
151 320
152#if ECB_GCC_VERSION(4,3) 321#if ECB_GCC_VERSION(4,3)
153 #define ecb_bswap32(x) __builtin_bswap32 (x)
154 #define ecb_bswap16(x) (__builtin_bswap32(x) >> 16) 322 #define ecb_bswap16(x) (__builtin_bswap32 (x) >> 16)
323 #define ecb_bswap32(x) __builtin_bswap32 (x)
324 #define ecb_bswap64(x) __builtin_bswap64 (x)
155#else 325#else
326 ecb_function_ uint16_t ecb_bswap16 (uint16_t x) ecb_const;
327 ecb_function_ uint16_t
328 ecb_bswap16 (uint16_t x)
329 {
330 return ecb_rotl16 (x, 8);
331 }
332
156 ECB_HEADER_INLINE uint32_t ecb_bswap32 (uint32_t x) ecb_const; 333 ecb_function_ uint32_t ecb_bswap32 (uint32_t x) ecb_const;
157 ECB_HEADER_INLINE uint32_t 334 ecb_function_ uint32_t
158 ecb_bswap32 (uint32_t x) 335 ecb_bswap32 (uint32_t x)
159 { 336 {
160 return (x >> 24) 337 return (((uint32_t)ecb_bswap16 (x)) << 16) | ecb_bswap16 (x >> 16);
161 | ((x >> 8) & 0x0000ff00)
162 | ((x << 8) & 0x00ff0000)
163 | (x << 24);
164 } 338 }
165 339
166 ECB_HEADER_INLINE uint32_t ecb_bswap16 (uint32_t x) ecb_const; 340 ecb_function_ uint64_t ecb_bswap64 (uint64_t x) ecb_const;
167 ECB_HEADER_INLINE uint32_t 341 ecb_function_ uint64_t
168 ecb_bswap16 (uint32_t x) 342 ecb_bswap64 (uint64_t x)
169 { 343 {
170 return ((x >> 8) & 0xff) 344 return (((uint64_t)ecb_bswap32 (x)) << 32) | ecb_bswap32 (x >> 32);
171 | ((x << 8) & 0x00ff0000)
172 | (x << 24);
173 } 345 }
174#endif 346#endif
175 347
176#if ECB_GCC_VERSION(4,5) 348#if ECB_GCC_VERSION(4,5)
177 #define ecb_unreachable() __builtin_unreachable () 349 #define ecb_unreachable() __builtin_unreachable ()
178#else 350#else
179 /* this seems to work fine, but gcc always emits a warning for it :/ */ 351 /* this seems to work fine, but gcc always emits a warning for it :/ */
180 ECB_HEADER_INLINE void ecb_unreachable (void) ecb_noreturn; 352 ecb_function_ void ecb_unreachable (void) ecb_noreturn;
181 ECB_HEADER_INLINE void ecb_unreachable (void) { } 353 ecb_function_ void ecb_unreachable (void) { }
182#endif 354#endif
183 355
356/* try to tell the compiler that some condition is definitely true */
357#define ecb_assume(cond) do { if (!(cond)) ecb_unreachable (); } while (0)
358
184ECB_HEADER_INLINE unsigned char ecb_byteorder_helper (void) ecb_const; 359ecb_function_ unsigned char ecb_byteorder_helper (void) ecb_const;
185ECB_HEADER_INLINE unsigned char 360ecb_function_ unsigned char
186ecb_byteorder_helper (void) 361ecb_byteorder_helper (void)
187{ 362{
188 const uint32_t u = 0x11223344; 363 const uint32_t u = 0x11223344;
189 return *(unsigned char *)&u; 364 return *(unsigned char *)&u;
190} 365}
191 366
192ECB_HEADER_INLINE ecb_bool ecb_big_endian (void) ecb_const; 367ecb_function_ ecb_bool ecb_big_endian (void) ecb_const;
193ECB_HEADER_INLINE ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; }; 368ecb_function_ ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; }
194ECB_HEADER_INLINE ecb_bool ecb_little_endian (void) ecb_const; 369ecb_function_ ecb_bool ecb_little_endian (void) ecb_const;
195ECB_HEADER_INLINE ecb_bool ecb_little_endian (void) { return ecb_byteorder_helper () == 0x44; }; 370ecb_function_ ecb_bool ecb_little_endian (void) { return ecb_byteorder_helper () == 0x44; }
196 371
197#if ECB_GCC_VERSION(3,0) 372#if ECB_GCC_VERSION(3,0) || ECB_C99
198 #define ecb_mod(m,n) ((m) % (n) + ((m) % (n) < 0 ? (n) : 0)) 373 #define ecb_mod(m,n) ((m) % (n) + ((m) % (n) < 0 ? (n) : 0))
199#else 374#else
200 #define ecb_mod(m,n) ((m) < 0 ? ((n) - 1 - ((-1 - (m)) % (n))) : ((m) % (n))) 375 #define ecb_mod(m,n) ((m) < 0 ? ((n) - 1 - ((-1 - (m)) % (n))) : ((m) % (n)))
201#endif 376#endif
202 377
203#if ecb_cplusplus_does_not_suck 378#if ecb_cplusplus_does_not_suck
204 // does not work for local types (http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2657.htm) 379 /* does not work for local types (http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2657.htm) */
205 template<typename T, int N> 380 template<typename T, int N>
206 static inline int ecb_array_length (const T (&arr)[N]) 381 static inline int ecb_array_length (const T (&arr)[N])
207 { 382 {
208 return N; 383 return N;
209 } 384 }
210#else 385#else
211 #define ecb_array_length(name) (sizeof (name) / sizeof (name [0])) 386 #define ecb_array_length(name) (sizeof (name) / sizeof (name [0]))
212#endif 387#endif
213 388
214ECB_INLINE uint32_t ecb_rotr32 (uint32_t x, unsigned int count) ecb_const;
215ECB_INLINE uint32_t
216ecb_rotr32 (uint32_t x, unsigned int count)
217{
218 return (x << (32 - count)) | (x >> count);
219}
220
221ECB_INLINE uint32_t ecb_rotl32 (uint32_t x, unsigned int count) ecb_const;
222ECB_INLINE uint32_t
223ecb_rotl32 (uint32_t x, unsigned int count)
224{
225 return (x >> (32 - count)) | (x << count);
226}
227
228#endif 389#endif
229 390

Diff Legend

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