X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=Adders.hs;h=a281ea63467780d4f7e6b7b9a32cfae58061ff22;hb=83a9910bd8031fbce225992e432e7dfba73b5c0f;hp=94184b077a66602c8c4b9ded53b6107ebeabc0bd;hpb=65d99830e416463d66f97581ece93da49f746778;p=matthijs%2Fmaster-project%2Fc%CE%BBash.git diff --git a/Adders.hs b/Adders.hs index 94184b0..a281ea6 100644 --- a/Adders.hs +++ b/Adders.hs @@ -13,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) () @@ -176,8 +178,11 @@ highordtest = \x -> xand a b = hwand a b -functiontest :: TFVec D4 (TFVec D3 Bit) -> (TFVec D12 Bit, TFVec D3 Bit) -functiontest = \v -> let r = (concat v, head v) in r +functiontest :: TFVec D3 (TFVec D4 Bit) -> TFVec D12 Bit +functiontest = \v -> let r = concat v in r + +functiontest2 :: SizedInt D8 -> SizedInt D8 +functiontest2 = \a -> let r = a + 1 in r xhwnot x = hwnot x