projects
/
matthijs
/
master-project
/
cλash.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0bc61dd
)
Let the exec function output something.
author
Matthijs Kooijman
<m.kooijman@student.utwente.nl>
Thu, 19 Feb 2009 15:14:52 +0000
(16:14 +0100)
committer
Matthijs Kooijman
<m.kooijman@student.utwente.nl>
Thu, 19 Feb 2009 15:14:52 +0000
(16:14 +0100)
Alu.hs
patch
|
blob
|
history
diff --git
a/Alu.hs
b/Alu.hs
index 3880245ff0d82a8ecee0609575a925903b90e3c1..ca2dbe9180613a3db75b55843660299246f809aa 100644
(file)
--- a/
Alu.hs
+++ b/
Alu.hs
@@
-61,11
+61,11
@@
salu High a b s = (s, a `hwand` b)
salu Low a b s = (s, a `hwor` b)
type ExecState = (RegisterBankState, Bit, Bit)
salu Low a b s = (s, a `hwor` b)
type ExecState = (RegisterBankState, Bit, Bit)
-exec :: (RegAddr, Bit, AluOp) -> ExecState -> (ExecState, ())
+exec :: (RegAddr, Bit, AluOp) -> ExecState -> (ExecState, (
Bit
))
-- Read & Exec
exec (addr, Low, op) s =
-- Read & Exec
exec (addr, Low, op) s =
- (s',
()
)
+ (s',
z'
)
where
(reg_s, t, z) = s
(reg_s', t') = register_bank (addr, Low, dontcare) reg_s
where
(reg_s, t, z) = s
(reg_s', t') = register_bank (addr, Low, dontcare) reg_s
@@
-74,7
+74,7
@@
exec (addr, Low, op) s =
-- Write
exec (addr, High, op) s =
-- Write
exec (addr, High, op) s =
- (s',
()
)
+ (s',
dontcare
)
where
(reg_s, t, z) = s
(reg_s', _) = register_bank (addr, High, z) reg_s
where
(reg_s, t, z) = s
(reg_s', _) = register_bank (addr, High, z) reg_s