Add a anyset operation to HighOrdAlu, using foldl.

[matthijs/master-project/cλash.git] / HighOrdAlu.hs

diff --git a/HighOrdAlu.hs b/HighOrdAlu.hs
index 6458f3c968958b8f265057b1fe173c534cdbe3cb..331fa1debd0b4f20a071b126398ee498b552967d 100644 (file)
--- a/HighOrdAlu.hs
+++ b/HighOrdAlu.hs
@@ -12,15 +12,21 @@ constant :: e -> Op D4 e
 constant e a b =
   e +> (e +> (e +> (singleton e )))
 
-inv = hwnot
-
 invop :: Op n Bit
-invop a b = map inv a
+invop a b = map hwnot a
 
-xand = hwand
 
 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 :: Op D4 Bit
+--anyset a b = copy undefined (a' `hwor` b')
+anyset a b = constant (a' `hwor` b') a b
+  where 
+    a' = foldl hwor Low a
+    b' = foldl hwor Low b
 
 type Op n e = (TFVec n e -> TFVec n e -> TFVec n e)
 type Opcode = Bit
@@ -32,4 +38,5 @@ alu op1 op2 opc a b =
     High -> op2 a b
 
 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 andop