X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fmaster-project%2Fdsd-paper.git;a=blobdiff_plain;f=HigherOrderCPU.hs;h=a881001cb756df49c8c61bf005b7531842b397dc;hp=fd7471b4f9119257607ccc381f1f0a07b282bb78;hb=197f33f41a022d438997327361c759ffe6cadd03;hpb=b4f8f6d5cfa441b0e89d9ffd67a7cb1d30a9ca02

diff --git a/HigherOrderCPU.hs b/HigherOrderCPU.hs
index fd7471b..a881001 100644
--- a/HigherOrderCPU.hs
+++ b/HigherOrderCPU.hs
@@ -12,41 +12,41 @@ import CLasH.Translator.Annotations
 type Word   = SizedInt D16
 type Index  = RangedWord
 
-const :: a -> a -> a
 const a b = a
 
-fu :: ( PositiveT p, NaturalT n, (p :>: n) ~ True) =>
-  (a -> a -> a)
-  -> Vector p a
-  -> (Index n, Index n)
-  -> a
-  -> (a, a)
-fu op inputs (addr1, addr2) out =
-  (out', out)
+fu op inputs (addr1, addr2) = regIn
   where
-    in1  = inputs!addr1
-    in2  = inputs!addr2
-    out' = op in1 in2
+    in1   = inputs!addr1
+    in2   = inputs!addr2
+    regIn = op in1 in2
 
 type CpuState = State (Vector D4 Word)
 
 {-# ANN cpu TopEntity #-}
 {-# ANN cpu (InitState 'cpuState) #-}
-cpu :: 
-  Word 
-  -> Vector D4 (Index D6, Index D6)
-  -> CpuState
+cpu :: CpuState -> Word -> Vector D4 (Index D6, Index D6) -> Opcode
   -> (CpuState, Word)
-cpu input addrs (State fuss) =
-  (State fuss', out)
+cpu (State fuss) input addrs opc = (State fuss', out)
   where
-    fures = (fu const inputs (addrs!(0 :: Index D3)) (fuss!(0 :: Index D3))) +> (
-            (fu (+)   inputs (addrs!(1 :: Index D3)) (fuss!(1 :: Index D3))) +> (
-            (fu (-)   inputs (addrs!(2 :: Index D3)) (fuss!(2 :: Index D3))) +> ( singleton
-            (fu (*)   inputs (addrs!(3 :: Index D3)) (fuss!(3 :: Index D3))))))
-    (fuss', outputs) = unzip fures
-    inputs = 0 +> (1 +> (input +> outputs))
-    out = head outputs
+    fuss'   = (fu (multiop opc) inputs (addrs!(0 :: Index D3))) +> (
+              (fu (+)   inputs (addrs!(1 :: Index D3))) +> (
+              (fu (-)   inputs (addrs!(2 :: Index D3))) +> (
+              (fu (*)   inputs (addrs!(3 :: Index D3))) +> empty)))
+    inputs  = 0 +> (1 +> (input +> fuss))
+    out     = head fuss
 
 cpuState :: Vector D4 Word
-cpuState = copy 0
\ No newline at end of file
+cpuState = copy 0
+
+data Opcode = Shift | Xor | Equal
+
+multiop :: Opcode -> Word -> Word -> Word
+multiop opc a b = case opc of
+  Shift             -> shift a b
+  Xor               -> xor a b 
+  Equal | a == b    -> 1
+        | otherwise -> 0
+
+-- Placeholders, since we don't have these operations
+xor = const
+shift = const