[ViewVC] Diff of: cvs/libecb/ecb.h

Comparing libecb/ecb.h (file contents):
Revision 1.46 by root, Fri Jun 17 15:17:26 2011 UTC vs.
Revision 1.78 by root, Sat Feb 4 15:17:22 2012 UTC

…		…
1	/*	1	/*
2	* libecb - http://software.schmorp.de/pkg/libecb	2	* libecb - http://software.schmorp.de/pkg/libecb
3	*	3	*
4	* Copyright (©) 2009-2011 Marc Alexander Lehmann <libecb@schmorp.de>	4	* Copyright (©) 2009-2012 Marc Alexander Lehmann <libecb@schmorp.de>
5	* Copyright (©) 2011 Emanuele Giaquinta	5	* Copyright (©) 2011 Emanuele Giaquinta
6	* All rights reserved.	6	* All rights reserved.
7	*	7	*
8	* Redistribution and use in source and binary forms, with or without modifica-	8	* Redistribution and use in source and binary forms, with or without modifica-
9	* tion, are permitted provided that the following conditions are met:	9	* tion, are permitted provided that the following conditions are met:
38	typedef signed int int32_t;	38	typedef signed int int32_t;
39	typedef unsigned int uint32_t;	39	typedef unsigned int uint32_t;
40	#if __GNUC__	40	#if __GNUC__
41	typedef signed long long int64_t;	41	typedef signed long long int64_t;
42	typedef unsigned long long uint64_t;	42	typedef unsigned long long uint64_t;
43	#else	43	#else /* _MSC_VER \|\| __BORLANDC__ */
44	typedef signed __int64 int64_t;	44	typedef signed __int64 int64_t;
45	typedef unsigned __int64 uint64_t;	45	typedef unsigned __int64 uint64_t;
46	#endif	46	#endif
47	#else	47	#else
48	#include <inttypes.h>	48	#include <inttypes.h>
49	#endif	49	#endif
50		50
51	/* many compilers define _GNUC_ to some versions but then only implement	51	/* many compilers define _GNUC_ to some versions but then only implement
52	* what their idiot authors think are the "more important" extensions,	52	* what their idiot authors think are the "more important" extensions,
53	* causing enourmous grief in return for some better fake benchmark numbers.	53	* causing enormous grief in return for some better fake benchmark numbers.
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
		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) \|\| defined(__INTEL_COMPILER) \|\| (__llvm__ && __GNUC__) \|\| __SUNPRO_C >= 0x5110 \|\| __SUNPRO_CC >= 0x5110
		77	#if __i386 \|\| __i386__
		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 \|\| __amd64__ \|\| __x86_64 \|\| __x86_64__
		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,5" : : "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__ ("dmb" : : : "memory")
		93	#elif __sparc \|\| __sparc__
		94	#define ECB_MEMORY_FENCE __asm__ __volatile__ ("membar #LoadStore \| #LoadLoad \| #StoreStore \| #StoreLoad \| " : : : "memory")
		95	#define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("membar #LoadStore \| #LoadLoad" : : : "memory")
		96	#define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("membar #LoadStore \| #StoreStore")
		97	#elif defined(__s390__) \|\| defined(__s390x__)
		98	#define ECB_MEMORY_FENCE __asm__ __volatile__ ("bcr 15,0" : : : "memory")
		99	#endif
		100	#endif
		101	#endif
		102
		103	#ifndef ECB_MEMORY_FENCE
		104	#if ECB_GCC_VERSION(4,4) \|\| defined(__INTEL_COMPILER) \|\| defined(__clang__)
		105	#define ECB_MEMORY_FENCE __sync_synchronize ()
		106	/#define ECB_MEMORY_FENCE_ACQUIRE ({ char dummy = 0; __sync_lock_test_and_set (&dummy, 1); }) /
		107	/#define ECB_MEMORY_FENCE_RELEASE ({ char dummy = 1; __sync_lock_release (&dummy ); }) /
		108	#elif _MSC_VER >= 1400 /* VC++ 2005 */
		109	#pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier)
		110	#define ECB_MEMORY_FENCE _ReadWriteBarrier ()
		111	#define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier () /* according to msdn, _ReadBarrier is not a load fence */
		112	#define ECB_MEMORY_FENCE_RELEASE _WriteBarrier ()
		113	#elif defined(_WIN32)
		114	#include <WinNT.h>
		115	#define ECB_MEMORY_FENCE MemoryBarrier () /* actually just xchg on x86... scary */
		116	#elif __SUNPRO_C >= 0x5110 \|\| __SUNPRO_CC >= 0x5110
		117	#include <mbarrier.h>
		118	#define ECB_MEMORY_FENCE __machine_rw_barrier ()
		119	#define ECB_MEMORY_FENCE_ACQUIRE __machine_r_barrier ()
		120	#define ECB_MEMORY_FENCE_RELEASE __machine_w_barrier ()
		121	#endif
		122	#endif
		123
		124	#ifndef ECB_MEMORY_FENCE
		125	#if !ECB_AVOID_PTHREADS
		126	/*
		127	* if you get undefined symbol references to pthread_mutex_lock,
		128	* or failure to find pthread.h, then you should implement
		129	* the ECB_MEMORY_FENCE operations for your cpu/compiler
		130	* OR provide pthread.h and link against the posix thread library
		131	* of your system.
		132	*/
		133	#include <pthread.h>
		134	#define ECB_NEEDS_PTHREADS 1
		135	#define ECB_MEMORY_FENCE_NEEDS_PTHREADS 1
		136
		137	static pthread_mutex_t ecb_mf_lock = PTHREAD_MUTEX_INITIALIZER;
		138	#define ECB_MEMORY_FENCE do { pthread_mutex_lock (&ecb_mf_lock); pthread_mutex_unlock (&ecb_mf_lock); } while (0)
		139	#endif
		140	#endif
		141
		142	#if !defined(ECB_MEMORY_FENCE_ACQUIRE) && defined(ECB_MEMORY_FENCE)
		143	#define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE
		144	#endif
		145
		146	#if !defined(ECB_MEMORY_FENCE_RELEASE) && defined(ECB_MEMORY_FENCE)
		147	#define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
		148	#endif
		149
		150	/*****************************************************************************/
65		151
66	#define ECB_C99 (__STDC_VERSION__ >= 199901L)	152	#define ECB_C99 (__STDC_VERSION__ >= 199901L)
67		153
68	#if __cplusplus	154	#if __cplusplus
69	#define ecb_inline static inline	155	#define ecb_inline static inline
…		…
136	#define ecb_likely(expr) ecb_expect_true (expr)	222	#define ecb_likely(expr) ecb_expect_true (expr)
137	#define ecb_unlikely(expr) ecb_expect_false (expr)	223	#define ecb_unlikely(expr) ecb_expect_false (expr)
138		224
139	/* count trailing zero bits and count # of one bits */	225	/* count trailing zero bits and count # of one bits */
140	#if ECB_GCC_VERSION(3,4)	226	#if ECB_GCC_VERSION(3,4)
		227	/* we assume int == 32 bit, long == 32 or 64 bit and long long == 64 bit */
		228	#define ecb_ld32(x) (__builtin_clz (x) ^ 31)
		229	#define ecb_ld64(x) (__builtin_clzll (x) ^ 63)
141	#define ecb_ctz32(x) __builtin_ctz (x)	230	#define ecb_ctz32(x) __builtin_ctz (x)
		231	#define ecb_ctz64(x) __builtin_ctzll (x)
142	#define ecb_popcount32(x) __builtin_popcount (x)	232	#define ecb_popcount32(x) __builtin_popcount (x)
		233	/* no popcountll */
143	#else	234	#else
144	ecb_function_ int ecb_ctz32 (uint32_t x) ecb_const;	235	ecb_function_ int ecb_ctz32 (uint32_t x) ecb_const;
145	ecb_function_ int	236	ecb_function_ int
146	ecb_ctz32 (uint32_t x)	237	ecb_ctz32 (uint32_t x)
147	{	238	{
148	int r = 0;	239	int r = 0;
149		240
150	x &= (uint32_t)-(int32_t)x; /* this isolates the lowest bit */	241	x &= ~x + 1; /* this isolates the lowest bit */
151		242
		243	#if ECB_branchless_on_i386
		244	r += !!(x & 0xaaaaaaaa) << 0;
		245	r += !!(x & 0xcccccccc) << 1;
		246	r += !!(x & 0xf0f0f0f0) << 2;
		247	r += !!(x & 0xff00ff00) << 3;
		248	r += !!(x & 0xffff0000) << 4;
		249	#else
152	if (x & 0xaaaaaaaa) r += 1;	250	if (x & 0xaaaaaaaa) r += 1;
153	if (x & 0xcccccccc) r += 2;	251	if (x & 0xcccccccc) r += 2;
154	if (x & 0xf0f0f0f0) r += 4;	252	if (x & 0xf0f0f0f0) r += 4;
155	if (x & 0xff00ff00) r += 8;	253	if (x & 0xff00ff00) r += 8;
156	if (x & 0xffff0000) r += 16;	254	if (x & 0xffff0000) r += 16;
		255	#endif
157		256
158	return r;	257	return r;
		258	}
		259
		260	ecb_function_ int ecb_ctz64 (uint64_t x) ecb_const;
		261	ecb_function_ int
		262	ecb_ctz64 (uint64_t x)
		263	{
		264	int shift = x & 0xffffffffU ? 0 : 32;
		265	return ecb_ctz32 (x >> shift) + shift;
159	}	266	}
160		267
161	ecb_function_ int ecb_popcount32 (uint32_t x) ecb_const;	268	ecb_function_ int ecb_popcount32 (uint32_t x) ecb_const;
162	ecb_function_ int	269	ecb_function_ int
163	ecb_popcount32 (uint32_t x)	270	ecb_popcount32 (uint32_t x)
…		…
167	x = ((x >> 4) + x) & 0x0f0f0f0f;	274	x = ((x >> 4) + x) & 0x0f0f0f0f;
168	x *= 0x01010101;	275	x *= 0x01010101;
169		276
170	return x >> 24;	277	return x >> 24;
171	}	278	}
		279
		280	ecb_function_ int ecb_ld32 (uint32_t x) ecb_const;
		281	ecb_function_ int ecb_ld32 (uint32_t x)
		282	{
		283	int r = 0;
		284
		285	if (x >> 16) { x >>= 16; r += 16; }
		286	if (x >> 8) { x >>= 8; r += 8; }
		287	if (x >> 4) { x >>= 4; r += 4; }
		288	if (x >> 2) { x >>= 2; r += 2; }
		289	if (x >> 1) { r += 1; }
		290
		291	return r;
		292	}
		293
		294	ecb_function_ int ecb_ld64 (uint64_t x) ecb_const;
		295	ecb_function_ int ecb_ld64 (uint64_t x)
		296	{
		297	int r = 0;
		298
		299	if (x >> 32) { x >>= 32; r += 32; }
		300
		301	return r + ecb_ld32 (x);
		302	}
172	#endif	303	#endif
		304
		305	ecb_function_ uint8_t ecb_bitrev8 (uint8_t x) ecb_const;
		306	ecb_function_ uint8_t ecb_bitrev8 (uint8_t x)
		307	{
		308	return ( (x * 0x0802U & 0x22110U)
		309	\| (x * 0x8020U & 0x88440U)) * 0x10101U >> 16;
		310	}
		311
		312	ecb_function_ uint16_t ecb_bitrev16 (uint16_t x) ecb_const;
		313	ecb_function_ uint16_t ecb_bitrev16 (uint16_t x)
		314	{
		315	x = ((x >> 1) & 0x5555) \| ((x & 0x5555) << 1);
		316	x = ((x >> 2) & 0x3333) \| ((x & 0x3333) << 2);
		317	x = ((x >> 4) & 0x0f0f) \| ((x & 0x0f0f) << 4);
		318	x = ( x >> 8 ) \| ( x << 8);
		319
		320	return x;
		321	}
		322
		323	ecb_function_ uint32_t ecb_bitrev32 (uint32_t x) ecb_const;
		324	ecb_function_ uint32_t ecb_bitrev32 (uint32_t x)
		325	{
		326	x = ((x >> 1) & 0x55555555) \| ((x & 0x55555555) << 1);
		327	x = ((x >> 2) & 0x33333333) \| ((x & 0x33333333) << 2);
		328	x = ((x >> 4) & 0x0f0f0f0f) \| ((x & 0x0f0f0f0f) << 4);
		329	x = ((x >> 8) & 0x00ff00ff) \| ((x & 0x00ff00ff) << 8);
		330	x = ( x >> 16 ) \| ( x << 16);
		331
		332	return x;
		333	}
		334
		335	/* popcount64 is only available on 64 bit cpus as gcc builtin */
		336	/* so for this version we are lazy */
		337	ecb_function_ int ecb_popcount64 (uint64_t x) ecb_const;
		338	ecb_function_ int
		339	ecb_popcount64 (uint64_t x)
		340	{
		341	return ecb_popcount32 (x) + ecb_popcount32 (x >> 32);
		342	}
		343
		344	ecb_inline uint8_t ecb_rotl8 (uint8_t x, unsigned int count) ecb_const;
		345	ecb_inline uint8_t ecb_rotr8 (uint8_t x, unsigned int count) ecb_const;
		346	ecb_inline uint16_t ecb_rotl16 (uint16_t x, unsigned int count) ecb_const;
		347	ecb_inline uint16_t ecb_rotr16 (uint16_t x, unsigned int count) ecb_const;
		348	ecb_inline uint32_t ecb_rotl32 (uint32_t x, unsigned int count) ecb_const;
		349	ecb_inline uint32_t ecb_rotr32 (uint32_t x, unsigned int count) ecb_const;
		350	ecb_inline uint64_t ecb_rotl64 (uint64_t x, unsigned int count) ecb_const;
		351	ecb_inline uint64_t ecb_rotr64 (uint64_t x, unsigned int count) ecb_const;
		352
		353	ecb_inline uint8_t ecb_rotl8 (uint8_t x, unsigned int count) { return (x >> ( 8 - count)) \| (x << count); }
		354	ecb_inline uint8_t ecb_rotr8 (uint8_t x, unsigned int count) { return (x << ( 8 - count)) \| (x >> count); }
		355	ecb_inline uint16_t ecb_rotl16 (uint16_t x, unsigned int count) { return (x >> (16 - count)) \| (x << count); }
		356	ecb_inline uint16_t ecb_rotr16 (uint16_t x, unsigned int count) { return (x << (16 - count)) \| (x >> count); }
		357	ecb_inline uint32_t ecb_rotl32 (uint32_t x, unsigned int count) { return (x >> (32 - count)) \| (x << count); }
		358	ecb_inline uint32_t ecb_rotr32 (uint32_t x, unsigned int count) { return (x << (32 - count)) \| (x >> count); }
		359	ecb_inline uint64_t ecb_rotl64 (uint64_t x, unsigned int count) { return (x >> (64 - count)) \| (x << count); }
		360	ecb_inline uint64_t ecb_rotr64 (uint64_t x, unsigned int count) { return (x << (64 - count)) \| (x >> count); }
173		361
174	#if ECB_GCC_VERSION(4,3)	362	#if ECB_GCC_VERSION(4,3)
175	#define ecb_bswap32(x) __builtin_bswap32 (x)
176	#define ecb_bswap16(x) (__builtin_bswap32(x) >> 16)	363	#define ecb_bswap16(x) (__builtin_bswap32 (x) >> 16)
		364	#define ecb_bswap32(x) __builtin_bswap32 (x)
		365	#define ecb_bswap64(x) __builtin_bswap64 (x)
177	#else	366	#else
		367	ecb_function_ uint16_t ecb_bswap16 (uint16_t x) ecb_const;
		368	ecb_function_ uint16_t
		369	ecb_bswap16 (uint16_t x)
		370	{
		371	return ecb_rotl16 (x, 8);
		372	}
		373
178	ecb_function_ uint32_t ecb_bswap32 (uint32_t x) ecb_const;	374	ecb_function_ uint32_t ecb_bswap32 (uint32_t x) ecb_const;
179	ecb_function_ uint32_t	375	ecb_function_ uint32_t
180	ecb_bswap32 (uint32_t x)	376	ecb_bswap32 (uint32_t x)
181	{	377	{
182	return (x >> 24)	378	return (((uint32_t)ecb_bswap16 (x)) << 16) \| ecb_bswap16 (x >> 16);
183	\| ((x >> 8) & 0x0000ff00)
184	\| ((x << 8) & 0x00ff0000)
185	\| (x << 24);
186	}	379	}
187		380
188	ecb_function_ uint32_t ecb_bswap16 (uint32_t x) ecb_const;	381	ecb_function_ uint64_t ecb_bswap64 (uint64_t x) ecb_const;
189	ecb_function_ uint32_t	382	ecb_function_ uint64_t
190	ecb_bswap16 (uint32_t x)	383	ecb_bswap64 (uint64_t x)
191	{	384	{
192	return ((x >> 8) & 0xff)	385	return (((uint64_t)ecb_bswap32 (x)) << 32) \| ecb_bswap32 (x >> 32);
193	\| ((x << 8) & 0x00ff0000)
194	\| (x << 24);
195	}	386	}
196	#endif	387	#endif
197		388
198	#if ECB_GCC_VERSION(4,5)	389	#if ECB_GCC_VERSION(4,5)
199	#define ecb_unreachable() __builtin_unreachable ()	390	#define ecb_unreachable() __builtin_unreachable ()
200	#else	391	#else
201	/* this seems to work fine, but gcc always emits a warning for it :/ */	392	/* this seems to work fine, but gcc always emits a warning for it :/ */
202	ecb_function_ void ecb_unreachable (void) ecb_noreturn;	393	ecb_inline void ecb_unreachable (void) ecb_noreturn;
203	ecb_function_ void ecb_unreachable (void) { }	394	ecb_inline void ecb_unreachable (void) { }
204	#endif	395	#endif
205		396
206	/* try to tell the compiler that some condition is definitely true */	397	/* try to tell the compiler that some condition is definitely true */
207	#define ecb_assume(cond) do { if (!(cond)) ecb_unreachable (); } while (0)	398	#define ecb_assume(cond) do { if (!(cond)) ecb_unreachable (); } while (0)
208		399
209	ecb_function_ unsigned char ecb_byteorder_helper (void) ecb_const;	400	ecb_inline unsigned char ecb_byteorder_helper (void) ecb_const;
210	ecb_function_ unsigned char	401	ecb_inline unsigned char
211	ecb_byteorder_helper (void)	402	ecb_byteorder_helper (void)
212	{	403	{
213	const uint32_t u = 0x11223344;	404	const uint32_t u = 0x11223344;
214	return (unsigned char )&u;	405	return (unsigned char )&u;
215	}	406	}
216		407
217	ecb_function_ ecb_bool ecb_big_endian (void) ecb_const;	408	ecb_inline ecb_bool ecb_big_endian (void) ecb_const;
218	ecb_function_ ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; }	409	ecb_inline ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; }
219	ecb_function_ ecb_bool ecb_little_endian (void) ecb_const;	410	ecb_inline ecb_bool ecb_little_endian (void) ecb_const;
220	ecb_function_ ecb_bool ecb_little_endian (void) { return ecb_byteorder_helper () == 0x44; }	411	ecb_inline ecb_bool ecb_little_endian (void) { return ecb_byteorder_helper () == 0x44; }
221		412
222	#if ECB_GCC_VERSION(3,0) \|\| ECB_C99	413	#if ECB_GCC_VERSION(3,0) \|\| ECB_C99
223	#define ecb_mod(m,n) ((m) % (n) + ((m) % (n) < 0 ? (n) : 0))	414	#define ecb_mod(m,n) ((m) % (n) + ((m) % (n) < 0 ? (n) : 0))
224	#else	415	#else
225	#define ecb_mod(m,n) ((m) < 0 ? ((n) - 1 - ((-1 - (m)) % (n))) : ((m) % (n)))	416	#define ecb_mod(m,n) ((m) < 0 ? ((n) - 1 - ((-1 - (m)) % (n))) : ((m) % (n)))
		417	#endif
		418
		419	#if __cplusplus
		420	template<typename T>
		421	static inline T ecb_div_rd (T val, T div)
		422	{
		423	return val < 0 ? - ((-val + div - 1) / div) : (val ) / div;
		424	}
		425	template<typename T>
		426	static inline T ecb_div_ru (T val, T div)
		427	{
		428	return val < 0 ? - ((-val ) / div) : (val + div - 1) / div;
		429	}
		430	#else
		431	#define ecb_div_rd(val,div) ((val) < 0 ? - ((-(val) + (div) - 1) / (div)) : ((val) ) / (div))
		432	#define ecb_div_ru(val,div) ((val) < 0 ? - ((-(val) ) / (div)) : ((val) + (div) - 1) / (div))
226	#endif	433	#endif
227		434
228	#if ecb_cplusplus_does_not_suck	435	#if ecb_cplusplus_does_not_suck
229	/* does not work for local types (http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2657.htm) */	436	/* does not work for local types (http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2657.htm) */
230	template<typename T, int N>	437	template<typename T, int N>
…		…
234	}	441	}
235	#else	442	#else
236	#define ecb_array_length(name) (sizeof (name) / sizeof (name [0]))	443	#define ecb_array_length(name) (sizeof (name) / sizeof (name [0]))
237	#endif	444	#endif
238		445
239	ecb_inline uint32_t ecb_rotr32 (uint32_t x, unsigned int count) ecb_const;
240	ecb_inline uint32_t
241	ecb_rotr32 (uint32_t x, unsigned int count)
242	{
243	return (x << (32 - count)) \| (x >> count);
244	}
245
246	ecb_inline uint32_t ecb_rotl32 (uint32_t x, unsigned int count) ecb_const;
247	ecb_inline uint32_t
248	ecb_rotl32 (uint32_t x, unsigned int count)
249	{
250	return (x >> (32 - count)) \| (x << count);
251	}
252
253	#endif	446	#endif
254		447

Diff Legend

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

Comparing libecb/ecb.h (file contents): Revision 1.46 by root, Fri Jun 17 15:17:26 2011 UTC vs. Revision 1.78 by root, Sat Feb 4 15:17:22 2012 UTC

Diff Legend

Comparing libecb/ecb.h (file contents):
Revision 1.46 by root, Fri Jun 17 15:17:26 2011 UTC vs.
Revision 1.78 by root, Sat Feb 4 15:17:22 2012 UTC