Merge pull request #9 from hermit-os/memory_addr

Replaced custom memory addr type with memory_address
hermit-os · Nov 12, 2024 · 603046b · 603046b
2 parents 2ab88f4 + 7af72ba
commit 603046b
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 589 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -12,9 +12,11 @@ keywords = ["os", "arm64", "aarch64"]
 license = "MIT/Apache-2.0"
 edition = '2021'
 exclude = ["/.gitlab-ci.yml", ".gitignore", ".gitattributes", "/.github/*"]
+rust-version = "1.82"
 
 [dependencies]
 aarch64-cpu = { version = "9.3" }
+memory_addresses = { version = "0.2.0", default-features = false, features = ["aarch64"] }
 tock-registers = { version = "0.8.x", default-features = false }
 
 [features]

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,5 +1,4 @@
 [toolchain]
-channel = "nightly"
 components = [
     "rustfmt",
     "rust-src",

diff --git a/src/lib.rs b/src/lib.rs
@@ -6,7 +6,6 @@
 // copied, modified, or distributed except according to those terms.
 
 #![allow(dead_code)]
-#![cfg_attr(feature = "nightly", feature(asm_const))]
 #![no_std]
 
 pub mod instructions;