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

Implement most of mima-run CLI

Browse source
This commit is contained in:
Joscha 2019-11-06 17:20:08 +00:00
parent a1f532172a
commit 082a205a7e
3 changed files with 57 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Mima/Instruction.hs
View file

@ -63,7 +63,7 @@ data Instruction
deriving (Show, Eq)
instance ToText Instruction where
toText (SmallInstruction oc addr) = toText oc <> " 0x" <> addrToHex addr
toText (SmallInstruction oc addr) = T.justifyLeft 4 ' ' (toText oc) <> " " <> addrToDec addr
toText (LargeInstruction oc) = toText oc

8
src/Mima/State.hs
View file

@ -43,7 +43,13 @@ memoryToWords mem = map (\addr -> readAt addr mem) $ addressRange mem
addressWordToText :: MimaAddress -> MimaWord -> T.Text
addressWordToText addr word =
addrToHex addr <> " (" <> addrToDec addr <> ") - " <> wordToHex word <> " (" <> wordToDec word <> ")"
let separator = " - "
addrText = addrToHex addr <> " (" <> addrToDec addr <> ")"
wordText = wordToHex word <> " (" <> wordToDec word <> ")"
instrText = case wordToInstruction word of
Left _ -> ""
Right i -> separator <> toText i
in addrText <> separator <> wordText <> instrText
memoryToText :: Bool -> MimaMemory -> T.Text
memoryToText sparse mem@(MimaMemory m)