X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=Adders.hs;h=67d7d95e9fa3a7e3c5d693c2bf1980bb24900155;hb=8d8e5446f4558cd5bfbd78f3378e6cf96a9c3fc8;hp=d64331f0499f899f715a4a0464c722b7c7685b2a;hpb=1643800a4ef64501806747d2cafe917be7b1b3b2;p=matthijs%2Fmaster-project%2Fc%CE%BBash.git diff --git a/Adders.hs b/Adders.hs index d64331f..67d7d95 100644 --- a/Adders.hs +++ b/Adders.hs @@ -1,3 +1,5 @@ +{-# LANGUAGE TemplateHaskell #-} + module Adders where import Bits import qualified Sim @@ -174,8 +176,8 @@ highordtest = \x -> xand a b = hwand a b -functiontest :: TFVec D4 Bit -> Bit -> Bit -functiontest = \v s -> let r = foldl xand s v in r +functiontest :: TFVec D4 Bit -> TFVec D8 Bit +functiontest = \v -> let r = v ++ $(vectorTH ([High,Low,High,Low] :: [Bit])) in r xhwnot x = hwnot x