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
Add comment to DEFAULT alternative simplification
[matthijs/master-project/cλash.git]
/
HigherOrderCPU.hs
diff --git
a/HigherOrderCPU.hs
b/HigherOrderCPU.hs
index 8e3f0da182f6d6db4a7d9d4372a25a4efa145e23..9b151d14c08b3dbf1ed516ba65dc7f5e98a18d84 100644
(file)
--- a/
HigherOrderCPU.hs
+++ b/
HigherOrderCPU.hs
@@
-18,9
+18,9
@@
fu1 = fu (+)
fu2 = fu (-)
fu3 = fu (*)
fu2 = fu (-)
fu3 = fu (*)
-data Opcode = Shift | Xor | Equal
+data Opcode = Shift
L
| Xor | Equal
-multiop Shift
= shift
+multiop Shift
L = shiftL
multiop Xor = xor
multiop Equal = \a b -> if a == b then 1 else 0
multiop Xor = xor
multiop Equal = \a b -> if a == b then 1 else 0
@@
-40,16
+40,5
@@
cpu (State s) (x,opc,addrs) = (State s', out)
(fu3 inputs (addrs!3)) +> empty)))
out = last s
(fu3 inputs (addrs!3)) +> empty)))
out = last s
-
-
-
-
-
-
--- Some minor details
cpuState :: Vector D4 (Signed D16)
cpuState = copy 0
cpuState :: Vector D4 (Signed D16)
cpuState = copy 0
-
-const a b = a
-xor = const
-shift = const