X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=HighOrdAlu.hs;h=6458f3c968958b8f265057b1fe173c534cdbe3cb;hb=30414e977c5c4ba3c16441a281601c7c68f0fb6e;hp=11636f2c8ba8e6c20242d2c1e4fba061085a2af3;hpb=69f55a9c6716f385e22378ce8be378e08b02377d;p=matthijs%2Fmaster-project%2Fc%CE%BBash.git

diff --git a/HighOrdAlu.hs b/HighOrdAlu.hs
index 11636f2..6458f3c 100644
--- a/HighOrdAlu.hs
+++ b/HighOrdAlu.hs
@@ -10,13 +10,18 @@ import Data.RangedWord
 
 constant :: e -> Op D4 e
 constant e a b =
-  e +> (e +> (e +> singleton e))
+  e +> (e +> (e +> (singleton e )))
 
 inv = hwnot
 
 invop :: Op n Bit
 invop a b = map inv a
 
+xand = hwand
+
+andop :: Op n Bit
+andop a b = zipWith xand a b
+
 type Op n e = (TFVec n e -> TFVec n e -> TFVec n e)
 type Opcode = Bit
 
@@ -26,5 +31,5 @@ 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