diff --git a/ChangeLog b/ChangeLog deleted file mode 100644 --- a/ChangeLog +++ /dev/null @@ -1,5 +0,0 @@ -0.1.0.1: 2016-08-10 - * fixed build issue: added bitfn.h to cabal file - -0.1.0.0: 2016-08-09 - * initial release diff --git a/cbits/bitfn.h b/cbits/bitfn.h deleted file mode 100644 --- a/cbits/bitfn.h +++ /dev/null @@ -1,238 +0,0 @@ -/* - * Copyright (C) 2006-2009 Vincent Hanquez - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef BITFN_H -#define BITFN_H -#include - -#ifndef NO_INLINE_ASM -/**********************************************************/ -# if (defined(__i386__)) -# define ARCH_HAS_SWAP32 -static inline uint32_t bitfn_swap32(uint32_t a) -{ - asm ("bswap %0" : "=r" (a) : "0" (a)); - return a; -} -/**********************************************************/ -# elif (defined(__arm__)) -# define ARCH_HAS_SWAP32 -static inline uint32_t bitfn_swap32(uint32_t a) -{ - uint32_t tmp = a; - asm volatile ("eor %1, %0, %0, ror #16\n" - "bic %1, %1, #0xff0000\n" - "mov %0, %0, ror #8\n" - "eor %0, %0, %1, lsr #8\n" - : "=r" (a), "=r" (tmp) : "0" (a), "1" (tmp)); - return a; -} -/**********************************************************/ -# elif defined(__x86_64__) -# define ARCH_HAS_SWAP32 -# define ARCH_HAS_SWAP64 -static inline uint32_t bitfn_swap32(uint32_t a) -{ - asm ("bswap %0" : "=r" (a) : "0" (a)); - return a; -} - -static inline uint64_t bitfn_swap64(uint64_t a) -{ - asm ("bswap %0" : "=r" (a) : "0" (a)); - return a; -} - -# endif -#endif /* NO_INLINE_ASM */ -/**********************************************************/ - -#ifndef ARCH_HAS_ROL32 -static inline uint32_t rol32(uint32_t word, uint32_t shift) -{ - return (word << shift) | (word >> (32 - shift)); -} -#endif - -#ifndef ARCH_HAS_ROR32 -static inline uint32_t ror32(uint32_t word, uint32_t shift) -{ - return (word >> shift) | (word << (32 - shift)); -} -#endif - -#ifndef ARCH_HAS_ROL64 -static inline uint64_t rol64(uint64_t word, uint32_t shift) -{ - return (word << shift) | (word >> (64 - shift)); -} -#endif - -#ifndef ARCH_HAS_ROR64 -static inline uint64_t ror64(uint64_t word, uint32_t shift) -{ - return (word >> shift) | (word << (64 - shift)); -} -#endif - -#ifndef ARCH_HAS_SWAP32 -static inline uint32_t bitfn_swap32(uint32_t a) -{ - return (a << 24) | ((a & 0xff00) << 8) | ((a >> 8) & 0xff00) | (a >> 24); -} -#endif - -#ifndef ARCH_HAS_ARRAY_SWAP32 -static inline void array_swap32(uint32_t *d, uint32_t *s, uint32_t nb) -{ - while (nb--) - *d++ = bitfn_swap32(*s++); -} -#endif - -#ifndef ARCH_HAS_SWAP64 -static inline uint64_t bitfn_swap64(uint64_t a) -{ - return ((uint64_t) bitfn_swap32((uint32_t) (a >> 32))) | - (((uint64_t) bitfn_swap32((uint32_t) a)) << 32); -} -#endif - -#ifndef ARCH_HAS_ARRAY_SWAP64 -static inline void array_swap64(uint64_t *d, uint64_t *s, uint32_t nb) -{ - while (nb--) - *d++ = bitfn_swap64(*s++); -} -#endif - -#ifndef ARCH_HAS_MEMORY_ZERO -static inline void memory_zero(void *ptr, uint32_t len) -{ - uint32_t *ptr32 = ptr; - uint8_t *ptr8; - int i; - - for (i = 0; i < len / 4; i++) - *ptr32++ = 0; - if (len % 4) { - ptr8 = (uint8_t *) ptr32; - for (i = len % 4; i >= 0; i--) - ptr8[i] = 0; - } -} -#endif - -#ifndef ARCH_HAS_ARRAY_COPY32 -static inline void array_copy32(uint32_t *d, uint32_t *s, uint32_t nb) -{ - while (nb--) *d++ = *s++; -} -#endif - -#ifndef ARCH_HAS_ARRAY_COPY64 -static inline void array_copy64(uint64_t *d, uint64_t *s, uint32_t nb) -{ - while (nb--) *d++ = *s++; -} -#endif - -#ifdef __MINGW32__ - # define LITTLE_ENDIAN 1234 - # define BYTE_ORDER LITTLE_ENDIAN -#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) - # include -#elif defined(__OpenBSD__) || defined(__SVR4) - # include -#elif defined(__APPLE__) - # include -#elif defined( BSD ) && ( BSD >= 199103 ) - # include -#elif defined( __QNXNTO__ ) && defined( __LITTLEENDIAN__ ) - # define LITTLE_ENDIAN 1234 - # define BYTE_ORDER LITTLE_ENDIAN -#elif defined( __QNXNTO__ ) && defined( __BIGENDIAN__ ) - # define BIG_ENDIAN 1234 - # define BYTE_ORDER BIG_ENDIAN -#else - # include -#endif -/* big endian to cpu */ -#if LITTLE_ENDIAN == BYTE_ORDER - -# define be32_to_cpu(a) bitfn_swap32(a) -# define cpu_to_be32(a) bitfn_swap32(a) -# define le32_to_cpu(a) (a) -# define cpu_to_le32(a) (a) -# define be64_to_cpu(a) bitfn_swap64(a) -# define cpu_to_be64(a) bitfn_swap64(a) -# define le64_to_cpu(a) (a) -# define cpu_to_le64(a) (a) - -# define cpu_to_le32_array(d, s, l) array_copy32(d, s, l) -# define le32_to_cpu_array(d, s, l) array_copy32(d, s, l) -# define cpu_to_be32_array(d, s, l) array_swap32(d, s, l) -# define be32_to_cpu_array(d, s, l) array_swap32(d, s, l) - -# define cpu_to_le64_array(d, s, l) array_copy64(d, s, l) -# define le64_to_cpu_array(d, s, l) array_copy64(d, s, l) -# define cpu_to_be64_array(d, s, l) array_swap64(d, s, l) -# define be64_to_cpu_array(d, s, l) array_swap64(d, s, l) - -# define ror32_be(a, s) rol32(a, s) -# define rol32_be(a, s) ror32(a, s) - -# define ARCH_IS_LITTLE_ENDIAN - -#elif BIG_ENDIAN == BYTE_ORDER - -# define be32_to_cpu(a) (a) -# define cpu_to_be32(a) (a) -# define be64_to_cpu(a) (a) -# define cpu_to_be64(a) (a) -# define le64_to_cpu(a) bitfn_swap64(a) -# define cpu_to_le64(a) bitfn_swap64(a) -# define le32_to_cpu(a) bitfn_swap32(a) -# define cpu_to_le32(a) bitfn_swap32(a) - -# define cpu_to_le32_array(d, s, l) array_swap32(d, s, l) -# define le32_to_cpu_array(d, s, l) array_swap32(d, s, l) -# define cpu_to_be32_array(d, s, l) array_copy32(d, s, l) -# define be32_to_cpu_array(d, s, l) array_copy32(d, s, l) - -# define cpu_to_le64_array(d, s, l) array_swap64(d, s, l) -# define le64_to_cpu_array(d, s, l) array_swap64(d, s, l) -# define cpu_to_be64_array(d, s, l) array_copy64(d, s, l) -# define be64_to_cpu_array(d, s, l) array_copy64(d, s, l) - -# define ror32_be(a, s) ror32(a, s) -# define rol32_be(a, s) rol32(a, s) - -# define ARCH_IS_BIG_ENDIAN - -#else -# error "endian not supported" -#endif - -#endif /* !BITFN_H */ diff --git a/large-hashable.cabal b/large-hashable.cabal --- a/large-hashable.cabal +++ b/large-hashable.cabal @@ -1,5 +1,5 @@ name: large-hashable -version: 0.1.0.1 +version: 0.1.0.2 synopsis: Efficiently hash (large) Haskell values description: Please see README.md homepage: https://github.com/factisresearch/large-hashable @@ -13,9 +13,7 @@ cabal-version: >=1.10 extra-source-files: cbits/md5.h - cbits/bitfn.h README.md - ChangeLog shell.nix stack.yaml diff --git a/src/Data/LargeHashable/TH.hs b/src/Data/LargeHashable/TH.hs --- a/src/Data/LargeHashable/TH.hs +++ b/src/Data/LargeHashable/TH.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE CPP #-} {-# LANGUAGE QuasiQuotes #-} {-# LANGUAGE TemplateHaskell #-} module Data.LargeHashable.TH ( @@ -48,16 +49,33 @@ case info of TyConI dec -> case dec of +#if MIN_VERSION_template_haskell(2,11,0) + DataD context name tyvars _ cons _ -> +#else DataD context name tyvars cons _ -> +#endif buildInstance (ConT name) context tyvars cons + +#if MIN_VERSION_template_haskell(2,11,0) + NewtypeD context name tyvars _ con _ -> +#else NewtypeD context name tyvars con _ -> +#endif buildInstance (ConT name) context tyvars [con] _ -> fail $ notDeriveAbleErrorMsg n info FamilyI _ instDecs -> fmap concat $ forM instDecs $ \instDec -> case instDec of +#if MIN_VERSION_template_haskell(2,11,0) + DataInstD context name types _ cons _ -> +#else DataInstD context name types cons _ -> +#endif buildInstance (foldl AppT (ConT name) types) context [] cons +#if MIN_VERSION_template_haskell(2,11,0) + NewtypeInstD context name types _ con _ -> +#else NewtypeInstD context name types con _ -> +#endif buildInstance (foldl AppT (ConT name) types) context [] [con] _ -> fail $ notDeriveAbleErrorMsg n info _ -> fail $ notDeriveAbleErrorMsg n info @@ -93,11 +111,19 @@ deriveLargeHashableCustomCtx tyName extraPreds = do decs <- deriveLargeHashable tyName case decs of +#if MIN_VERSION_template_haskell(2,11,0) + (InstanceD overlap ctx ty body : _) -> +#else (InstanceD ctx ty body : _) -> +#endif do let args = reverse (collectArgs ty) newCtx <- sequence (extraPreds (map return args) (map return ctx)) -- _ <- fail ("args: " ++ show args ++", ty: " ++ show ty) +#if MIN_VERSION_template_haskell(2,11,0) + return [InstanceD overlap newCtx ty body] +#else return [InstanceD newCtx ty body] +#endif _ -> error $ "Unexpected declarations returned by deriveLargeHashable: " ++ show (ppr decs) @@ -167,6 +193,10 @@ RecC n varTypes -> ConP n $ uniqueVarPats (length varTypes) InfixC _ n _ -> InfixP (VarP . mkName $ "x") n (VarP . mkName $ "y") ForallC _ _ c -> patternForCon c +#if MIN_VERSION_template_haskell(2,11,0) + GadtC [n] types _ -> ConP n $ uniqueVarPats (length types) + RecGadtC [n] varTypes _ -> ConP n $ uniqueVarPats (length varTypes) +#endif where uniqueVarPats n = take n . map (VarP . mkName) $ names -- | Sequences two Expressions using the '(>>)' operator.