X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=HighOrdAlu.hs;h=eb92520676b82cca2ef6bb2ac3ba04b58baf4eaf;hb=89d205565ee7b8c7f4da92861e22a69687d659cf;hp=6458f3c968958b8f265057b1fe173c534cdbe3cb;hpb=ede1f399f096569d1305cd75cb21f037bd4162dc;p=matthijs%2Fmaster-project%2Fc%CE%BBash.git

diff --git a/HighOrdAlu.hs b/HighOrdAlu.hs
index 6458f3c..eb92520 100644
--- a/HighOrdAlu.hs
+++ b/HighOrdAlu.hs
@@ -7,29 +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 )))
-
-inv = hwnot
+  (e +> (e +> (e +> (singleton e))))
 
 invop :: Op n Bit
-invop a b = map inv a
-
-xand = hwand
+invop a b = map hwnot a
 
 andop :: Op n Bit
-andop a b = zipWith xand a b
+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 (constant Low) andop
+actual_alu = alu (anyset xhwor)  andop