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
Never inline the half_adder function.
[matthijs/master-project/cλash.git]
/
Adders.hs
diff --git
a/Adders.hs
b/Adders.hs
index 10590fa7c765736ced0e4cf166160687c4ff2fd1..7243b504063c0871350745daf98036839078d83b 100644
(file)
--- a/
Adders.hs
+++ b/
Adders.hs
@@
-7,6
+7,7
@@
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.
-- 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))
stateless f = \i s -> (s, f i)
show_add f = do print ("Sum: " ++ (displaysigs s)); print ("Carry: " ++ (displaysig c))
@@
-15,6
+16,10
@@
show_add f = do print ("Sum: " ++ (displaysigs s)); print ("Carry: " ++ (displ
b = [Low, Low, Low, High]
(s, c) = f (a, b)
b = [Low, Low, Low, High]
(s, c) = f (a, b)
+mux2 :: Bit -> (Bit, Bit) -> Bit
+mux2 Low (a, b) = a
+mux2 High (a, b) = b
+
-- Not really an adder, but this is nice minimal hardware description
wire :: Bit -> Bit
wire a = a
-- Not really an adder, but this is nice minimal hardware description
wire :: Bit -> Bit
wire a = a
@@
-38,6
+43,14
@@
dff d s = (s', q)
q = s
s' = d
q = s
s' = d
+type ShifterState = (Bit, Bit, Bit, Bit)
+shifter :: Bit -> ShifterState -> (ShifterState, Bit)
+shifter a s =
+ (s', o)
+ where
+ s' = (a, b, c, d)
+ (b, c, d, o) = s
+
-- 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
@@
-46,6
+59,7
@@
no_carry_adder (a, b) = a `hwxor` b
-- Combinatoric stateless half adder
-- A -> B -> (S, C)
half_adder :: (Bit, Bit) -> (Bit, Bit)
-- Combinatoric stateless half adder
-- A -> B -> (S, C)
half_adder :: (Bit, Bit) -> (Bit, Bit)
+{-# NOINLINE half_adder #-}
half_adder (a, b) =
( a `hwxor` b, a `hwand` b )
half_adder (a, b) =
( a `hwxor` b, a `hwand` b )