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
Made Bit an instance of Lift so it can be used in vectorTH
[matthijs/master-project/cλash.git]
/
Adders.hs
diff --git
a/Adders.hs
b/Adders.hs
index b17f744c0fbea1548e70cc341add975c9d99f089..67d7d95e9fa3a7e3c5d693c2bf1980bb24900155 100644
(file)
--- a/
Adders.hs
+++ b/
Adders.hs
@@
-1,3
+1,5
@@
+{-# LANGUAGE TemplateHaskell #-}
+
module Adders where
import Bits
import qualified Sim
module Adders where
import Bits
import qualified Sim
@@
-174,8
+176,8
@@
highordtest = \x ->
xand a b = hwand a b
xand a b = hwand a b
-functiontest :: TFVec D4 Bit -> TFVec D
4 Bit -> TFVec D4 (Bit, Bit)
-functiontest = \v
1 v2 -> let r = zip v1 v2
in r
+functiontest :: TFVec D4 Bit -> TFVec D
8 Bit
+functiontest = \v
-> let r = v ++ $(vectorTH ([High,Low,High,Low] :: [Bit]))
in r
xhwnot x = hwnot x
xhwnot x = hwnot x