X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=Adders.hs;h=67d7d95e9fa3a7e3c5d693c2bf1980bb24900155;hb=8d8e5446f4558cd5bfbd78f3378e6cf96a9c3fc8;hp=9e78fcf87dd6a0b4c431133b5e6ad5bbfb9b918e;hpb=c8034ff49822eb6e0e0696f288e20e49a1b9af6e;p=matthijs%2Fmaster-project%2Fc%CE%BBash.git diff --git a/Adders.hs b/Adders.hs index 9e78fcf..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 (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 :: TFVec D4 Bit -> TFVec D8 Bit +functiontest = \v -> let r = v ++ $(vectorTH ([High,Low,High,Low] :: [Bit])) in r xhwnot x = hwnot x