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
Unify all BuiltinBuilder functions.
[matthijs/master-project/cλash.git]
/
Adders.hs
diff --git
a/Adders.hs
b/Adders.hs
index d4c43ca173450c14892dbfe92b57b478bcf8db63..d64331f0499f899f715a4a0464c722b7c7685b2a 100644
(file)
--- a/
Adders.hs
+++ b/
Adders.hs
@@
-10,6
+10,7
@@
import Prelude hiding (
import Language.Haskell.Syntax
import Types
import Data.Param.TFVec
import Language.Haskell.Syntax
import Types
import Data.Param.TFVec
+import Data.RangedWord
mainIO f = Sim.simulateIO (Sim.stateless f) ()
mainIO f = Sim.simulateIO (Sim.stateless f) ()
@@
-171,8
+172,15
@@
highordtest = \x ->
in
\c d -> op' d c
in
\c d -> op' d c
-functiontest :: TFVec D4 Bit -> Bit
-functiontest = \v -> let r = head v in r
+xand a b = hwand a b
+
+functiontest :: TFVec D4 Bit -> Bit -> Bit
+functiontest = \v s -> let r = foldl xand s v in r
+
+xhwnot x = hwnot x
+
+maptest :: TFVec D4 Bit -> TFVec D4 Bit
+maptest = \v -> let r = map xhwnot v in r
highordtest2 = \a b ->
case a of
highordtest2 = \a b ->
case a of