From 258f37c7ef4af4c1ac1e9bf6dfedb53dd8a4c0e9 Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Wed, 30 Jul 2008 10:35:39 +0000 Subject: [PATCH] FIX #2376: inline shiftR Duplicating the default definition for shiftR doesn't seem quite right to me, but it gets the right results when compiling the example program, and I couldn't find a better way to do it. --- Data/Bits.hs | 4 ++++ GHC/Int.hs | 24 ++++++++++++++++++++++++ GHC/Word.hs | 28 ++++++++++++++++++++++++++++ 3 files changed, 56 insertions(+) diff --git a/Data/Bits.hs b/Data/Bits.hs index 638935d..8eaec9c 100644 --- a/Data/Bits.hs +++ b/Data/Bits.hs @@ -222,6 +222,10 @@ instance Bits Int where i'# = word2Int# (int2Word# i# `and#` int2Word# (wsib -# 1#)) wsib = WORD_SIZE_IN_BITS# {- work around preprocessor problem (??) -} bitSize _ = WORD_SIZE_IN_BITS + + {-# INLINE shiftR #-} + -- same as the default definition, but we want it inlined (#2376) + x `shiftR` i = x `shift` (-i) #else /* !__GLASGOW_HASKELL__ */ #ifdef __HUGS__ diff --git a/GHC/Int.hs b/GHC/Int.hs index b5e4b73..a419acc 100644 --- a/GHC/Int.hs +++ b/GHC/Int.hs @@ -146,6 +146,10 @@ instance Bits Int8 where bitSize _ = 8 isSigned _ = True + {-# INLINE shiftR #-} + -- same as the default definition, but we want it inlined (#2376) + x `shiftR` i = x `shift` (-i) + {-# RULES "fromIntegral/Int8->Int8" fromIntegral = id :: Int8 -> Int8 "fromIntegral/a->Int8" fromIntegral = \x -> case fromIntegral x of I# x# -> I8# (narrow8Int# x#) @@ -258,6 +262,10 @@ instance Bits Int16 where bitSize _ = 16 isSigned _ = True + {-# INLINE shiftR #-} + -- same as the default definition, but we want it inlined (#2376) + x `shiftR` i = x `shift` (-i) + {-# RULES "fromIntegral/Word8->Int16" fromIntegral = \(W8# x#) -> I16# (word2Int# x#) "fromIntegral/Int8->Int16" fromIntegral = \(I8# x#) -> I16# x# @@ -390,6 +398,10 @@ instance Bits Int32 where bitSize _ = 32 isSigned _ = True + {-# INLINE shiftR #-} + -- same as the default definition, but we want it inlined (#2376) + x `shiftR` i = x `shift` (-i) + {-# RULES "fromIntegral/Int->Int32" fromIntegral = \(I# x#) -> I32# (intToInt32# x#) "fromIntegral/Word->Int32" fromIntegral = \(W# x#) -> I32# (word32ToInt32# (wordToWord32# x#)) @@ -499,6 +511,10 @@ instance Bits Int32 where bitSize _ = 32 isSigned _ = True + {-# INLINE shiftR #-} + -- same as the default definition, but we want it inlined (#2376) + x `shiftR` i = x `shift` (-i) + {-# RULES "fromIntegral/Word8->Int32" fromIntegral = \(W8# x#) -> I32# (word2Int# x#) "fromIntegral/Word16->Int32" fromIntegral = \(W16# x#) -> I32# (word2Int# x#) @@ -644,6 +660,10 @@ instance Bits Int64 where bitSize _ = 64 isSigned _ = True + {-# INLINE shiftR #-} + -- same as the default definition, but we want it inlined (#2376) + x `shiftR` i = x `shift` (-i) + -- give the 64-bit shift operations the same treatment as the 32-bit -- ones (see GHC.Base), namely we wrap them in tests to catch the @@ -758,6 +778,10 @@ instance Bits Int64 where bitSize _ = 64 isSigned _ = True + {-# INLINE shiftR #-} + -- same as the default definition, but we want it inlined (#2376) + x `shiftR` i = x `shift` (-i) + {-# RULES "fromIntegral/a->Int64" fromIntegral = \x -> case fromIntegral x of I# x# -> I64# x# "fromIntegral/Int64->a" fromIntegral = \(I64# x#) -> fromIntegral (I# x#) diff --git a/GHC/Word.hs b/GHC/Word.hs index b60cc33..99b25ba 100644 --- a/GHC/Word.hs +++ b/GHC/Word.hs @@ -179,6 +179,10 @@ instance Bits Word where bitSize _ = WORD_SIZE_IN_BITS isSigned _ = False + {-# INLINE shiftR #-} + -- same as the default definition, but we want it inlined (#2376) + x `shiftR` i = x `shift` (-i) + {-# RULES "fromIntegral/Int->Word" fromIntegral = \(I# x#) -> W# (int2Word# x#) "fromIntegral/Word->Int" fromIntegral = \(W# x#) -> I# (word2Int# x#) @@ -278,6 +282,10 @@ instance Bits Word8 where bitSize _ = 8 isSigned _ = False + {-# INLINE shiftR #-} + -- same as the default definition, but we want it inlined (#2376) + x `shiftR` i = x `shift` (-i) + {-# RULES "fromIntegral/Word8->Word8" fromIntegral = id :: Word8 -> Word8 "fromIntegral/Word8->Integer" fromIntegral = toInteger :: Word8 -> Integer @@ -378,6 +386,10 @@ instance Bits Word16 where bitSize _ = 16 isSigned _ = False + {-# INLINE shiftR #-} + -- same as the default definition, but we want it inlined (#2376) + x `shiftR` i = x `shift` (-i) + {-# RULES "fromIntegral/Word8->Word16" fromIntegral = \(W8# x#) -> W16# x# "fromIntegral/Word16->Word16" fromIntegral = id :: Word16 -> Word16 @@ -477,6 +489,10 @@ instance Bits Word32 where bitSize _ = 32 isSigned _ = False + {-# INLINE shiftR #-} + -- same as the default definition, but we want it inlined (#2376) + x `shiftR` i = x `shift` (-i) + {-# RULES "fromIntegral/Int->Word32" fromIntegral = \(I# x#) -> W32# (int32ToWord32# (intToInt32# x#)) "fromIntegral/Word->Word32" fromIntegral = \(W# x#) -> W32# (wordToWord32# x#) @@ -583,6 +599,10 @@ instance Bits Word32 where bitSize _ = 32 isSigned _ = False + {-# INLINE shiftR #-} + -- same as the default definition, but we want it inlined (#2376) + x `shiftR` i = x `shift` (-i) + {-# RULES "fromIntegral/Word8->Word32" fromIntegral = \(W8# x#) -> W32# x# "fromIntegral/Word16->Word32" fromIntegral = \(W16# x#) -> W32# x# @@ -709,6 +729,10 @@ instance Bits Word64 where bitSize _ = 64 isSigned _ = False + {-# INLINE shiftR #-} + -- same as the default definition, but we want it inlined (#2376) + x `shiftR` i = x `shift` (-i) + -- give the 64-bit shift operations the same treatment as the 32-bit -- ones (see GHC.Base), namely we wrap them in tests to catch the -- cases when we're shifting more than 64 bits to avoid unspecified @@ -812,6 +836,10 @@ instance Bits Word64 where bitSize _ = 64 isSigned _ = False + {-# INLINE shiftR #-} + -- same as the default definition, but we want it inlined (#2376) + x `shiftR` i = x `shift` (-i) + {-# RULES "fromIntegral/a->Word64" fromIntegral = \x -> case fromIntegral x of W# x# -> W64# x# "fromIntegral/Word64->a" fromIntegral = \(W64# x#) -> fromIntegral (W# x#) -- 1.7.10.4