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
Started adding numeric operations
[matthijs/master-project/cλash.git]
/
Adders.hs
diff --git
a/Adders.hs
b/Adders.hs
index 67d7d95e9fa3a7e3c5d693c2bf1980bb24900155..aca64d3c229550415200cf047ebba8b8d4fb6ac8 100644
(file)
--- a/
Adders.hs
+++ b/
Adders.hs
@@
-13,6
+13,8
@@
import Language.Haskell.Syntax
import Types
import Data.Param.TFVec
import Data.RangedWord
import Types
import Data.Param.TFVec
import Data.RangedWord
+import Data.SizedInt
+import Data.SizedWord
mainIO f = Sim.simulateIO (Sim.stateless f) ()
mainIO f = Sim.simulateIO (Sim.stateless f) ()
@@
-176,8
+178,8
@@
highordtest = \x ->
xand a b = hwand a b
xand a b = hwand a b
-functiontest ::
TFVec D4 Bit -> TFVec D8 Bit
-functiontest = \
v -> let r = v ++ $(vectorTH ([High,Low,High,Low] :: [Bit]))
in r
+functiontest ::
SizedWord D8 -> RangedWord D255
+functiontest = \
a -> let r = fromSizedWord a
in r
xhwnot x = hwnot x
xhwnot x = hwnot x