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 dbb0ecac94cc93a0dcd446686fb01714a4d9d894..f462e3efa9064bc0da99299cc2cf622ab0c4ab42 100644
(file)
--- a/
clash/CLasH/HardwareTypes.hs
+++ b/
clash/CLasH/HardwareTypes.hs
@@
-2,11
+2,14
@@
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(..)
, hwand
, Bit(..)
, State(..)
, hwand
@@
-21,10
+24,12
@@
module CLasH.HardwareTypes
import qualified Prelude as P
import Prelude (Bool(..),Num(..),Eq(..),Ord(..),snd,fst,otherwise,(&&),(||),not)
import Types
import qualified Prelude as P
import Prelude (Bool(..),Num(..),Eq(..),Ord(..),snd,fst,otherwise,(&&),(||),not)
import Types
+import Data.Param.Integer (HWBits(..))
import Data.Param.Vector
import Data.Param.Index
import Data.Param.Signed
import Data.Param.Unsigned
import Data.Param.Vector
import Data.Param.Index
import Data.Param.Signed
import Data.Param.Unsigned
+import Data.Bits hiding (shiftL,shiftR)
import Language.Haskell.TH.Lift
import Data.Typeable
import Language.Haskell.TH.Lift
import Data.Typeable