X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=Adders.hs;h=3afb82fae22e6ecebd6349ac23da944ebbec95f5;hb=b4ae262efb842ce254721f0f9ed9f0936241e094;hp=d4c43ca173450c14892dbfe92b57b478bcf8db63;hpb=91f8a87a34c9b4493bacda77b7df3c95951d3a67;p=matthijs%2Fmaster-project%2Fc%CE%BBash.git diff --git a/Adders.hs b/Adders.hs index d4c43ca..3afb82f 100644 --- a/Adders.hs +++ b/Adders.hs @@ -10,6 +10,7 @@ import Prelude hiding ( import Language.Haskell.Syntax import Types import Data.Param.TFVec +import Data.RangedWord mainIO f = Sim.simulateIO (Sim.stateless f) () @@ -171,8 +172,13 @@ highordtest = \x -> in \c d -> op' d c -functiontest :: TFVec D4 Bit -> Bit -functiontest = \v -> let r = head v in r +functiontest :: TFVec D4 Bit -> TFVec D5 Bit -> RangedWord D3 -> RangedWord D4 -> (Bit, Bit) +functiontest = \v1 v2 i1 i2 -> let r1 = v1!i1 ; r2 = v2!i2 in (r1,r2) + +xhwnot x = hwnot x + +maptest :: TFVec D4 Bit -> TFVec D4 Bit +maptest = \v -> let r = map xhwnot v in r highordtest2 = \a b -> case a of