GaloisInc/macaw
1
1
Fork 0
mirror of https://github.com/GaloisInc/macaw.git synced 2024-12-29 17:17:05 +03:00
Code Issues Projects Releases Wiki Activity

base: Change the type of the address in the ArchState statement

Browse Source 
ArchMemAddr is easier to use than ArchAddrWord in downstream clients, and is
probably more faithful in the case where we want to support shared libraries
and/or object files.
This commit is contained in:
Tristan Ravitch 2018-03-30 10:33:49 -07:00
parent ce96c55896
commit 2524b77cb5
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
base/src/Data/Macaw/CFG/Core.hs
View File

@ -779,7 +779,7 @@ data Stmt arch ids
-- ^ A user-level comment -- ^ A user-level comment
| ExecArchStmt !(ArchStmt arch (Value arch ids)) | ExecArchStmt !(ArchStmt arch (Value arch ids))
-- ^ Execute an architecture specific statement -- ^ Execute an architecture specific statement
| ArchState !(ArchAddrWord arch) !(MapF.MapF (ArchReg arch) (Value arch ids)) | ArchState !(ArchMemAddr arch) !(MapF.MapF (ArchReg arch) (Value arch ids))
-- ^ Address of an instruction and the *machine* registers that it updates -- ^ Address of an instruction and the *machine* registers that it updates
-- (with their associated macaw values after the execution of the -- (with their associated macaw values after the execution of the
-- instruction). -- instruction).
@ -801,7 +801,11 @@ ppStmt ppOff stmt =
ExecArchStmt s -> ppArchStmt (ppValue 10) s ExecArchStmt s -> ppArchStmt (ppValue 10) s
ArchState a m -> hang (length (show prefix)) (prefix PP.<> PP.semiBraces (MapF.foldrWithKey ppUpdate [] m)) ArchState a m -> hang (length (show prefix)) (prefix PP.<> PP.semiBraces (MapF.foldrWithKey ppUpdate [] m))
where where
prefix = text "#" <+> ppOff a PP.<> text ": " ppAddr addr =
case asAbsoluteAddr addr of
Just absAddr -> ppOff absAddr
Nothing -> PP.braces (PP.int (addrBase addr)) PP.<> ppOff (addrOffset addr)
prefix = text "#" <+> ppAddr a PP.<> text ": "
ppUpdate key val acc = text (showF key) <+> text "=>" <+> ppValue 0 val : acc ppUpdate key val acc = text (showF key) <+> text "=>" <+> ppValue 0 val : acc
instance ArchConstraints arch => Show (Stmt arch ids) where instance ArchConstraints arch => Show (Stmt arch ids) where