X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=HighOrdAlu.hs;h=eb92520676b82cca2ef6bb2ac3ba04b58baf4eaf;hb=7538f04668475b1782239832fb01b38783b1f9e3;hp=f49d5110c5673b0cca7d1164a80972b5a4028525;hpb=f428ef73d3c779bf00e9d493bad4eddf5bb9d0cb;p=matthijs%2Fmaster-project%2Fc%CE%BBash.git

diff --git a/HighOrdAlu.hs b/HighOrdAlu.hs
index f49d511..eb92520 100644
--- a/HighOrdAlu.hs
+++ b/HighOrdAlu.hs
@@ -7,27 +7,42 @@ import Bits
 import Types
 import Data.Param.TFVec
 import Data.RangedWord
+import CLasH.Translator.Annotations
 
 constant :: e -> Op D4 e
 constant e a b =
-  e +> (e +> (e +> (singleton e )))
+  (e +> (e +> (e +> (singleton e))))
 
 invop :: Op n Bit
 invop a b = map hwnot a
 
-
 andop :: Op n Bit
 andop a b = zipWith hwand a b
 
+-- Is any bit set?
+--anyset :: (PositiveT n) => Op n Bit
+anyset :: (Bit -> Bit -> Bit) -> Op D4 Bit
+--anyset a b = copy undefined (a' `hwor` b')
+anyset f a b = constant (a' `hwor` b') a b
+  where 
+    a' = foldl f Low a
+    b' = foldl f Low b
+
+xhwor = hwor
+
 type Op n e = (TFVec n e -> TFVec n e -> TFVec n e)
 type Opcode = Bit
 
+{-# ANN actual_alu InitState #-}
+initstate = High
+
 alu :: Op n e -> Op n e -> Opcode -> TFVec n e -> TFVec n e -> TFVec n e
 alu op1 op2 opc a b =
   case opc of
     Low -> op1 a b
     High -> op2 a b
 
+{-# ANN actual_alu TopEntity #-}
 actual_alu :: Opcode -> TFVec D4 Bit -> TFVec D4 Bit -> TFVec D4 Bit
 --actual_alu = alu (constant Low) andop
-actual_alu = alu invop andop
+actual_alu = alu (anyset xhwor)  andop