From: Matthijs Kooijman Date: Thu, 25 Jun 2009 09:11:10 +0000 (+0200) Subject: Give HighOrdAlu an and operation. X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=85630a6edff0a39510f78dd4e2d31dd82126d457;p=matthijs%2Fmaster-project%2Fc%CE%BBash.git Give HighOrdAlu an and operation. --- diff --git a/HighOrdAlu.hs b/HighOrdAlu.hs index cdef771..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 +> (e +> empty))) + 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