projects
/
matthijs
/
master-project
/
cλash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Really revert all of the recent rotating changes.
[matthijs/master-project/cλash.git]
/
clash
/
CLasH
/
HardwareTypes.hs
diff --git
a/clash/CLasH/HardwareTypes.hs
b/clash/CLasH/HardwareTypes.hs
index d66befeeacca9a89aa5c5b853b7fcad593bd00ee..f462e3efa9064bc0da99299cc2cf622ab0c4ab42 100644
(file)
--- a/
clash/CLasH/HardwareTypes.hs
+++ b/
clash/CLasH/HardwareTypes.hs
@@
-1,16
+1,17
@@
-{-# LANGUAGE TemplateHaskell, DeriveDataTypeable
, FlexibleContexts, TypeFamilies, TypeOperators
#-}
+{-# LANGUAGE TemplateHaskell, DeriveDataTypeable #-}
module CLasH.HardwareTypes
( module Types
module CLasH.HardwareTypes
( module Types
+ , module Data.Param.Integer
, module Data.Param.Vector
, module Data.Param.Index
, module Data.Param.Signed
, module Data.Param.Unsigned
, module Prelude
, module Data.Param.Vector
, module Data.Param.Index
, module Data.Param.Signed
, module Data.Param.Unsigned
, module Prelude
+ , module Data.Bits
+ , module Language.Haskell.TH.Lift
, Bit(..)
, State(..)
, Bit(..)
, State(..)
- , resizeInt
- , resizeWord
, hwand
, hwor
, hwxor
, hwand
, hwor
, hwxor
@@
-21,31
+22,23
@@
module CLasH.HardwareTypes
) where
import qualified Prelude as P
) where
import qualified Prelude as P
-import Prelude hiding (
- null, length, head, tail, last, init, take, drop, (++), map, foldl, foldr,
- zipWith, zip, unzip, concat, reverse, iterate )
+import Prelude (Bool(..),Num(..),Eq(..),Ord(..),snd,fst,otherwise,(&&),(||),not)
import Types
import Types
+import Data.Param.Integer (HWBits(..))
import Data.Param.Vector
import Data.Param.Index
import Data.Param.Vector
import Data.Param.Index
-import qualified Data.Param.Signed as Signed
-import Data.Param.Signed hiding (resize)
-import qualified Data.Param.Unsigned as Unsigned
-import Data.Param.Unsigned hiding (resize)
+import Data.Param.Signed
+import Data.Param.Unsigned
+import Data.Bits hiding (shiftL,shiftR)
import Language.Haskell.TH.Lift
import Data.Typeable
newtype State s = State s deriving (P.Show)
import Language.Haskell.TH.Lift
import Data.Typeable
newtype State s = State s deriving (P.Show)
-resizeInt :: (NaturalT nT, NaturalT nT') => Signed nT -> Signed nT'
-resizeInt = Signed.resize
-
-resizeWord :: (NaturalT nT, NaturalT nT') => Unsigned nT -> Unsigned nT'
-resizeWord = Unsigned.resize
-
-- The plain Bit type
data Bit = High | Low
-- The plain Bit type
data Bit = High | Low
- deriving (P.Show,
P.
Eq, P.Read, Typeable)
+ deriving (P.Show, Eq, P.Read, Typeable)
deriveLift ''Bit
deriveLift ''Bit