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
Make createEntity preserve the Entity on builtin functions.
[matthijs/master-project/cλash.git]
/
Alu.hs
diff --git
a/Alu.hs
b/Alu.hs
index e9ddf5775869a4538ee064b120d0034e8730cf82..adc350f06dff902d2dc8250191f7c692270aa4e5 100644
(file)
--- a/
Alu.hs
+++ b/
Alu.hs
@@
-43,8
+43,8
@@
register_bank (addr, High, d) s = -- Write
where
--Regs r0 r1 = s
(r0, r1) = s
where
--Regs r0 r1 = s
(r0, r1) = s
- r0' =
if addr == Low then d else
r0
- r1' =
if addr == High then d else
r1
+ r0' =
case addr of Low -> d; High ->
r0
+ r1' =
case addr of High -> d; Low ->
r1
--s' = Regs r0' r1'
s' = (r0', r1')
--s' = Regs r0' r1'
s' = (r0', r1')
@@
-53,31
+53,20
@@
register_bank (addr, High, d) s = -- Write
type AluOp = Bit
alu :: AluOp -> Bit -> Bit -> Bit
type AluOp = Bit
alu :: AluOp -> Bit -> Bit -> Bit
+{-# NOINLINE alu #-}
alu High a b = a `hwand` b
alu Low a b = a `hwor` b
alu High a b = a `hwand` b
alu Low a b = a `hwor` b
-salu :: AluOp -> Bit -> Bit -> () -> ((), Bit)
-salu High a b s = (s, a `hwand` b)
-salu Low a b s = (s, a `hwor` b)
-
type ExecState = (RegisterBankState, Bit, Bit)
type ExecState = (RegisterBankState, Bit, Bit)
-exec :: (RegAddr, Bit, AluOp) -> ExecState -> (ExecState, ())
+exec :: (RegAddr, Bit, AluOp) -> ExecState -> (ExecState, (
Bit
))
-- Read & Exec
-- Read & Exec
-exec (addr,
Low
, op) s =
- (s',
()
)
+exec (addr,
we
, op) s =
+ (s',
z'
)
where
(reg_s, t, z) = s
where
(reg_s, t, z) = s
- (reg_s', t') = register_bank (addr,
Low, dontcare
) reg_s
+ (reg_s', t') = register_bank (addr,
we, z
) reg_s
z' = alu op t' t
s' = (reg_s', t', z')
z' = alu op t' t
s' = (reg_s', t', z')
--- Write
-exec (addr, High, op) s =
- (s', ())
- where
- (reg_s, t, z) = s
- (reg_s', _) = register_bank (addr, High, z) reg_s
- s' = (reg_s', t, z)
-
-- vim: set ts=8 sw=2 sts=2 expandtab:
-- vim: set ts=8 sw=2 sts=2 expandtab: