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
Remove a double line introduced a few commits back.
[matthijs/master-project/cλash.git]
/
Adders.hs
diff --git
a/Adders.hs
b/Adders.hs
index d4c43ca173450c14892dbfe92b57b478bcf8db63..c4389147c28726e1f1a9486f4cfe44f44a360309 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,8
@@
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
+functiontest :: TFVec D4 Bit ->
TFVec D5 Bit -> RangedWord D3 -> RangedWord D4 -> (Bit, Bit)
+functiontest = \v
1 v2 i1 i2 -> let r1 = v1!i1 ; r2 = v2!i2 in (r1,r2)
highordtest2 = \a b ->
case a of
highordtest2 = \a b ->
case a of