GaloisInc/macaw
1
1
Fork 0
mirror of https://github.com/GaloisInc/macaw.git synced 2024-12-28 08:34:23 +03:00
Code Issues Projects Releases Wiki Activity

Remove redundant function from Memory.

Browse Source
This commit is contained in:
Joe Hendrix 2018-07-12 13:46:02 -07:00
parent bca405562a
commit b24649db35
No known key found for this signature in database
GPG Key ID: 8DFA5FF784098C4F
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
base/src/Data/Macaw/Memory.hs
View File

@ -541,8 +541,11 @@ data SegmentRange (w :: Nat)
= ByteRegion !BS.ByteString
-- ^ A region with specificed bytes
| RelocationRegion !(Relocation w)
-- ^ A region whose contents are computed using the expression
-- denoted by the relocation.
| BSSRegion !(MemWord w)
-- ^ A region containing the given number of zero-initialized bytes.
-- ^ A region containing the given number of zero-initialized
-- bytes.
rangeSize :: forall w . MemWidth w => SegmentRange w -> MemWord w
rangeSize (ByteRegion bs) = fromIntegral (BS.length bs)
@ -629,7 +632,7 @@ contentsSize (SegmentContents m) =
Nothing -> 0
Just ((start, c),_) -> start + rangeSize c
-- | De-construct a 'SegmentContents' into its constituent ranges
-- | Deconstruct a 'SegmentContents' into its constituent ranges
contentsRanges :: SegmentContents w -> [(MemWord w, SegmentRange w)]
contentsRanges = Map.toList . segContentsMap
@ -670,8 +673,6 @@ contentsAfterSegmentOff mseg = do
Just ((_, RelocationRegion r),_) ->
Left (UnexpectedRelocation (relativeSegmentAddr mseg) r "caso")
contentsList :: SegmentContents w -> [(MemWord w, SegmentRange w)]
contentsList (SegmentContents m) = Map.toList m
------------------------------------------------------------------------
-- Code for injecting relocations into segments.
@ -1026,7 +1027,7 @@ memAsAddrPairs :: Memory w
-> [(MemSegmentOff w, MemSegmentOff w)]
memAsAddrPairs mem end = addrWidthClass (memAddrWidth mem) $ do
seg <- memSegments mem
(contents_offset,r) <- contentsList (segmentContents seg)
(contents_offset,r) <- contentsRanges (segmentContents seg)
let sz = addrSize mem
case r of
ByteRegion bs -> assert (BS.length bs `rem` fromIntegral sz == 0) $ do