X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=GHC%2FWord.hs;h=9d3e1a6ae717ff90f8c0f15d5fdd27fdaba68fd7;hb=HEAD;hp=b70378276905169a8fc0f49887f791f4a153a786;hpb=8e905585c46e3bd2682996fad63509272c3a8ff6;p=ghc-base.git diff --git a/GHC/Word.hs b/GHC/Word.hs index b703782..9d3e1a6 100644 --- a/GHC/Word.hs +++ b/GHC/Word.hs @@ -1,4 +1,6 @@ -{-# OPTIONS -fno-implicit-prelude #-} +{-# LANGUAGE CPP, NoImplicitPrelude, BangPatterns, MagicHash #-} +{-# OPTIONS_HADDOCK hide #-} + ----------------------------------------------------------------------------- -- | -- Module : GHC.Word @@ -16,14 +18,23 @@ #include "MachDeps.h" +-- #hide module GHC.Word ( Word(..), Word8(..), Word16(..), Word32(..), Word64(..), - toEnumError, fromEnumError, succError, predError) - where + toEnumError, fromEnumError, succError, predError, + uncheckedShiftL64#, + uncheckedShiftRL64# + ) where import Data.Bits -import {-# SOURCE #-} GHC.Err +#if WORD_SIZE_IN_BITS < 32 +import GHC.IntWord32 +#endif +#if WORD_SIZE_IN_BITS < 64 +import GHC.IntWord64 +#endif + import GHC.Base import GHC.Enum import GHC.Num @@ -31,6 +42,8 @@ import GHC.Real import GHC.Read import GHC.Arr import GHC.Show +import GHC.Err +import GHC.Float () -- for RealFrac methods ------------------------------------------------------------------------ -- Helper functions @@ -80,8 +93,7 @@ instance Num Word where abs x = x signum 0 = 0 signum _ = 1 - fromInteger (S# i#) = W# (int2Word# i#) - fromInteger (J# s# d#) = W# (integer2Word# s# d#) + fromInteger i = W# (integerToWord i) instance Real Word where toRational x = toInteger x % 1 @@ -106,29 +118,29 @@ instance Enum Word where enumFromThenTo = integralEnumFromThenTo instance Integral Word where - quot x@(W# x#) y@(W# y#) + quot (W# x#) y@(W# y#) | y /= 0 = W# (x# `quotWord#` y#) | otherwise = divZeroError - rem x@(W# x#) y@(W# y#) + rem (W# x#) y@(W# y#) | y /= 0 = W# (x# `remWord#` y#) | otherwise = divZeroError - div x@(W# x#) y@(W# y#) + div (W# x#) y@(W# y#) | y /= 0 = W# (x# `quotWord#` y#) | otherwise = divZeroError - mod x@(W# x#) y@(W# y#) + mod (W# x#) y@(W# y#) | y /= 0 = W# (x# `remWord#` y#) | otherwise = divZeroError - quotRem x@(W# x#) y@(W# y#) + quotRem (W# x#) y@(W# y#) | y /= 0 = (W# (x# `quotWord#` y#), W# (x# `remWord#` y#)) | otherwise = divZeroError - divMod x@(W# x#) y@(W# y#) + divMod (W# x#) y@(W# y#) | y /= 0 = (W# (x# `quotWord#` y#), W# (x# `remWord#` y#)) | otherwise = divZeroError toInteger (W# x#) - | i# >=# 0# = S# i# - | otherwise = case word2Integer# x# of (# s, d #) -> J# s d + | i# >=# 0# = smallInteger i# + | otherwise = wordToInteger x# where - i# = word2Int# x# + !i# = word2Int# x# instance Bounded Word where minBound = 0 @@ -144,28 +156,30 @@ instance Bounded Word where #endif instance Ix Word where - range (m,n) = [m..n] - unsafeIndex b@(m,_) i = fromIntegral (i - m) - inRange (m,n) i = m <= i && i <= n - unsafeRangeSize b@(_l,h) = unsafeIndex b h + 1 + range (m,n) = [m..n] + unsafeIndex (m,_) i = fromIntegral (i - m) + inRange (m,n) i = m <= i && i <= n instance Read Word where readsPrec p s = [(fromInteger x, r) | (x, r) <- readsPrec p s] instance Bits Word where + {-# INLINE shift #-} + (W# x#) .&. (W# y#) = W# (x# `and#` y#) (W# x#) .|. (W# y#) = W# (x# `or#` y#) (W# x#) `xor` (W# y#) = W# (x# `xor#` y#) - complement (W# x#) = W# (x# `xor#` mb#) where W# mb# = maxBound + complement (W# x#) = W# (x# `xor#` mb#) + where !(W# mb#) = maxBound (W# x#) `shift` (I# i#) | i# >=# 0# = W# (x# `shiftL#` i#) | otherwise = W# (x# `shiftRL#` negateInt# i#) (W# x#) `rotate` (I# i#) | i'# ==# 0# = W# x# - | otherwise = W# ((x# `shiftL#` i'#) `or#` (x# `shiftRL#` (wsib -# i'#))) + | otherwise = W# ((x# `uncheckedShiftL#` i'#) `or#` (x# `uncheckedShiftRL#` (wsib -# i'#))) where - i'# = word2Int# (int2Word# i# `and#` int2Word# (wsib -# 1#)) - wsib = WORD_SIZE_IN_BITS# {- work around preprocessor problem (??) -} + !i'# = word2Int# (int2Word# i# `and#` int2Word# (wsib -# 1#)) + !wsib = WORD_SIZE_IN_BITS# {- work around preprocessor problem (??) -} bitSize _ = WORD_SIZE_IN_BITS isSigned _ = False @@ -175,6 +189,10 @@ instance Bits Word where "fromIntegral/Word->Word" fromIntegral = id :: Word -> Word #-} +-- No RULES for RealFrac unfortunately. +-- Going through Int isn't possible because Word's range is not +-- included in Int's, going through Integer may or may not be slower. + ------------------------------------------------------------------------ -- type Word8 ------------------------------------------------------------------------ @@ -196,8 +214,7 @@ instance Num Word8 where abs x = x signum 0 = 0 signum _ = 1 - fromInteger (S# i#) = W8# (narrow8Word# (int2Word# i#)) - fromInteger (J# s# d#) = W8# (narrow8Word# (integer2Word# s# d#)) + fromInteger i = W8# (narrow8Word# (integerToWord i)) instance Real Word8 where toRational x = toInteger x % 1 @@ -218,53 +235,55 @@ instance Enum Word8 where enumFromThen = boundedEnumFromThen instance Integral Word8 where - quot x@(W8# x#) y@(W8# y#) + quot (W8# x#) y@(W8# y#) | y /= 0 = W8# (x# `quotWord#` y#) | otherwise = divZeroError - rem x@(W8# x#) y@(W8# y#) + rem (W8# x#) y@(W8# y#) | y /= 0 = W8# (x# `remWord#` y#) | otherwise = divZeroError - div x@(W8# x#) y@(W8# y#) + div (W8# x#) y@(W8# y#) | y /= 0 = W8# (x# `quotWord#` y#) | otherwise = divZeroError - mod x@(W8# x#) y@(W8# y#) + mod (W8# x#) y@(W8# y#) | y /= 0 = W8# (x# `remWord#` y#) | otherwise = divZeroError - quotRem x@(W8# x#) y@(W8# y#) + quotRem (W8# x#) y@(W8# y#) | y /= 0 = (W8# (x# `quotWord#` y#), W8# (x# `remWord#` y#)) | otherwise = divZeroError - divMod x@(W8# x#) y@(W8# y#) + divMod (W8# x#) y@(W8# y#) | y /= 0 = (W8# (x# `quotWord#` y#), W8# (x# `remWord#` y#)) | otherwise = divZeroError - toInteger (W8# x#) = S# (word2Int# x#) + toInteger (W8# x#) = smallInteger (word2Int# x#) instance Bounded Word8 where minBound = 0 maxBound = 0xFF instance Ix Word8 where - range (m,n) = [m..n] - unsafeIndex b@(m,_) i = fromIntegral (i - m) - inRange (m,n) i = m <= i && i <= n - unsafeRangeSize b@(_l,h) = unsafeIndex b h + 1 + range (m,n) = [m..n] + unsafeIndex (m,_) i = fromIntegral (i - m) + inRange (m,n) i = m <= i && i <= n instance Read Word8 where readsPrec p s = [(fromIntegral (x::Int), r) | (x, r) <- readsPrec p s] instance Bits Word8 where + {-# INLINE shift #-} + (W8# x#) .&. (W8# y#) = W8# (x# `and#` y#) (W8# x#) .|. (W8# y#) = W8# (x# `or#` y#) (W8# x#) `xor` (W8# y#) = W8# (x# `xor#` y#) - complement (W8# x#) = W8# (x# `xor#` mb#) where W8# mb# = maxBound + complement (W8# x#) = W8# (x# `xor#` mb#) + where !(W8# mb#) = maxBound (W8# x#) `shift` (I# i#) | i# >=# 0# = W8# (narrow8Word# (x# `shiftL#` i#)) | otherwise = W8# (x# `shiftRL#` negateInt# i#) (W8# x#) `rotate` (I# i#) | i'# ==# 0# = W8# x# - | otherwise = W8# (narrow8Word# ((x# `shiftL#` i'#) `or#` - (x# `shiftRL#` (8# -# i'#)))) + | otherwise = W8# (narrow8Word# ((x# `uncheckedShiftL#` i'#) `or#` + (x# `uncheckedShiftRL#` (8# -# i'#)))) where - i'# = word2Int# (int2Word# i# `and#` int2Word# 7#) + !i'# = word2Int# (int2Word# i# `and#` int2Word# 7#) bitSize _ = 8 isSigned _ = False @@ -275,6 +294,36 @@ instance Bits Word8 where "fromIntegral/Word8->a" fromIntegral = \(W8# x#) -> fromIntegral (W# x#) #-} +{-# RULES +"properFraction/Float->(Word8,Float)" + forall x. properFraction (x :: Float) = + case properFraction x of { + (n, y) -> ((fromIntegral :: Int -> Word8) n, y) } +"truncate/Float->Word8" + forall x. truncate (x :: Float) = (fromIntegral :: Int -> Word8) (truncate x) +"floor/Float->Word8" + forall x. floor (x :: Float) = (fromIntegral :: Int -> Word8) (floor x) +"ceiling/Float->Word8" + forall x. ceiling (x :: Float) = (fromIntegral :: Int -> Word8) (ceiling x) +"round/Float->Word8" + forall x. round (x :: Float) = (fromIntegral :: Int -> Word8) (round x) + #-} + +{-# RULES +"properFraction/Double->(Word8,Double)" + forall x. properFraction (x :: Double) = + case properFraction x of { + (n, y) -> ((fromIntegral :: Int -> Word8) n, y) } +"truncate/Double->Word8" + forall x. truncate (x :: Double) = (fromIntegral :: Int -> Word8) (truncate x) +"floor/Double->Word8" + forall x. floor (x :: Double) = (fromIntegral :: Int -> Word8) (floor x) +"ceiling/Double->Word8" + forall x. ceiling (x :: Double) = (fromIntegral :: Int -> Word8) (ceiling x) +"round/Double->Word8" + forall x. round (x :: Double) = (fromIntegral :: Int -> Word8) (round x) + #-} + ------------------------------------------------------------------------ -- type Word16 ------------------------------------------------------------------------ @@ -296,8 +345,7 @@ instance Num Word16 where abs x = x signum 0 = 0 signum _ = 1 - fromInteger (S# i#) = W16# (narrow16Word# (int2Word# i#)) - fromInteger (J# s# d#) = W16# (narrow16Word# (integer2Word# s# d#)) + fromInteger i = W16# (narrow16Word# (integerToWord i)) instance Real Word16 where toRational x = toInteger x % 1 @@ -318,53 +366,55 @@ instance Enum Word16 where enumFromThen = boundedEnumFromThen instance Integral Word16 where - quot x@(W16# x#) y@(W16# y#) + quot (W16# x#) y@(W16# y#) | y /= 0 = W16# (x# `quotWord#` y#) | otherwise = divZeroError - rem x@(W16# x#) y@(W16# y#) + rem (W16# x#) y@(W16# y#) | y /= 0 = W16# (x# `remWord#` y#) | otherwise = divZeroError - div x@(W16# x#) y@(W16# y#) + div (W16# x#) y@(W16# y#) | y /= 0 = W16# (x# `quotWord#` y#) | otherwise = divZeroError - mod x@(W16# x#) y@(W16# y#) + mod (W16# x#) y@(W16# y#) | y /= 0 = W16# (x# `remWord#` y#) | otherwise = divZeroError - quotRem x@(W16# x#) y@(W16# y#) + quotRem (W16# x#) y@(W16# y#) | y /= 0 = (W16# (x# `quotWord#` y#), W16# (x# `remWord#` y#)) | otherwise = divZeroError - divMod x@(W16# x#) y@(W16# y#) + divMod (W16# x#) y@(W16# y#) | y /= 0 = (W16# (x# `quotWord#` y#), W16# (x# `remWord#` y#)) | otherwise = divZeroError - toInteger (W16# x#) = S# (word2Int# x#) + toInteger (W16# x#) = smallInteger (word2Int# x#) instance Bounded Word16 where minBound = 0 maxBound = 0xFFFF instance Ix Word16 where - range (m,n) = [m..n] - unsafeIndex b@(m,_) i = fromIntegral (i - m) - inRange (m,n) i = m <= i && i <= n - unsafeRangeSize b@(_l,h) = unsafeIndex b h + 1 + range (m,n) = [m..n] + unsafeIndex (m,_) i = fromIntegral (i - m) + inRange (m,n) i = m <= i && i <= n instance Read Word16 where readsPrec p s = [(fromIntegral (x::Int), r) | (x, r) <- readsPrec p s] instance Bits Word16 where + {-# INLINE shift #-} + (W16# x#) .&. (W16# y#) = W16# (x# `and#` y#) (W16# x#) .|. (W16# y#) = W16# (x# `or#` y#) (W16# x#) `xor` (W16# y#) = W16# (x# `xor#` y#) - complement (W16# x#) = W16# (x# `xor#` mb#) where W16# mb# = maxBound + complement (W16# x#) = W16# (x# `xor#` mb#) + where !(W16# mb#) = maxBound (W16# x#) `shift` (I# i#) | i# >=# 0# = W16# (narrow16Word# (x# `shiftL#` i#)) | otherwise = W16# (x# `shiftRL#` negateInt# i#) (W16# x#) `rotate` (I# i#) | i'# ==# 0# = W16# x# - | otherwise = W16# (narrow16Word# ((x# `shiftL#` i'#) `or#` - (x# `shiftRL#` (16# -# i'#)))) + | otherwise = W16# (narrow16Word# ((x# `uncheckedShiftL#` i'#) `or#` + (x# `uncheckedShiftRL#` (16# -# i'#)))) where - i'# = word2Int# (int2Word# i# `and#` int2Word# 15#) + !i'# = word2Int# (int2Word# i# `and#` int2Word# 15#) bitSize _ = 16 isSigned _ = False @@ -376,6 +426,36 @@ instance Bits Word16 where "fromIntegral/Word16->a" fromIntegral = \(W16# x#) -> fromIntegral (W# x#) #-} +{-# RULES +"properFraction/Float->(Word16,Float)" + forall x. properFraction (x :: Float) = + case properFraction x of { + (n, y) -> ((fromIntegral :: Int -> Word16) n, y) } +"truncate/Float->Word16" + forall x. truncate (x :: Float) = (fromIntegral :: Int -> Word16) (truncate x) +"floor/Float->Word16" + forall x. floor (x :: Float) = (fromIntegral :: Int -> Word16) (floor x) +"ceiling/Float->Word16" + forall x. ceiling (x :: Float) = (fromIntegral :: Int -> Word16) (ceiling x) +"round/Float->Word16" + forall x. round (x :: Float) = (fromIntegral :: Int -> Word16) (round x) + #-} + +{-# RULES +"properFraction/Double->(Word16,Double)" + forall x. properFraction (x :: Double) = + case properFraction x of { + (n, y) -> ((fromIntegral :: Int -> Word16) n, y) } +"truncate/Double->Word16" + forall x. truncate (x :: Double) = (fromIntegral :: Int -> Word16) (truncate x) +"floor/Double->Word16" + forall x. floor (x :: Double) = (fromIntegral :: Int -> Word16) (floor x) +"ceiling/Double->Word16" + forall x. ceiling (x :: Double) = (fromIntegral :: Int -> Word16) (ceiling x) +"round/Double->Word16" + forall x. round (x :: Double) = (fromIntegral :: Int -> Word16) (round x) + #-} + ------------------------------------------------------------------------ -- type Word32 ------------------------------------------------------------------------ @@ -449,6 +529,8 @@ instance Integral Word32 where | otherwise = case word32ToInteger# x# of (# s, d #) -> J# s d instance Bits Word32 where + {-# INLINE shift #-} + (W32# x#) .&. (W32# y#) = W32# (x# `and32#` y#) (W32# x#) .|. (W32# y#) = W32# (x# `or32#` y#) (W32# x#) `xor` (W32# y#) = W32# (x# `xor32#` y#) @@ -465,30 +547,6 @@ instance Bits Word32 where bitSize _ = 32 isSigned _ = False -foreign import unsafe "stg_eqWord32" eqWord32# :: Word32# -> Word32# -> Bool -foreign import unsafe "stg_neWord32" neWord32# :: Word32# -> Word32# -> Bool -foreign import unsafe "stg_ltWord32" ltWord32# :: Word32# -> Word32# -> Bool -foreign import unsafe "stg_leWord32" leWord32# :: Word32# -> Word32# -> Bool -foreign import unsafe "stg_gtWord32" gtWord32# :: Word32# -> Word32# -> Bool -foreign import unsafe "stg_geWord32" geWord32# :: Word32# -> Word32# -> Bool -foreign import unsafe "stg_int32ToWord32" int32ToWord32# :: Int32# -> Word32# -foreign import unsafe "stg_word32ToInt32" word32ToInt32# :: Word32# -> Int32# -foreign import unsafe "stg_intToInt32" intToInt32# :: Int# -> Int32# -foreign import unsafe "stg_wordToWord32" wordToWord32# :: Word# -> Word32# -foreign import unsafe "stg_word32ToWord" word32ToWord# :: Word32# -> Word# -foreign import unsafe "stg_plusInt32" plusInt32# :: Int32# -> Int32# -> Int32# -foreign import unsafe "stg_minusInt32" minusInt32# :: Int32# -> Int32# -> Int32# -foreign import unsafe "stg_timesInt32" timesInt32# :: Int32# -> Int32# -> Int32# -foreign import unsafe "stg_negateInt32" negateInt32# :: Int32# -> Int32# -foreign import unsafe "stg_quotWord32" quotWord32# :: Word32# -> Word32# -> Word32# -foreign import unsafe "stg_remWord32" remWord32# :: Word32# -> Word32# -> Word32# -foreign import unsafe "stg_and32" and32# :: Word32# -> Word32# -> Word32# -foreign import unsafe "stg_or32" or32# :: Word32# -> Word32# -> Word32# -foreign import unsafe "stg_xor32" xor32# :: Word32# -> Word32# -> Word32# -foreign import unsafe "stg_not32" not32# :: Word32# -> Word32# -foreign import unsafe "stg_shiftL32" shiftL32# :: Word32# -> Int# -> Word32# -foreign import unsafe "stg_shiftRL32" shiftRL32# :: Word32# -> Int# -> Word32# - {-# RULES "fromIntegral/Int->Word32" fromIntegral = \(I# x#) -> W32# (int32ToWord32# (intToInt32# x#)) "fromIntegral/Word->Word32" fromIntegral = \(W# x#) -> W32# (wordToWord32# x#) @@ -503,6 +561,39 @@ foreign import unsafe "stg_shiftRL32" shiftRL32# :: Word32# -> Int# -> W #if WORD_SIZE_IN_BITS > 32 -- Operations may assume and must ensure that it holds only values -- from its logical range. + +-- We can use rewrite rules for the RealFrac methods + +{-# RULES +"properFraction/Float->(Word32,Float)" + forall x. properFraction (x :: Float) = + case properFraction x of { + (n, y) -> ((fromIntegral :: Int -> Word32) n, y) } +"truncate/Float->Word32" + forall x. truncate (x :: Float) = (fromIntegral :: Int -> Word32) (truncate x) +"floor/Float->Word32" + forall x. floor (x :: Float) = (fromIntegral :: Int -> Word32) (floor x) +"ceiling/Float->Word32" + forall x. ceiling (x :: Float) = (fromIntegral :: Int -> Word32) (ceiling x) +"round/Float->Word32" + forall x. round (x :: Float) = (fromIntegral :: Int -> Word32) (round x) + #-} + +{-# RULES +"properFraction/Double->(Word32,Double)" + forall x. properFraction (x :: Double) = + case properFraction x of { + (n, y) -> ((fromIntegral :: Int -> Word32) n, y) } +"truncate/Double->Word32" + forall x. truncate (x :: Double) = (fromIntegral :: Int -> Word32) (truncate x) +"floor/Double->Word32" + forall x. floor (x :: Double) = (fromIntegral :: Int -> Word32) (floor x) +"ceiling/Double->Word32" + forall x. ceiling (x :: Double) = (fromIntegral :: Int -> Word32) (ceiling x) +"round/Double->Word32" + forall x. round (x :: Double) = (fromIntegral :: Int -> Word32) (round x) + #-} + #endif data Word32 = W32# Word# deriving (Eq, Ord) @@ -516,8 +607,7 @@ instance Num Word32 where abs x = x signum 0 = 0 signum _ = 1 - fromInteger (S# i#) = W32# (narrow32Word# (int2Word# i#)) - fromInteger (J# s# d#) = W32# (narrow32Word# (integer2Word# s# d#)) + fromInteger i = W32# (narrow32Word# (integerToWord i)) instance Enum Word32 where succ x @@ -549,48 +639,51 @@ instance Enum Word32 where #endif instance Integral Word32 where - quot x@(W32# x#) y@(W32# y#) + quot (W32# x#) y@(W32# y#) | y /= 0 = W32# (x# `quotWord#` y#) | otherwise = divZeroError - rem x@(W32# x#) y@(W32# y#) + rem (W32# x#) y@(W32# y#) | y /= 0 = W32# (x# `remWord#` y#) | otherwise = divZeroError - div x@(W32# x#) y@(W32# y#) + div (W32# x#) y@(W32# y#) | y /= 0 = W32# (x# `quotWord#` y#) | otherwise = divZeroError - mod x@(W32# x#) y@(W32# y#) + mod (W32# x#) y@(W32# y#) | y /= 0 = W32# (x# `remWord#` y#) | otherwise = divZeroError - quotRem x@(W32# x#) y@(W32# y#) + quotRem (W32# x#) y@(W32# y#) | y /= 0 = (W32# (x# `quotWord#` y#), W32# (x# `remWord#` y#)) | otherwise = divZeroError - divMod x@(W32# x#) y@(W32# y#) + divMod (W32# x#) y@(W32# y#) | y /= 0 = (W32# (x# `quotWord#` y#), W32# (x# `remWord#` y#)) | otherwise = divZeroError toInteger (W32# x#) #if WORD_SIZE_IN_BITS == 32 - | i# >=# 0# = S# i# - | otherwise = case word2Integer# x# of (# s, d #) -> J# s d + | i# >=# 0# = smallInteger i# + | otherwise = wordToInteger x# where - i# = word2Int# x# + !i# = word2Int# x# #else - = S# (word2Int# x#) + = smallInteger (word2Int# x#) #endif instance Bits Word32 where + {-# INLINE shift #-} + (W32# x#) .&. (W32# y#) = W32# (x# `and#` y#) (W32# x#) .|. (W32# y#) = W32# (x# `or#` y#) (W32# x#) `xor` (W32# y#) = W32# (x# `xor#` y#) - complement (W32# x#) = W32# (x# `xor#` mb#) where W32# mb# = maxBound + complement (W32# x#) = W32# (x# `xor#` mb#) + where !(W32# mb#) = maxBound (W32# x#) `shift` (I# i#) | i# >=# 0# = W32# (narrow32Word# (x# `shiftL#` i#)) | otherwise = W32# (x# `shiftRL#` negateInt# i#) (W32# x#) `rotate` (I# i#) | i'# ==# 0# = W32# x# - | otherwise = W32# (narrow32Word# ((x# `shiftL#` i'#) `or#` - (x# `shiftRL#` (32# -# i'#)))) + | otherwise = W32# (narrow32Word# ((x# `uncheckedShiftL#` i'#) `or#` + (x# `uncheckedShiftRL#` (32# -# i'#)))) where - i'# = word2Int# (int2Word# i# `and#` int2Word# 31#) + !i'# = word2Int# (int2Word# i# `and#` int2Word# 31#) bitSize _ = 32 isSigned _ = False @@ -621,10 +714,9 @@ instance Bounded Word32 where maxBound = 0xFFFFFFFF instance Ix Word32 where - range (m,n) = [m..n] - unsafeIndex b@(m,_) i = fromIntegral (i - m) - inRange (m,n) i = m <= i && i <= n - unsafeRangeSize b@(_l,h) = unsafeIndex b h + 1 + range (m,n) = [m..n] + unsafeIndex (m,_) i = fromIntegral (i - m) + inRange (m,n) i = m <= i && i <= n instance Read Word32 where #if WORD_SIZE_IN_BITS < 33 @@ -660,8 +752,7 @@ instance Num Word64 where abs x = x signum 0 = 0 signum _ = 1 - fromInteger (S# i#) = W64# (int64ToWord64# (intToInt64# i#)) - fromInteger (J# s# d#) = W64# (integerToWord64# s# d#) + fromInteger i = W64# (integerToWord64 i) instance Enum Word64 where succ x @@ -683,29 +774,29 @@ instance Enum Word64 where enumFromThenTo = integralEnumFromThenTo instance Integral Word64 where - quot x@(W64# x#) y@(W64# y#) + quot (W64# x#) y@(W64# y#) | y /= 0 = W64# (x# `quotWord64#` y#) | otherwise = divZeroError - rem x@(W64# x#) y@(W64# y#) + rem (W64# x#) y@(W64# y#) | y /= 0 = W64# (x# `remWord64#` y#) | otherwise = divZeroError - div x@(W64# x#) y@(W64# y#) + div (W64# x#) y@(W64# y#) | y /= 0 = W64# (x# `quotWord64#` y#) | otherwise = divZeroError - mod x@(W64# x#) y@(W64# y#) + mod (W64# x#) y@(W64# y#) | y /= 0 = W64# (x# `remWord64#` y#) | otherwise = divZeroError - quotRem x@(W64# x#) y@(W64# y#) + quotRem (W64# x#) y@(W64# y#) | y /= 0 = (W64# (x# `quotWord64#` y#), W64# (x# `remWord64#` y#)) | otherwise = divZeroError - divMod x@(W64# x#) y@(W64# y#) + divMod (W64# x#) y@(W64# y#) | y /= 0 = (W64# (x# `quotWord64#` y#), W64# (x# `remWord64#` y#)) | otherwise = divZeroError - toInteger x@(W64# x#) - | x <= 0x7FFFFFFF = S# (word2Int# (word64ToWord# x#)) - | otherwise = case word64ToInteger# x# of (# s, d #) -> J# s d + toInteger (W64# x#) = word64ToInteger x# instance Bits Word64 where + {-# INLINE shift #-} + (W64# x#) .&. (W64# y#) = W64# (x# `and64#` y#) (W64# x#) .|. (W64# y#) = W64# (x# `or64#` y#) (W64# x#) `xor` (W64# y#) = W64# (x# `xor64#` y#) @@ -718,7 +809,7 @@ instance Bits Word64 where | otherwise = W64# ((x# `uncheckedShiftL64#` i'#) `or64#` (x# `uncheckedShiftRL64#` (64# -# i'#))) where - i'# = word2Int# (int2Word# i# `and#` int2Word# 63#) + !i'# = word2Int# (int2Word# i# `and#` int2Word# 63#) bitSize _ = 64 isSigned _ = False @@ -730,38 +821,10 @@ instance Bits Word64 where shiftL64#, shiftRL64# :: Word64# -> Int# -> Word64# a `shiftL64#` b | b >=# 64# = wordToWord64# (int2Word# 0#) - | otherwise = a `uncheckedShiftL64#` b + | otherwise = a `uncheckedShiftL64#` b a `shiftRL64#` b | b >=# 64# = wordToWord64# (int2Word# 0#) - | otherwise = a `uncheckedShiftRL64#` b - - -foreign import ccall unsafe "stg_eqWord64" eqWord64# :: Word64# -> Word64# -> Bool -foreign import ccall unsafe "stg_neWord64" neWord64# :: Word64# -> Word64# -> Bool -foreign import ccall unsafe "stg_ltWord64" ltWord64# :: Word64# -> Word64# -> Bool -foreign import ccall unsafe "stg_leWord64" leWord64# :: Word64# -> Word64# -> Bool -foreign import ccall unsafe "stg_gtWord64" gtWord64# :: Word64# -> Word64# -> Bool -foreign import ccall unsafe "stg_geWord64" geWord64# :: Word64# -> Word64# -> Bool -foreign import ccall unsafe "stg_int64ToWord64" int64ToWord64# :: Int64# -> Word64# -foreign import ccall unsafe "stg_word64ToInt64" word64ToInt64# :: Word64# -> Int64# -foreign import ccall unsafe "stg_intToInt64" intToInt64# :: Int# -> Int64# -foreign import ccall unsafe "stg_wordToWord64" wordToWord64# :: Word# -> Word64# -foreign import ccall unsafe "stg_word64ToWord" word64ToWord# :: Word64# -> Word# -foreign import ccall unsafe "stg_plusInt64" plusInt64# :: Int64# -> Int64# -> Int64# -foreign import ccall unsafe "stg_minusInt64" minusInt64# :: Int64# -> Int64# -> Int64# -foreign import ccall unsafe "stg_timesInt64" timesInt64# :: Int64# -> Int64# -> Int64# -foreign import ccall unsafe "stg_negateInt64" negateInt64# :: Int64# -> Int64# -foreign import ccall unsafe "stg_quotWord64" quotWord64# :: Word64# -> Word64# -> Word64# -foreign import ccall unsafe "stg_remWord64" remWord64# :: Word64# -> Word64# -> Word64# -foreign import ccall unsafe "stg_and64" and64# :: Word64# -> Word64# -> Word64# -foreign import ccall unsafe "stg_or64" or64# :: Word64# -> Word64# -> Word64# -foreign import ccall unsafe "stg_xor64" xor64# :: Word64# -> Word64# -> Word64# -foreign import ccall unsafe "stg_not64" not64# :: Word64# -> Word64# -foreign import ccall unsafe "stg_uncheckedShiftL64" uncheckedShiftL64# :: Word64# -> Int# -> Word64# -foreign import ccall unsafe "stg_uncheckedShiftRL64" uncheckedShiftRL64# :: Word64# -> Int# -> Word64# - -foreign import ccall unsafe "stg_integerToWord64" integerToWord64# :: Int# -> ByteArray# -> Word64# - + | otherwise = a `uncheckedShiftRL64#` b {-# RULES "fromIntegral/Int->Word64" fromIntegral = \(I# x#) -> W64# (int64ToWord64# (intToInt64# x#)) @@ -788,8 +851,7 @@ instance Num Word64 where abs x = x signum 0 = 0 signum _ = 1 - fromInteger (S# i#) = W64# (int2Word# i#) - fromInteger (J# s# d#) = W64# (integer2Word# s# d#) + fromInteger i = W64# (integerToWord i) instance Enum Word64 where succ x @@ -811,44 +873,47 @@ instance Enum Word64 where enumFromThenTo = integralEnumFromThenTo instance Integral Word64 where - quot x@(W64# x#) y@(W64# y#) + quot (W64# x#) y@(W64# y#) | y /= 0 = W64# (x# `quotWord#` y#) | otherwise = divZeroError - rem x@(W64# x#) y@(W64# y#) + rem (W64# x#) y@(W64# y#) | y /= 0 = W64# (x# `remWord#` y#) | otherwise = divZeroError - div x@(W64# x#) y@(W64# y#) + div (W64# x#) y@(W64# y#) | y /= 0 = W64# (x# `quotWord#` y#) | otherwise = divZeroError - mod x@(W64# x#) y@(W64# y#) + mod (W64# x#) y@(W64# y#) | y /= 0 = W64# (x# `remWord#` y#) | otherwise = divZeroError - quotRem x@(W64# x#) y@(W64# y#) + quotRem (W64# x#) y@(W64# y#) | y /= 0 = (W64# (x# `quotWord#` y#), W64# (x# `remWord#` y#)) | otherwise = divZeroError - divMod x@(W64# x#) y@(W64# y#) + divMod (W64# x#) y@(W64# y#) | y /= 0 = (W64# (x# `quotWord#` y#), W64# (x# `remWord#` y#)) | otherwise = divZeroError toInteger (W64# x#) - | i# >=# 0# = S# i# - | otherwise = case word2Integer# x# of (# s, d #) -> J# s d + | i# >=# 0# = smallInteger i# + | otherwise = wordToInteger x# where - i# = word2Int# x# + !i# = word2Int# x# instance Bits Word64 where + {-# INLINE shift #-} + (W64# x#) .&. (W64# y#) = W64# (x# `and#` y#) (W64# x#) .|. (W64# y#) = W64# (x# `or#` y#) (W64# x#) `xor` (W64# y#) = W64# (x# `xor#` y#) - complement (W64# x#) = W64# (x# `xor#` mb#) where W64# mb# = maxBound + complement (W64# x#) = W64# (x# `xor#` mb#) + where !(W64# mb#) = maxBound (W64# x#) `shift` (I# i#) | i# >=# 0# = W64# (x# `shiftL#` i#) | otherwise = W64# (x# `shiftRL#` negateInt# i#) (W64# x#) `rotate` (I# i#) | i'# ==# 0# = W64# x# - | otherwise = W64# ((x# `shiftL#` i'#) `or#` - (x# `shiftRL#` (64# -# i'#))) + | otherwise = W64# ((x# `uncheckedShiftL#` i'#) `or#` + (x# `uncheckedShiftRL#` (64# -# i'#))) where - i'# = word2Int# (int2Word# i# `and#` int2Word# 63#) + !i'# = word2Int# (int2Word# i# `and#` int2Word# 63#) bitSize _ = 64 isSigned _ = False @@ -857,6 +922,12 @@ instance Bits Word64 where "fromIntegral/Word64->a" fromIntegral = \(W64# x#) -> fromIntegral (W# x#) #-} +uncheckedShiftL64# :: Word# -> Int# -> Word# +uncheckedShiftL64# = uncheckedShiftL# + +uncheckedShiftRL64# :: Word# -> Int# -> Word# +uncheckedShiftRL64# = uncheckedShiftRL# + #endif instance Show Word64 where @@ -870,10 +941,9 @@ instance Bounded Word64 where maxBound = 0xFFFFFFFFFFFFFFFF instance Ix Word64 where - range (m,n) = [m..n] - unsafeIndex b@(m,_) i = fromIntegral (i - m) - inRange (m,n) i = m <= i && i <= n - unsafeRangeSize b@(_l,h) = unsafeIndex b h + 1 + range (m,n) = [m..n] + unsafeIndex (m,_) i = fromIntegral (i - m) + inRange (m,n) i = m <= i && i <= n instance Read Word64 where readsPrec p s = [(fromInteger x, r) | (x, r) <- readsPrec p s]