X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=HighOrdAlu.hs;h=f7d4516c4fd047e6aad63d4d7407de285b7fcc05;hb=1a10d214e6ffc7097c0f4bddf16f0dd87b5355a8;hp=331fa1debd0b4f20a071b126398ee498b552967d;hpb=85a89721bf286e8bef30f845d5c1067b64c73249;p=matthijs%2Fmaster-project%2Fc%CE%BBash.git diff --git a/HighOrdAlu.hs b/HighOrdAlu.hs index 331fa1d..f7d4516 100644 --- a/HighOrdAlu.hs +++ b/HighOrdAlu.hs @@ -8,20 +8,19 @@ 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 :: Op D4 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