X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=Adders.hs;h=2ee1de69534f144ab6f41d627fdfc7ce950e4f05;hb=e6cbe8ccf80244d1e36d30ffa45dcf56d8bf982f;hp=f07c8e9acf673338be33ba4df7ea6ed23d9e8808;hpb=f330640bc6a6652d5d841ce147596e08e05e316c;p=matthijs%2Fmaster-project%2Fc%CE%BBash.git

diff --git a/Adders.hs b/Adders.hs
index f07c8e9..2ee1de6 100644
--- a/Adders.hs
+++ b/Adders.hs
@@ -2,7 +2,7 @@ module Adders where
 import Bits
 import qualified Sim
 import Language.Haskell.Syntax
-import Data.TypeLevel
+import qualified Data.TypeLevel as TypeLevel
 import qualified Data.Param.FSVec as FSVec
 
 mainIO f = Sim.simulateIO (Sim.stateless f) ()
@@ -26,10 +26,10 @@ mux2 High (a, b) = b
 wire :: Bit -> Bit
 wire a = a
 
-bus :: (Pos len) => BitVec len -> BitVec len
+bus :: (TypeLevel.Pos len) => BitVec len -> BitVec len
 bus v = v
 
-bus_4 :: BitVec D4 -> BitVec D4
+bus_4 :: BitVec TypeLevel.D4 -> BitVec TypeLevel.D4
 bus_4 v = v
 
 {-
@@ -53,7 +53,7 @@ instance Inv (BitVec D0) where
 -}
 -- Not really an adder either, but a slightly more complex example
 inv :: Bit -> Bit
-inv a = hwnot a
+inv a = let r = hwnot a in r
 
 -- Not really an adder either, but a slightly more complex example
 invinv :: Bit -> Bit
@@ -72,11 +72,31 @@ dff d s = (s', q)
 
 type ShifterState = (Bit, Bit, Bit, Bit)
 shifter :: Bit -> ShifterState -> (ShifterState, Bit)
-shifter a s =
-  (s', o)
+shifter i (a, b, c, d) =
+  (s', d)
   where
-    s' = (a, b, c, d)
-    (b, c, d, o) = s
+    s' = (i, a, b, c)
+
+{-# NOINLINE shifter_en #-}
+shifter_en :: Bit -> Bit-> ShifterState -> (ShifterState, Bit)
+shifter_en High i (a, b, c, d) =
+  (s', d)
+  where
+    s' = (i, a, b, c)
+
+shifter_en Low i s@(a, b, c, d) =
+  (s, d)
+
+-- Two multiplexed shifters
+type ShiftersState = (ShifterState, ShifterState)
+shifters :: Bit -> Bit -> ShiftersState -> (ShiftersState, Bit)
+shifters sel i (sa, sb) =
+  (s', out)
+  where
+    (sa', outa) = shifter_en sel i sa
+    (sb', outb) = shifter_en (hwnot sel) i sb
+    s' = (sa', sb')
+    out = if sel == High then outa else outb
 
 -- Combinatoric stateless no-carry adder
 -- A -> B -> S
@@ -126,6 +146,25 @@ rec_adder ((a:as), (b:bs)) =
     (rest, cin) = rec_adder (as, bs)
     (s, cout) = full_adder (a, b, cin)
 
+foo = id
+add, sub :: Int -> Int -> Int
+add a b = a + b
+sub a b = a - b
+
+highordtest = \x ->
+  let s = foo x
+  in
+     case s of
+       (a, b) ->
+         case a of
+           High -> add
+           Low -> let
+             op' = case b of
+                High -> sub
+                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 =