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 9e78fcf87dd6a0b4c431133b5e6ad5bbfb9b918e..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
@@
-11,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) ()
@@
-174,8
+178,8
@@
highordtest = \x ->
xand a b = hwand a b
xand a b = hwand a b
-functiontest ::
TFVec D4 (TFVec D3 Bit) -> (TFVec D12 Bit, TFVec D3 Bit, TFVec D3 (TFVec D3 Bit))
-functiontest = \
v -> let r = (concat v, head v, tail v)
in r
+functiontest ::
SizedWord D8 -> RangedWord D255
+functiontest = \
a -> let r = fromSizedWord a
in r
xhwnot x = hwnot x
xhwnot x = hwnot x