Garmelon/mima-tools
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update resolver to 15.2

Browse source
This commit is contained in:
Joscha 2020-03-25 14:58:40 +00:00
parent bbd0707a6d
commit 3e0f4e22b1
4 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Mima/Instruction.hs
View file

@ -107,8 +107,6 @@ parseSmallInstruction mw = do
so <- parseSmallOpcode (getSmallOpcode mw) so <- parseSmallOpcode (getSmallOpcode mw)
pure $ SmallInstruction so (getLargeValue mw) pure $ SmallInstruction so (getLargeValue mw)
-- Assumes that all bits not part of the opcode are zeroed. The opcode
-- uses the lowest four bits.
parseSmallOpcode :: Opcode -> Either T.Text SmallOpcode parseSmallOpcode :: Opcode -> Either T.Text SmallOpcode
parseSmallOpcode w = case smallOpcodeMap Map.!? w of parseSmallOpcode w = case smallOpcodeMap Map.!? w of
Just oc -> pure oc Just oc -> pure oc
@ -120,8 +118,6 @@ parseLargeInstruction mw = do
lo <- parseLargeOpcode (getLargeOpcode mw) lo <- parseLargeOpcode (getLargeOpcode mw)
pure $ LargeInstruction lo (getSmallValue mw) pure $ LargeInstruction lo (getSmallValue mw)
-- Assumes that all bits not part of the opcode are zeroed. The opcode
-- uses the lowest four bits.
parseLargeOpcode :: Opcode -> Either T.Text LargeOpcode parseLargeOpcode :: Opcode -> Either T.Text LargeOpcode
parseLargeOpcode w = case largeOpcodeMap Map.!? w of parseLargeOpcode w = case largeOpcodeMap Map.!? w of
Just oc -> pure oc Just oc -> pure oc

3
src/Mima/State.hs
View file

@ -25,7 +25,6 @@ import Control.Monad.Trans.Except
import Control.Monad.Trans.Reader import Control.Monad.Trans.Reader
import Data.Bits import Data.Bits
import qualified Data.Map.Strict as Map import qualified Data.Map.Strict as Map
import Data.Maybe
import qualified Data.Text as T import qualified Data.Text as T
import Mima.Flag import Mima.Flag
@ -99,7 +98,7 @@ runExecution :: Flags (MimaAddress -> Bool) -> Execution a -> Either AbortReason
runExecution f exec = runExcept $ runReaderT exec f runExecution f exec = runExcept $ runReaderT exec f
failWith :: AbortReason -> Execution a failWith :: AbortReason -> Execution a
failWith = lift . except . Left failWith = lift . throwE
incrementIAR :: MimaState -> Execution MimaState incrementIAR :: MimaState -> Execution MimaState
incrementIAR ms = incrementIAR ms =

2
stack.yaml
View file

@ -17,7 +17,7 @@
# #
# resolver: ./custom-snapshot.yaml # resolver: ./custom-snapshot.yaml
# resolver: https://example.com/snapshots/2018-01-01.yaml # resolver: https://example.com/snapshots/2018-01-01.yaml
resolver: lts-14.14 resolver: lts-15.2
# User packages to be built. # User packages to be built.
# Various formats can be used as shown in the example below. # Various formats can be used as shown in the example below.

8
stack.yaml.lock
View file

@ -13,7 +13,7 @@ packages:
hackage: OddWord-1.0.2.0@sha256:5d848ff5db2c0457ce37ccc8898ce2b6b880a1c6a78e5b16841328a7404ff5ee,1888 hackage: OddWord-1.0.2.0@sha256:5d848ff5db2c0457ce37ccc8898ce2b6b880a1c6a78e5b16841328a7404ff5ee,1888
snapshots: snapshots:
- completed: - completed:
size: 525663 size: 491372
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/14/14.yaml url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/15/2.yaml
sha256: 6edc48df46eb8bf7b861e98dd30d021a92c2e1820c9bb6528aac5d997b0e14ef sha256: a98d091d911606d0d8adccbeb811b81bbd8cc2d888f99ef9e273350e8e9692a8
original: lts-14.14 original: lts-15.2