X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=HighOrdAlu.hs;fp=HighOrdAlu.hs;h=f7d4516c4fd047e6aad63d4d7407de285b7fcc05;hb=774c352cc8eb496df66e80ca1602f865b5ced2b8;hp=d453f640b91737a2a3dc0af0baa902d175822210;hpb=d9fdace4c79166836aaa00d7cfa5541f2dc29c3f;p=matthijs%2Fmaster-project%2Fc%CE%BBash.git diff --git a/HighOrdAlu.hs b/HighOrdAlu.hs index d453f64..f7d4516 100644 --- a/HighOrdAlu.hs +++ b/HighOrdAlu.hs @@ -8,9 +8,9 @@ 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 = - copy (lengthT a) e + copy e invop :: Op n Bit invop a b = map hwnot a @@ -20,7 +20,7 @@ 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