Merge git://github.com/darchon/clash into cλash

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

diff --git a/HighOrdAlu.hs b/HighOrdAlu.hs
index 11636f2c8ba8e6c20242d2c1e4fba061085a2af3..def77421281ce0362125c266f3887c9d86c9943b 100644 (file)
--- a/HighOrdAlu.hs
+++ b/HighOrdAlu.hs
@@ -10,12 +10,24 @@ import Data.RangedWord
 
 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
+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
@@ -26,5 +38,6 @@ alu op1 op2 opc a b =
     Low -> op1 a b
     High -> op2 a b
 
-zero_inv_alu :: Opcode -> TFVec D4 Bit -> TFVec D4 Bit -> TFVec D4 Bit
-zero_inv_alu = alu (constant Low) invop
+actual_alu :: Opcode -> TFVec D4 Bit -> TFVec D4 Bit -> TFVec D4 Bit
+--actual_alu = alu (constant Low) andop
+actual_alu = alu (anyset xhwor)  andop