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
Correctly handle negate for unsigned integers
[matthijs/master-project/cλash.git]
/
Bits.hs
diff --git
a/Bits.hs
b/Bits.hs
index c0717bff475bf107e5117c5e9cb6f441787e144d..435b04e1efc5cb0292b345111f5584a694cf2521 100644
(file)
--- a/
Bits.hs
+++ b/
Bits.hs
@@
-1,5
+1,11
@@
+{-# LANGUAGE FlexibleContexts,GADTs,ExistentialQuantification,LiberalTypeSynonyms,TemplateHaskell #-}
+
module Bits where
module Bits where
+import qualified Data.Param.TFVec as TFVec
+import qualified Types
+import Language.Haskell.TH.Lift
+
--class Signal a where
-- hwand :: a -> a -> a
-- hwor :: a -> a -> a
--class Signal a where
-- hwand :: a -> a -> a
-- hwor :: a -> a -> a
@@
-38,9
+44,11
@@
displaysig High = "1"
displaysig Low = "0"
-- The plain Bit type
displaysig Low = "0"
-- The plain Bit type
-data Bit = High | Low
| DontCare
+data Bit = High | Low
deriving (Show, Eq, Read)
deriving (Show, Eq, Read)
+$(deriveLift1 ''Bit)
+
-- A function to prettyprint a bitvector
--displaysigs :: (Signal s) => [s] -> String
-- A function to prettyprint a bitvector
--displaysigs :: (Signal s) => [s] -> String
@@
-53,4
+61,6
@@
type Stream a = [a]
lows = Low : lows
highs = High : highs
lows = Low : lows
highs = High : highs
+type BitVec len = TFVec.TFVec len Bit
+
-- vim: set ts=8 sw=2 sts=2 expandtab:
-- vim: set ts=8 sw=2 sts=2 expandtab: