X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=Adders.hs;h=67d7d95e9fa3a7e3c5d693c2bf1980bb24900155;hb=8d8e5446f4558cd5bfbd78f3378e6cf96a9c3fc8;hp=57823bd5009d935bb0c41c9fb2873f75d803f706;hpb=87f5213db3cfaa65ad805d0ee1c41434e2bed096;p=matthijs%2Fmaster-project%2Fc%CE%BBash.git diff --git a/Adders.hs b/Adders.hs index 57823bd..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) -> (TFVec D4 Bit, TFVec D4 Bit) -functiontest = \v -> let r = unzip 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