X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=Alu.hs;h=e1aff99e98bbafc444ef29035dcaed1c2817781f;hb=c14448ec4b59b13cffa7274d6154366d3be13fbb;hp=1c60c0414886cbb975d18fb994a286beb46e1c24;hpb=655444253776431f0949cafce2b991d12613fe04;p=matthijs%2Fmaster-project%2Fc%CE%BBash.git diff --git a/Alu.hs b/Alu.hs index 1c60c04..e1aff99 100644 --- a/Alu.hs +++ b/Alu.hs @@ -30,6 +30,7 @@ type RegAddr = Bit type RegisterBankState = State (Word, Word) --data RegisterBankState = Regs { r0, r1 :: Bit} deriving (Show) +{-# NOINLINE register_bank #-} register_bank :: RegAddr -- ^ Address -> Bit -- ^ Write Enable @@ -37,19 +38,21 @@ register_bank :: -> RegisterBankState -> -- State (RegisterBankState, Word) -- (State', Output) -register_bank addr we d (State s) = - case we of - Low -> -- Read - let - o = case addr of Low -> fst s; High -> snd s - in (State s, o) -- Don't change state - High -> -- Write - let - (r0, r1) = s - r0' = case addr of Low -> d; High -> r0 - r1' = case addr of High -> d; Low -> r1 - s' = (r0', r1') - in (State s', 0) -- Don't output anything useful +register_bank addr we d (State s) = (State s', o) + where + s' = case we of + Low -> s -- Read + High -> -- Write + let + (r0, r1) = s + r0' = case addr of Low -> d; High -> r0 + r1' = case addr of High -> d; Low -> r1 + in (r0', r1') + o = case we of + -- Read + Low -> case addr of Low -> fst s; High -> snd s + -- Write + High -> 0 -- Don't output anything useful -- ALU