Started adding numeric operations

[matthijs/master-project/cλash.git] / Adders.hs

diff --git a/Adders.hs b/Adders.hs
index 2f3af384a5f186886c0c15f607f0fa13ba52a9fb..aca64d3c229550415200cf047ebba8b8d4fb6ac8 100644 (file)
--- a/Adders.hs
+++ b/Adders.hs
@@ -1,3 +1,5 @@
+{-# LANGUAGE TemplateHaskell #-}
+
 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 Data.SizedInt
+import Data.SizedWord
 
 mainIO f = Sim.simulateIO (Sim.stateless f) ()
 
@@ -174,8 +178,8 @@ highordtest = \x ->
 
 xand a b = hwand a b
 
-functiontest :: Bit -> TFVec D3 Bit
-functiontest = \a -> let r = generaten d3 hwnot a in r
+functiontest :: SizedWord D8 -> RangedWord D255
+functiontest = \a -> let r = fromSizedWord a in r
 
 xhwnot x = hwnot x