X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=HighOrdAlu.hs;fp=HighOrdAlu.hs;h=1ead210f0bb82dd85ceae098bdd3fb89380b5cf8;hb=4c63601269c7097e2177c547dc36d4edecc1c648;hp=eb92520676b82cca2ef6bb2ac3ba04b58baf4eaf;hpb=d30d9fe36698d9d9b5e44099fba9ba090e54064f;p=matthijs%2Fmaster-project%2Fc%CE%BBash.git

diff --git a/HighOrdAlu.hs b/HighOrdAlu.hs
index eb92520..1ead210 100644
--- a/HighOrdAlu.hs
+++ b/HighOrdAlu.hs
@@ -1,3 +1,5 @@
+{-# LANGUAGE TemplateHaskell #-}
+
 module HighOrdAlu where
 
 import Prelude hiding (
@@ -33,6 +35,11 @@ xhwor = hwor
 type Op n e = (TFVec n e -> TFVec n e -> TFVec n e)
 type Opcode = Bit
 
+{-# ANN sim_input TestInput#-}
+sim_input = [ (High,$(vectorTH [High,Low,Low,Low]),$(vectorTH [High,Low,Low,Low]))
+            , (High,$(vectorTH [High,High,High,High]),$(vectorTH [High,High,High,High]))
+            , (Low,$(vectorTH [High,Low,Low,High]),$(vectorTH [High,Low,High,Low]))]
+
 {-# ANN actual_alu InitState #-}
 initstate = High
 
@@ -43,6 +50,6 @@ alu op1 op2 opc a b =
     High -> op2 a b
 
 {-# ANN actual_alu TopEntity #-}
-actual_alu :: Opcode -> TFVec D4 Bit -> TFVec D4 Bit -> TFVec D4 Bit
+actual_alu :: (Opcode, TFVec D4 Bit, TFVec D4 Bit) -> TFVec D4 Bit
 --actual_alu = alu (constant Low) andop
-actual_alu = alu (anyset xhwor)  andop
+actual_alu (opc, a, b) = alu (anyset xhwor) (andop) opc a b