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 d4c43ca173450c14892dbfe92b57b478bcf8db63..aca64d3c229550415200cf047ebba8b8d4fb6ac8 100644
(file)
--- a/
Adders.hs
+++ b/
Adders.hs
@@
-1,3
+1,5
@@
+{-# LANGUAGE TemplateHaskell #-}
+
module Adders where
import Bits
import qualified Sim
module Adders where
import Bits
import qualified Sim
@@
-10,6
+12,9
@@
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
+import Data.SizedInt
+import Data.SizedWord
mainIO f = Sim.simulateIO (Sim.stateless f) ()
mainIO f = Sim.simulateIO (Sim.stateless f) ()
@@
-171,8
+176,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 :: SizedWord D8 -> RangedWord D255
+functiontest = \a -> let r = fromSizedWord 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