Emulation/Stellarator
1
0
Fork 0
mirror of https://github.com/dpiponi/Stellarator.git synced 2024-05-16 19:10:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

Yet more hlint suggestions

Browse source
This commit is contained in:
dan.piponi 2020-09-30 18:06:47 -07:00
parent 70c3c2d189
commit 9b2ac062d1
2 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Display.hs
View file

@ -12,9 +12,7 @@ import Metrics ( screenWidth, screenHeight )
import Foreign.Marshal.Alloc ( mallocBytes )
import Foreign.Ptr ( Ptr )
import Foreign.Storable ( Storable(pokeElemOff) )
import System.Exit (die)
import System.Exit (exitFailure)
import System.Exit (die, exitFailure)
import System.IO
import TIAColors
import qualified Data.ByteString as BS

21
src/Emulation.hs
View file

@ -843,28 +843,25 @@ stellaVsync v = do
renderDisplay
vsync @= v
-- {-# INLINE pureReadRom #-}
-- | pureReadRom sees address in full 6507 range 0x0000-0x1fff
pureReadRom :: Word16 -> MonadAtari Word8
pureReadRom addr = do
withMemory :: Word16 -> (IOUArray Int Word8 -> BankState -> Int-> MonadAtari a) -> MonadAtari a
withMemory addr op = do
atari <- ask
let m = atari ^. rom
let bankStateRef = atari ^. bankState
bankState' <- liftIO $ readIORef bankStateRef
let bankedAddress = bankAddress bankState' addr
liftIO $ readArray m bankedAddress
op m bankState' bankedAddress
-- {-# INLINE pureReadRom #-}
-- | pureReadRom sees address in full 6507 range 0x0000-0x1fff
pureReadRom :: Word16 -> MonadAtari Word8
pureReadRom addr = withMemory addr $ \m _ bankedAddress -> liftIO $ readArray m bankedAddress
-- {-# INLINE pureWriteRom #-}
-- | pureWriteRom sees address in full 6507 range 0x0000-0x1fff
-- You can write to Super Chip "ROM"
pureWriteRom :: Word16 -> Word8 -> MonadAtari ()
pureWriteRom addr v = do
atari <- ask
let m = atari ^. rom
let bankStateRef = atari ^. bankState
bankState' <- liftIO $ readIORef bankStateRef
let bankedAddress = bankAddress bankState' addr
when (bankWritable bankState' addr) $ liftIO $ writeArray m bankedAddress v
pureWriteRom addr v = withMemory addr $ \m bankState' bankedAddress -> when (bankWritable bankState' addr) $ liftIO $ writeArray m bankedAddress v
-- {-# INLINE pureReadMemory #-}
-- | pureReadMemory expects an address in range 0x0000-0x1fff