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 71d38dc4197293febaaca3917998fc8cf94841e2..ce261668e48eb7a9afd5a8e05ddb4bd31f65edf0 100644
(file)
--- a/
Adders.hs
+++ b/
Adders.hs
@@
-1,8
+1,14
@@
module Adders where
import Bits
module Adders where
import Bits
+import qualified Sim
import Language.Haskell.Syntax
import Language.Haskell.Syntax
-main = do show_add exp_adder; show_add rec_adder;
+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
show_add f = do print ("Sum: " ++ (displaysigs s)); print ("Carry: " ++ (displaysig c))
where
@@
-26,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
@@
-42,9
+55,11
@@
half_adder (a, b) =
full_adder :: (Bit, Bit, Bit) -> (Bit, Bit)
full_adder (a, b, cin) = (s, c)
where
full_adder :: (Bit, Bit, Bit) -> (Bit, Bit)
full_adder (a, b, cin) = (s, c)
where
- x = a `hwxor` b
- s = x `hwxor` cin
- c = a `hwand` b `hwor` (cin `hwand` x)
+ (s1, c1) = half_adder(a, b)
+ (s, c2) = half_adder(s1, cin)
+ c = c1 `hwor` c2
+
+sfull_adder = stateless full_adder
-- Four bit adder
-- Explicit version
-- Four bit adder
-- Explicit version