Merge pull request #2234 from GaloisInc/macaw-loader-merged-into-macaw

Bump `macaw` submodule, remove `macaw-loader` submodule
GaloisInc · Feb 26, 2025 · 7e9ddc2 · 7e9ddc2
2 parents 4b919f6 + f55e0ea
commit 7e9ddc2
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 7 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -52,6 +52,3 @@
 [submodule "deps/mir-json"]
 	path = deps/mir-json
 	url = https://github.com/GaloisInc/mir-json.git
-[submodule "deps/macaw-loader"]
-	path = deps/macaw-loader
-	url = https://github.com/GaloisInc/macaw-loader.git
diff --git a/cabal.project b/cabal.project
@@ -37,11 +37,11 @@ packages:
     deps/lmdb/lmdb-simple
     deps/macaw/base
     deps/macaw/macaw-dump
+    deps/macaw/macaw-loader
+    deps/macaw/macaw-loader-x86
     deps/macaw/symbolic
     deps/macaw/x86
     deps/macaw/x86_symbolic
-    deps/macaw-loader/macaw-loader
-    deps/macaw-loader/macaw-loader-x86
     deps/elf-edit
     deps/dwarf
     deps/argo/argo

diff --git a/deps/macaw b/deps/macaw
diff --git a/deps/macaw-loader b/deps/macaw-loader
+7 −4		.github/workflows/ci.yaml
+9 −12		.gitmodules
+17 −10		README.md
+17 −0		README.org
+7 −5		cabal.project.dist
+52 −46		cabal.project.freeze.ghc-9.4.8
+51 −45		cabal.project.freeze.ghc-9.6.6
+51 −45		cabal.project.freeze.ghc-9.8.2
+1 −0		crucible-macaw-debug/.gitignore
+30 −0		crucible-macaw-debug/LICENSE
+15 −0		crucible-macaw-debug/README.md
+106 −0		crucible-macaw-debug/crucible-macaw-debug.cabal
+337 −0		crucible-macaw-debug/src/Data/Macaw/Symbolic/Debug.hs
+0 −1		deps/macaw-loader
+1 −1		macaw-aarch32-symbolic/src/Data/Macaw/AArch32/Symbolic.hs
+1 −1		macaw-aarch32-symbolic/tests/Main.hs
+2 −0		macaw-aarch32/ChangeLog.md
+0 −2		macaw-aarch32/Setup.hs
+1 −1		macaw-aarch32/src/Data/Macaw/ARM.hs
+131 −32		macaw-aarch32/src/Data/Macaw/ARM/ARMReg.hs
+24 −30		macaw-aarch32/src/Data/Macaw/ARM/Arch.hs
+1 −1		macaw-aarch32/src/Data/Macaw/ARM/Eval.hs
+2 −2		macaw-aarch32/src/Data/Macaw/ARM/Identify.hs
+5 −0		macaw-loader-aarch32/ChangeLog.md
+30 −0		macaw-loader-aarch32/LICENSE
+28 −0		macaw-loader-aarch32/macaw-loader-aarch32.cabal
+114 −0		macaw-loader-aarch32/src/Data/Macaw/BinaryLoader/AArch32.hs
+5 −0		macaw-loader-ppc/ChangeLog.md
+30 −0		macaw-loader-ppc/LICENSE
+32 −0		macaw-loader-ppc/macaw-loader-ppc.cabal
+206 −0		macaw-loader-ppc/src/Data/Macaw/BinaryLoader/PPC.hs
+110 −0		macaw-loader-ppc/src/Data/Macaw/BinaryLoader/PPC/ELF.hs
+80 −0		macaw-loader-ppc/src/Data/Macaw/BinaryLoader/PPC/TOC.hs
+5 −0		macaw-loader-riscv/ChangeLog.md
+30 −0		macaw-loader-riscv/LICENSE
+29 −0		macaw-loader-riscv/macaw-loader-riscv.cabal
+125 −0		macaw-loader-riscv/src/Data/Macaw/BinaryLoader/RISCV.hs
+5 −0		macaw-loader-x86/ChangeLog.md
+30 −0		macaw-loader-x86/LICENSE
+28 −0		macaw-loader-x86/macaw-loader-x86.cabal
+113 −0		macaw-loader-x86/src/Data/Macaw/BinaryLoader/X86.hs
+5 −0		macaw-loader/ChangeLog.md
+30 −0		macaw-loader/LICENSE
+0 −0		macaw-loader/Setup.hs
+41 −0		macaw-loader/macaw-loader.cabal
+109 −0		macaw-loader/src/Data/Macaw/BinaryLoader.hs
+33 −0		macaw-loader/src/Data/Macaw/BinaryLoader/ELF.hs
+0 −2		macaw-ppc-symbolic/Setup.hs
+0 −2		macaw-ppc/Setup.hs
+0 −2		macaw-riscv-symbolic/Setup.hs
+0 −2		macaw-riscv/Setup.hs
+0 −2		macaw-semmc/Setup.hs