[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/ecb.h

Comparing deliantra/Deliantra-Client/ecb.h (file contents):
Revision 1.3 by root, Sat Jan 11 02:10:03 2020 UTC vs.
Revision 1.4 by root, Thu Nov 12 03:04:54 2020 UTC

…		…
1	/*	1	/*
2	* libecb - http://software.schmorp.de/pkg/libecb	2	* libecb - http://software.schmorp.de/pkg/libecb
3	*	3	*
4	* Copyright (©) 2009-2015 Marc Alexander Lehmann <libecb@schmorp.de>	4	* Copyright (©) 2009-2015,2018-2020 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:
40		40
41	#ifndef ECB_H	41	#ifndef ECB_H
42	#define ECB_H	42	#define ECB_H
43		43
44	/* 16 bits major, 16 bits minor */	44	/* 16 bits major, 16 bits minor */
45	#define ECB_VERSION 0x00010007	45	#define ECB_VERSION 0x00010008
46		46
47	#ifdef _WIN32	47	#include <string.h> /* for memcpy */
		48
		49	#if defined (_WIN32) && !defined (__MINGW32__)
48	typedef signed char int8_t;	50	typedef signed char int8_t;
49	typedef unsigned char uint8_t;	51	typedef unsigned char uint8_t;
		52	typedef signed char int_fast8_t;
		53	typedef unsigned char uint_fast8_t;
50	typedef signed short int16_t;	54	typedef signed short int16_t;
51	typedef unsigned short uint16_t;	55	typedef unsigned short uint16_t;
		56	typedef signed int int_fast16_t;
		57	typedef unsigned int uint_fast16_t;
52	typedef signed int int32_t;	58	typedef signed int int32_t;
53	typedef unsigned int uint32_t;	59	typedef unsigned int uint32_t;
		60	typedef signed int int_fast32_t;
		61	typedef unsigned int uint_fast32_t;
54	#if __GNUC__	62	#if __GNUC__
55	typedef signed long long int64_t;	63	typedef signed long long int64_t;
56	typedef unsigned long long uint64_t;	64	typedef unsigned long long uint64_t;
57	#else /* _MSC_VER \|\| __BORLANDC__ */	65	#else /* _MSC_VER \|\| __BORLANDC__ */
58	typedef signed __int64 int64_t;	66	typedef signed __int64 int64_t;
59	typedef unsigned __int64 uint64_t;	67	typedef unsigned __int64 uint64_t;
60	#endif	68	#endif
		69	typedef int64_t int_fast64_t;
		70	typedef uint64_t uint_fast64_t;
61	#ifdef _WIN64	71	#ifdef _WIN64
62	#define ECB_PTRSIZE 8	72	#define ECB_PTRSIZE 8
63	typedef uint64_t uintptr_t;	73	typedef uint64_t uintptr_t;
64	typedef int64_t intptr_t;	74	typedef int64_t intptr_t;
65	#else	75	#else
…		…
600	ecb_inline ecb_const uint32_t ecb_rotl32 (uint32_t x, unsigned int count) { return (x >> (32 - count)) \| (x << count); }	610	ecb_inline ecb_const uint32_t ecb_rotl32 (uint32_t x, unsigned int count) { return (x >> (32 - count)) \| (x << count); }
601	ecb_inline ecb_const uint32_t ecb_rotr32 (uint32_t x, unsigned int count) { return (x << (32 - count)) \| (x >> count); }	611	ecb_inline ecb_const uint32_t ecb_rotr32 (uint32_t x, unsigned int count) { return (x << (32 - count)) \| (x >> count); }
602	ecb_inline ecb_const uint64_t ecb_rotl64 (uint64_t x, unsigned int count) { return (x >> (64 - count)) \| (x << count); }	612	ecb_inline ecb_const uint64_t ecb_rotl64 (uint64_t x, unsigned int count) { return (x >> (64 - count)) \| (x << count); }
603	ecb_inline ecb_const uint64_t ecb_rotr64 (uint64_t x, unsigned int count) { return (x << (64 - count)) \| (x >> count); }	613	ecb_inline ecb_const uint64_t ecb_rotr64 (uint64_t x, unsigned int count) { return (x << (64 - count)) \| (x >> count); }
604		614
		615	#if ECB_CPP
		616
		617	inline uint8_t ecb_ctz (uint8_t v) { return ecb_ctz32 (v); }
		618	inline uint16_t ecb_ctz (uint16_t v) { return ecb_ctz32 (v); }
		619	inline uint32_t ecb_ctz (uint32_t v) { return ecb_ctz32 (v); }
		620	inline uint64_t ecb_ctz (uint64_t v) { return ecb_ctz64 (v); }
		621
		622	inline bool ecb_is_pot (uint8_t v) { return ecb_is_pot32 (v); }
		623	inline bool ecb_is_pot (uint16_t v) { return ecb_is_pot32 (v); }
		624	inline bool ecb_is_pot (uint32_t v) { return ecb_is_pot32 (v); }
		625	inline bool ecb_is_pot (uint64_t v) { return ecb_is_pot64 (v); }
		626
		627	inline int ecb_ld (uint8_t v) { return ecb_ld32 (v); }
		628	inline int ecb_ld (uint16_t v) { return ecb_ld32 (v); }
		629	inline int ecb_ld (uint32_t v) { return ecb_ld32 (v); }
		630	inline int ecb_ld (uint64_t v) { return ecb_ld64 (v); }
		631
		632	inline int ecb_popcount (uint8_t v) { return ecb_popcount32 (v); }
		633	inline int ecb_popcount (uint16_t v) { return ecb_popcount32 (v); }
		634	inline int ecb_popcount (uint32_t v) { return ecb_popcount32 (v); }
		635	inline int ecb_popcount (uint64_t v) { return ecb_popcount64 (v); }
		636
		637	inline uint8_t ecb_bitrev (uint8_t v) { return ecb_bitrev8 (v); }
		638	inline uint16_t ecb_bitrev (uint16_t v) { return ecb_bitrev16 (v); }
		639	inline uint32_t ecb_bitrev (uint32_t v) { return ecb_bitrev32 (v); }
		640
		641	inline uint8_t ecb_rotl (uint8_t v, unsigned int count) { return ecb_rotl8 (v, count); }
		642	inline uint16_t ecb_rotl (uint16_t v, unsigned int count) { return ecb_rotl16 (v, count); }
		643	inline uint32_t ecb_rotl (uint32_t v, unsigned int count) { return ecb_rotl32 (v, count); }
		644	inline uint64_t ecb_rotl (uint64_t v, unsigned int count) { return ecb_rotl64 (v, count); }
		645
		646	inline uint8_t ecb_rotr (uint8_t v, unsigned int count) { return ecb_rotr8 (v, count); }
		647	inline uint16_t ecb_rotr (uint16_t v, unsigned int count) { return ecb_rotr16 (v, count); }
		648	inline uint32_t ecb_rotr (uint32_t v, unsigned int count) { return ecb_rotr32 (v, count); }
		649	inline uint64_t ecb_rotr (uint64_t v, unsigned int count) { return ecb_rotr64 (v, count); }
		650
		651	#endif
		652
605	#if ECB_GCC_VERSION(4,3) \|\| (ECB_CLANG_BUILTIN(__builtin_bswap32) && ECB_CLANG_BUILTIN(__builtin_bswap64))	653	#if ECB_GCC_VERSION(4,3) \|\| (ECB_CLANG_BUILTIN(__builtin_bswap32) && ECB_CLANG_BUILTIN(__builtin_bswap64))
606	#if ECB_GCC_VERSION(4,8) \|\| ECB_CLANG_BUILTIN(__builtin_bswap16)	654	#if ECB_GCC_VERSION(4,8) \|\| ECB_CLANG_BUILTIN(__builtin_bswap16)
607	#define ecb_bswap16(x) __builtin_bswap16 (x)	655	#define ecb_bswap16(x) __builtin_bswap16 (x)
608	#else	656	#else
609	#define ecb_bswap16(x) (__builtin_bswap32 (x) >> 16)	657	#define ecb_bswap16(x) (__builtin_bswap32 (x) >> 16)
…		…
680	ecb_inline ecb_const ecb_bool ecb_big_endian (void);	728	ecb_inline ecb_const ecb_bool ecb_big_endian (void);
681	ecb_inline ecb_const ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11223344; }	729	ecb_inline ecb_const ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11223344; }
682	ecb_inline ecb_const ecb_bool ecb_little_endian (void);	730	ecb_inline ecb_const ecb_bool ecb_little_endian (void);
683	ecb_inline ecb_const ecb_bool ecb_little_endian (void) { return ecb_byteorder_helper () == 0x44332211; }	731	ecb_inline ecb_const ecb_bool ecb_little_endian (void) { return ecb_byteorder_helper () == 0x44332211; }
684		732
		733	/*****************************************************************************/
		734	/* unaligned load/store */
		735
		736	ecb_inline uint_fast16_t ecb_be_u16_to_host (uint_fast16_t v) { return ecb_little_endian () ? ecb_bswap16 (v) : v; }
		737	ecb_inline uint_fast32_t ecb_be_u32_to_host (uint_fast32_t v) { return ecb_little_endian () ? ecb_bswap32 (v) : v; }
		738	ecb_inline uint_fast64_t ecb_be_u64_to_host (uint_fast64_t v) { return ecb_little_endian () ? ecb_bswap64 (v) : v; }
		739
		740	ecb_inline uint_fast16_t ecb_le_u16_to_host (uint_fast16_t v) { return ecb_big_endian () ? ecb_bswap16 (v) : v; }
		741	ecb_inline uint_fast32_t ecb_le_u32_to_host (uint_fast32_t v) { return ecb_big_endian () ? ecb_bswap32 (v) : v; }
		742	ecb_inline uint_fast64_t ecb_le_u64_to_host (uint_fast64_t v) { return ecb_big_endian () ? ecb_bswap64 (v) : v; }
		743
		744	ecb_inline uint_fast16_t ecb_peek_u16_u (const void *ptr) { uint16_t v; memcpy (&v, ptr, sizeof (v)); return v; }
		745	ecb_inline uint_fast32_t ecb_peek_u32_u (const void *ptr) { uint32_t v; memcpy (&v, ptr, sizeof (v)); return v; }
		746	ecb_inline uint_fast64_t ecb_peek_u64_u (const void *ptr) { uint64_t v; memcpy (&v, ptr, sizeof (v)); return v; }
		747
		748	ecb_inline uint_fast16_t ecb_peek_be_u16_u (const void *ptr) { return ecb_be_u16_to_host (ecb_peek_u16_u (ptr)); }
		749	ecb_inline uint_fast32_t ecb_peek_be_u32_u (const void *ptr) { return ecb_be_u32_to_host (ecb_peek_u32_u (ptr)); }
		750	ecb_inline uint_fast64_t ecb_peek_be_u64_u (const void *ptr) { return ecb_be_u64_to_host (ecb_peek_u64_u (ptr)); }
		751
		752	ecb_inline uint_fast16_t ecb_peek_le_u16_u (const void *ptr) { return ecb_le_u16_to_host (ecb_peek_u16_u (ptr)); }
		753	ecb_inline uint_fast32_t ecb_peek_le_u32_u (const void *ptr) { return ecb_le_u32_to_host (ecb_peek_u32_u (ptr)); }
		754	ecb_inline uint_fast64_t ecb_peek_le_u64_u (const void *ptr) { return ecb_le_u64_to_host (ecb_peek_u64_u (ptr)); }
		755
		756	ecb_inline uint_fast16_t ecb_host_to_be_u16 (uint_fast16_t v) { return ecb_little_endian () ? ecb_bswap16 (v) : v; }
		757	ecb_inline uint_fast32_t ecb_host_to_be_u32 (uint_fast32_t v) { return ecb_little_endian () ? ecb_bswap32 (v) : v; }
		758	ecb_inline uint_fast64_t ecb_host_to_be_u64 (uint_fast64_t v) { return ecb_little_endian () ? ecb_bswap64 (v) : v; }
		759
		760	ecb_inline uint_fast16_t ecb_host_to_le_u16 (uint_fast16_t v) { return ecb_big_endian () ? ecb_bswap16 (v) : v; }
		761	ecb_inline uint_fast32_t ecb_host_to_le_u32 (uint_fast32_t v) { return ecb_big_endian () ? ecb_bswap32 (v) : v; }
		762	ecb_inline uint_fast64_t ecb_host_to_le_u64 (uint_fast64_t v) { return ecb_big_endian () ? ecb_bswap64 (v) : v; }
		763
		764	ecb_inline void ecb_poke_u16_u (void *ptr, uint16_t v) { memcpy (ptr, &v, sizeof (v)); }
		765	ecb_inline void ecb_poke_u32_u (void *ptr, uint32_t v) { memcpy (ptr, &v, sizeof (v)); }
		766	ecb_inline void ecb_poke_u64_u (void *ptr, uint64_t v) { memcpy (ptr, &v, sizeof (v)); }
		767
		768	ecb_inline void ecb_poke_be_u16_u (void *ptr, uint_fast16_t v) { ecb_poke_u16_u (ptr, ecb_host_to_be_u16 (v)); }
		769	ecb_inline void ecb_poke_be_u32_u (void *ptr, uint_fast32_t v) { ecb_poke_u32_u (ptr, ecb_host_to_be_u32 (v)); }
		770	ecb_inline void ecb_poke_be_u64_u (void *ptr, uint_fast64_t v) { ecb_poke_u64_u (ptr, ecb_host_to_be_u64 (v)); }
		771
		772	ecb_inline void ecb_poke_le_u16_u (void *ptr, uint_fast16_t v) { ecb_poke_u16_u (ptr, ecb_host_to_le_u16 (v)); }
		773	ecb_inline void ecb_poke_le_u32_u (void *ptr, uint_fast32_t v) { ecb_poke_u32_u (ptr, ecb_host_to_le_u32 (v)); }
		774	ecb_inline void ecb_poke_le_u64_u (void *ptr, uint_fast64_t v) { ecb_poke_u64_u (ptr, ecb_host_to_le_u64 (v)); }
		775
		776	#if ECB_CPP
		777
		778	inline uint8_t ecb_bswap (uint8_t v) { return v; }
		779	inline uint16_t ecb_bswap (uint16_t v) { return ecb_bswap16 (v); }
		780	inline uint32_t ecb_bswap (uint32_t v) { return ecb_bswap32 (v); }
		781	inline uint64_t ecb_bswap (uint64_t v) { return ecb_bswap64 (v); }
		782
		783	template<typename T> inline T ecb_be_to_host (T v) { return ecb_little_endian () ? ecb_bswap (v) : v; }
		784	template<typename T> inline T ecb_le_to_host (T v) { return ecb_big_endian () ? ecb_bswap (v) : v; }
		785	template<typename T> inline T ecb_peek (const void ptr) { return (const T *)ptr; }
		786	template<typename T> inline T ecb_peek_be (const void *ptr) { return ecb_be_to_host (ecb_peek <T> (ptr)); }
		787	template<typename T> inline T ecb_peek_le (const void *ptr) { return ecb_le_to_host (ecb_peek <T> (ptr)); }
		788	template<typename T> inline T ecb_peek_u (const void *ptr) { T v; memcpy (&v, ptr, sizeof (v)); return v; }
		789	template<typename T> inline T ecb_peek_be_u (const void *ptr) { return ecb_be_to_host (ecb_peek_u<T> (ptr)); }
		790	template<typename T> inline T ecb_peek_le_u (const void *ptr) { return ecb_le_to_host (ecb_peek_u<T> (ptr)); }
		791
		792	template<typename T> inline T ecb_host_to_be (T v) { return ecb_little_endian () ? ecb_bswap (v) : v; }
		793	template<typename T> inline T ecb_host_to_le (T v) { return ecb_big_endian () ? ecb_bswap (v) : v; }
		794	template<typename T> inline void ecb_poke (void ptr, T v) { (T *)ptr = v; }
		795	template<typename T> inline void ecb_poke_be (void *ptr, T v) { return ecb_poke <T> (ptr, ecb_host_to_be (v)); }
		796	template<typename T> inline void ecb_poke_le (void *ptr, T v) { return ecb_poke <T> (ptr, ecb_host_to_le (v)); }
		797	template<typename T> inline void ecb_poke_u (void *ptr, T v) { memcpy (ptr, &v, sizeof (v)); }
		798	template<typename T> inline void ecb_poke_be_u (void *ptr, T v) { return ecb_poke_u<T> (ptr, ecb_host_to_be (v)); }
		799	template<typename T> inline void ecb_poke_le_u (void *ptr, T v) { return ecb_poke_u<T> (ptr, ecb_host_to_le (v)); }
		800
		801	#endif
		802
		803	/*****************************************************************************/
		804	/* division */
		805
685	#if ECB_GCC_VERSION(3,0) \|\| ECB_C99	806	#if ECB_GCC_VERSION(3,0) \|\| ECB_C99
		807	/* C99 tightened the definition of %, so we can use a more efficient version */
686	#define ecb_mod(m,n) ((m) % (n) + ((m) % (n) < 0 ? (n) : 0))	808	#define ecb_mod(m,n) ((m) % (n) + ((m) % (n) < 0 ? (n) : 0))
687	#else	809	#else
688	#define ecb_mod(m,n) ((m) < 0 ? ((n) - 1 - ((-1 - (m)) % (n))) : ((m) % (n)))	810	#define ecb_mod(m,n) ((m) < 0 ? ((n) - 1 - ((-1 - (m)) % (n))) : ((m) % (n)))
689	#endif	811	#endif
690		812
…		…
701	}	823	}
702	#else	824	#else
703	#define ecb_div_rd(val,div) ((val) < 0 ? - ((-(val) + (div) - 1) / (div)) : ((val) ) / (div))	825	#define ecb_div_rd(val,div) ((val) < 0 ? - ((-(val) + (div) - 1) / (div)) : ((val) ) / (div))
704	#define ecb_div_ru(val,div) ((val) < 0 ? - ((-(val) ) / (div)) : ((val) + (div) - 1) / (div))	826	#define ecb_div_ru(val,div) ((val) < 0 ? - ((-(val) ) / (div)) : ((val) + (div) - 1) / (div))
705	#endif	827	#endif
		828
		829	/*****************************************************************************/
		830	/* array length */
706		831
707	#if ecb_cplusplus_does_not_suck	832	#if ecb_cplusplus_does_not_suck
708	/* does not work for local types (http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2657.htm) */	833	/* does not work for local types (http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2657.htm) */
709	template<typename T, int N>	834	template<typename T, int N>
710	static inline int ecb_array_length (const T (&arr)[N])	835	static inline int ecb_array_length (const T (&arr)[N])
…		…
712	return N;	837	return N;
713	}	838	}
714	#else	839	#else
715	#define ecb_array_length(name) (sizeof (name) / sizeof (name [0]))	840	#define ecb_array_length(name) (sizeof (name) / sizeof (name [0]))
716	#endif	841	#endif
		842
		843	/*****************************************************************************/
		844	/* IEEE 754-2008 half float conversions */
717		845
718	ecb_function_ ecb_const uint32_t ecb_binary16_to_binary32 (uint32_t x);	846	ecb_function_ ecb_const uint32_t ecb_binary16_to_binary32 (uint32_t x);
719	ecb_function_ ecb_const uint32_t	847	ecb_function_ ecb_const uint32_t
720	ecb_binary16_to_binary32 (uint32_t x)	848	ecb_binary16_to_binary32 (uint32_t x)
721	{	849	{
…		…
830	\|\| defined __sh__ \	958	\|\| defined __sh__ \
831	\|\| defined _M_IX86 \|\| defined ECB_MSVC_AMD64 \|\| defined _M_IA64 \	959	\|\| defined _M_IX86 \|\| defined ECB_MSVC_AMD64 \|\| defined _M_IA64 \
832	\|\| (defined __arm__ && (defined __ARM_EABI__ \|\| defined __EABI__ \|\| defined __VFP_FP__ \|\| defined _WIN32_WCE \|\| defined __ANDROID__)) \	960	\|\| (defined __arm__ && (defined __ARM_EABI__ \|\| defined __EABI__ \|\| defined __VFP_FP__ \|\| defined _WIN32_WCE \|\| defined __ANDROID__)) \
833	\|\| defined __aarch64__	961	\|\| defined __aarch64__
834	#define ECB_STDFP 1	962	#define ECB_STDFP 1
835	#include <string.h> /* for memcpy */
836	#else	963	#else
837	#define ECB_STDFP 0	964	#define ECB_STDFP 0
838	#endif	965	#endif
839		966
840	#ifndef ECB_NO_LIBM	967	#ifndef ECB_NO_LIBM

Diff Legend

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

Comparing deliantra/Deliantra-Client/ecb.h (file contents): Revision 1.3 by root, Sat Jan 11 02:10:03 2020 UTC vs. Revision 1.4 by root, Thu Nov 12 03:04:54 2020 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/ecb.h (file contents):
Revision 1.3 by root, Sat Jan 11 02:10:03 2020 UTC vs.
Revision 1.4 by root, Thu Nov 12 03:04:54 2020 UTC