From: Christiaan Baaij Date: Thu, 20 Aug 2009 20:03:46 +0000 (+0200) Subject: TFP has updated/remade. Change hardwaretypes accordingly X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=ba07c230bcda1111bccab1740a9caa48e8df8897;p=matthijs%2Fmaster-project%2Fc%CE%BBash.git TFP has updated/remade. Change hardwaretypes accordingly Delete your old git repo of TFP, it doesn't include the darcs history from the original TFP from Peter Gavin. Then clone the new TFP. --- diff --git "a/c\316\273ash/CLasH/HardwareTypes.hs" "b/c\316\273ash/CLasH/HardwareTypes.hs" index c3eaf43..cff5c88 100644 --- "a/c\316\273ash/CLasH/HardwareTypes.hs" +++ "b/c\316\273ash/CLasH/HardwareTypes.hs" @@ -10,6 +10,8 @@ module CLasH.HardwareTypes , Bit(..) , State(..) , Vector + , resizeInt + , resizeWord , hwand , hwor , hwxor @@ -27,8 +29,10 @@ import Types import qualified Data.Param.TFVec as TFVec import Data.Param.TFVec hiding (TFVec) import Data.RangedWord -import Data.SizedInt -import Data.SizedWord +import qualified Data.SizedInt as SizedInt +import Data.SizedInt hiding (resize) +import qualified Data.SizedWord as SizedWord +import Data.SizedWord hiding (resize) import Language.Haskell.TH.Lift import Data.Typeable @@ -37,6 +41,12 @@ newtype State s = State s deriving (P.Show) type Vector = TFVec.TFVec +resizeInt :: (NaturalT nT, NaturalT nT') => SizedInt nT -> SizedInt nT' +resizeInt = SizedInt.resize + +resizeWord :: (NaturalT nT, NaturalT nT') => SizedWord nT -> SizedWord nT' +resizeWord = SizedWord.resize + -- The plain Bit type data Bit = High | Low deriving (P.Show, P.Eq, P.Read, Typeable)