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
Add a full_adder version with stateful interface.
[matthijs/master-project/cλash.git]
/
Adders.hs
diff --git
a/Adders.hs
b/Adders.hs
index f32f5d4f9fd89acaa71d4535c072dafeb5f78361..b09b98fdc4b43823fc13325f9887a7ea7f6cf260 100644
(file)
--- a/
Adders.hs
+++ b/
Adders.hs
@@
-5,6
+5,10
@@
import Language.Haskell.Syntax
mainIO f = Sim.simulateIO (Sim.stateless f) ()
mainIO f = Sim.simulateIO (Sim.stateless f) ()
+-- This function is from Sim.hs, but we redefine it here so it can get inlined
+-- by default.
+stateless f = \i s -> (s, f i)
+
show_add f = do print ("Sum: " ++ (displaysigs s)); print ("Carry: " ++ (displaysig c))
where
a = [High, High, High, High]
show_add f = do print ("Sum: " ++ (displaysigs s)); print ("Carry: " ++ (displaysig c))
where
a = [High, High, High, High]
@@
-47,6
+51,8
@@
full_adder (a, b, cin) = (s, c)
(s, c2) = half_adder(s1, cin)
c = c1 `hwor` c2
(s, c2) = half_adder(s1, cin)
c = c1 `hwor` c2
+sfull_adder = stateless full_adder
+
-- Four bit adder
-- Explicit version
-- [a] -> [b] -> ([s], cout)
-- Four bit adder
-- Explicit version
-- [a] -> [b] -> ([s], cout)