From: Christiaan Baaij Date: Thu, 13 Aug 2009 07:55:33 +0000 (+0200) Subject: Class Num is re-exported by CLasH.HardwareTypes, so no need to use the one in Prelude X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=575a772a99af0b2b169b83c83b21a2bf07798bd2;p=matthijs%2Fmaster-project%2Fc%CE%BBash.git Class Num is re-exported by CLasH.HardwareTypes, so no need to use the one in Prelude --- diff --git a/Alu.hs b/Alu.hs index e1aff99..7171a65 100644 --- a/Alu.hs +++ b/Alu.hs @@ -62,8 +62,8 @@ alu :: AluOp -> Word -> Word -> Word {-# NOINLINE alu #-} --alu High a b = a `hwand` b --alu Low a b = a `hwor` b -alu High a b = a P.+ b -alu Low a b = a P.- b +alu High a b = a + b +alu Low a b = a - b type ExecState = State (RegisterBankState, Word, Word) exec :: (RegAddr, Bit, AluOp) -> ExecState -> (ExecState, Word)