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

Comparing libecb/ecb.h (file contents):
Revision 1.38 by root, Sat Jun 11 14:02:40 2011 UTC vs.
Revision 1.39 by root, Sat Jun 11 14:18:49 2011 UTC

… …
45 #else 45 #else
46 #define ECB_GCC_VERSION(major,minor) (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor))) 46 #define ECB_GCC_VERSION(major,minor) (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor)))
47 #endif 47 #endif
48#endif 48#endif
49 49
50#define ECB_C99 (__STDC_VERSION__ >= 199901L)
51
50#ifdef __cplusplus 52#if __cplusplus
51 #define ECB_INLINE static inline 53 #define ECB_INLINE static inline
52#elif ECB_GCC_VERSION(2,5) 54#elif ECB_GCC_VERSION(2,5)
53 #define ECB_INLINE static __inline__ 55 #define ECB_INLINE static __inline__
54#elif __STDC_VERSION__ >= 199901L 56#elif ECB_C99
55 #define ECB_INLINE static inline 57 #define ECB_INLINE static inline
56#else 58#else
57 #define ECB_INLINE static 59 #define ECB_INLINE static
58#endif 60#endif
59 61
60#if ECB_GCC_VERSION(3,3) 62#if ECB_GCC_VERSION(3,3)
61 #define ecb_restrict __restrict__ 63 #define ecb_restrict __restrict__
62#elif __STDC_VERSION__ >= 199901L 64#elif ECB_C99
63 #define ecb_restrict restrict 65 #define ecb_restrict restrict
64#else 66#else
65 #define ecb_restrict 67 #define ecb_restrict
66#endif 68#endif
67 69
… …
70#define ECB_CONCAT_(a, b) a ## b 72#define ECB_CONCAT_(a, b) a ## b
71#define ECB_CONCAT(a, b) ECB_CONCAT_(a, b) 73#define ECB_CONCAT(a, b) ECB_CONCAT_(a, b)
72#define ECB_STRINGIFY_(a) # a 74#define ECB_STRINGIFY_(a) # a
73#define ECB_STRINGIFY(a) ECB_STRINGIFY_(a) 75#define ECB_STRINGIFY(a) ECB_STRINGIFY_(a)
74 76
75#define ECB_HEADER_INLINE ECB_INLINE 77#define ecb_function_ ECB_INLINE
76 78
77#if ECB_GCC_VERSION(3,1) 79#if ECB_GCC_VERSION(3,1)
78 #define ecb_attribute(attrlist) __attribute__(attrlist) 80 #define ecb_attribute(attrlist) __attribute__(attrlist)
79 #define ecb_is_constant(expr) __builtin_constant_p (expr) 81 #define ecb_is_constant(expr) __builtin_constant_p (expr)
80 #define ecb_expect(expr,value) __builtin_expect ((expr),(value)) 82 #define ecb_expect(expr,value) __builtin_expect ((expr),(value))
… …
88 90
89/* no emulation for ecb_decltype */ 91/* no emulation for ecb_decltype */
90#if ECB_GCC_VERSION(4,5) 92#if ECB_GCC_VERSION(4,5)
91 #define ecb_decltype(x) __decltype(x) 93 #define ecb_decltype(x) __decltype(x)
92#elif ECB_GCC_VERSION(3,0) 94#elif ECB_GCC_VERSION(3,0)
93 #define ecb_decltype(x) typeof(x) 95 #define ecb_decltype(x) __typeof(x)
94#endif 96#endif
95 97
96#define ecb_noinline ecb_attribute ((__noinline__)) 98#define ecb_noinline ecb_attribute ((__noinline__))
97#define ecb_noreturn ecb_attribute ((__noreturn__)) 99#define ecb_noreturn ecb_attribute ((__noreturn__))
98#define ecb_unused ecb_attribute ((__unused__)) 100#define ecb_unused ecb_attribute ((__unused__))
99#define ecb_const ecb_attribute ((__const__)) 101#define ecb_const ecb_attribute ((__const__))
100#define ecb_pure ecb_attribute ((__pure__)) 102#define ecb_pure ecb_attribute ((__pure__))
101 103
102#if ECB_GCC_VERSION(4,3) 104#if ECB_GCC_VERSION(4,3)
103 #define ecb_artificial ecb_attribute ((__artificial__)) /* 4.3 */ 105 #define ecb_artificial ecb_attribute ((__artificial__))
104 #define ecb_hot ecb_attribute ((__hot__)) /* 4.3 */ 106 #define ecb_hot ecb_attribute ((__hot__))
105 #define ecb_cold ecb_attribute ((__cold__)) /* 4.3 */ 107 #define ecb_cold ecb_attribute ((__cold__))
106#else 108#else
107 #define ecb_artificial 109 #define ecb_artificial
108 #define ecb_hot 110 #define ecb_hot
109 #define ecb_cold 111 #define ecb_cold
110#endif 112#endif
111 113
112/* put into if's if you are very sure that the expression */ 114/* put around conditional expressions if you are very sure that the */
113/* is mostly true or mostly false. note that these return */ 115/* expression is mostly true or mostly false. note that these return */
114/* booleans, not the expression. */ 116/* booleans, not the expression. */
115#define ecb_expect_false(expr) ecb_expect (!!(expr), 0) 117#define ecb_expect_false(expr) ecb_expect (!!(expr), 0)
116#define ecb_expect_true(expr) ecb_expect (!!(expr), 1) 118#define ecb_expect_true(expr) ecb_expect (!!(expr), 1)
117/* for compatibility to the rest of the world */ 119/* for compatibility to the rest of the world */
118#define ecb_likely(expr) ecb_expect_true (expr) 120#define ecb_likely(expr) ecb_expect_true (expr)
119#define ecb_unlikely(expr) ecb_expect_false (expr) 121#define ecb_unlikely(expr) ecb_expect_false (expr)
… …
124/* count trailing zero bits and count # of one bits */ 126/* count trailing zero bits and count # of one bits */
125#if ECB_GCC_VERSION(3,4) 127#if ECB_GCC_VERSION(3,4)
126 #define ecb_ctz32(x) __builtin_ctz (x) 128 #define ecb_ctz32(x) __builtin_ctz (x)
127 #define ecb_popcount32(x) __builtin_popcount (x) 129 #define ecb_popcount32(x) __builtin_popcount (x)
128#else 130#else
129 ECB_HEADER_INLINE int ecb_ctz32 (uint32_t x) ecb_const; 131 ecb_function_ int ecb_ctz32 (uint32_t x) ecb_const;
130 ECB_HEADER_INLINE int 132 ecb_function_ int
131 ecb_ctz32 (uint32_t x) 133 ecb_ctz32 (uint32_t x)
132 { 134 {
133 int r = 0; 135 int r = 0;
134 136
135 x &= -x; /* this isolates the lowest bit */ 137 x &= -x; /* this isolates the lowest bit */
… …
141 if (x & 0xffff0000) r += 16; 143 if (x & 0xffff0000) r += 16;
142 144
143 return r; 145 return r;
144 } 146 }
145 147
146 ECB_HEADER_INLINE int ecb_popcount32 (uint32_t x) ecb_const; 148 ecb_function_ int ecb_popcount32 (uint32_t x) ecb_const;
147 ECB_HEADER_INLINE int 149 ecb_function_ int
148 ecb_popcount32 (uint32_t x) 150 ecb_popcount32 (uint32_t x)
149 { 151 {
150 x -= (x >> 1) & 0x55555555; 152 x -= (x >> 1) & 0x55555555;
151 x = ((x >> 2) & 0x33333333) + (x & 0x33333333); 153 x = ((x >> 2) & 0x33333333) + (x & 0x33333333);
152 x = ((x >> 4) + x) & 0x0f0f0f0f; 154 x = ((x >> 4) + x) & 0x0f0f0f0f;
… …
158 160
159#if ECB_GCC_VERSION(4,3) 161#if ECB_GCC_VERSION(4,3)
160 #define ecb_bswap32(x) __builtin_bswap32 (x) 162 #define ecb_bswap32(x) __builtin_bswap32 (x)
161 #define ecb_bswap16(x) (__builtin_bswap32(x) >> 16) 163 #define ecb_bswap16(x) (__builtin_bswap32(x) >> 16)
162#else 164#else
163 ECB_HEADER_INLINE uint32_t ecb_bswap32 (uint32_t x) ecb_const; 165 ecb_function_ uint32_t ecb_bswap32 (uint32_t x) ecb_const;
164 ECB_HEADER_INLINE uint32_t 166 ecb_function_ uint32_t
165 ecb_bswap32 (uint32_t x) 167 ecb_bswap32 (uint32_t x)
166 { 168 {
167 return (x >> 24) 169 return (x >> 24)
168 | ((x >> 8) & 0x0000ff00) 170 | ((x >> 8) & 0x0000ff00)
169 | ((x << 8) & 0x00ff0000) 171 | ((x << 8) & 0x00ff0000)
170 | (x << 24); 172 | (x << 24);
171 } 173 }
172 174
173 ECB_HEADER_INLINE uint32_t ecb_bswap16 (uint32_t x) ecb_const; 175 ecb_function_ uint32_t ecb_bswap16 (uint32_t x) ecb_const;
174 ECB_HEADER_INLINE uint32_t 176 ecb_function_ uint32_t
175 ecb_bswap16 (uint32_t x) 177 ecb_bswap16 (uint32_t x)
176 { 178 {
177 return ((x >> 8) & 0xff) 179 return ((x >> 8) & 0xff)
178 | ((x << 8) & 0x00ff0000) 180 | ((x << 8) & 0x00ff0000)
179 | (x << 24); 181 | (x << 24);
… …
182 184
183#if ECB_GCC_VERSION(4,5) 185#if ECB_GCC_VERSION(4,5)
184 #define ecb_unreachable() __builtin_unreachable () 186 #define ecb_unreachable() __builtin_unreachable ()
185#else 187#else
186 /* this seems to work fine, but gcc always emits a warning for it :/ */ 188 /* this seems to work fine, but gcc always emits a warning for it :/ */
187 ECB_HEADER_INLINE void ecb_unreachable (void) ecb_noreturn; 189 ecb_function_ void ecb_unreachable (void) ecb_noreturn;
188 ECB_HEADER_INLINE void ecb_unreachable (void) { } 190 ecb_function_ void ecb_unreachable (void) { }
189#endif 191#endif
190 192
191ECB_HEADER_INLINE unsigned char ecb_byteorder_helper (void) ecb_const; 193ecb_function_ unsigned char ecb_byteorder_helper (void) ecb_const;
192ECB_HEADER_INLINE unsigned char 194ecb_function_ unsigned char
193ecb_byteorder_helper (void) 195ecb_byteorder_helper (void)
194{ 196{
195 const uint32_t u = 0x11223344; 197 const uint32_t u = 0x11223344;
196 return *(unsigned char *)&u; 198 return *(unsigned char *)&u;
197} 199}
198 200
199ECB_HEADER_INLINE ecb_bool ecb_big_endian (void) ecb_const; 201ecb_function_ ecb_bool ecb_big_endian (void) ecb_const;
200ECB_HEADER_INLINE ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; }; 202ecb_function_ ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; };
201ECB_HEADER_INLINE ecb_bool ecb_little_endian (void) ecb_const; 203ecb_function_ ecb_bool ecb_little_endian (void) ecb_const;
202ECB_HEADER_INLINE ecb_bool ecb_little_endian (void) { return ecb_byteorder_helper () == 0x44; }; 204ecb_function_ ecb_bool ecb_little_endian (void) { return ecb_byteorder_helper () == 0x44; };
203 205
204#if ECB_GCC_VERSION(3,0) 206#if ECB_GCC_VERSION(3,0) || ECB_C99
205 #define ecb_mod(m,n) ((m) % (n) + ((m) % (n) < 0 ? (n) : 0)) 207 #define ecb_mod(m,n) ((m) % (n) + ((m) % (n) < 0 ? (n) : 0))
206#else 208#else
207 #define ecb_mod(m,n) ((m) < 0 ? ((n) - 1 - ((-1 - (m)) % (n))) : ((m) % (n))) 209 #define ecb_mod(m,n) ((m) < 0 ? ((n) - 1 - ((-1 - (m)) % (n))) : ((m) % (n)))
208#endif 210#endif
209 211

Diff Legend

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