projects
/
matthijs
/
master-project
/
cλash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added support for copyn and copy
[matthijs/master-project/cλash.git]
/
HighOrdAlu.hs
diff --git
a/HighOrdAlu.hs
b/HighOrdAlu.hs
index d453f640b91737a2a3dc0af0baa902d175822210..f7d4516c4fd047e6aad63d4d7407de285b7fcc05 100644
(file)
--- a/
HighOrdAlu.hs
+++ b/
HighOrdAlu.hs
@@
-8,9
+8,9
@@
import Types
import Data.Param.TFVec
import Data.RangedWord
import Data.Param.TFVec
import Data.RangedWord
-constant ::
e -> Op D4
e
+constant ::
NaturalT n => e -> Op n
e
constant e a b =
constant e a b =
- copy
(lengthT a)
e
+ copy e
invop :: Op n Bit
invop a b = map hwnot a
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
-- 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
--anyset a b = copy undefined (a' `hwor` b')
anyset a b = constant (a' `hwor` b') a b
where