X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=HighOrdAlu.hs;h=f7d4516c4fd047e6aad63d4d7407de285b7fcc05;hb=ce7380ad772e2a81c0329c6ee495e18fa0a62280;hp=f49d5110c5673b0cca7d1164a80972b5a4028525;hpb=f428ef73d3c779bf00e9d493bad4eddf5bb9d0cb;p=matthijs%2Fmaster-project%2Fc%CE%BBash.git diff --git a/HighOrdAlu.hs b/HighOrdAlu.hs index f49d511..f7d4516 100644 --- a/HighOrdAlu.hs +++ b/HighOrdAlu.hs @@ -8,17 +8,25 @@ 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 ))) + copy e invop :: Op n Bit 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 :: 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 @@ -30,4 +38,4 @@ alu op1 op2 opc a b = actual_alu :: Opcode -> TFVec D4 Bit -> TFVec D4 Bit -> TFVec D4 Bit --actual_alu = alu (constant Low) andop -actual_alu = alu invop andop +actual_alu = alu anyset andop