X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=HighOrdAlu.hs;h=f7d4516c4fd047e6aad63d4d7407de285b7fcc05;hb=1a10d214e6ffc7097c0f4bddf16f0dd87b5355a8;hp=6458f3c968958b8f265057b1fe173c534cdbe3cb;hpb=85630a6edff0a39510f78dd4e2d31dd82126d457;p=matthijs%2Fmaster-project%2Fc%CE%BBash.git

diff --git a/HighOrdAlu.hs b/HighOrdAlu.hs
index 6458f3c..f7d4516 100644
--- a/HighOrdAlu.hs
+++ b/HighOrdAlu.hs
@@ -8,19 +8,24 @@ import Types
 import Data.Param.TFVec
 import Data.RangedWord
 
-constant :: e -> Op D4 e
+constant :: NaturalT n => e -> Op n e
 constant e a b =
-  e +> (e +> (e +> (singleton e )))
-
-inv = hwnot
+  copy 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 :: NaturalT n => Op n 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 +37,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