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
Added builtin functions: concat, reverse, iterate, iteraten, generate and generaten
[matthijs/master-project/cλash.git]
/
Adders.hs
diff --git
a/Adders.hs
b/Adders.hs
index 6cf3be5d97ddafff47bd158e4d38a8e7cdaea73d..2f3af384a5f186886c0c15f607f0fa13ba52a9fb 100644
(file)
--- a/
Adders.hs
+++ b/
Adders.hs
@@
-172,8
+172,15
@@
highordtest = \x ->
in
\c d -> op' d c
in
\c d -> op' d c
-functiontest :: TFVec D4 Bit -> RangedWord D3 -> Bit
-functiontest = \v i -> let r = v!i in r
+xand a b = hwand a b
+
+functiontest :: Bit -> TFVec D3 Bit
+functiontest = \a -> let r = generaten d3 hwnot a 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