projects
/
matthijs
/
master-project
/
cλash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated cabal file to reflect change in TFVec, and the need for the filepath library
[matthijs/master-project/cλash.git]
/
Adders.hs
diff --git
a/Adders.hs
b/Adders.hs
index 85e86c0f4a985f20da6d69207c4a9fa43e5825d4..67d7d95e9fa3a7e3c5d693c2bf1980bb24900155 100644
(file)
--- a/
Adders.hs
+++ b/
Adders.hs
@@
-1,3
+1,5
@@
+{-# LANGUAGE TemplateHaskell #-}
+
module Adders where
import Bits
import qualified Sim
module Adders where
import Bits
import qualified Sim
@@
-174,8
+176,8
@@
highordtest = \x ->
xand a b = hwand a b
xand a b = hwand a b
-functiontest :: TFVec D4 Bit ->
(TFVec D4 Bit, TFVec D4 Bit)
-functiontest = \v -> let r =
(rotl v, rotr 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
xhwnot x = hwnot x