Changes for shuttle test

Cargo.toml

@@ -26,7 +26,8 @@ gdbstub = { version = "0.6.2", optional = true }
 goblin = "0.5.1"
 hash32 = "0.2.0"
 log = "0.4.2"
-loom = {path = "/Users/lucasste/Documents/loom"}
+# loom = {path = "/Users/lucasste/Documents/loom"}
+shuttle = "0.7.0"
 rand = { version = "0.8.5", features = ["small_rng"]}
 rustc-demangle = "0.1"
 scroll = "0.11"

src/assembler.rs

@@ -28,7 +28,7 @@ use std::{collections::HashMap};
 use std::sync::Arc;
 
 #[cfg(feature = "loom-test")]
-use loom::sync::Arc;
+use shuttle::sync::Arc;
 
 
 #[derive(Clone, Copy, Debug, PartialEq)]

src/elf.rs

@@ -36,7 +36,7 @@ use std::{collections::BTreeMap, fmt::Debug, mem, ops::Range, str};
 use std::sync::Arc;
 
 #[cfg(feature = "loom-test")]
-use loom::sync::Arc;
+use shuttle::sync::Arc;
 
 /// Error definitions
 #[derive(Debug, thiserror::Error, PartialEq, Eq)]

src/vm.rs

@@ -28,7 +28,7 @@ use std::{collections::BTreeMap, fmt::Debug};
 use std::sync::Arc;
 
 #[cfg(feature = "loom-test")]
-use loom::sync::Arc;
+use shuttle::sync::Arc;
 
 /// Shift the RUNTIME_ENVIRONMENT_KEY by this many bits to the LSB
 ///