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
Updated all error messages to include modulename and function name
[matthijs/master-project/cλash.git]
/
HighOrdAlu.hs
diff --git
a/HighOrdAlu.hs
b/HighOrdAlu.hs
index 331fa1debd0b4f20a071b126398ee498b552967d..f7d4516c4fd047e6aad63d4d7407de285b7fcc05 100644
(file)
--- a/
HighOrdAlu.hs
+++ b/
HighOrdAlu.hs
@@
-8,20
+8,19
@@
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 =
- e +> (e +> (e +> (singleton e )))
+ copy e
invop :: Op n Bit
invop a b = map hwnot a
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
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
--anyset a b = copy undefined (a' `hwor` b')
anyset a b = constant (a' `hwor` b') a b
where