Initial support for aarch32

chameco · chameco · commit 4625ea21c2cf · 2021-01-04T13:57:45.000-05:00
diff --git a/.gitmodules b/.gitmodules
@@ -52,3 +52,18 @@
 [submodule "deps/argo"]
 	path = deps/argo
 	url = https://github.com/galoisinc/argo
+[submodule "deps/what4-serialize"]
+	path = deps/what4-serialize
+	url = https://github.com/GaloisInc/what4-serialize
+[submodule "deps/asl-translator"]
+	path = deps/asl-translator
+	url = https://github.com/GaloisInc/asl-translator
+[submodule "deps/arm-asl-parser"]
+	path = deps/arm-asl-parser
+	url = https://github.com/GaloisInc/arm-asl-parser
+[submodule "deps/dismantle"]
+	path = deps/dismantle
+	url = https://github.com/travitch/dismantle
+[submodule "deps/semmc"]
+	path = deps/semmc
+	url = https://github.com/GaloisInc/semmc
diff --git a/cabal.project b/cabal.project
@@ -24,10 +24,21 @@ packages:
     deps/parameterized-utils
     deps/flexdis86
     deps/flexdis86/binary-symbols
+    deps/what4-serialize
+    deps/asl-translator
+    deps/arm-asl-parser
+    deps/dismantle/dismantle-tablegen
+    deps/dismantle/dismantle-arm-xml
+    deps/semmc/semmc
+    deps/semmc/semmc-synthesis
+    deps/semmc/semmc-aarch32
     deps/macaw/base
     deps/macaw/symbolic
     deps/macaw/x86
     deps/macaw/x86_symbolic
+    deps/macaw/macaw-semmc
+    deps/macaw/macaw-aarch32
+    deps/macaw/macaw-aarch32-symbolic
     deps/elf-edit
     deps/dwarf
     deps/argo/argo
diff --git a/deps/arm-asl-parser b/deps/arm-asl-parser
@@ -0,0 +1 @@
+Subproject commit afbeff2db4781e138bb8c920d803b7e7a88383b7
diff --git a/deps/asl-translator b/deps/asl-translator
@@ -0,0 +1 @@
+Subproject commit 943cf7d724b15c6ae4b650061f96c8bf0b63344a
diff --git a/deps/dismantle b/deps/dismantle
@@ -0,0 +1 @@
+Subproject commit 1c2e7892c6edc514cef94efa68717c7a7505140a
diff --git a/deps/macaw b/deps/macaw
@@ -1 +1 @@
-Subproject commit 7761a6f6e1348e6479b2ad272ad47e59fb5a8fd7
+Subproject commit 12ce4d05d81d21854fd68aba33e05c9ca5e6eb96
diff --git a/deps/semmc b/deps/semmc
@@ -0,0 +1 @@
+Subproject commit a60ace5ab6036dcb0c63aec0dddd2324b288ef9c
diff --git a/deps/what4-serialize b/deps/what4-serialize
@@ -0,0 +1 @@
+Subproject commit 1266de365f6fd094fd7456311a2072cb1ef651ed
diff --git a/saw-script.cabal b/saw-script.cabal
@@ -91,9 +91,12 @@ library
     , GraphSCC
     , macaw-base
     , macaw-x86
+    , macaw-aarch32
     , macaw-symbolic
     , macaw-x86-symbolic
+    , macaw-aarch32-symbolic
     , flexdis86
+    , asl-translator
     , elf-edit
     , reflection
     , aeson
@@ -155,6 +158,7 @@ library
     SAWScript.Crucible.LLVM.Skeleton
     SAWScript.Crucible.LLVM.Skeleton.Builtins
     SAWScript.Crucible.LLVM.X86
+    SAWScript.Crucible.LLVM.AArch32
 
     SAWScript.Crucible.JVM.Builtins
     SAWScript.Crucible.JVM.BuiltinsJVM
diff --git a/src/SAWScript/Crucible/LLVM/AArch32.hs b/src/SAWScript/Crucible/LLVM/AArch32.hs
diff --git a/src/SAWScript/Interpreter.hs b/src/SAWScript/Interpreter.hs
