X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=HighOrdAlu.hs;h=f49d5110c5673b0cca7d1164a80972b5a4028525;hb=571f4340e8e28262975cdf7b5150eb789fa674af;hp=cdef7710c206a817b1bedcfa030bdbfefdd6bfe3;hpb=1643800a4ef64501806747d2cafe917be7b1b3b2;p=matthijs%2Fmaster-project%2Fc%CE%BBash.git

diff --git a/HighOrdAlu.hs b/HighOrdAlu.hs
index cdef771..f49d511 100644
--- a/HighOrdAlu.hs
+++ b/HighOrdAlu.hs
@@ -10,12 +10,14 @@ import Data.RangedWord
 
 constant :: e -> Op D4 e
 constant e a b =
-  e +> (e +> (e +> (e +> empty)))
-
-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
 
 type Op n e = (TFVec n e -> TFVec n e -> TFVec n e)
 type Opcode = Bit
@@ -26,5 +28,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 invop andop