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
Merge branch 'cλash' of http://git.stderr.nl/matthijs/projects/master-project
[matthijs/master-project/cλash.git]
/
Adders.hs
diff --git
a/Adders.hs
b/Adders.hs
index ebc1c8c4f0ee45aa6a3975bbeb46d99fe0c04fd3..4b18e393504e7844be495b748a4c3143180e9f24 100644
(file)
--- a/
Adders.hs
+++ b/
Adders.hs
@@
-174,6
+174,16
@@
instance Inv (BitVec D0) where
functiontest :: TFVec D4 Bit -> Bit
functiontest = \v -> let r = head v in r
functiontest :: TFVec D4 Bit -> Bit
functiontest = \v -> let r = head v in r
+highordtest2 = \a b ->
+ case a of
+ High -> \c d -> d
+ Low -> let
+ op' :: Bit -> Bit -> Bit
+ op' = case b of
+ High -> \c d -> d
+ Low -> \c d -> c
+ in
+ \c d -> op' d c
-- Four bit adder, using the continous adder below
-- [a] -> [b] -> ([s], cout)
--con_adder_4 as bs =
-- Four bit adder, using the continous adder below
-- [a] -> [b] -> ([s], cout)
--con_adder_4 as bs =