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
Give stateless a type signature.
[matthijs/master-project/cλash.git]
/
Adders.hs
diff --git
a/Adders.hs
b/Adders.hs
index f32f5d4f9fd89acaa71d4535c072dafeb5f78361..ce261668e48eb7a9afd5a8e05ddb4bd31f65edf0 100644
(file)
--- a/
Adders.hs
+++ b/
Adders.hs
@@
-5,6
+5,11
@@
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 :: (i -> o) -> (i -> () -> ((), o))
+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]
@@
-27,6
+32,13
@@
invinv a = hwnot (hwnot a)
dup :: Bit -> (Bit, Bit)
dup a = (a, a)
dup :: Bit -> (Bit, Bit)
dup a = (a, a)
+-- Not really an adder either, but a simple stateful example (D-flipflop)
+dff :: Bit -> Bit -> (Bit, Bit)
+dff d s = (s', q)
+ where
+ q = s
+ s' = d
+
-- Combinatoric stateless no-carry adder
-- A -> B -> S
no_carry_adder :: (Bit, Bit) -> Bit
-- Combinatoric stateless no-carry adder
-- A -> B -> S
no_carry_adder :: (Bit, Bit) -> Bit
@@
-47,6
+59,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)