diff --git a/moo/Makefile.in b/moo/Makefile.in index 9e029b0..7777fba 100644 --- a/moo/Makefile.in +++ b/moo/Makefile.in @@ -166,8 +166,8 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/ac/ar-lib \ $(top_srcdir)/ac/compile $(top_srcdir)/ac/config.guess \ $(top_srcdir)/ac/config.sub $(top_srcdir)/ac/install-sh \ $(top_srcdir)/ac/ltmain.sh $(top_srcdir)/ac/missing ac/ar-lib \ - ac/compile ac/config.guess ac/config.sub ac/depcomp \ - ac/install-sh ac/ltmain.sh ac/missing + ac/compile ac/config.guess ac/config.sub ac/install-sh \ + ac/ltmain.sh ac/missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) diff --git a/moo/configure b/moo/configure index a3a0507..9867813 100755 --- a/moo/configure +++ b/moo/configure @@ -21778,7 +21778,7 @@ MOO_PROJECT_AUTHOR="${PACKAGE_BUGREPORT}" MOO_PROJECT_URL="${PACKAGE_URL}" -ac_config_files="$ac_config_files Makefile lib/Makefile mod/Makefile" +ac_config_files="$ac_config_files Makefile lib/Makefile mod/Makefile t/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -22946,6 +22946,7 @@ do "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;; "mod/Makefile") CONFIG_FILES="$CONFIG_FILES mod/Makefile" ;; + "t/Makefile") CONFIG_FILES="$CONFIG_FILES t/Makefile" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac diff --git a/moo/configure.ac b/moo/configure.ac index 3ab1da2..c5c5aa8 100644 --- a/moo/configure.ac +++ b/moo/configure.ac @@ -860,6 +860,7 @@ AC_CONFIG_FILES([ Makefile lib/Makefile mod/Makefile + t/Makefile ]) AC_OUTPUT diff --git a/moo/lib/moo-utl.h b/moo/lib/moo-utl.h index 83c6b7c..5eb6e60 100644 --- a/moo/lib/moo-utl.h +++ b/moo/lib/moo-utl.h @@ -90,28 +90,126 @@ /* ========================================================================= * ENDIAN CHANGE * ========================================================================= */ -#define MOO_CONST_SWAP16(x) \ - ((qse_uint16_t)((((qse_uint16_t)(x) & (qse_uint16_t)0x00ffU) << 8) | \ - (((qse_uint16_t)(x) & (qse_uint16_t)0xff00U) >> 8) )) +#define MOO_CONST_BSWAP16(x) \ + ((qse_uint16_t)((((qse_uint16_t)(x) & (qse_uint16_t)0x00ff) << 8) | \ + (((qse_uint16_t)(x) & (qse_uint16_t)0xff00) >> 8) )) -#define MOO_CONST_SWAP32(x) \ - ((qse_uint32_t)((((qse_uint32_t)(x) & (qse_uint32_t)0x000000ffUL) << 24) | \ - (((qse_uint32_t)(x) & (qse_uint32_t)0x0000ff00UL) << 8) | \ - (((qse_uint32_t)(x) & (qse_uint32_t)0x00ff0000UL) >> 8) | \ - (((qse_uint32_t)(x) & (qse_uint32_t)0xff000000UL) >> 24) )) +#define MOO_CONST_BSWAP32(x) \ + ((qse_uint32_t)((((qse_uint32_t)(x) & (qse_uint32_t)0x000000ff) << 24) | \ + (((qse_uint32_t)(x) & (qse_uint32_t)0x0000ff00) << 8) | \ + (((qse_uint32_t)(x) & (qse_uint32_t)0x00ff0000) >> 8) | \ + (((qse_uint32_t)(x) & (qse_uint32_t)0xff000000) >> 24) )) + +#if defined(MOO_HAVE_UINT64_T) +#define MOO_CONST_BSWAP64(x) \ + ((qse_uint64_t)((((qse_uint64_t)(x) & (qse_uint64_t)0x00000000000000ff) << 56) | \ + (((qse_uint64_t)(x) & (qse_uint64_t)0x000000000000ff00) << 40) | \ + (((qse_uint64_t)(x) & (qse_uint64_t)0x0000000000ff0000) << 24) | \ + (((qse_uint64_t)(x) & (qse_uint64_t)0x00000000ff000000) << 8) | \ + (((qse_uint64_t)(x) & (qse_uint64_t)0x000000ff00000000) >> 8) | \ + (((qse_uint64_t)(x) & (qse_uint64_t)0x0000ff0000000000) >> 24) | \ + (((qse_uint64_t)(x) & (qse_uint64_t)0x00ff000000000000) >> 40) | \ + (((qse_uint64_t)(x) & (qse_uint64_t)0xff00000000000000) >> 56)) +#endif + +#if defined(MOO_HAVE_UINT128_T) +#define MOO_CONST_BSWAP128(x) \ + ((qse_uint128_t)((((qse_uint128_t)(x) & (qse_uint128_t)0x000000000000000000000000000000ff) << 120) | \ + (((qse_uint128_t)(x) & (qse_uint128_t)0x0000000000000000000000000000ff00) << 104) | \ + (((qse_uint128_t)(x) & (qse_uint128_t)0x00000000000000000000000000ff0000) << 88) | \ + (((qse_uint128_t)(x) & (qse_uint128_t)0x000000000000000000000000ff000000) << 72) | \ + (((qse_uint128_t)(x) & (qse_uint128_t)0x0000000000000000000000ff00000000) << 56) | \ + (((qse_uint128_t)(x) & (qse_uint128_t)0x00000000000000000000ff0000000000) << 40) | \ + (((qse_uint128_t)(x) & (qse_uint128_t)0x000000000000000000ff000000000000) << 24) | \ + (((qse_uint128_t)(x) & (qse_uint128_t)0x0000000000000000ff00000000000000) << 8) | \ + (((qse_uint128_t)(x) & (qse_uint128_t)0x00000000000000ff0000000000000000) >> 8) | \ + (((qse_uint128_t)(x) & (qse_uint128_t)0x000000000000ff000000000000000000) >> 24) | \ + (((qse_uint128_t)(x) & (qse_uint128_t)0x0000000000ff00000000000000000000) >> 40) | \ + (((qse_uint128_t)(x) & (qse_uint128_t)0x00000000ff0000000000000000000000) >> 56) | \ + (((qse_uint128_t)(x) & (qse_uint128_t)0x000000ff000000000000000000000000) >> 72) | \ + (((qse_uint128_t)(x) & (qse_uint128_t)0x0000ff00000000000000000000000000) >> 88) | \ + (((qse_uint128_t)(x) & (qse_uint128_t)0x00ff0000000000000000000000000000) >> 104) | \ + (((qse_uint128_t)(x) & (qse_uint128_t)0xff000000000000000000000000000000) >> 120)) +#endif #if defined(MOO_ENDIAN_LITTLE) -# define MOO_CONST_NTOH16(x) MOO_CONST_SWAP16(x) -# define MOO_CONST_HTON16(x) MOO_CONST_SWAP16(x) -# define MOO_CONST_NTOH32(x) MOO_CONST_SWAP32(x) -# define MOO_CONST_HTON32(x) MOO_CONST_SWAP32(x) + +# if defined(MOO_HAVE_UINT16_T) +# define MOO_CONST_NTOH16(x) MOO_CONST_BSWAP16(x) +# define MOO_CONST_HTON16(x) MOO_CONST_BSWAP16(x) +# define MOO_CONST_HTOBE16(x) MOO_CONST_BSWAP16(x) +# define MOO_CONST_HTOLE16(x) (x) +# define MOO_CONST_BE16TOH(x) MOO_CONST_BSWAP16(x) +# define MOO_CONST_LE16TOH(x) (x) +# endif + +# if defined(MOO_HAVE_UINT32_T) +# define MOO_CONST_NTOH32(x) MOO_CONST_BSWAP32(x) +# define MOO_CONST_HTON32(x) MOO_CONST_BSWAP32(x) +# define MOO_CONST_HTOBE32(x) MOO_CONST_BSWAP32(x) +# define MOO_CONST_HTOLE32(x) (x) +# define MOO_CONST_BE32TOH(x) MOO_CONST_BSWAP32(x) +# define MOO_CONST_LE32TOH(x) (x) +# endif + +# if defined(MOO_HAVE_UINT64_T) +# define MOO_CONST_NTOH64(x) MOO_CONST_BSWAP64(x) +# define MOO_CONST_HTON64(x) MOO_CONST_BSWAP64(x) +# define MOO_CONST_HTOBE64(x) MOO_CONST_BSWAP64(x) +# define MOO_CONST_HTOLE64(x) (x) +# define MOO_CONST_BE64TOH(x) MOO_CONST_BSWAP64(x) +# define MOO_CONST_LE64TOH(x) (x) +# endif + +# if defined(MOO_HAVE_UINT128_T) +# define MOO_CONST_NTOH128(x) MOO_CONST_BSWAP128(x) +# define MOO_CONST_HTON128(x) MOO_CONST_BSWAP128(x) +# define MOO_CONST_HTOBE128(x) MOO_CONST_BSWAP128(x) +# define MOO_CONST_HTOLE128(x) (x) +# define MOO_CONST_BE128TOH(x) MOO_CONST_BSWAP128(x) +# define MOO_CONST_LE128TOH(x) (x) +#endif + #elif defined(MOO_ENDIAN_BIG) -# define MOO_CONST_NTOH16(x) (x) -# define MOO_CONST_HTON16(x) (x) -# define MOO_CONST_NTOH32(x) (x) -# define MOO_CONST_HTON32(x) (x) + +# if defined(MOO_HAVE_UINT16_T) +# define MOO_CONST_NTOH16(x) (x) +# define MOO_CONST_HTON16(x) (x) +# define MOO_CONST_HTOBE16(x) (x) +# define MOO_CONST_HTOLE16(x) MOO_CONST_BSWAP16(x) +# define MOO_CONST_BE16TOH(x) (x) +# define MOO_CONST_LE16TOH(x) MOO_CONST_BSWAP16(x) +# endif + +# if defined(MOO_HAVE_UINT32_T) +# define MOO_CONST_NTOH32(x) (x) +# define MOO_CONST_HTON32(x) (x) +# define MOO_CONST_HTOBE32(x) (x) +# define MOO_CONST_HTOLE32(x) MOO_CONST_BSWAP32(x) +# define MOO_CONST_BE32TOH(x) (x) +# define MOO_CONST_LE32TOH(x) MOO_CONST_BSWAP32(x) +# endif + +# if defined(MOO_HAVE_UINT64_T) +# define MOO_CONST_NTOH64(x) (x) +# define MOO_CONST_HTON64(x) (x) +# define MOO_CONST_HTOBE64(x) (x) +# define MOO_CONST_HTOLE64(x) MOO_CONST_BSWAP64(x) +# define MOO_CONST_BE64TOH(x) (x) +# define MOO_CONST_LE64TOH(x) MOO_CONST_BSWAP64(x) +# endif + +# if defined(MOO_HAVE_UINT128_T) +# define MOO_CONST_NTOH128(x) (x) +# define MOO_CONST_HTON128(x) (x) +# define MOO_CONST_HTOBE128(x) (x) +# define MOO_CONST_HTOLE128(x) MOO_CONST_BSWAP128(x) +# define MOO_CONST_BE128TOH(x) (x) +# define MOO_CONST_LE128TOH(x) MOO_CONST_BSWAP128(x) +# endif + #else -# error UNKNOWN ENDIAN +# error UNKNOWN ENDIAN #endif @@ -640,44 +738,187 @@ MOO_EXPORT moo_oow_t moo_utf16_to_uc ( /* ------------------------------------------------------------------------- */ -#if defined(MOO_HAVE_UINT16_T) -MOO_EXPORT moo_uint16_t moo_ntoh16 ( - moo_uint16_t x -); -MOO_EXPORT moo_uint16_t moo_hton16 ( - moo_uint16_t x -); + +#if defined(MOO_HAVE_INLINE) + +#if defined(MOO_HAVE_UINT16_T) +static MOO_INLINE moo_uint16_t moo_bswap16 (moo_uint16_t x) +{ + return (x << 8) | (x >> 8); +} #endif #if defined(MOO_HAVE_UINT32_T) -MOO_EXPORT moo_uint32_t moo_ntoh32 ( - moo_uint32_t x -); - -MOO_EXPORT moo_uint32_t moo_hton32 ( - moo_uint32_t x -); +static MOO_INLINE moo_uint32_t moo_bswap32 (moo_uint32_t x) +{ + return ((x >> 24)) | + ((x >> 8) & ((moo_uint32_t)0xff << 8)) | + ((x << 8) & ((moo_uint32_t)0xff << 16)) | + ((x << 24)); +} #endif #if defined(MOO_HAVE_UINT64_T) -MOO_EXPORT moo_uint64_t moo_ntoh64 ( - moo_uint64_t x -); - -MOO_EXPORT moo_uint64_t moo_hton64 ( - moo_uint64_t x -); +static MOO_INLINE moo_uint64_t moo_bswap64 (moo_uint64_t x) +{ + return ((x >> 56)) | + ((x >> 40) & ((moo_uint64_t)0xff << 8)) | + ((x >> 24) & ((moo_uint64_t)0xff << 16)) | + ((x >> 8) & ((moo_uint64_t)0xff << 24)) | + ((x << 8) & ((moo_uint64_t)0xff << 32)) | + ((x << 24) & ((moo_uint64_t)0xff << 40)) | + ((x << 40) & ((moo_uint64_t)0xff << 48)) | + ((x << 56)); +} #endif #if defined(MOO_HAVE_UINT128_T) -MOO_EXPORT moo_uint128_t moo_ntoh128 ( - moo_uint128_t x -); +static MOO_INLINE moo_uint128_t moo_bswap128 (moo_uint128_t x) +{ + return ((x >> 120)) | + ((x >> 104) & ((moo_uint128_t)0xff << 8)) | + ((x >> 88) & ((moo_uint128_t)0xff << 16)) | + ((x >> 72) & ((moo_uint128_t)0xff << 24)) | + ((x >> 56) & ((moo_uint128_t)0xff << 32)) | + ((x >> 40) & ((moo_uint128_t)0xff << 40)) | + ((x >> 24) & ((moo_uint128_t)0xff << 48)) | + ((x >> 8) & ((moo_uint128_t)0xff << 56)) | + ((x << 8) & ((moo_uint128_t)0xff << 64)) | + ((x << 24) & ((moo_uint128_t)0xff << 72)) | + ((x << 40) & ((moo_uint128_t)0xff << 80)) | + ((x << 56) & ((moo_uint128_t)0xff << 88)) | + ((x << 72) & ((moo_uint128_t)0xff << 96)) | + ((x << 88) & ((moo_uint128_t)0xff << 104)) | + ((x << 104) & ((moo_uint128_t)0xff << 112)) | + ((x << 120)); +} +#endif -MOO_EXPORT moo_uint128_t moo_hton128 ( - moo_uint128_t x -); +#else + +#if defined(MOO_HAVE_UINT16_T) +# define moo_bswap16(x) ((moo_uint16_t)(((moo_uint16_t)(x)) << 8) | (((moo_uint16_t)(x)) >> 8)) +#endif + +#if defined(MOO_HAVE_UINT32_T) +# define moo_bswap32(x) ((moo_uint32_t)(((((moo_uint32_t)(x)) >> 24)) | \ + ((((moo_uint32_t)(x)) >> 8) & ((moo_uint32_t)0xff << 8)) | \ + ((((moo_uint32_t)(x)) << 8) & ((moo_uint32_t)0xff << 16)) | \ + ((((moo_uint32_t)(x)) << 24)))) +#endif + +#if defined(MOO_HAVE_UINT64_T) +# define moo_bswap64(x) ((moo_uint64_t)(((((moo_uint64_t)(x)) >> 56)) | \ + ((((moo_uint64_t)(x)) >> 40) & ((moo_uint64_t)0xff << 8)) | \ + ((((moo_uint64_t)(x)) >> 24) & ((moo_uint64_t)0xff << 16)) | \ + ((((moo_uint64_t)(x)) >> 8) & ((moo_uint64_t)0xff << 24)) | \ + ((((moo_uint64_t)(x)) << 8) & ((moo_uint64_t)0xff << 32)) | \ + ((((moo_uint64_t)(x)) << 24) & ((moo_uint64_t)0xff << 40)) | \ + ((((moo_uint64_t)(x)) << 40) & ((moo_uint64_t)0xff << 48)) | \ + ((((moo_uint64_t)(x)) << 56)))) +#endif + +#if defined(MOO_HAVE_UINT128_T) +# define moo_bswap128(x) ((moo_uint128_t)(((((moo_uint128_t)(x)) >> 120)) | \ + ((((moo_uint128_t)(x)) >> 104) & ((moo_uint128_t)0xff << 8)) | \ + ((((moo_uint128_t)(x)) >> 88) & ((moo_uint128_t)0xff << 16)) | \ + ((((moo_uint128_t)(x)) >> 72) & ((moo_uint128_t)0xff << 24)) | \ + ((((moo_uint128_t)(x)) >> 56) & ((moo_uint128_t)0xff << 32)) | \ + ((((moo_uint128_t)(x)) >> 40) & ((moo_uint128_t)0xff << 40)) | \ + ((((moo_uint128_t)(x)) >> 24) & ((moo_uint128_t)0xff << 48)) | \ + ((((moo_uint128_t)(x)) >> 8) & ((moo_uint128_t)0xff << 56)) | \ + ((((moo_uint128_t)(x)) << 8) & ((moo_uint128_t)0xff << 64)) | \ + ((((moo_uint128_t)(x)) << 24) & ((moo_uint128_t)0xff << 72)) | \ + ((((moo_uint128_t)(x)) << 40) & ((moo_uint128_t)0xff << 80)) | \ + ((((moo_uint128_t)(x)) << 56) & ((moo_uint128_t)0xff << 88)) | \ + ((((moo_uint128_t)(x)) << 72) & ((moo_uint128_t)0xff << 96)) | \ + ((((moo_uint128_t)(x)) << 88) & ((moo_uint128_t)0xff << 104)) | \ + ((((moo_uint128_t)(x)) << 104) & ((moo_uint128_t)0xff << 112)) | \ + ((((moo_uint128_t)(x)) << 120)))) +#endif + +#endif /* MOO_HAVE_INLINE */ + + +#if defined(MOO_ENDIAN_LITTLE) + +# if defined(MOO_HAVE_UINT16_T) +# define moo_ntoh16(x) moo_bswap16(x) +# define moo_hton16(x) moo_bswap16(x) +# define moo_htobe16(x) moo_bswap16(x) +# define moo_htole16(x) (x) +# define moo_be16toh(x) moo_bswap16(x) +# define moo_le16toh(x) (x) +# endif + +# if defined(MOO_HAVE_UINT32_T) +# define moo_ntoh32(x) moo_bswap32(x) +# define moo_hton32(x) moo_bswap32(x) +# define moo_htobe32(x) moo_bswap32(x) +# define moo_htole32(x) (x) +# define moo_be32toh(x) moo_bswap32(x) +# define moo_le32toh(x) (x) +# endif + +# if defined(MOO_HAVE_UINT64_T) +# define moo_ntoh64(x) moo_bswap64(x) +# define moo_hton64(x) moo_bswap64(x) +# define moo_htobe64(x) moo_bswap64(x) +# define moo_htole64(x) (x) +# define moo_be64toh(x) moo_bswap64(x) +# define moo_le64toh(x) (x) +# endif + +# if defined(MOO_HAVE_UINT128_T) +# define moo_ntoh128(x) moo_bswap128(x) +# define moo_hton128(x) moo_bswap128(x) +# define moo_htobe128(x) moo_bswap128(x) +# define moo_htole128(x) (x) +# define moo_be128toh(x) moo_bswap128(x) +# define moo_le128toh(x) (x) +# endif + +#elif defined(MOO_ENDIAN_BIG) + +# if defined(MOO_HAVE_UINT16_T) +# define moo_ntoh16(x) (x) +# define moo_hton16(x) (x) +# define moo_htobe16(x) (x) +# define moo_htole16(x) moo_bswap16(x) +# define moo_be16toh(x) (x) +# define moo_le16toh(x) moo_bswap16(x) +# endif + +# if defined(MOO_HAVE_UINT32_T) +# define moo_ntoh32(x) (x) +# define moo_hton32(x) (x) +# define moo_htobe32(x) (x) +# define moo_htole32(x) moo_bswap32(x) +# define moo_be32toh(x) (x) +# define moo_le32toh(x) moo_bswap32(x) +# endif + +# if defined(MOO_HAVE_UINT64_T) +# define moo_ntoh64(x) (x) +# define moo_hton64(x) (x) +# define moo_htobe64(x) (x) +# define moo_htole64(x) moo_bswap64(x) +# define moo_be64toh(x) (x) +# define moo_le64toh(x) moo_bswap64(x) +# endif + +# if defined(MOO_HAVE_UINT128_T) +# define moo_ntoh128(x) (x) +# define moo_hton128(x) (x) +# define moo_htobe128(x) (x) +# define moo_htole128(x) moo_bswap128(x) +# define moo_be128toh(x) (x) +# define moo_le128toh(x) moo_bswap128(x) +# endif + +#else +# error unknown endian #endif #if defined(__cplusplus) diff --git a/moo/lib/utl.c b/moo/lib/utl.c index a6bb754..67470aa 100644 --- a/moo/lib/utl.c +++ b/moo/lib/utl.c @@ -67,184 +67,6 @@ int moo_log2_for_pow2 (moo_oow_t pow2v) /* ----------------------------------------------------------------------- */ -#if defined(MOO_HAVE_UINT16_T) - -moo_uint16_t moo_ntoh16 (moo_uint16_t x) -{ -#if defined(MOO_ENDIAN_BIG) - return x; -#elif defined(MOO_ENDIAN_LITTLE) - moo_uint8_t* c = (moo_uint8_t*)&x; - return (moo_uint16_t)( - ((moo_uint16_t)c[0] << 8) | - ((moo_uint16_t)c[1] << 0)); -#else -# error Unknown endian -#endif -} - -moo_uint16_t moo_hton16 (moo_uint16_t x) -{ -#if defined(MOO_ENDIAN_BIG) - return x; -#elif defined(MOO_ENDIAN_LITTLE) - moo_uint8_t* c = (moo_uint8_t*)&x; - return (moo_uint16_t)( - ((moo_uint16_t)c[0] << 8) | - ((moo_uint16_t)c[1] << 0)); -#else -# error Unknown endian -#endif -} - -#endif - -/* --------------------------------------------------------------- */ - -#if defined(MOO_HAVE_UINT32_T) - -moo_uint32_t moo_ntoh32 (moo_uint32_t x) -{ -#if defined(MOO_ENDIAN_BIG) - return x; -#elif defined(MOO_ENDIAN_LITTLE) - moo_uint8_t* c = (moo_uint8_t*)&x; - return (moo_uint32_t)( - ((moo_uint32_t)c[0] << 24) | - ((moo_uint32_t)c[1] << 16) | - ((moo_uint32_t)c[2] << 8) | - ((moo_uint32_t)c[3] << 0)); -#else -# error Unknown endian -#endif -} - -moo_uint32_t moo_hton32 (moo_uint32_t x) -{ -#if defined(MOO_ENDIAN_BIG) - return x; -#elif defined(MOO_ENDIAN_LITTLE) - moo_uint8_t* c = (moo_uint8_t*)&x; - return (moo_uint32_t)( - ((moo_uint32_t)c[0] << 24) | - ((moo_uint32_t)c[1] << 16) | - ((moo_uint32_t)c[2] << 8) | - ((moo_uint32_t)c[3] << 0)); -#else -# error Unknown endian -#endif -} -#endif - - -#if defined(MOO_HAVE_UINT64_T) - -moo_uint64_t moo_ntoh64 (moo_uint64_t x) -{ -#if defined(MOO_ENDIAN_BIG) - return x; -#elif defined(MOO_ENDIAN_LITTLE) - moo_uint8_t* c = (moo_uint8_t*)&x; - return (moo_uint64_t)( - ((moo_uint64_t)c[0] << 56) | - ((moo_uint64_t)c[1] << 48) | - ((moo_uint64_t)c[2] << 40) | - ((moo_uint64_t)c[3] << 32) | - ((moo_uint64_t)c[4] << 24) | - ((moo_uint64_t)c[5] << 16) | - ((moo_uint64_t)c[6] << 8) | - ((moo_uint64_t)c[7] << 0)); -#else -# error Unknown endian -#endif -} - -moo_uint64_t moo_hton64 (moo_uint64_t x) -{ -#if defined(MOO_ENDIAN_BIG) - return x; -#elif defined(MOO_ENDIAN_LITTLE) - moo_uint8_t* c = (moo_uint8_t*)&x; - return (moo_uint64_t)( - ((moo_uint64_t)c[0] << 56) | - ((moo_uint64_t)c[1] << 48) | - ((moo_uint64_t)c[2] << 40) | - ((moo_uint64_t)c[3] << 32) | - ((moo_uint64_t)c[4] << 24) | - ((moo_uint64_t)c[5] << 16) | - ((moo_uint64_t)c[6] << 8) | - ((moo_uint64_t)c[7] << 0)); -#else -# error Unknown endian -#endif -} - -#endif - -/* --------------------------------------------------------------- */ - -#if defined(MOO_HAVE_UINT128_T) - -moo_uint128_t moo_ntoh128 (moo_uint128_t x) -{ -#if defined(MOO_ENDIAN_BIG) - return x; -#elif defined(MOO_ENDIAN_LITTLE) - moo_uint8_t* c = (moo_uint8_t*)&x; - return (moo_uint128_t)( - ((moo_uint128_t)c[0] << 120) | - ((moo_uint128_t)c[1] << 112) | - ((moo_uint128_t)c[2] << 104) | - ((moo_uint128_t)c[3] << 96) | - ((moo_uint128_t)c[4] << 88) | - ((moo_uint128_t)c[5] << 80) | - ((moo_uint128_t)c[6] << 72) | - ((moo_uint128_t)c[7] << 64) | - ((moo_uint128_t)c[8] << 56) | - ((moo_uint128_t)c[9] << 48) | - ((moo_uint128_t)c[10] << 40) | - ((moo_uint128_t)c[11] << 32) | - ((moo_uint128_t)c[12] << 24) | - ((moo_uint128_t)c[13] << 16) | - ((moo_uint128_t)c[14] << 8) | - ((moo_uint128_t)c[15] << 0)); -#else -# error Unknown endian -#endif -} - -moo_uint128_t moo_hton128 (moo_uint128_t x) -{ -#if defined(MOO_ENDIAN_BIG) - return x; -#elif defined(MOO_ENDIAN_LITTLE) - moo_uint8_t* c = (moo_uint8_t*)&x; - return (moo_uint128_t)( - ((moo_uint128_t)c[0] << 120) | - ((moo_uint128_t)c[1] << 112) | - ((moo_uint128_t)c[2] << 104) | - ((moo_uint128_t)c[3] << 96) | - ((moo_uint128_t)c[4] << 88) | - ((moo_uint128_t)c[5] << 80) | - ((moo_uint128_t)c[6] << 72) | - ((moo_uint128_t)c[7] << 64) | - ((moo_uint128_t)c[8] << 56) | - ((moo_uint128_t)c[9] << 48) | - ((moo_uint128_t)c[10] << 40) | - ((moo_uint128_t)c[11] << 32) | - ((moo_uint128_t)c[12] << 24) | - ((moo_uint128_t)c[13] << 16) | - ((moo_uint128_t)c[14] << 8) | - ((moo_uint128_t)c[15] << 0)); -#else -# error Unknown endian -#endif -} - -#endif - -/* ----------------------------------------------------------------------- */ - moo_oow_t moo_hash_bytes_ (const moo_oob_t* ptr, moo_oow_t len) { moo_oow_t hv; diff --git a/moo/t/Makefile.am b/moo/t/Makefile.am new file mode 100644 index 0000000..cbc02ca --- /dev/null +++ b/moo/t/Makefile.am @@ -0,0 +1,18 @@ +AUTOMAKE_OPTIONS = nostdinc + +AM_CFLAGS = $(PTHREAD_CFLAGS) + +AM_CPPFLAGS = \ + -I$(abs_builddir) \ + -I$(abs_srcdir) \ + -I$(includedir) + +AM_LDFLAGS = -L$(libdir) +LDADD = -lmoo $(PTHREAD_LIBS) + +if WIN32 +LDADD += $(SOCKET_LIBS) +endif + +bin_PROGRAMS = t-001 +t_001_SOURCES = t-001.c diff --git a/moo/t/Makefile.in b/moo/t/Makefile.in new file mode 100644 index 0000000..a444728 --- /dev/null +++ b/moo/t/Makefile.in @@ -0,0 +1,680 @@ +# Makefile.in generated by automake 1.15 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +@WIN32_TRUE@am__append_1 = $(SOCKET_LIBS) +bin_PROGRAMS = t-001$(EXEEXT) +subdir = t +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_sign.m4 \ + $(top_srcdir)/m4/ax_cxx_namespace.m4 \ + $(top_srcdir)/m4/ax_numval.m4 $(top_srcdir)/m4/ax_pthread.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/lib/moo-cfg.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__installdirs = "$(DESTDIR)$(bindir)" +PROGRAMS = $(bin_PROGRAMS) +am_t_001_OBJECTS = t-001.$(OBJEXT) +t_001_OBJECTS = $(am_t_001_OBJECTS) +t_001_LDADD = $(LDADD) +am__DEPENDENCIES_1 = +@WIN32_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) +t_001_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +DEFAULT_INCLUDES = +depcomp = $(SHELL) $(top_srcdir)/ac/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +SOURCES = $(t_001_SOURCES) +DIST_SOURCES = $(t_001_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/ac/depcomp +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BUILD_MODE = @BUILD_MODE@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DL_LIBS = @DL_LIBS@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +DYNCALL_LIBS = @DYNCALL_LIBS@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GREP = @GREP@ +HAVE_CXX = @HAVE_CXX@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBM = @LIBM@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIBTOOL_DEPS = @LIBTOOL_DEPS@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTDL_LIBS = @LTDL_LIBS@ +LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +MOO_PROJECT_AUTHOR = @MOO_PROJECT_AUTHOR@ +MOO_PROJECT_URL = @MOO_PROJECT_URL@ +MOO_SIZEOF_CHAR = @MOO_SIZEOF_CHAR@ +MOO_SIZEOF_DOUBLE = @MOO_SIZEOF_DOUBLE@ +MOO_SIZEOF_FLOAT = @MOO_SIZEOF_FLOAT@ +MOO_SIZEOF_INT = @MOO_SIZEOF_INT@ +MOO_SIZEOF_LONG = @MOO_SIZEOF_LONG@ +MOO_SIZEOF_LONG_DOUBLE = @MOO_SIZEOF_LONG_DOUBLE@ +MOO_SIZEOF_LONG_LONG = @MOO_SIZEOF_LONG_LONG@ +MOO_SIZEOF_OFF64_T = @MOO_SIZEOF_OFF64_T@ +MOO_SIZEOF_OFF_T = @MOO_SIZEOF_OFF_T@ +MOO_SIZEOF_SHORT = @MOO_SIZEOF_SHORT@ +MOO_SIZEOF_VOID_P = @MOO_SIZEOF_VOID_P@ +MOO_SIZEOF_WCHAR_T = @MOO_SIZEOF_WCHAR_T@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PACKAGE_VERSION_MAJOR = @PACKAGE_VERSION_MAJOR@ +PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ +PACKAGE_VERSION_PATCH = @PACKAGE_VERSION_PATCH@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PTHREAD_CC = @PTHREAD_CC@ +PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ +PTHREAD_LIBS = @PTHREAD_LIBS@ +QUADMATH_LIBS = @QUADMATH_LIBS@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SOCKET_LIBS = @SOCKET_LIBS@ +STRIP = @STRIP@ +TERMINAL_LIBS = @TERMINAL_LIBS@ +UNICOWS_LIBS = @UNICOWS_LIBS@ +UNWIND_LIBS = @UNWIND_LIBS@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +ax_pthread_config = @ax_pthread_config@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +AUTOMAKE_OPTIONS = nostdinc +AM_CFLAGS = $(PTHREAD_CFLAGS) +AM_CPPFLAGS = \ + -I$(abs_builddir) \ + -I$(abs_srcdir) \ + -I$(includedir) + +AM_LDFLAGS = -L$(libdir) +LDADD = -lmoo $(PTHREAD_LIBS) $(am__append_1) +t_001_SOURCES = t-001.c +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .lo .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign t/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign t/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): +install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ + for p in $$list; do echo "$$p $$p"; done | \ + sed 's/$(EXEEXT)$$//' | \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ + sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) files[d] = files[d] " " $$1; \ + else { print "f", $$3 "/" $$4, $$1; } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ + } \ + ; done + +uninstall-binPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ + -e 's/$$/$(EXEEXT)/' \ + `; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(bindir)" && rm -f $$files + +clean-binPROGRAMS: + @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list + +t-001$(EXEEXT): $(t_001_OBJECTS) $(t_001_DEPENDENCIES) $(EXTRA_t_001_DEPENDENCIES) + @rm -f t-001$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(t_001_OBJECTS) $(t_001_LDADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-001.Po@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< + +.c.obj: +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.c.lo: +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(PROGRAMS) +installdirs: + for dir in "$(DESTDIR)$(bindir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: install-binPROGRAMS + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-binPROGRAMS + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ + clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-binPROGRAMS \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am uninstall-binPROGRAMS + +.PRECIOUS: Makefile + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/moo/t/t-001.c b/moo/t/t-001.c new file mode 100644 index 0000000..d75b84a --- /dev/null +++ b/moo/t/t-001.c @@ -0,0 +1,117 @@ +/* test endian conversion macros */ + +#include +#include +#include "t.h" + +int main () +{ + { + union { + moo_uint16_t u16; + moo_uint8_t arr[2]; + } x; + + x.arr[0] = 0x11; + x.arr[1] = 0x22; + + printf("x.u16 = 0x%04x\n", x.u16); + printf("htole16(x.u16) = 0x%04x\n", moo_htole16(x.u16)); + printf("htobe16(x.u16) = 0x%04x\n", moo_htobe16(x.u16)); + + T_ASSERT1 (x.u16 != moo_htole16(x.u16) || x.u16 != moo_htobe16(x.u16), "u16 endian conversion #0"); + T_ASSERT1 (x.u16 == moo_le16toh(moo_htole16(x.u16)), "u16 endian conversion #1"); + T_ASSERT1 (x.u16 == moo_be16toh(moo_htobe16(x.u16)), "u16 endian conversion #2"); + } + + + { + union { + moo_uint32_t u32; + moo_uint8_t arr[4]; + } x; + + x.arr[0] = 0x11; + x.arr[1] = 0x22; + x.arr[2] = 0x33; + x.arr[3] = 0x44; + + printf("x.u32 = 0x%08x\n", x.u32); + printf("htole32(x.u32) = 0x%08x\n", moo_htole32(x.u32)); + printf("htobe32(x.u32) = 0x%08x\n", moo_htobe32(x.u32)); + + T_ASSERT1 (x.u32 != moo_htole32(x.u32) || x.u32 != moo_htobe32(x.u32), "u32 endian conversion #0"); + T_ASSERT1 (x.u32 == moo_le32toh(moo_htole32(x.u32)), "u32 endian conversion #1"); + T_ASSERT1 (x.u32 == moo_be32toh(moo_htobe32(x.u32)), "u32 endian conversion #2"); + } + +#if defined(MOO_HAVE_UINT64_T) + { + union { + moo_uint64_t u64; + moo_uint8_t arr[8]; + } x; + + x.arr[0] = 0x11; + x.arr[1] = 0x22; + x.arr[2] = 0x33; + x.arr[3] = 0x44; + x.arr[4] = 0x55; + x.arr[5] = 0x66; + x.arr[6] = 0x77; + x.arr[7] = 0x88; + + printf("x.u64 = 0x%016llx\n", (unsigned long long)x.u64); + printf("htole64(x.u64) = 0x%016llx\n", (unsigned long long)moo_htole64(x.u64)); + printf("htobe64(x.u64) = 0x%016llx\n", (unsigned long long)moo_htobe64(x.u64)); + + T_ASSERT1 (x.u64 != moo_htole64(x.u64) || x.u64 != moo_htobe64(x.u64), "u64 endian conversion #0"); + T_ASSERT1 (x.u64 == moo_le64toh(moo_htole64(x.u64)), "u64 endian conversion #1"); + T_ASSERT1 (x.u64 == moo_be64toh(moo_htobe64(x.u64)), "u64 endian conversion #2"); + } +#endif + +#if defined(MOO_HAVE_UINT128_T) + { + union { + moo_uint128_t u128; + moo_uint8_t arr[16]; + } x; + moo_uint128_t tmp; + + x.arr[0] = 0x11; + x.arr[1] = 0x22; + x.arr[2] = 0x33; + x.arr[3] = 0x44; + x.arr[4] = 0x55; + x.arr[5] = 0x66; + x.arr[6] = 0x77; + x.arr[7] = 0x88; + x.arr[8] = 0x99; + x.arr[9] = 0xaa; + x.arr[10] = 0xbb; + x.arr[11] = 0xcc; + x.arr[12] = 0xdd; + x.arr[13] = 0xee; + x.arr[14] = 0xff; + x.arr[15] = 0xfa; + + printf("x.u128 = 0x%016llx%016llx\n", (unsigned long long)(moo_uint64_t)(x.u128 >> 64), (unsigned long long)(moo_uint64_t)(x.u128 >> 0)); + + tmp = moo_htole128(x.u128); + printf("htole128(tmp) = 0x%016llx%016llx\n", (unsigned long long)(moo_uint64_t)(tmp >> 64), (unsigned long long)(moo_uint64_t)(tmp >> 0)); + + tmp = moo_htobe128(x.u128); + printf("htobe128(tmp) = 0x%016llx%016llx\n", (unsigned long long)(moo_uint64_t)(tmp >> 64), (unsigned long long)(moo_uint64_t)(tmp >> 0)); + + T_ASSERT1 (x.u128 != moo_htole128(x.u128) || x.u128 != moo_htobe128(x.u128), "u128 endian conversion #0"); + T_ASSERT1 (x.u128 == moo_le128toh(moo_htole128(x.u128)), "u128 endian conversion #1"); + T_ASSERT1 (x.u128 == moo_be128toh(moo_htobe128(x.u128)), "u128 endian conversion #2"); + } +#endif + + return 0; + +oops: + return -1; +} diff --git a/moo/t/t.h b/moo/t/t.h new file mode 100644 index 0000000..1b4312a --- /dev/null +++ b/moo/t/t.h @@ -0,0 +1,13 @@ +#ifndef _MOO_T_T_H_ +#define _MOO_T_T_H_ + +#include + +#define T_ASSERT_FAIL1(msg1) printf("FAILURE in %s[%d] - %s\n", __func__, (int)__LINE__, msg1) +#define T_ASSERT_FAIL2(msg1,msg2) printf("FAILURE in %s[%d] - %s - %s\n", __func__, (int)__LINE__, msg1, msg2) + +#define T_ASSERT1(test,msg1) do { if (!(test)) { T_ASSERT_FAIL1(msg1); goto oops; } } while(0) +#define T_ASSERT2(test,msg1,msg2) do { if (!(test)) { T_ASSERT_FAIL2(msg1,msg2); goto oops; } } while(0) + + +#endif