Return RewriterEnv from ELF rewriter

renovate/src/Renovate.hs

@@ -109,6 +109,7 @@ module Renovate
   RW.RewriteSite(..),
   E.SomeBlocks(..),
   E.RewriterInfo,
+  E.RewriterEnv,
   E.SectionInfo(..),
   E.riSmallBlockCount,
   E.riReusedByteCount,

renovate/src/Renovate/BinaryFormat/ELF.hs

@@ -24,6 +24,7 @@ module Renovate.BinaryFormat.ELF (
   rewriteElf,
   analyzeElf,
   RewriterInfo,
+  RewriterEnv,
   SomeBlocks(..),
   RE.SectionInfo(..),
   reSegmentMaximumSize,
@@ -191,13 +192,13 @@ rewriteElf :: (B.InstructionConstraints arch,
            -- (including statically-allocated data)
            -> RE.LayoutStrategy
            -- ^ The layout strategy for blocks in the new binary
-           -> IO (E.Elf (MM.ArchAddrWidth arch), b arch, RewriterInfo lm arch)
+           -> IO (E.Elf (MM.ArchAddrWidth arch), b arch, RewriterInfo lm arch, RewriterEnv arch)
 rewriteElf cfg hdlAlloc e loadedBinary strat = do
-    (analysisResult, ri) <- runElfRewriter cfg e $ do
+    (analysisResult, ri, env) <- runElfRewriter cfg e $ do
       -- FIXME: Use the symbol map from the loaded binary (which we still need to add)
       symmap <- withCurrentELF buildSymbolMap
       doRewrite cfg hdlAlloc loadedBinary symmap strat
-    return (_riELF ri, analysisResult, ri)
+    return (_riELF ri, analysisResult, ri, env)
 
 -- | Run an analysis over an ELF file
 --
@@ -217,7 +218,7 @@ analyzeElf :: (B.InstructionConstraints arch,
            -- (including statically-allocated data)
            -> IO (b arch, [RE.Diagnostic])
 analyzeElf cfg hdlAlloc e loadedBinary = do
-  (b, ri) <- runElfRewriter cfg e $ do
+  (b, ri, _env) <- runElfRewriter cfg e $ do
     symmap <- withCurrentELF buildSymbolMap
     textSection <- withCurrentELF findTextSection
     let textRange = sectionAddressRange textSection

renovate/src/Renovate/BinaryFormat/ELF/Rewriter.hs

@@ -136,12 +136,14 @@ runElfRewriter :: E.ElfWidthConstraints (MM.ArchAddrWidth arch)
                => RenovateConfig arch binFmt callbacks b
                -> E.Elf (MM.ArchAddrWidth arch)
                -> ElfRewriter lm arch a
-               -> IO (a, RewriterInfo lm arch)
+               -> IO (a, RewriterInfo lm arch, Env.RewriterEnv arch)
 runElfRewriter config e a = do
   env <- Env.makeRewriterEnv config e
-  S.runStateT
-    (R.runReaderT (unElfRewrite a) env)
-    (emptyRewriterInfo e)
+  (result, info) <-
+    S.runStateT
+      (R.runReaderT (unElfRewrite a) env)
+      (emptyRewriterInfo e)
+  return (result, info, env)
 
 emptyRewriterInfo :: E.Elf (MM.ArchAddrWidth arch) -> RewriterInfo lm arch
 emptyRewriterInfo e = RewriterInfo { _riOverwrittenRegions       = []