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

Comparing libecb/ecb.h (file contents):
Revision 1.64 by root, Thu Aug 4 14:47:53 2011 UTC vs.
Revision 1.70 by root, Sat Dec 10 11:58:38 2011 UTC

… …
71#if ECB_NO_THREADS || ECB_NO_SMP 71#if ECB_NO_THREADS || ECB_NO_SMP
72 #define ECB_MEMORY_FENCE do { } while (0) 72 #define ECB_MEMORY_FENCE do { } while (0)
73#endif 73#endif
74 74
75#ifndef ECB_MEMORY_FENCE 75#ifndef ECB_MEMORY_FENCE
76 #if ECB_GCC_VERSION(2,5) 76 #if ECB_GCC_VERSION(2,5) || defined(__INTEL_COMPILER) || defined(__clang__)
77 #if __x86 77 #if __i386__
78 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("lock; orb $0, -1(%%esp)" : : : "memory") 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 */ 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 */ 80 #define ECB_MEMORY_FENCE_RELEASE do { } while (0) /* unlikely to change in future cpus */
81 #elif __amd64 81 #elif __amd64
82 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mfence" : : : "memory") 82 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mfence" : : : "memory")
… …
84 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("sfence") /* play safe - not needed in any current cpu */ 84 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("sfence") /* play safe - not needed in any current cpu */
85 #elif __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__ 85 #elif __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__
86 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory") 86 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory")
87 #elif defined(__ARM_ARCH_6__ ) || defined(__ARM_ARCH_6J__ ) \ 87 #elif defined(__ARM_ARCH_6__ ) || defined(__ARM_ARCH_6J__ ) \
88 || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6ZK__) 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") 89 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mcr p15,0,%0,c7,c10,5" : : "r" (0) : "memory")
90 #elif defined(__ARM_ARCH_7__ ) || defined(__ARM_ARCH_7A__ ) \ 90 #elif defined(__ARM_ARCH_7__ ) || defined(__ARM_ARCH_7A__ ) \
91 || defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7R__ ) 91 || defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7R__ )
92 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("dsb" : : : "memory") 92 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("dmb" : : : "memory")
93 #endif 93 #endif
94 #endif 94 #endif
95#endif 95#endif
96 96
97#ifndef ECB_MEMORY_FENCE 97#ifndef ECB_MEMORY_FENCE
98 #if ECB_GCC_VERSION(4,4) || defined(__INTEL_COMPILER) 98 #if ECB_GCC_VERSION(4,4) || defined(__INTEL_COMPILER) || defined(__clang__)
99 #define ECB_MEMORY_FENCE __sync_synchronize () 99 #define ECB_MEMORY_FENCE __sync_synchronize ()
100 /*#define ECB_MEMORY_FENCE_ACQUIRE ({ char dummy = 0; __sync_lock_test_and_set (&dummy, 1); }) */ 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 ); }) */ 101 /*#define ECB_MEMORY_FENCE_RELEASE ({ char dummy = 1; __sync_lock_release (&dummy ); }) */
102 #elif _MSC_VER >= 1400 /* VC++ 2005 */ 102 #elif _MSC_VER >= 1400 /* VC++ 2005 */
103 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier) 103 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier)
… …
289 289
290 return r + ecb_ld32 (x); 290 return r + ecb_ld32 (x);
291 } 291 }
292#endif 292#endif
293 293
294ecb_function_ uint8_t ecb_bitrev8 (uint8_t x)
295{
296 return ( (x * 0x0802U & 0x22110U)
297 | (x * 0x8020U & 0x88440U)) * 0x10101U >> 16;
298}
299
300ecb_function_ uint16_t ecb_bitrev16 (uint16_t x)
301{
302 x = ((x >> 1) & 0x5555) | ((x & 0x5555) << 1);
303 x = ((x >> 2) & 0x3333) | ((x & 0x3333) << 2);
304 x = ((x >> 4) & 0x0f0f) | ((x & 0x0f0f) << 4);
305 x = ( x >> 8 ) | ( x << 8);
306
307 return x;
308}
309
310ecb_function_ uint32_t ecb_bitrev32 (uint32_t x)
311{
312 x = ((x >> 1) & 0x55555555) | ((x & 0x55555555) << 1);
313 x = ((x >> 2) & 0x33333333) | ((x & 0x33333333) << 2);
314 x = ((x >> 4) & 0x0f0f0f0f) | ((x & 0x0f0f0f0f) << 4);
315 x = ((x >> 8) & 0x00ff00ff) | ((x & 0x00ff00ff) << 8);
316 x = ( x >> 16 ) | ( x << 16);
317
318 return x;
319}
320
294/* popcount64 is only available on 64 bit cpus as gcc builtin */ 321/* popcount64 is only available on 64 bit cpus as gcc builtin */
295/* so for this version we are lazy */ 322/* so for this version we are lazy */
296ecb_function_ int ecb_popcount64 (uint64_t x) ecb_const; 323ecb_function_ int ecb_popcount64 (uint64_t x) ecb_const;
297ecb_function_ int 324ecb_function_ int
298ecb_popcount64 (uint64_t x) 325ecb_popcount64 (uint64_t x)
… …
373 #define ecb_mod(m,n) ((m) % (n) + ((m) % (n) < 0 ? (n) : 0)) 400 #define ecb_mod(m,n) ((m) % (n) + ((m) % (n) < 0 ? (n) : 0))
374#else 401#else
375 #define ecb_mod(m,n) ((m) < 0 ? ((n) - 1 - ((-1 - (m)) % (n))) : ((m) % (n))) 402 #define ecb_mod(m,n) ((m) < 0 ? ((n) - 1 - ((-1 - (m)) % (n))) : ((m) % (n)))
376#endif 403#endif
377 404
405#if __cplusplus
406 template<typename T>
407 static inline T ecb_div_rd (T val, T div)
408 {
409 return val < 0 ? - ((-val + div - 1) / div) : (val ) / div;
410 }
411 template<typename T>
412 static inline T ecb_div_ru (T val, T div)
413 {
414 return val < 0 ? - ((-val ) / div) : (val + div - 1) / div;
415 }
416#else
417 #define ecb_div_rd(val,div) ((val) < 0 ? - ((-(val) + (div) - 1) / (div)) : ((val) ) / (div))
418 #define ecb_div_ru(val,div) ((val) < 0 ? - ((-(val) ) / (div)) : ((val) + (div) - 1) / (div))
419#endif
420
378#if ecb_cplusplus_does_not_suck 421#if ecb_cplusplus_does_not_suck
379 /* does not work for local types (http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2657.htm) */ 422 /* does not work for local types (http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2657.htm) */
380 template<typename T, int N> 423 template<typename T, int N>
381 static inline int ecb_array_length (const T (&arr)[N]) 424 static inline int ecb_array_length (const T (&arr)[N])
382 { 425 {

Diff Legend

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