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

Comparing libeio/ecb.h (file contents):
Revision 1.17 by root, Fri Dec 28 07:33:41 2012 UTC vs.
Revision 1.24 by root, Sat Jun 13 00:06:13 2015 UTC

1/* 1/*
2 * libecb - http://software.schmorp.de/pkg/libecb 2 * libecb - http://software.schmorp.de/pkg/libecb
3 * 3 *
4 * Copyright (©) 2009-2012 Marc Alexander Lehmann <libecb@schmorp.de> 4 * Copyright (©) 2009-2015 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:
23 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 23 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
24 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 24 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
25 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH- 25 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
26 * ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 26 * ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
27 * OF THE POSSIBILITY OF SUCH DAMAGE. 27 * OF THE POSSIBILITY OF SUCH DAMAGE.
28 *
29 * Alternatively, the contents of this file may be used under the terms of
30 * the GNU General Public License ("GPL") version 2 or any later version,
31 * in which case the provisions of the GPL are applicable instead of
32 * the above. If you wish to allow the use of your version of this file
33 * only under the terms of the GPL and not to allow others to use your
34 * version of this file under the BSD license, indicate your decision
35 * by deleting the provisions above and replace them with the notice
36 * and other provisions required by the GPL. If you do not delete the
37 * provisions above, a recipient may use your version of this file under
38 * either the BSD or the GPL.
28 */ 39 */
29 40
30#ifndef ECB_H 41#ifndef ECB_H
31#define ECB_H 42#define ECB_H
32 43
33/* 16 bits major, 16 bits minor */ 44/* 16 bits major, 16 bits minor */
34#define ECB_VERSION 0x00010003 45#define ECB_VERSION 0x00010004
35 46
36#ifdef _WIN32 47#ifdef _WIN32
37 typedef signed char int8_t; 48 typedef signed char int8_t;
38 typedef unsigned char uint8_t; 49 typedef unsigned char uint8_t;
39 typedef signed short int16_t; 50 typedef signed short int16_t;
64 #define ECB_PTRSIZE 4 75 #define ECB_PTRSIZE 4
65 #endif 76 #endif
66#endif 77#endif
67 78
68/* work around x32 idiocy by defining proper macros */ 79/* work around x32 idiocy by defining proper macros */
69#if __x86_64 || _M_AMD64 80#if __amd64 || __x86_64 || _M_AMD64 || _M_X64
70 #if __ILP32 81 #if _ILP32
71 #define ECB_AMD64_X32 1 82 #define ECB_AMD64_X32 1
72 #else 83 #else
73 #define ECB_AMD64 1 84 #define ECB_AMD64 1
74 #endif 85 #endif
75#endif 86#endif
79 * causing enormous grief in return for some better fake benchmark numbers. 90 * causing enormous grief in return for some better fake benchmark numbers.
80 * or so. 91 * or so.
81 * we try to detect these and simply assume they are not gcc - if they have 92 * we try to detect these and simply assume they are not gcc - if they have
82 * an issue with that they should have done it right in the first place. 93 * an issue with that they should have done it right in the first place.
83 */ 94 */
84#ifndef ECB_GCC_VERSION
85 #if !defined __GNUC_MINOR__ || defined __INTEL_COMPILER || defined __SUNPRO_C || defined __SUNPRO_CC || defined __llvm__ || defined __clang__ 95#if !defined __GNUC_MINOR__ || defined __INTEL_COMPILER || defined __SUNPRO_C || defined __SUNPRO_CC || defined __llvm__ || defined __clang__
86 #define ECB_GCC_VERSION(major,minor) 0 96 #define ECB_GCC_VERSION(major,minor) 0
87 #else 97#else
88 #define ECB_GCC_VERSION(major,minor) (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor))) 98 #define ECB_GCC_VERSION(major,minor) (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor)))
89 #endif 99#endif
90#endif
91 100
92#define ECB_C (__STDC__+0) /* this assumes that __STDC__ is either empty or a number */ 101#define ECB_CLANG_VERSION(major,minor) (__clang_major__ > (major) || (__clang_major__ == (major) && __clang_minor__ >= (minor)))
93#define ECB_C99 (__STDC_VERSION__ >= 199901L) 102
94#define ECB_C11 (__STDC_VERSION__ >= 201112L) 103#if __clang__ && defined __has_builtin
104 #define ECB_CLANG_BUILTIN(x) __has_builtin (x)
105#else
106 #define ECB_CLANG_BUILTIN(x) 0
107#endif
108
109#if __clang__ && defined __has_extension
110 #define ECB_CLANG_EXTENSION(x) __has_extension (x)
111#else
112 #define ECB_CLANG_EXTENSION(x) 0
113#endif
114
95#define ECB_CPP (__cplusplus+0) 115#define ECB_CPP (__cplusplus+0)
96#define ECB_CPP11 (__cplusplus >= 201103L) 116#define ECB_CPP11 (__cplusplus >= 201103L)
117
118#if ECB_CPP
119 #define ECB_C 0
120 #define ECB_STDC_VERSION 0
121#else
122 #define ECB_C 1
123 #define ECB_STDC_VERSION __STDC_VERSION__
124#endif
125
126#define ECB_C99 (ECB_STDC_VERSION >= 199901L)
127#define ECB_C11 (ECB_STDC_VERSION >= 201112L)
97 128
98#if ECB_CPP 129#if ECB_CPP
99 #define ECB_EXTERN_C extern "C" 130 #define ECB_EXTERN_C extern "C"
100 #define ECB_EXTERN_C_BEG ECB_EXTERN_C { 131 #define ECB_EXTERN_C_BEG ECB_EXTERN_C {
101 #define ECB_EXTERN_C_END } 132 #define ECB_EXTERN_C_END }
134 || defined __ARM_ARCH_6K__ || defined __ARM_ARCH_6ZK__ 165 || defined __ARM_ARCH_6K__ || defined __ARM_ARCH_6ZK__
135 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mcr p15,0,%0,c7,c10,5" : : "r" (0) : "memory") 166 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mcr p15,0,%0,c7,c10,5" : : "r" (0) : "memory")
136 #elif defined __ARM_ARCH_7__ || defined __ARM_ARCH_7A__ \ 167 #elif defined __ARM_ARCH_7__ || defined __ARM_ARCH_7A__ \
137 || defined __ARM_ARCH_7M__ || defined __ARM_ARCH_7R__ 168 || defined __ARM_ARCH_7M__ || defined __ARM_ARCH_7R__
138 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("dmb" : : : "memory") 169 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("dmb" : : : "memory")
170 #elif __aarch64__
171 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("dmb ish" : : : "memory")
139 #elif __sparc || __sparc__ 172 #elif (__sparc || __sparc__) && !__sparcv8
140 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad | #StoreStore | #StoreLoad" : : : "memory") 173 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad | #StoreStore | #StoreLoad" : : : "memory")
141 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad" : : : "memory") 174 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad" : : : "memory")
142 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("membar #LoadStore | #StoreStore") 175 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("membar #LoadStore | #StoreStore")
143 #elif defined __s390__ || defined __s390x__ 176 #elif defined __s390__ || defined __s390x__
144 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("bcr 15,0" : : : "memory") 177 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("bcr 15,0" : : : "memory")
145 #elif defined __mips__ 178 #elif defined __mips__
179 /* GNU/Linux emulates sync on mips1 architectures, so we force its use */
180 /* anybody else who still uses mips1 is supposed to send in their version, with detection code. */
146 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory") 181 #define ECB_MEMORY_FENCE __asm__ __volatile__ (".set mips2; sync; .set mips0" : : : "memory")
147 #elif defined __alpha__ 182 #elif defined __alpha__
148 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mb" : : : "memory") 183 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mb" : : : "memory")
149 #elif defined __hppa__ 184 #elif defined __hppa__
150 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("" : : : "memory") 185 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("" : : : "memory")
151 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("") 186 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("")
152 #elif defined __ia64__ 187 #elif defined __ia64__
153 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mf" : : : "memory") 188 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mf" : : : "memory")
189 #elif defined __m68k__
190 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("" : : : "memory")
191 #elif defined __m88k__
192 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("tb1 0,%%r0,128" : : : "memory")
193 #elif defined __sh__
194 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("" : : : "memory")
154 #endif 195 #endif
155 #endif 196 #endif
156#endif 197#endif
157 198
158#ifndef ECB_MEMORY_FENCE 199#ifndef ECB_MEMORY_FENCE
159 #if ECB_GCC_VERSION(4,7) 200 #if ECB_GCC_VERSION(4,7)
160 /* see comment below (stdatomic.h) about the C11 memory model. */ 201 /* see comment below (stdatomic.h) about the C11 memory model. */
161 #define ECB_MEMORY_FENCE __atomic_thread_fence (__ATOMIC_SEQ_CST) 202 #define ECB_MEMORY_FENCE __atomic_thread_fence (__ATOMIC_SEQ_CST)
203 #define ECB_MEMORY_FENCE_ACQUIRE __atomic_thread_fence (__ATOMIC_ACQUIRE)
204 #define ECB_MEMORY_FENCE_RELEASE __atomic_thread_fence (__ATOMIC_RELEASE)
162 205
163 /* The __has_feature syntax from clang is so misdesigned that we cannot use it 206 #elif ECB_CLANG_EXTENSION(c_atomic)
164 * without risking compile time errors with other compilers. We *could*
165 * define our own ecb_clang_has_feature, but I just can't be bothered to work
166 * around this shit time and again.
167 * #elif defined __clang && __has_feature (cxx_atomic)
168 * // see comment below (stdatomic.h) about the C11 memory model. 207 /* see comment below (stdatomic.h) about the C11 memory model. */
169 * #define ECB_MEMORY_FENCE __c11_atomic_thread_fence (__ATOMIC_SEQ_CST) 208 #define ECB_MEMORY_FENCE __c11_atomic_thread_fence (__ATOMIC_SEQ_CST)
170 */ 209 #define ECB_MEMORY_FENCE_ACQUIRE __c11_atomic_thread_fence (__ATOMIC_ACQUIRE)
210 #define ECB_MEMORY_FENCE_RELEASE __c11_atomic_thread_fence (__ATOMIC_RELEASE)
171 211
172 #elif ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__ 212 #elif ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__
173 #define ECB_MEMORY_FENCE __sync_synchronize () 213 #define ECB_MEMORY_FENCE __sync_synchronize ()
214 #elif _MSC_VER >= 1500 /* VC++ 2008 */
215 /* apparently, microsoft broke all the memory barrier stuff in Visual Studio 2008... */
216 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier)
217 #define ECB_MEMORY_FENCE _ReadWriteBarrier (); MemoryBarrier()
218 #define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier (); MemoryBarrier() /* according to msdn, _ReadBarrier is not a load fence */
219 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier (); MemoryBarrier()
174 #elif _MSC_VER >= 1400 /* VC++ 2005 */ 220 #elif _MSC_VER >= 1400 /* VC++ 2005 */
175 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier) 221 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier)
176 #define ECB_MEMORY_FENCE _ReadWriteBarrier () 222 #define ECB_MEMORY_FENCE _ReadWriteBarrier ()
177 #define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier () /* according to msdn, _ReadBarrier is not a load fence */ 223 #define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier () /* according to msdn, _ReadBarrier is not a load fence */
178 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier () 224 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier ()
198 /* any fence other than seq_cst, which isn't very efficient for us. */ 244 /* any fence other than seq_cst, which isn't very efficient for us. */
199 /* Why that is, we don't know - either the C11 memory model is quite useless */ 245 /* Why that is, we don't know - either the C11 memory model is quite useless */
200 /* for most usages, or gcc and clang have a bug */ 246 /* for most usages, or gcc and clang have a bug */
201 /* I *currently* lean towards the latter, and inefficiently implement */ 247 /* I *currently* lean towards the latter, and inefficiently implement */
202 /* all three of ecb's fences as a seq_cst fence */ 248 /* all three of ecb's fences as a seq_cst fence */
249 /* Update, gcc-4.8 generates mfence for all c++ fences, but nothing */
250 /* for all __atomic_thread_fence's except seq_cst */
203 #define ECB_MEMORY_FENCE atomic_thread_fence (memory_order_seq_cst) 251 #define ECB_MEMORY_FENCE atomic_thread_fence (memory_order_seq_cst)
204 #endif 252 #endif
205#endif 253#endif
206 254
207#ifndef ECB_MEMORY_FENCE 255#ifndef ECB_MEMORY_FENCE
230 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE 278 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
231#endif 279#endif
232 280
233/*****************************************************************************/ 281/*****************************************************************************/
234 282
235#if __cplusplus 283#if ECB_CPP
236 #define ecb_inline static inline 284 #define ecb_inline static inline
237#elif ECB_GCC_VERSION(2,5) 285#elif ECB_GCC_VERSION(2,5)
238 #define ecb_inline static __inline__ 286 #define ecb_inline static __inline__
239#elif ECB_C99 287#elif ECB_C99
240 #define ecb_inline static inline 288 #define ecb_inline static inline
254 302
255#define ECB_CONCAT_(a, b) a ## b 303#define ECB_CONCAT_(a, b) a ## b
256#define ECB_CONCAT(a, b) ECB_CONCAT_(a, b) 304#define ECB_CONCAT(a, b) ECB_CONCAT_(a, b)
257#define ECB_STRINGIFY_(a) # a 305#define ECB_STRINGIFY_(a) # a
258#define ECB_STRINGIFY(a) ECB_STRINGIFY_(a) 306#define ECB_STRINGIFY(a) ECB_STRINGIFY_(a)
307#define ECB_STRINGIFY_EXPR(expr) ((expr), ECB_STRINGIFY_ (expr))
259 308
260#define ecb_function_ ecb_inline 309#define ecb_function_ ecb_inline
261 310
262#if ECB_GCC_VERSION(3,1) 311#if ECB_GCC_VERSION(3,1) || ECB_CLANG_VERSION(2,8)
263 #define ecb_attribute(attrlist) __attribute__(attrlist) 312 #define ecb_attribute(attrlist) __attribute__ (attrlist)
313#else
314 #define ecb_attribute(attrlist)
315#endif
316
317#if ECB_GCC_VERSION(3,1) || ECB_CLANG_BUILTIN(__builtin_constant_p)
264 #define ecb_is_constant(expr) __builtin_constant_p (expr) 318 #define ecb_is_constant(expr) __builtin_constant_p (expr)
319#else
320 /* possible C11 impl for integral types
321 typedef struct ecb_is_constant_struct ecb_is_constant_struct;
322 #define ecb_is_constant(expr) _Generic ((1 ? (struct ecb_is_constant_struct *)0 : (void *)((expr) - (expr)), ecb_is_constant_struct *: 0, default: 1)) */
323
324 #define ecb_is_constant(expr) 0
325#endif
326
327#if ECB_GCC_VERSION(3,1) || ECB_CLANG_BUILTIN(__builtin_expect)
265 #define ecb_expect(expr,value) __builtin_expect ((expr),(value)) 328 #define ecb_expect(expr,value) __builtin_expect ((expr),(value))
329#else
330 #define ecb_expect(expr,value) (expr)
331#endif
332
333#if ECB_GCC_VERSION(3,1) || ECB_CLANG_BUILTIN(__builtin_prefetch)
266 #define ecb_prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality) 334 #define ecb_prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality)
267#else 335#else
268 #define ecb_attribute(attrlist)
269 #define ecb_is_constant(expr) 0
270 #define ecb_expect(expr,value) (expr)
271 #define ecb_prefetch(addr,rw,locality) 336 #define ecb_prefetch(addr,rw,locality)
272#endif 337#endif
273 338
274/* no emulation for ecb_decltype */ 339/* no emulation for ecb_decltype */
275#if ECB_GCC_VERSION(4,5) 340#if ECB_CPP11
341 // older implementations might have problems with decltype(x)::type, work around it
342 template<class T> struct ecb_decltype_t { typedef T type; };
276 #define ecb_decltype(x) __decltype(x) 343 #define ecb_decltype(x) ecb_decltype_t<decltype (x)>::type
277#elif ECB_GCC_VERSION(3,0) 344#elif ECB_GCC_VERSION(3,0) || ECB_CLANG_VERSION(2,8)
278 #define ecb_decltype(x) __typeof(x) 345 #define ecb_decltype(x) __typeof__ (x)
279#endif 346#endif
280 347
348#if _MSC_VER >= 1300
349 #define ecb_deprecated __declspec (deprecated)
350#else
351 #define ecb_deprecated ecb_attribute ((__deprecated__))
352#endif
353
354#if __MSC_VER >= 1500
355 #define ecb_deprecated_message(msg) __declspec (deprecated (msg))
356#elif ECB_GCC_VERSION(4,5)
357 #define ecb_deprecated_message(msg) ecb_attribute ((__deprecated__ (msg))
358#else
359 #define ecb_deprecated_message(msg) ecb_deprecated
360#endif
361
362#if _MSC_VER >= 1400
363 #define ecb_noinline __declspec (noinline)
364#else
281#define ecb_noinline ecb_attribute ((__noinline__)) 365 #define ecb_noinline ecb_attribute ((__noinline__))
366#endif
367
282#define ecb_unused ecb_attribute ((__unused__)) 368#define ecb_unused ecb_attribute ((__unused__))
283#define ecb_const ecb_attribute ((__const__)) 369#define ecb_const ecb_attribute ((__const__))
284#define ecb_pure ecb_attribute ((__pure__)) 370#define ecb_pure ecb_attribute ((__pure__))
285 371
286#if ECB_C11 372/* TODO http://msdn.microsoft.com/en-us/library/k6ktzx3s.aspx __declspec(noreturn) */
373#if ECB_C11 || __IBMC_NORETURN
374 /* http://pic.dhe.ibm.com/infocenter/compbg/v121v141/topic/com.ibm.xlcpp121.bg.doc/language_ref/noreturn.html */
287 #define ecb_noreturn _Noreturn 375 #define ecb_noreturn _Noreturn
376#elif ECB_CPP11
377 #define ecb_noreturn [[noreturn]]
378#elif _MSC_VER >= 1200
379 #define ecb_noreturn __declspec (noreturn)
288#else 380#else
289 #define ecb_noreturn ecb_attribute ((__noreturn__)) 381 #define ecb_noreturn ecb_attribute ((__noreturn__))
290#endif 382#endif
291 383
292#if ECB_GCC_VERSION(4,3) 384#if ECB_GCC_VERSION(4,3)
307/* for compatibility to the rest of the world */ 399/* for compatibility to the rest of the world */
308#define ecb_likely(expr) ecb_expect_true (expr) 400#define ecb_likely(expr) ecb_expect_true (expr)
309#define ecb_unlikely(expr) ecb_expect_false (expr) 401#define ecb_unlikely(expr) ecb_expect_false (expr)
310 402
311/* count trailing zero bits and count # of one bits */ 403/* count trailing zero bits and count # of one bits */
312#if ECB_GCC_VERSION(3,4) 404#if ECB_GCC_VERSION(3,4) \
405 || (ECB_CLANG_BUILTIN(__builtin_clz) && ECB_CLANG_BUILTIN(__builtin_clzll) \
406 && ECB_CLANG_BUILTIN(__builtin_ctz) && ECB_CLANG_BUILTIN(__builtin_ctzll) \
407 && ECB_CLANG_BUILTIN(__builtin_popcount))
313 /* we assume int == 32 bit, long == 32 or 64 bit and long long == 64 bit */ 408 /* we assume int == 32 bit, long == 32 or 64 bit and long long == 64 bit */
314 #define ecb_ld32(x) (__builtin_clz (x) ^ 31) 409 #define ecb_ld32(x) (__builtin_clz (x) ^ 31)
315 #define ecb_ld64(x) (__builtin_clzll (x) ^ 63) 410 #define ecb_ld64(x) (__builtin_clzll (x) ^ 63)
316 #define ecb_ctz32(x) __builtin_ctz (x) 411 #define ecb_ctz32(x) __builtin_ctz (x)
317 #define ecb_ctz64(x) __builtin_ctzll (x) 412 #define ecb_ctz64(x) __builtin_ctzll (x)
318 #define ecb_popcount32(x) __builtin_popcount (x) 413 #define ecb_popcount32(x) __builtin_popcount (x)
319 /* no popcountll */ 414 /* no popcountll */
320#else 415#else
321 ecb_function_ int ecb_ctz32 (uint32_t x) ecb_const; 416 ecb_function_ ecb_const int ecb_ctz32 (uint32_t x);
322 ecb_function_ int 417 ecb_function_ ecb_const int
323 ecb_ctz32 (uint32_t x) 418 ecb_ctz32 (uint32_t x)
324 { 419 {
325 int r = 0; 420 int r = 0;
326 421
327 x &= ~x + 1; /* this isolates the lowest bit */ 422 x &= ~x + 1; /* this isolates the lowest bit */
341#endif 436#endif
342 437
343 return r; 438 return r;
344 } 439 }
345 440
346 ecb_function_ int ecb_ctz64 (uint64_t x) ecb_const; 441 ecb_function_ ecb_const int ecb_ctz64 (uint64_t x);
347 ecb_function_ int 442 ecb_function_ ecb_const int
348 ecb_ctz64 (uint64_t x) 443 ecb_ctz64 (uint64_t x)
349 { 444 {
350 int shift = x & 0xffffffffU ? 0 : 32; 445 int shift = x & 0xffffffffU ? 0 : 32;
351 return ecb_ctz32 (x >> shift) + shift; 446 return ecb_ctz32 (x >> shift) + shift;
352 } 447 }
353 448
354 ecb_function_ int ecb_popcount32 (uint32_t x) ecb_const; 449 ecb_function_ ecb_const int ecb_popcount32 (uint32_t x);
355 ecb_function_ int 450 ecb_function_ ecb_const int
356 ecb_popcount32 (uint32_t x) 451 ecb_popcount32 (uint32_t x)
357 { 452 {
358 x -= (x >> 1) & 0x55555555; 453 x -= (x >> 1) & 0x55555555;
359 x = ((x >> 2) & 0x33333333) + (x & 0x33333333); 454 x = ((x >> 2) & 0x33333333) + (x & 0x33333333);
360 x = ((x >> 4) + x) & 0x0f0f0f0f; 455 x = ((x >> 4) + x) & 0x0f0f0f0f;
361 x *= 0x01010101; 456 x *= 0x01010101;
362 457
363 return x >> 24; 458 return x >> 24;
364 } 459 }
365 460
366 ecb_function_ int ecb_ld32 (uint32_t x) ecb_const; 461 ecb_function_ ecb_const int ecb_ld32 (uint32_t x);
367 ecb_function_ int ecb_ld32 (uint32_t x) 462 ecb_function_ ecb_const int ecb_ld32 (uint32_t x)
368 { 463 {
369 int r = 0; 464 int r = 0;
370 465
371 if (x >> 16) { x >>= 16; r += 16; } 466 if (x >> 16) { x >>= 16; r += 16; }
372 if (x >> 8) { x >>= 8; r += 8; } 467 if (x >> 8) { x >>= 8; r += 8; }
375 if (x >> 1) { r += 1; } 470 if (x >> 1) { r += 1; }
376 471
377 return r; 472 return r;
378 } 473 }
379 474
380 ecb_function_ int ecb_ld64 (uint64_t x) ecb_const; 475 ecb_function_ ecb_const int ecb_ld64 (uint64_t x);
381 ecb_function_ int ecb_ld64 (uint64_t x) 476 ecb_function_ ecb_const int ecb_ld64 (uint64_t x)
382 { 477 {
383 int r = 0; 478 int r = 0;
384 479
385 if (x >> 32) { x >>= 32; r += 32; } 480 if (x >> 32) { x >>= 32; r += 32; }
386 481
387 return r + ecb_ld32 (x); 482 return r + ecb_ld32 (x);
388 } 483 }
389#endif 484#endif
390 485
391ecb_function_ ecb_bool ecb_is_pot32 (uint32_t x) ecb_const; 486ecb_function_ ecb_const ecb_bool ecb_is_pot32 (uint32_t x);
392ecb_function_ ecb_bool ecb_is_pot32 (uint32_t x) { return !(x & (x - 1)); } 487ecb_function_ ecb_const ecb_bool ecb_is_pot32 (uint32_t x) { return !(x & (x - 1)); }
393ecb_function_ ecb_bool ecb_is_pot64 (uint64_t x) ecb_const; 488ecb_function_ ecb_const ecb_bool ecb_is_pot64 (uint64_t x);
394ecb_function_ ecb_bool ecb_is_pot64 (uint64_t x) { return !(x & (x - 1)); } 489ecb_function_ ecb_const ecb_bool ecb_is_pot64 (uint64_t x) { return !(x & (x - 1)); }
395 490
396ecb_function_ uint8_t ecb_bitrev8 (uint8_t x) ecb_const; 491ecb_function_ ecb_const uint8_t ecb_bitrev8 (uint8_t x);
397ecb_function_ uint8_t ecb_bitrev8 (uint8_t x) 492ecb_function_ ecb_const uint8_t ecb_bitrev8 (uint8_t x)
398{ 493{
399 return ( (x * 0x0802U & 0x22110U) 494 return ( (x * 0x0802U & 0x22110U)
400 | (x * 0x8020U & 0x88440U)) * 0x10101U >> 16; 495 | (x * 0x8020U & 0x88440U)) * 0x10101U >> 16;
401} 496}
402 497
403ecb_function_ uint16_t ecb_bitrev16 (uint16_t x) ecb_const; 498ecb_function_ ecb_const uint16_t ecb_bitrev16 (uint16_t x);
404ecb_function_ uint16_t ecb_bitrev16 (uint16_t x) 499ecb_function_ ecb_const uint16_t ecb_bitrev16 (uint16_t x)
405{ 500{
406 x = ((x >> 1) & 0x5555) | ((x & 0x5555) << 1); 501 x = ((x >> 1) & 0x5555) | ((x & 0x5555) << 1);
407 x = ((x >> 2) & 0x3333) | ((x & 0x3333) << 2); 502 x = ((x >> 2) & 0x3333) | ((x & 0x3333) << 2);
408 x = ((x >> 4) & 0x0f0f) | ((x & 0x0f0f) << 4); 503 x = ((x >> 4) & 0x0f0f) | ((x & 0x0f0f) << 4);
409 x = ( x >> 8 ) | ( x << 8); 504 x = ( x >> 8 ) | ( x << 8);
410 505
411 return x; 506 return x;
412} 507}
413 508
414ecb_function_ uint32_t ecb_bitrev32 (uint32_t x) ecb_const; 509ecb_function_ ecb_const uint32_t ecb_bitrev32 (uint32_t x);
415ecb_function_ uint32_t ecb_bitrev32 (uint32_t x) 510ecb_function_ ecb_const uint32_t ecb_bitrev32 (uint32_t x)
416{ 511{
417 x = ((x >> 1) & 0x55555555) | ((x & 0x55555555) << 1); 512 x = ((x >> 1) & 0x55555555) | ((x & 0x55555555) << 1);
418 x = ((x >> 2) & 0x33333333) | ((x & 0x33333333) << 2); 513 x = ((x >> 2) & 0x33333333) | ((x & 0x33333333) << 2);
419 x = ((x >> 4) & 0x0f0f0f0f) | ((x & 0x0f0f0f0f) << 4); 514 x = ((x >> 4) & 0x0f0f0f0f) | ((x & 0x0f0f0f0f) << 4);
420 x = ((x >> 8) & 0x00ff00ff) | ((x & 0x00ff00ff) << 8); 515 x = ((x >> 8) & 0x00ff00ff) | ((x & 0x00ff00ff) << 8);
423 return x; 518 return x;
424} 519}
425 520
426/* popcount64 is only available on 64 bit cpus as gcc builtin */ 521/* popcount64 is only available on 64 bit cpus as gcc builtin */
427/* so for this version we are lazy */ 522/* so for this version we are lazy */
428ecb_function_ int ecb_popcount64 (uint64_t x) ecb_const; 523ecb_function_ ecb_const int ecb_popcount64 (uint64_t x);
429ecb_function_ int 524ecb_function_ ecb_const int
430ecb_popcount64 (uint64_t x) 525ecb_popcount64 (uint64_t x)
431{ 526{
432 return ecb_popcount32 (x) + ecb_popcount32 (x >> 32); 527 return ecb_popcount32 (x) + ecb_popcount32 (x >> 32);
433} 528}
434 529
435ecb_inline uint8_t ecb_rotl8 (uint8_t x, unsigned int count) ecb_const; 530ecb_inline ecb_const uint8_t ecb_rotl8 (uint8_t x, unsigned int count);
436ecb_inline uint8_t ecb_rotr8 (uint8_t x, unsigned int count) ecb_const; 531ecb_inline ecb_const uint8_t ecb_rotr8 (uint8_t x, unsigned int count);
437ecb_inline uint16_t ecb_rotl16 (uint16_t x, unsigned int count) ecb_const; 532ecb_inline ecb_const uint16_t ecb_rotl16 (uint16_t x, unsigned int count);
438ecb_inline uint16_t ecb_rotr16 (uint16_t x, unsigned int count) ecb_const; 533ecb_inline ecb_const uint16_t ecb_rotr16 (uint16_t x, unsigned int count);
439ecb_inline uint32_t ecb_rotl32 (uint32_t x, unsigned int count) ecb_const; 534ecb_inline ecb_const uint32_t ecb_rotl32 (uint32_t x, unsigned int count);
440ecb_inline uint32_t ecb_rotr32 (uint32_t x, unsigned int count) ecb_const; 535ecb_inline ecb_const uint32_t ecb_rotr32 (uint32_t x, unsigned int count);
441ecb_inline uint64_t ecb_rotl64 (uint64_t x, unsigned int count) ecb_const; 536ecb_inline ecb_const uint64_t ecb_rotl64 (uint64_t x, unsigned int count);
442ecb_inline uint64_t ecb_rotr64 (uint64_t x, unsigned int count) ecb_const; 537ecb_inline ecb_const uint64_t ecb_rotr64 (uint64_t x, unsigned int count);
443 538
444ecb_inline uint8_t ecb_rotl8 (uint8_t x, unsigned int count) { return (x >> ( 8 - count)) | (x << count); } 539ecb_inline ecb_const uint8_t ecb_rotl8 (uint8_t x, unsigned int count) { return (x >> ( 8 - count)) | (x << count); }
445ecb_inline uint8_t ecb_rotr8 (uint8_t x, unsigned int count) { return (x << ( 8 - count)) | (x >> count); } 540ecb_inline ecb_const uint8_t ecb_rotr8 (uint8_t x, unsigned int count) { return (x << ( 8 - count)) | (x >> count); }
446ecb_inline uint16_t ecb_rotl16 (uint16_t x, unsigned int count) { return (x >> (16 - count)) | (x << count); } 541ecb_inline ecb_const uint16_t ecb_rotl16 (uint16_t x, unsigned int count) { return (x >> (16 - count)) | (x << count); }
447ecb_inline uint16_t ecb_rotr16 (uint16_t x, unsigned int count) { return (x << (16 - count)) | (x >> count); } 542ecb_inline ecb_const uint16_t ecb_rotr16 (uint16_t x, unsigned int count) { return (x << (16 - count)) | (x >> count); }
448ecb_inline uint32_t ecb_rotl32 (uint32_t x, unsigned int count) { return (x >> (32 - count)) | (x << count); } 543ecb_inline ecb_const uint32_t ecb_rotl32 (uint32_t x, unsigned int count) { return (x >> (32 - count)) | (x << count); }
449ecb_inline uint32_t ecb_rotr32 (uint32_t x, unsigned int count) { return (x << (32 - count)) | (x >> count); } 544ecb_inline ecb_const uint32_t ecb_rotr32 (uint32_t x, unsigned int count) { return (x << (32 - count)) | (x >> count); }
450ecb_inline uint64_t ecb_rotl64 (uint64_t x, unsigned int count) { return (x >> (64 - count)) | (x << count); } 545ecb_inline ecb_const uint64_t ecb_rotl64 (uint64_t x, unsigned int count) { return (x >> (64 - count)) | (x << count); }
451ecb_inline uint64_t ecb_rotr64 (uint64_t x, unsigned int count) { return (x << (64 - count)) | (x >> count); } 546ecb_inline ecb_const uint64_t ecb_rotr64 (uint64_t x, unsigned int count) { return (x << (64 - count)) | (x >> count); }
452 547
453#if ECB_GCC_VERSION(4,3) 548#if ECB_GCC_VERSION(4,3) || (ECB_CLANG_BUILTIN(__builtin_bswap32) && ECB_CLANG_BUILTIN(__builtin_bswap64))
454 #define ecb_bswap16(x) (__builtin_bswap32 (x) >> 16) 549 #define ecb_bswap16(x) (__builtin_bswap32 (x) >> 16)
455 #define ecb_bswap32(x) __builtin_bswap32 (x) 550 #define ecb_bswap32(x) __builtin_bswap32 (x)
456 #define ecb_bswap64(x) __builtin_bswap64 (x) 551 #define ecb_bswap64(x) __builtin_bswap64 (x)
457#else 552#else
458 ecb_function_ uint16_t ecb_bswap16 (uint16_t x) ecb_const; 553 ecb_function_ ecb_const uint16_t ecb_bswap16 (uint16_t x);
459 ecb_function_ uint16_t 554 ecb_function_ ecb_const uint16_t
460 ecb_bswap16 (uint16_t x) 555 ecb_bswap16 (uint16_t x)
461 { 556 {
462 return ecb_rotl16 (x, 8); 557 return ecb_rotl16 (x, 8);
463 } 558 }
464 559
465 ecb_function_ uint32_t ecb_bswap32 (uint32_t x) ecb_const; 560 ecb_function_ ecb_const uint32_t ecb_bswap32 (uint32_t x);
466 ecb_function_ uint32_t 561 ecb_function_ ecb_const uint32_t
467 ecb_bswap32 (uint32_t x) 562 ecb_bswap32 (uint32_t x)
468 { 563 {
469 return (((uint32_t)ecb_bswap16 (x)) << 16) | ecb_bswap16 (x >> 16); 564 return (((uint32_t)ecb_bswap16 (x)) << 16) | ecb_bswap16 (x >> 16);
470 } 565 }
471 566
472 ecb_function_ uint64_t ecb_bswap64 (uint64_t x) ecb_const; 567 ecb_function_ ecb_const uint64_t ecb_bswap64 (uint64_t x);
473 ecb_function_ uint64_t 568 ecb_function_ ecb_const uint64_t
474 ecb_bswap64 (uint64_t x) 569 ecb_bswap64 (uint64_t x)
475 { 570 {
476 return (((uint64_t)ecb_bswap32 (x)) << 32) | ecb_bswap32 (x >> 32); 571 return (((uint64_t)ecb_bswap32 (x)) << 32) | ecb_bswap32 (x >> 32);
477 } 572 }
478#endif 573#endif
479 574
480#if ECB_GCC_VERSION(4,5) 575#if ECB_GCC_VERSION(4,5) || ECB_CLANG_BUILTIN(__builtin_unreachable)
481 #define ecb_unreachable() __builtin_unreachable () 576 #define ecb_unreachable() __builtin_unreachable ()
482#else 577#else
483 /* this seems to work fine, but gcc always emits a warning for it :/ */ 578 /* this seems to work fine, but gcc always emits a warning for it :/ */
484 ecb_inline void ecb_unreachable (void) ecb_noreturn; 579 ecb_inline ecb_noreturn void ecb_unreachable (void);
485 ecb_inline void ecb_unreachable (void) { } 580 ecb_inline ecb_noreturn void ecb_unreachable (void) { }
486#endif 581#endif
487 582
488/* try to tell the compiler that some condition is definitely true */ 583/* try to tell the compiler that some condition is definitely true */
489#define ecb_assume(cond) if (!(cond)) ecb_unreachable (); else 0 584#define ecb_assume(cond) if (!(cond)) ecb_unreachable (); else 0
490 585
491ecb_inline unsigned char ecb_byteorder_helper (void) ecb_const; 586ecb_inline ecb_const unsigned char ecb_byteorder_helper (void);
492ecb_inline unsigned char 587ecb_inline ecb_const unsigned char
493ecb_byteorder_helper (void) 588ecb_byteorder_helper (void)
494{ 589{
495 /* the union code still generates code under pressure in gcc, */ 590 /* the union code still generates code under pressure in gcc, */
496 /* but less than using pointers, and always seems to */ 591 /* but less than using pointers, and always seems to */
497 /* successfully return a constant. */ 592 /* successfully return a constant. */
512 } u = { 0x11223344 }; 607 } u = { 0x11223344 };
513 return u.c; 608 return u.c;
514#endif 609#endif
515} 610}
516 611
517ecb_inline ecb_bool ecb_big_endian (void) ecb_const; 612ecb_inline ecb_const ecb_bool ecb_big_endian (void);
518ecb_inline ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; } 613ecb_inline ecb_const ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; }
519ecb_inline ecb_bool ecb_little_endian (void) ecb_const; 614ecb_inline ecb_const ecb_bool ecb_little_endian (void);
520ecb_inline ecb_bool ecb_little_endian (void) { return ecb_byteorder_helper () == 0x44; } 615ecb_inline ecb_const ecb_bool ecb_little_endian (void) { return ecb_byteorder_helper () == 0x44; }
521 616
522#if ECB_GCC_VERSION(3,0) || ECB_C99 617#if ECB_GCC_VERSION(3,0) || ECB_C99
523 #define ecb_mod(m,n) ((m) % (n) + ((m) % (n) < 0 ? (n) : 0)) 618 #define ecb_mod(m,n) ((m) % (n) + ((m) % (n) < 0 ? (n) : 0))
524#else 619#else
525 #define ecb_mod(m,n) ((m) < 0 ? ((n) - 1 - ((-1 - (m)) % (n))) : ((m) % (n))) 620 #define ecb_mod(m,n) ((m) < 0 ? ((n) - 1 - ((-1 - (m)) % (n))) : ((m) % (n)))
526#endif 621#endif
527 622
528#if __cplusplus 623#if ECB_CPP
529 template<typename T> 624 template<typename T>
530 static inline T ecb_div_rd (T val, T div) 625 static inline T ecb_div_rd (T val, T div)
531 { 626 {
532 return val < 0 ? - ((-val + div - 1) / div) : (val ) / div; 627 return val < 0 ? - ((-val + div - 1) / div) : (val ) / div;
533 } 628 }
559/* the only noteworthy exception is ancient armle, which uses order 43218765 */ 654/* the only noteworthy exception is ancient armle, which uses order 43218765 */
560#if 0 \ 655#if 0 \
561 || __i386 || __i386__ \ 656 || __i386 || __i386__ \
562 || __amd64 || __amd64__ || __x86_64 || __x86_64__ \ 657 || __amd64 || __amd64__ || __x86_64 || __x86_64__ \
563 || __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__ \ 658 || __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__ \
564 || defined __arm__ && defined __ARM_EABI__ \
565 || defined __s390__ || defined __s390x__ \ 659 || defined __s390__ || defined __s390x__ \
566 || defined __mips__ \ 660 || defined __mips__ \
567 || defined __alpha__ \ 661 || defined __alpha__ \
568 || defined __hppa__ \ 662 || defined __hppa__ \
569 || defined __ia64__ \ 663 || defined __ia64__ \
664 || defined __m68k__ \
665 || defined __m88k__ \
666 || defined __sh__ \
570 || defined _M_IX86 || defined _M_AMD64 || defined _M_IA64 667 || defined _M_IX86 || defined _M_AMD64 || defined _M_IA64 \
668 || (defined __arm__ && (defined __ARM_EABI__ || defined __EABI__ || defined __VFP_FP__ || defined _WIN32_WCE || defined __ANDROID__)) \
669 || defined __aarch64__
571 #define ECB_STDFP 1 670 #define ECB_STDFP 1
572 #include <string.h> /* for memcpy */ 671 #include <string.h> /* for memcpy */
573#else 672#else
574 #define ECB_STDFP 0 673 #define ECB_STDFP 0
575 #include <math.h> /* for frexp*, ldexp* */
576#endif 674#endif
577 675
578#ifndef ECB_NO_LIBM 676#ifndef ECB_NO_LIBM
579 677
678 #include <math.h> /* for frexp*, ldexp*, INFINITY, NAN */
679
680 /* only the oldest of old doesn't have this one. solaris. */
681 #ifdef INFINITY
682 #define ECB_INFINITY INFINITY
683 #else
684 #define ECB_INFINITY HUGE_VAL
685 #endif
686
687 #ifdef NAN
688 #define ECB_NAN NAN
689 #else
690 #define ECB_NAN ECB_INFINITY
691 #endif
692
693 #if ECB_C99 || _XOPEN_VERSION >= 600 || _POSIX_VERSION >= 200112L
694 #define ecb_ldexpf(x,e) ldexpf ((x), (e))
695 #else
696 #define ecb_ldexpf(x,e) (float) ldexp ((x), (e))
697 #endif
698
699 /* converts an ieee half/binary16 to a float */
700 ecb_function_ ecb_const float ecb_binary16_to_float (uint16_t x);
701 ecb_function_ ecb_const float
702 ecb_binary16_to_float (uint16_t x)
703 {
704 int e = (x >> 10) & 0x1f;
705 int m = x & 0x3ff;
706 float r;
707
708 if (!e ) r = ecb_ldexpf (m , -24);
709 else if (e != 31) r = ecb_ldexpf (m + 0x400, e - 25);
710 else if (m ) r = ECB_NAN;
711 else r = ECB_INFINITY;
712
713 return x & 0x8000 ? -r : r;
714 }
715
580 /* convert a float to ieee single/binary32 */ 716 /* convert a float to ieee single/binary32 */
581 ecb_function_ uint32_t ecb_float_to_binary32 (float x) ecb_const; 717 ecb_function_ ecb_const uint32_t ecb_float_to_binary32 (float x);
582 ecb_function_ uint32_t 718 ecb_function_ ecb_const uint32_t
583 ecb_float_to_binary32 (float x) 719 ecb_float_to_binary32 (float x)
584 { 720 {
585 uint32_t r; 721 uint32_t r;
586 722
587 #if ECB_STDFP 723 #if ECB_STDFP
616 752
617 return r; 753 return r;
618 } 754 }
619 755
620 /* converts an ieee single/binary32 to a float */ 756 /* converts an ieee single/binary32 to a float */
621 ecb_function_ float ecb_binary32_to_float (uint32_t x) ecb_const; 757 ecb_function_ ecb_const float ecb_binary32_to_float (uint32_t x);
622 ecb_function_ float 758 ecb_function_ ecb_const float
623 ecb_binary32_to_float (uint32_t x) 759 ecb_binary32_to_float (uint32_t x)
624 { 760 {
625 float r; 761 float r;
626 762
627 #if ECB_STDFP 763 #if ECB_STDFP
637 x |= 0x800000U; 773 x |= 0x800000U;
638 else 774 else
639 e = 1; 775 e = 1;
640 776
641 /* we distrust ldexpf a bit and do the 2**-24 scaling by an extra multiply */ 777 /* we distrust ldexpf a bit and do the 2**-24 scaling by an extra multiply */
642 r = ldexpf (x * (0.5f / 0x800000U), e - 126); 778 r = ecb_ldexpf (x * (0.5f / 0x800000U), e - 126);
643 779
644 r = neg ? -r : r; 780 r = neg ? -r : r;
645 #endif 781 #endif
646 782
647 return r; 783 return r;
648 } 784 }
649 785
650 /* convert a double to ieee double/binary64 */ 786 /* convert a double to ieee double/binary64 */
651 ecb_function_ uint64_t ecb_double_to_binary64 (double x) ecb_const; 787 ecb_function_ ecb_const uint64_t ecb_double_to_binary64 (double x);
652 ecb_function_ uint64_t 788 ecb_function_ ecb_const uint64_t
653 ecb_double_to_binary64 (double x) 789 ecb_double_to_binary64 (double x)
654 { 790 {
655 uint64_t r; 791 uint64_t r;
656 792
657 #if ECB_STDFP 793 #if ECB_STDFP
686 822
687 return r; 823 return r;
688 } 824 }
689 825
690 /* converts an ieee double/binary64 to a double */ 826 /* converts an ieee double/binary64 to a double */
691 ecb_function_ double ecb_binary64_to_double (uint64_t x) ecb_const; 827 ecb_function_ ecb_const double ecb_binary64_to_double (uint64_t x);
692 ecb_function_ double 828 ecb_function_ ecb_const double
693 ecb_binary64_to_double (uint64_t x) 829 ecb_binary64_to_double (uint64_t x)
694 { 830 {
695 double r; 831 double r;
696 832
697 #if ECB_STDFP 833 #if ECB_STDFP

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines