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
Remove the function wrapper hack from HighOrdAlu.
[matthijs/master-project/cλash.git]
/
HighOrdAlu.hs
diff --git
a/HighOrdAlu.hs
b/HighOrdAlu.hs
index 6458f3c968958b8f265057b1fe173c534cdbe3cb..f49d5110c5673b0cca7d1164a80972b5a4028525 100644
(file)
--- a/
HighOrdAlu.hs
+++ b/
HighOrdAlu.hs
@@
-12,15
+12,12
@@
constant :: e -> Op D4 e
constant e a b =
e +> (e +> (e +> (singleton e )))
constant e a b =
e +> (e +> (e +> (singleton e )))
-inv = hwnot
-
invop :: Op n Bit
invop :: Op n Bit
-invop a b = map
inv
a
+invop a b = map
hwnot
a
-xand = hwand
andop :: Op n Bit
andop :: Op n Bit
-andop a b = zipWith
x
and a b
+andop a b = zipWith
hw
and a b
type Op n e = (TFVec n e -> TFVec n e -> TFVec n e)
type Opcode = Bit
type Op n e = (TFVec n e -> TFVec n e -> TFVec n e)
type Opcode = Bit
@@
-32,4
+29,5
@@
alu op1 op2 opc a b =
High -> op2 a b
actual_alu :: Opcode -> TFVec D4 Bit -> TFVec D4 Bit -> TFVec D4 Bit
High -> op2 a b
actual_alu :: Opcode -> TFVec D4 Bit -> TFVec D4 Bit -> TFVec D4 Bit
-actual_alu = alu (constant Low) andop
+--actual_alu = alu (constant Low) andop
+actual_alu = alu invop andop