From: Matthijs Kooijman <m.kooijman@student.utwente.nl>
Date: Thu, 25 Jun 2009 14:45:30 +0000 (+0200)
Subject: Add a anyset operation to HighOrdAlu, using foldl.
X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=85a89721bf286e8bef30f845d5c1067b64c73249;p=matthijs%2Fmaster-project%2Fc%CE%BBash.git

Add a anyset operation to HighOrdAlu, using foldl.
---

diff --git a/HighOrdAlu.hs b/HighOrdAlu.hs
index f49d511..331fa1d 100644
--- a/HighOrdAlu.hs
+++ b/HighOrdAlu.hs
@@ -19,6 +19,15 @@ 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 :: 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
 
@@ -30,4 +39,4 @@ alu op1 op2 opc a b =
 
 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 andop