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 support for instances of tfp integer, but poorly...
[matthijs/master-project/cλash.git]
/
Adders.hs
diff --git
a/Adders.hs
b/Adders.hs
index 3afb82fae22e6ecebd6349ac23da944ebbec95f5..408e6b89c43e93cf291f460f0bafd154942eed45 100644
(file)
--- a/
Adders.hs
+++ b/
Adders.hs
@@
-172,8
+172,10
@@
highordtest = \x ->
in
\c d -> op' d c
in
\c d -> op' d c
-functiontest :: TFVec D4 Bit -> TFVec D5 Bit -> RangedWord D3 -> RangedWord D4 -> (Bit, Bit)
-functiontest = \v1 v2 i1 i2 -> let r1 = v1!i1 ; r2 = v2!i2 in (r1,r2)
+xand a b = hwand a b
+
+functiontest :: TFVec D4 Bit -> TFVec D2 Bit
+functiontest = \v -> let r = select d0 d1 d2 v in r
xhwnot x = hwnot x
xhwnot x = hwnot x