Fix higher-order cpu, also corrected in paper

diff --git a/HigherOrderCPU.hs b/HigherOrderCPU.hs
index 94bb7b6030d992cd46de713a57aa4b6e95b25a2d..8833766ebca36789ff9feb1808fe8207c90b5e03 100644 (file)
--- a/HigherOrderCPU.hs
+++ b/HigherOrderCPU.hs
@@ -14,32 +14,26 @@ type Index  = RangedWord
 
 const a b = 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)
   -> (CpuState, Word)
-cpu input addrs (State fuss) =
-  (State fuss', out)
+cpu (State fuss) input addrs = (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))) +> (
-            (fu (*)   inputs (addrs!(3 :: Index D3)) (fuss!(3 :: Index D3))) +> empty)))
-    (fuss', outputs) = unzip fures
-    inputs = 0 +> (1 +> (input +> outputs))
-    out = head outputs
+    fuss'   = (fu const 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

diff --git a/cλash.lhs b/cλash.lhs
index a1fadea64d82bd8474a0adc5d373c2bbb3bc26c1..95c7738e35bc8ea0671238f5e90e901bca388817 100644 (file)
--- a/cλash.lhs
+++ b/cλash.lhs
@@ -1207,10 +1207,10 @@ cpu :: Word -> [(Index 6, Index 6) | 4]
   -> State [Word | 4] -> (State [Word | 4], Word)
 cpu input addrs (State fuss) = (State fuss', out)
   where
-    fuss' =   [ fu const  inputs (addrs!0) (fuss!0)
-              , fu (+)    inputs (addrs!1) (fuss!1)
-              , fu (-)    inputs (addrs!2) (fuss!2)
-              , fu (*)    inputs (addrs!3) (fuss!3)
+    fuss' =   [ fu const  inputs (addrs!0)
+              , fu (+)    inputs (addrs!1)
+              , fu (-)    inputs (addrs!2)
+              , fu (*)    inputs (addrs!3)
               ]
     inputs    = 0 +> (1 +> (input +> fuss))
     out       = head fuss