Merge pull request #311 from GaloisInc/vr/bump-macaw

bump submodules (+ cleanup)
GaloisInc · Oct 7, 2024 · d908272 · d908272
2 parents fa5187d + e488cdc
commit d908272
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/deps/elf-edit b/deps/elf-edit
diff --git a/deps/flexdis86 b/deps/flexdis86
diff --git a/deps/macaw b/deps/macaw
diff --git a/src/Reopt.hs b/src/Reopt.hs
@@ -2713,7 +2713,10 @@ reoptInitialDiscovery ::
 reoptInitialDiscovery loadOpts reoptOpts hdrAnn hdrInfo = do
   (os, initState) <- reoptX86Init loadOpts reoptOpts hdrInfo
   let symAddrMap = initDiscSymAddrMap initState
+  -- traceM "SymAddrMap is:"
   let ainfo = osArchitectureInfo os
+  -- traceM $ show $ samAddrMap symAddrMap
+  -- traceM $ show $ samNameMap symAddrMap
   (debugTypeMap, discState) <- doDiscovery hdrAnn hdrInfo ainfo initState reoptOpts
   return (os, symAddrMap, debugTypeMap, discState)
+1 −0		elf-edit.cabal
+1 −1		src/Data/ElfEdit.hs
+5 −5		src/Data/ElfEdit/HighLevel/GOT.hs
+6 −18		src/Data/ElfEdit/HighLevel/Get.hs
+6 −16		src/Data/ElfEdit/HighLevel/Layout.hs
+1 −7		src/Data/ElfEdit/HighLevel/Types.hs
+3 −0		src/Data/ElfEdit/Prim.hs
+3 −3		src/Data/ElfEdit/Relocations/PPC32.hs
+3 −3		src/Data/ElfEdit/Relocations/PPC64.hs
+444 −0		src/Data/ElfEdit/Relocations/RISCV.hs
+7 −1		tests/Makefile
+34 −0		tests/Test.hs
+3 −0		tests/riscv-relocs.c
+ −		tests/riscv32-relocs.elf
+ −		tests/riscv64-relocs.elf
+28 −9		.github/workflows/ci.yaml
+20 −20		cabal.project.ghc-9.4.8.freeze
+21 −21		cabal.project.ghc-9.6.4.freeze
+35 −38		cabal.project.ghc-9.8.1.freeze
+18 −5		utils/DumpInstr.hs